diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | cputlb.c | 4 | ||||
| -rw-r--r-- | docs/bootindex.txt | 2 | ||||
| -rw-r--r-- | hw/framebuffer.c | 2 | ||||
| -rw-r--r-- | hw/ivshmem.c | 3 | ||||
| -rw-r--r-- | hw/qdev-monitor.c | 2 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 2 | ||||
| -rw-r--r-- | hw/versatilepb.c | 2 | ||||
| -rw-r--r-- | iov.c | 7 | ||||
| -rwxr-xr-x | scripts/simpletrace.py | 2 |
10 files changed, 20 insertions, 13 deletions
diff --git a/Makefile b/Makefile index 6a65f8f2fa..1cd5bc80d5 100644 --- a/Makefile +++ b/Makefile @@ -214,13 +214,10 @@ clean: # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h rm -f qemu-options.def - rm -f *.o *.d *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ + find . -name '*.[od]' -exec rm -f {} + + rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -Rf .libs - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d qga/*.o qga/*.d - rm -f qom/*.o qom/*.d libuser/qom/*.o libuser/qom/*.d - rm -f hw/usb/*.o hw/usb/*.d hw/*.o hw/*.d rm -f qemu-img-cmds.h - rm -f trace/*.o trace/*.d rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp @# May not be present in GENERATED_HEADERS rm -f trace-dtrace.h trace-dtrace.h-timestamp diff --git a/cputlb.c b/cputlb.c index 0d1e2527fb..d3e7b257ae 100644 --- a/cputlb.c +++ b/cputlb.c @@ -312,7 +312,9 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, /* NOTE: this function can trigger an exception */ /* NOTE2: the returned address is not exactly the physical address: it - is the offset relative to phys_ram_base */ + * is actually a ram_addr_t (in system mode; the user mode emulation + * version of this function returns a guest virtual address). + */ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) { int mmu_idx, page_index, pd; diff --git a/docs/bootindex.txt b/docs/bootindex.txt index 16083b387e..803ebfc831 100644 --- a/docs/bootindex.txt +++ b/docs/bootindex.txt @@ -1,4 +1,4 @@ -= Bootindex propery = += Bootindex property = Block and net devices have bootindex property. This property is used to determine the order in which firmware will consider devices for booting diff --git a/hw/framebuffer.c b/hw/framebuffer.c index f4747cd646..85a00a5798 100644 --- a/hw/framebuffer.c +++ b/hw/framebuffer.c @@ -28,7 +28,7 @@ void framebuffer_update_display( MemoryRegion *address_space, target_phys_addr_t base, int cols, /* Width in pixels. */ - int rows, /* Leight in pixels. */ + int rows, /* Height in pixels. */ int src_width, /* Length of source line, in bytes. */ int dest_row_pitch, /* Bytes between adjacent horizontal output pixels. */ int dest_col_pitch, /* Bytes between adjacent vertical output pixels. */ diff --git a/hw/ivshmem.c b/hw/ivshmem.c index 0c58161565..b4d65a6db5 100644 --- a/hw/ivshmem.c +++ b/hw/ivshmem.c @@ -677,7 +677,8 @@ static int pci_ivshmem_init(PCIDevice *dev) } if (s->role_val == IVSHMEM_PEER) { - error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION, "ivshmem", "peer mode"); + error_set(&s->migration_blocker, QERR_DEVICE_FEATURE_BLOCKS_MIGRATION, + "peer mode", "ivshmem"); migrate_add_blocker(s->migration_blocker); } diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index b22a37a00c..018b386782 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -443,7 +443,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) bus = qbus_find_recursive(sysbus_get_default(), NULL, k->bus_type); if (!bus) { qerror_report(QERR_NO_BUS_FOR_DEVICE, - driver, k->bus_type); + k->bus_type, driver); return NULL; } } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index b043e7c23e..104c21d315 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2010,7 +2010,7 @@ static void ehci_fill_queue(EHCIPacket *p) p->qtdaddr = qtdaddr; p->qtd = qtd; p->usb_status = ehci_execute(p, "queue"); - assert(p->usb_status = USB_RET_ASYNC); + assert(p->usb_status == USB_RET_ASYNC); p->async = EHCI_ASYNC_INFLIGHT; } } diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 4fd5d9b04b..7a92034718 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -162,7 +162,7 @@ static int vpb_sic_init(SysBusDevice *dev) /* Board init. */ /* The AB and PB boards both use the same core, just with different - peripherans and expansion busses. For now we emulate a subset of the + peripherals and expansion busses. For now we emulate a subset of the PB peripherals and just change the board ID. */ static struct arm_boot_info versatile_binfo; diff --git a/iov.c b/iov.c index b3330610bb..60705c73ab 100644 --- a/iov.c +++ b/iov.c @@ -146,6 +146,13 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt, { ssize_t ret; unsigned si, ei; /* start and end indexes */ + if (bytes == 0) { + /* Catch the do-nothing case early, as otherwise we will pass an + * empty iovec to sendmsg/recvmsg(), and not all implementations + * accept this. + */ + return 0; + } /* Find the start position, skipping `offset' bytes: * first, skip all full-sized vector elements, */ diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py index 9b4419f7c3..8bbcb42cc4 100755 --- a/scripts/simpletrace.py +++ b/scripts/simpletrace.py @@ -71,7 +71,7 @@ def read_trace_file(edict, fobj): log_version = header[2] if log_version == 0: - raise ValueError('Older log format, not supported with this Qemu release!') + raise ValueError('Older log format, not supported with this QEMU release!') while True: rec = read_record(edict, fobj) |