From 0ed6dc1a982fd029557a17fda7606d679a6ebb28 Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Mon, 16 Apr 2012 15:32:49 +0800 Subject: [PATCH 1/7] error.c: don't return value for void function It is invalid to return a value from a function returning void. [C99 6.8.6.4 says "A return statement with an expression shall not appear in a function whose return type is void" but gcc 4.6.3 with QEMU compile flags does not complain. It's still worth fixing this. Stefan] Signed-off-by: Amos Kong Reviewed-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/error.c b/error.c index d3455ab9e..a52b7710d 100644 --- a/error.c +++ b/error.c @@ -93,7 +93,7 @@ QDict *error_get_data(Error *err) void error_set_field(Error *err, const char *field, const char *value) { QDict *dict = qdict_get_qdict(err->obj, "data"); - return qdict_put(dict, field, qstring_from_str(value)); + qdict_put(dict, field, qstring_from_str(value)); } void error_free(Error *err) From 4451b799626207ba66df78257fdf08c740cda6ae Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 13 Apr 2012 12:03:46 +0200 Subject: [PATCH 2/7] fix block_job_set_speed name in documentation Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- hmp-commands.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index a6f5a8492..461fa597d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -92,8 +92,8 @@ ETEXI }, STEXI -@item block_job_set_stream -@findex block_job_set_stream +@item block_job_set_speed +@findex block_job_set_speed Set maximum speed for a background block operation. ETEXI From 5f8daf2e04709800531bc1ecbb7b49b637182777 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 1 Apr 2012 22:07:30 +0200 Subject: [PATCH 3/7] 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(-) diff --git a/hw/qxl.c b/hw/qxl.c index db2318e29..c3540c3d5 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 11a0db3f7..cbb1e2d6d 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, 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: [PATCH 4/7] 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(-) diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index b03f623cb..d1c742379 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; } From 4f5c0177381e066604a5fe1ffe9a69a0759fa4bb Mon Sep 17 00:00:00 2001 From: Eduardo Elias Ferreira Date: Mon, 16 Apr 2012 09:51:42 -0300 Subject: [PATCH 5/7] spice-qemu-char.c: Show what name is unsupported Signed-off-by: Eduardo Elias Ferreira Signed-off-by: Stefan Hajnoczi --- spice-qemu-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index 1e735ffd0..09aa22d56 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -209,7 +209,7 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts) } } if (subtype == NULL) { - fprintf(stderr, "spice-qemu-char: unsupported name\n"); + fprintf(stderr, "spice-qemu-char: unsupported name: %s\n", name); print_allowed_subtypes(); return NULL; } From 362f5fb5643a9cfcf4b5127f67af8dcb0fcb9130 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 18 Apr 2012 07:28:34 +0200 Subject: [PATCH 6/7] 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(-) diff --git a/hw/e1000.c b/hw/e1000.c index 7babc0b06..9c764624f 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); From fecccc4477451f82028c042eb700a20185d8cf65 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 20 Apr 2012 11:40:24 +1000 Subject: [PATCH 7/7] Add .gitignore for tests/ The new autotests in tests/ generate a number of files, both executable and source, which are not caught by the existing .gitignore files. This patch adds a new .gitignore in tests/ which covers these. [Changed 'rtc-test' to '*-test' so future tests do not need to be added to .gitignore on a case-by-case basis. Stefan] Signed-off-by: David Gibson Signed-off-by: Stefan Hajnoczi --- tests/.gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tests/.gitignore diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 000000000..f9041f3d3 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,13 @@ +check-qdict +check-qfloat +check-qint +check-qjson +check-qlist +check-qstring +test-qapi-types.[ch] +test-qapi-visit.[ch] +test-qmp-commands.h +test-qmp-commands +test-qmp-input-strict +test-qmp-marshal.c +*-test