From 5f8daf2e04709800531bc1ecbb7b49b637182777 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 1 Apr 2012 22:07:30 +0200 Subject: qxl: Add missing GCC_FMT_ATTR and fix format specifier val is an uint64_t, therefore %d was not correct. Signed-off-by: Stefan Weil Acked-by: Gerd Hoffmann Signed-off-by: Stefan Hajnoczi --- hw/qxl.c | 2 +- hw/qxl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/qxl.c b/hw/qxl.c index db2318e293..c3540c3d50 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1370,7 +1370,7 @@ async_common: case QXL_IO_DESTROY_SURFACE_WAIT: if (val >= NUM_SURFACES) { qxl_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):" - "%d >= NUM_SURFACES", async, val); + "%" PRIu64 " >= NUM_SURFACES", async, val); goto cancel_async; } qxl_spice_destroy_surface_wait(d, val, async); diff --git a/hw/qxl.h b/hw/qxl.h index 11a0db3f7d..cbb1e2d6d4 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -127,7 +127,7 @@ typedef struct PCIQXLDevice { /* qxl.c */ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); -void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...); +void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) GCC_FMT_ATTR(2, 3); void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, struct QXLRect *area, struct QXLRect *dirty_rects, -- cgit v1.2.3 From 4d6145488c84df52a2a0a20e3f36493d7417042a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= Date: Thu, 12 Apr 2012 09:51:46 +0200 Subject: pflash_cfi01: remove redundant line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- hw/pflash_cfi01.c | 1 - 1 file changed, 1 deletion(-) (limited to 'hw') diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index b03f623cb1..d1c742379b 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -144,7 +144,6 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset, } else { ret = p[offset]; ret |= p[offset + 1] << 8; - ret |= p[offset + 1] << 8; ret |= p[offset + 2] << 16; ret |= p[offset + 3] << 24; } -- cgit v1.2.3 From 362f5fb5643a9cfcf4b5127f67af8dcb0fcb9130 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 18 Apr 2012 07:28:34 +0200 Subject: e1000: Fix spelling (segmentaion -> segmentation) in debug output This was reported by https://bugs.launchpad.net/qemu/+bug/984476. I also changed the case for 'error'. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- hw/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw') diff --git a/hw/e1000.c b/hw/e1000.c index 7babc0b06e..9c764624f9 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -481,7 +481,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) } while (split_size -= bytes); } else if (!tp->tse && tp->cptse) { // context descriptor TSE is not set, while data descriptor TSE is set - DBGOUT(TXERR, "TCP segmentaion Error\n"); + DBGOUT(TXERR, "TCP segmentation error\n"); } else { split_size = MIN(sizeof(tp->data) - tp->size, split_size); pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); -- cgit v1.2.3