mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
avoid TABs in files that only contain a few
Most files that have TABs only contain a handful of them. Change
them to spaces so that we don't confuse people.
disas, standard-headers, linux-headers and libdecnumber are imported
from other projects and probably should be exempted from the check.
Outside those, after this patch the following files still contain both
8-space and TAB sequences at the beginning of the line. Many of them
have a majority of TABs, or were initially committed with all tabs.
bsd-user/i386/target_syscall.h
bsd-user/x86_64/target_syscall.h
crypto/aes.c
hw/audio/fmopl.c
hw/audio/fmopl.h
hw/block/tc58128.c
hw/display/cirrus_vga.c
hw/display/xenfb.c
hw/dma/etraxfs_dma.c
hw/intc/sh_intc.c
hw/misc/mst_fpga.c
hw/net/pcnet.c
hw/sh4/sh7750.c
hw/timer/m48t59.c
hw/timer/sh_timer.c
include/crypto/aes.h
include/disas/bfd.h
include/hw/sh4/sh.h
libdecnumber/decNumber.c
linux-headers/asm-generic/unistd.h
linux-headers/linux/kvm.h
linux-user/alpha/target_syscall.h
linux-user/arm/nwfpe/double_cpdo.c
linux-user/arm/nwfpe/fpa11_cpdt.c
linux-user/arm/nwfpe/fpa11_cprt.c
linux-user/arm/nwfpe/fpa11.h
linux-user/flat.h
linux-user/flatload.c
linux-user/i386/target_syscall.h
linux-user/ppc/target_syscall.h
linux-user/sparc/target_syscall.h
linux-user/syscall.c
linux-user/syscall_defs.h
linux-user/x86_64/target_syscall.h
slirp/cksum.c
slirp/if.c
slirp/ip.h
slirp/ip_icmp.c
slirp/ip_icmp.h
slirp/ip_input.c
slirp/ip_output.c
slirp/mbuf.c
slirp/misc.c
slirp/sbuf.c
slirp/socket.c
slirp/socket.h
slirp/tcp_input.c
slirp/tcpip.h
slirp/tcp_output.c
slirp/tcp_subr.c
slirp/tcp_timer.c
slirp/tftp.c
slirp/udp.c
slirp/udp.h
target/cris/cpu.h
target/cris/mmu.c
target/cris/op_helper.c
target/sh4/helper.c
target/sh4/op_helper.c
target/sh4/translate.c
tcg/sparc/tcg-target.inc.c
tests/tcg/cris/check_addo.c
tests/tcg/cris/check_moveq.c
tests/tcg/cris/check_swap.c
tests/tcg/multiarch/test-mmap.c
ui/vnc-enc-hextile-template.h
ui/vnc-enc-zywrle.h
util/envlist.c
util/readline.c
The following have only TABs:
bsd-user/i386/target_signal.h
bsd-user/sparc64/target_signal.h
bsd-user/sparc64/target_syscall.h
bsd-user/sparc/target_signal.h
bsd-user/sparc/target_syscall.h
bsd-user/x86_64/target_signal.h
crypto/desrfb.c
hw/audio/intel-hda-defs.h
hw/core/uboot_image.h
hw/sh4/sh7750_regnames.c
hw/sh4/sh7750_regs.h
include/hw/cris/etraxfs_dma.h
linux-user/alpha/termbits.h
linux-user/arm/nwfpe/fpopcode.h
linux-user/arm/nwfpe/fpsr.h
linux-user/arm/syscall_nr.h
linux-user/arm/target_signal.h
linux-user/cris/target_signal.h
linux-user/i386/target_signal.h
linux-user/linux_loop.h
linux-user/m68k/target_signal.h
linux-user/microblaze/target_signal.h
linux-user/mips64/target_signal.h
linux-user/mips/target_signal.h
linux-user/mips/target_syscall.h
linux-user/mips/termbits.h
linux-user/ppc/target_signal.h
linux-user/sh4/target_signal.h
linux-user/sh4/termbits.h
linux-user/sparc64/target_syscall.h
linux-user/sparc/target_signal.h
linux-user/x86_64/target_signal.h
linux-user/x86_64/termbits.h
pc-bios/optionrom/optionrom.h
slirp/mbuf.h
slirp/misc.h
slirp/sbuf.h
slirp/tcp.h
slirp/tcp_timer.h
slirp/tcp_var.h
target/i386/svm.h
target/sparc/asi.h
target/xtensa/core-dc232b/xtensa-modules.inc.c
target/xtensa/core-dc233c/xtensa-modules.inc.c
target/xtensa/core-de212/core-isa.h
target/xtensa/core-de212/xtensa-modules.inc.c
target/xtensa/core-fsf/xtensa-modules.inc.c
target/xtensa/core-sample_controller/core-isa.h
target/xtensa/core-sample_controller/xtensa-modules.inc.c
target/xtensa/core-test_kc705_be/core-isa.h
target/xtensa/core-test_kc705_be/xtensa-modules.inc.c
tests/tcg/cris/check_abs.c
tests/tcg/cris/check_addc.c
tests/tcg/cris/check_addcm.c
tests/tcg/cris/check_addoq.c
tests/tcg/cris/check_bound.c
tests/tcg/cris/check_ftag.c
tests/tcg/cris/check_int64.c
tests/tcg/cris/check_lz.c
tests/tcg/cris/check_openpf5.c
tests/tcg/cris/check_sigalrm.c
tests/tcg/cris/crisutils.h
tests/tcg/cris/sys.c
tests/tcg/i386/test-i386-ssse3.c
ui/vgafont.h
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20181213223737.11793-3-pbonzini@redhat.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Eric Blake <eblake@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Stefan Markovic <smarkovic@wavecomp.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
+11
-11
@@ -85,14 +85,14 @@ static int bochs_probe(const uint8_t *buf, int buf_size, const char *filename)
|
||||
const struct bochs_header *bochs = (const void *)buf;
|
||||
|
||||
if (buf_size < HEADER_SIZE)
|
||||
return 0;
|
||||
return 0;
|
||||
|
||||
if (!strcmp(bochs->magic, HEADER_MAGIC) &&
|
||||
!strcmp(bochs->type, REDOLOG_TYPE) &&
|
||||
!strcmp(bochs->subtype, GROWING_TYPE) &&
|
||||
((le32_to_cpu(bochs->version) == HEADER_VERSION) ||
|
||||
(le32_to_cpu(bochs->version) == HEADER_V1)))
|
||||
return 100;
|
||||
!strcmp(bochs->type, REDOLOG_TYPE) &&
|
||||
!strcmp(bochs->subtype, GROWING_TYPE) &&
|
||||
((le32_to_cpu(bochs->version) == HEADER_VERSION) ||
|
||||
(le32_to_cpu(bochs->version) == HEADER_V1)))
|
||||
return 100;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -125,8 +125,8 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
if (strcmp(bochs.magic, HEADER_MAGIC) ||
|
||||
strcmp(bochs.type, REDOLOG_TYPE) ||
|
||||
strcmp(bochs.subtype, GROWING_TYPE) ||
|
||||
((le32_to_cpu(bochs.version) != HEADER_VERSION) &&
|
||||
(le32_to_cpu(bochs.version) != HEADER_V1))) {
|
||||
((le32_to_cpu(bochs.version) != HEADER_VERSION) &&
|
||||
(le32_to_cpu(bochs.version) != HEADER_V1))) {
|
||||
error_setg(errp, "Image not in Bochs format");
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
|
||||
}
|
||||
|
||||
for (i = 0; i < s->catalog_size; i++)
|
||||
le32_to_cpus(&s->catalog_bitmap[i]);
|
||||
le32_to_cpus(&s->catalog_bitmap[i]);
|
||||
|
||||
s->data_offset = le32_to_cpu(bochs.header) + (s->catalog_size * 4);
|
||||
|
||||
@@ -217,7 +217,7 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)
|
||||
extent_offset = (offset % s->extent_size) / 512;
|
||||
|
||||
if (s->catalog_bitmap[extent_index] == 0xffffffff) {
|
||||
return 0; /* not allocated */
|
||||
return 0; /* not allocated */
|
||||
}
|
||||
|
||||
bitmap_offset = s->data_offset +
|
||||
@@ -232,7 +232,7 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num)
|
||||
}
|
||||
|
||||
if (!((bitmap_entry >> (extent_offset % 8)) & 1)) {
|
||||
return 0; /* not allocated */
|
||||
return 0; /* not allocated */
|
||||
}
|
||||
|
||||
return bitmap_offset + (512 * (s->bitmap_blocks + extent_offset));
|
||||
|
||||
+1
-1
@@ -2083,7 +2083,7 @@ again:
|
||||
#endif
|
||||
if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
|
||||
#ifdef DIOCGMEDIASIZE
|
||||
if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
|
||||
if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
|
||||
#elif defined(DIOCGPART)
|
||||
{
|
||||
struct partinfo pi;
|
||||
|
||||
+4
-4
@@ -176,7 +176,7 @@ int qemu_ftruncate64(int fd, int64_t length)
|
||||
BOOL res;
|
||||
|
||||
if ((GetVersion() & 0x80000000UL) && (length >> 32) != 0)
|
||||
return -1;
|
||||
return -1;
|
||||
|
||||
h = (HANDLE)_get_osfhandle(fd);
|
||||
|
||||
@@ -184,13 +184,13 @@ int qemu_ftruncate64(int fd, int64_t length)
|
||||
li.HighPart = 0;
|
||||
li.LowPart = SetFilePointer (h, 0, &li.HighPart, FILE_CURRENT);
|
||||
if (li.LowPart == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
high = length >> 32;
|
||||
dw = SetFilePointer(h, (DWORD) length, &high, FILE_BEGIN);
|
||||
if (dw == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) {
|
||||
return -1;
|
||||
return -1;
|
||||
}
|
||||
res = SetEndOfFile(h);
|
||||
|
||||
@@ -203,7 +203,7 @@ static int set_sparse(int fd)
|
||||
{
|
||||
DWORD returned;
|
||||
return (int) DeviceIoControl((HANDLE)_get_osfhandle(fd), FSCTL_SET_SPARSE,
|
||||
NULL, 0, NULL, 0, &returned, NULL);
|
||||
NULL, 0, NULL, 0, &returned, NULL);
|
||||
}
|
||||
|
||||
static void raw_detach_aio_context(BlockDriverState *bs)
|
||||
|
||||
+2
-2
@@ -384,10 +384,10 @@ static int laio_do_submit(int fd, struct qemu_laiocb *laiocb, off_t offset,
|
||||
switch (type) {
|
||||
case QEMU_AIO_WRITE:
|
||||
io_prep_pwritev(iocbs, fd, qiov->iov, qiov->niov, offset);
|
||||
break;
|
||||
break;
|
||||
case QEMU_AIO_READ:
|
||||
io_prep_preadv(iocbs, fd, qiov->iov, qiov->niov, offset);
|
||||
break;
|
||||
break;
|
||||
/* Currently Linux kernel does not support other operations */
|
||||
default:
|
||||
fprintf(stderr, "%s: invalid AIO request type 0x%x.\n",
|
||||
|
||||
@@ -402,7 +402,7 @@ static int count_contiguous_clusters(int nb_clusters, int cluster_size,
|
||||
}
|
||||
}
|
||||
|
||||
return i;
|
||||
return i;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
+1
-1
@@ -187,7 +187,7 @@ static uint32_t vpc_checksum(uint8_t* buf, size_t size)
|
||||
static int vpc_probe(const uint8_t *buf, int buf_size, const char *filename)
|
||||
{
|
||||
if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
|
||||
return 100;
|
||||
return 100;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -1367,7 +1367,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
|
||||
if (!have_guest_base) {
|
||||
/*
|
||||
* Go through ELF program header table and find out whether
|
||||
* any of the segments drop below our current mmap_min_addr and
|
||||
* any of the segments drop below our current mmap_min_addr and
|
||||
* in that case set guest_base to corresponding address.
|
||||
*/
|
||||
for (i = 0, elf_ppnt = elf_phdata; i < elf_ex.e_phnum;
|
||||
|
||||
@@ -296,7 +296,7 @@ static int fill_header(WinDumpHeader64 *hdr, struct pa_space *ps,
|
||||
static int fill_context(KDDEBUGGER_DATA64 *kdbg,
|
||||
struct va_space *vs, QEMU_Elf *qe)
|
||||
{
|
||||
int i;
|
||||
int i;
|
||||
for (i = 0; i < qe->state_nr; i++) {
|
||||
uint64_t Prcb;
|
||||
uint64_t Context;
|
||||
|
||||
+6
-6
@@ -664,8 +664,8 @@ static bool window_translate(TyphoonWindow *win, hwaddr addr,
|
||||
pte_addr |= (addr & (wsm | 0xfe000)) >> 10;
|
||||
return pte_translate(pte_addr, ret);
|
||||
} else {
|
||||
/* Direct-mapped translation. */
|
||||
return make_iommu_tlbe(tba & ~wsm_ext, wsm_ext, ret);
|
||||
/* Direct-mapped translation. */
|
||||
return make_iommu_tlbe(tba & ~wsm_ext, wsm_ext, ret);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -700,7 +700,7 @@ static IOMMUTLBEntry typhoon_translate_iommu(IOMMUMemoryRegion *iommu,
|
||||
|
||||
/* Check the fourth window for DAC disable. */
|
||||
if ((pchip->win[3].wba & 0x80000000000ull) == 0
|
||||
&& window_translate(&pchip->win[3], addr, &ret)) {
|
||||
&& window_translate(&pchip->win[3], addr, &ret)) {
|
||||
goto success;
|
||||
}
|
||||
} else {
|
||||
@@ -711,7 +711,7 @@ static IOMMUTLBEntry typhoon_translate_iommu(IOMMUMemoryRegion *iommu,
|
||||
if (pchip->ctl & 0x40) {
|
||||
/* See 10.1.4.4; in particular <39:35> is ignored. */
|
||||
make_iommu_tlbe(0, 0x007ffffffffull, &ret);
|
||||
goto success;
|
||||
goto success;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -723,8 +723,8 @@ static IOMMUTLBEntry typhoon_translate_iommu(IOMMUMemoryRegion *iommu,
|
||||
pte_addr = pchip->win[3].tba & 0x7ffc00000ull;
|
||||
pte_addr |= (addr & 0xffffe000u) >> 10;
|
||||
if (pte_translate(pte_addr, &ret)) {
|
||||
goto success;
|
||||
}
|
||||
goto success;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@ static void gptm_tick(void *opaque)
|
||||
s->state |= 1;
|
||||
if ((s->control & 0x20)) {
|
||||
/* Output trigger. */
|
||||
qemu_irq_pulse(s->trigger);
|
||||
qemu_irq_pulse(s->trigger);
|
||||
}
|
||||
if (s->mode[0] & 1) {
|
||||
/* One-shot. */
|
||||
|
||||
+9
-9
@@ -90,7 +90,7 @@ static void sh_serial_write(void *opaque, hwaddr offs,
|
||||
|
||||
#ifdef DEBUG_SERIAL
|
||||
printf("sh_serial: write offs=0x%02x val=0x%02x\n",
|
||||
offs, val);
|
||||
offs, val);
|
||||
#endif
|
||||
switch(offs) {
|
||||
case 0x00: /* SMR */
|
||||
@@ -98,17 +98,17 @@ static void sh_serial_write(void *opaque, hwaddr offs,
|
||||
return;
|
||||
case 0x04: /* BRR */
|
||||
s->brr = val;
|
||||
return;
|
||||
return;
|
||||
case 0x08: /* SCR */
|
||||
/* TODO : For SH7751, SCIF mask should be 0xfb. */
|
||||
s->scr = val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0xfa : 0xff);
|
||||
if (!(val & (1 << 5)))
|
||||
s->flags |= SH_SERIAL_FLAG_TEND;
|
||||
if ((s->feat & SH_SERIAL_FEAT_SCIF) && s->txi) {
|
||||
qemu_set_irq(s->txi, val & (1 << 7));
|
||||
qemu_set_irq(s->txi, val & (1 << 7));
|
||||
}
|
||||
if (!(val & (1 << 6))) {
|
||||
qemu_set_irq(s->rxi, 0);
|
||||
qemu_set_irq(s->rxi, 0);
|
||||
}
|
||||
return;
|
||||
case 0x0c: /* FTDR / TDR */
|
||||
@@ -117,9 +117,9 @@ static void sh_serial_write(void *opaque, hwaddr offs,
|
||||
/* XXX this blocks entire thread. Rewrite to use
|
||||
* qemu_chr_fe_write and background I/O callbacks */
|
||||
qemu_chr_fe_write_all(&s->chr, &ch, 1);
|
||||
}
|
||||
s->dr = val;
|
||||
s->flags &= ~SH_SERIAL_FLAG_TDE;
|
||||
}
|
||||
s->dr = val;
|
||||
s->flags &= ~SH_SERIAL_FLAG_TDE;
|
||||
return;
|
||||
#if 0
|
||||
case 0x14: /* FRDR / RDR */
|
||||
@@ -210,7 +210,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
|
||||
break;
|
||||
case 0x04:
|
||||
ret = s->brr;
|
||||
break;
|
||||
break;
|
||||
case 0x08:
|
||||
ret = s->scr;
|
||||
break;
|
||||
@@ -288,7 +288,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
|
||||
}
|
||||
#ifdef DEBUG_SERIAL
|
||||
printf("sh_serial: read offs=0x%02x val=0x%x\n",
|
||||
offs, ret);
|
||||
offs, ret);
|
||||
#endif
|
||||
|
||||
if (ret & ~((1 << 16) - 1)) {
|
||||
|
||||
@@ -696,7 +696,7 @@ static void virtio_serial_save_device(VirtIODevice *vdev, QEMUFile *f)
|
||||
qemu_put_byte(f, port->guest_connected);
|
||||
qemu_put_byte(f, port->host_connected);
|
||||
|
||||
elem_popped = 0;
|
||||
elem_popped = 0;
|
||||
if (port->elem) {
|
||||
elem_popped = 1;
|
||||
}
|
||||
|
||||
+29
-29
@@ -60,34 +60,34 @@ static void buffer_append(struct XenConsole *con)
|
||||
|
||||
size = prod - cons;
|
||||
if ((size == 0) || (size > sizeof(intf->out)))
|
||||
return;
|
||||
return;
|
||||
|
||||
if ((buffer->capacity - buffer->size) < size) {
|
||||
buffer->capacity += (size + 1024);
|
||||
buffer->data = g_realloc(buffer->data, buffer->capacity);
|
||||
buffer->capacity += (size + 1024);
|
||||
buffer->data = g_realloc(buffer->data, buffer->capacity);
|
||||
}
|
||||
|
||||
while (cons != prod)
|
||||
buffer->data[buffer->size++] = intf->out[
|
||||
MASK_XENCONS_IDX(cons++, intf->out)];
|
||||
buffer->data[buffer->size++] = intf->out[
|
||||
MASK_XENCONS_IDX(cons++, intf->out)];
|
||||
|
||||
xen_mb();
|
||||
intf->out_cons = cons;
|
||||
xen_pv_send_notify(&con->xendev);
|
||||
|
||||
if (buffer->max_capacity &&
|
||||
buffer->size > buffer->max_capacity) {
|
||||
/* Discard the middle of the data. */
|
||||
buffer->size > buffer->max_capacity) {
|
||||
/* Discard the middle of the data. */
|
||||
|
||||
size_t over = buffer->size - buffer->max_capacity;
|
||||
uint8_t *maxpos = buffer->data + buffer->max_capacity;
|
||||
size_t over = buffer->size - buffer->max_capacity;
|
||||
uint8_t *maxpos = buffer->data + buffer->max_capacity;
|
||||
|
||||
memmove(maxpos - over, maxpos, over);
|
||||
buffer->data = g_realloc(buffer->data, buffer->max_capacity);
|
||||
buffer->size = buffer->capacity = buffer->max_capacity;
|
||||
memmove(maxpos - over, maxpos, over);
|
||||
buffer->data = g_realloc(buffer->data, buffer->max_capacity);
|
||||
buffer->size = buffer->capacity = buffer->max_capacity;
|
||||
|
||||
if (buffer->consumed > buffer->max_capacity - over)
|
||||
buffer->consumed = buffer->max_capacity - over;
|
||||
if (buffer->consumed > buffer->max_capacity - over)
|
||||
buffer->consumed = buffer->max_capacity - over;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,8 +95,8 @@ static void buffer_advance(struct buffer *buffer, size_t len)
|
||||
{
|
||||
buffer->consumed += len;
|
||||
if (buffer->consumed == buffer->size) {
|
||||
buffer->consumed = 0;
|
||||
buffer->size = 0;
|
||||
buffer->consumed = 0;
|
||||
buffer->size = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ static int ring_free_bytes(struct XenConsole *con)
|
||||
|
||||
space = prod - cons;
|
||||
if (space > sizeof(intf->in))
|
||||
return 0; /* ring is screwed: ignore it */
|
||||
return 0; /* ring is screwed: ignore it */
|
||||
|
||||
return (sizeof(intf->in) - space);
|
||||
}
|
||||
@@ -132,12 +132,12 @@ static void xencons_receive(void *opaque, const uint8_t *buf, int len)
|
||||
max = ring_free_bytes(con);
|
||||
/* The can_receive() func limits this, but check again anyway */
|
||||
if (max < len)
|
||||
len = max;
|
||||
len = max;
|
||||
|
||||
prod = intf->in_prod;
|
||||
for (i = 0; i < len; i++) {
|
||||
intf->in[MASK_XENCONS_IDX(prod++, intf->in)] =
|
||||
buf[i];
|
||||
intf->in[MASK_XENCONS_IDX(prod++, intf->in)] =
|
||||
buf[i];
|
||||
}
|
||||
xen_wmb();
|
||||
intf->in_prod = prod;
|
||||
@@ -228,11 +228,11 @@ static int con_initialise(struct XenDevice *xendev)
|
||||
int limit;
|
||||
|
||||
if (xenstore_read_int(con->console, "ring-ref", &con->ring_ref) == -1)
|
||||
return -1;
|
||||
return -1;
|
||||
if (xenstore_read_int(con->console, "port", &con->xendev.remote_port) == -1)
|
||||
return -1;
|
||||
return -1;
|
||||
if (xenstore_read_int(con->console, "limit", &limit) == 0)
|
||||
con->buffer.max_capacity = limit;
|
||||
con->buffer.max_capacity = limit;
|
||||
|
||||
if (!xendev->dev) {
|
||||
xen_pfn_t mfn = con->ring_ref;
|
||||
@@ -244,7 +244,7 @@ static int con_initialise(struct XenDevice *xendev)
|
||||
PROT_READ | PROT_WRITE);
|
||||
}
|
||||
if (!con->sring)
|
||||
return -1;
|
||||
return -1;
|
||||
|
||||
xen_be_bind_evtchn(&con->xendev);
|
||||
qemu_chr_fe_set_handlers(&con->chr, xencons_can_receive,
|
||||
@@ -252,10 +252,10 @@ static int con_initialise(struct XenDevice *xendev)
|
||||
|
||||
xen_pv_printf(xendev, 1,
|
||||
"ring mfn %d, remote port %d, local port %d, limit %zd\n",
|
||||
con->ring_ref,
|
||||
con->xendev.remote_port,
|
||||
con->xendev.local_port,
|
||||
con->buffer.max_capacity);
|
||||
con->ring_ref,
|
||||
con->xendev.remote_port,
|
||||
con->xendev.local_port,
|
||||
con->buffer.max_capacity);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -282,7 +282,7 @@ static void con_event(struct XenDevice *xendev)
|
||||
|
||||
buffer_append(con);
|
||||
if (con->buffer.size - con->buffer.consumed)
|
||||
xencons_send(con);
|
||||
xencons_send(con);
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------------------- */
|
||||
|
||||
+14
-14
@@ -244,26 +244,26 @@ int load_aout(const char *filename, hwaddr addr, int max_sz,
|
||||
case OMAGIC:
|
||||
if (e.a_text + e.a_data > max_sz)
|
||||
goto fail;
|
||||
lseek(fd, N_TXTOFF(e), SEEK_SET);
|
||||
size = read_targphys(filename, fd, addr, e.a_text + e.a_data);
|
||||
if (size < 0)
|
||||
goto fail;
|
||||
break;
|
||||
lseek(fd, N_TXTOFF(e), SEEK_SET);
|
||||
size = read_targphys(filename, fd, addr, e.a_text + e.a_data);
|
||||
if (size < 0)
|
||||
goto fail;
|
||||
break;
|
||||
case NMAGIC:
|
||||
if (N_DATADDR(e, target_page_size) + e.a_data > max_sz)
|
||||
goto fail;
|
||||
lseek(fd, N_TXTOFF(e), SEEK_SET);
|
||||
size = read_targphys(filename, fd, addr, e.a_text);
|
||||
if (size < 0)
|
||||
goto fail;
|
||||
lseek(fd, N_TXTOFF(e), SEEK_SET);
|
||||
size = read_targphys(filename, fd, addr, e.a_text);
|
||||
if (size < 0)
|
||||
goto fail;
|
||||
ret = read_targphys(filename, fd, addr + N_DATADDR(e, target_page_size),
|
||||
e.a_data);
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
size += ret;
|
||||
break;
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
size += ret;
|
||||
break;
|
||||
default:
|
||||
goto fail;
|
||||
goto fail;
|
||||
}
|
||||
close(fd);
|
||||
return size;
|
||||
|
||||
@@ -319,7 +319,7 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)
|
||||
SCR_REG_B(DEBUG);
|
||||
}
|
||||
fprintf(stderr, "tc6393xb_scr: unhandled write at %08x: %02x\n",
|
||||
(uint32_t) addr, value & 0xff);
|
||||
(uint32_t) addr, value & 0xff);
|
||||
}
|
||||
#undef SCR_REG_B
|
||||
#undef SCR_REG_W
|
||||
@@ -358,7 +358,7 @@ static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, hwaddr addr, uint32_t val
|
||||
return;
|
||||
}
|
||||
fprintf(stderr, "tc6393xb_nand_cfg: unhandled write at %08x: %02x\n",
|
||||
(uint32_t) addr, value & 0xff);
|
||||
(uint32_t) addr, value & 0xff);
|
||||
}
|
||||
|
||||
static uint32_t tc6393xb_nand_readb(TC6393xbState *s, hwaddr addr) {
|
||||
@@ -421,7 +421,7 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t value)
|
||||
return;
|
||||
}
|
||||
fprintf(stderr, "tc6393xb_nand: unhandled write at %08x: %02x\n",
|
||||
(uint32_t) addr, value & 0xff);
|
||||
(uint32_t) addr, value & 0xff);
|
||||
}
|
||||
|
||||
#define BITS 8
|
||||
|
||||
+4
-4
@@ -85,10 +85,10 @@ const uint8_t gr_mask[16] = {
|
||||
|
||||
#define cbswap_32(__x) \
|
||||
((uint32_t)( \
|
||||
(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
|
||||
(((uint32_t)(__x) & (uint32_t)0x000000ffUL) << 24) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0x0000ff00UL) << 8) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0x00ff0000UL) >> 8) | \
|
||||
(((uint32_t)(__x) & (uint32_t)0xff000000UL) >> 24) ))
|
||||
|
||||
#ifdef HOST_WORDS_BIGENDIAN
|
||||
#define PAT(x) cbswap_32(x)
|
||||
|
||||
@@ -498,9 +498,9 @@ static void virgl_write_fence(void *opaque, uint32_t fence)
|
||||
|
||||
QTAILQ_FOREACH_SAFE(cmd, &g->fenceq, next, tmp) {
|
||||
/*
|
||||
* the guest can end up emitting fences out of order
|
||||
* so we should check all fenced cmds not just the first one.
|
||||
*/
|
||||
* the guest can end up emitting fences out of order
|
||||
* so we should check all fenced cmds not just the first one.
|
||||
*/
|
||||
if (cmd->cmd_hdr.fence_id > fence) {
|
||||
continue;
|
||||
}
|
||||
|
||||
+2
-2
@@ -228,7 +228,7 @@ static void pxa2xx_dma_run(PXA2xxDMAState *s)
|
||||
!(ch->state & DCSR_NODESCFETCH))
|
||||
pxa2xx_dma_descriptor_fetch(s, c);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ch->cmd = (ch->cmd & ~DCMD_LEN) | length;
|
||||
@@ -283,7 +283,7 @@ static uint64_t pxa2xx_dma_read(void *opaque, hwaddr offset,
|
||||
|
||||
case DCSR0 ... DCSR31:
|
||||
channel = offset >> 2;
|
||||
if (s->chan[channel].request)
|
||||
if (s->chan[channel].request)
|
||||
return s->chan[channel].state | DCSR_REQPEND;
|
||||
return s->chan[channel].state;
|
||||
|
||||
|
||||
+1
-1
@@ -345,7 +345,7 @@ void soc_dma_port_add_mem(struct soc_dma_s *soc, uint8_t *phys_base,
|
||||
while (entry < dma->memmap + dma->memmap_size &&
|
||||
entry->addr <= virt_base)
|
||||
entry ++;
|
||||
}
|
||||
}
|
||||
|
||||
memmove(entry + 1, entry,
|
||||
(uint8_t *) (dma->memmap + dma->memmap_size ++) -
|
||||
|
||||
+1
-1
@@ -118,7 +118,7 @@ static int max7310_tx(I2CSlave *i2c, uint8_t data)
|
||||
break;
|
||||
|
||||
case 0x00: /* Input port - ignore writes */
|
||||
break;
|
||||
break;
|
||||
default:
|
||||
#ifdef VERBOSE
|
||||
printf("%s: unknown register %02x\n", __func__, s->command);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user