diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:54 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-15 13:25:54 -0500 |
| commit | d1186a33efa74c91b01e1b5d9918c61d109f1b54 (patch) | |
| tree | 5e1430bcd829f18a905b95efd2d4b89d219b250b /hw | |
| parent | fdef621b5810cf8d6715e04d883a0f3523873014 (diff) | |
| parent | c3594ed73e0a7e7feae309be79f0eb6bafcc02ab (diff) | |
| download | focaccia-qemu-d1186a33efa74c91b01e1b5d9918c61d109f1b54.tar.gz focaccia-qemu-d1186a33efa74c91b01e1b5d9918c61d109f1b54.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: ivshmem, qdev-monitor: fix order of qerror parameters iov_send_recv(): Handle zero bytes case even if OS does not framebuffer: Fix spelling in comment (leight -> height) Spelling fix in comment (peripherans -> peripherals) docs: Fix spelling (propery -> property) trace: Fix "Qemu" -> "QEMU" cputlb.c: Fix out of date comment ehci: fix assertion typo Makefile: Avoid explicit list of directories in clean target
Diffstat (limited to 'hw')
| -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 |
5 files changed, 6 insertions, 5 deletions
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; |