* [Qemu-devel] [PATCH 1/5] vl.c: fix '-cpu ?' segfault
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
@ 2012-03-26 12:07 ` Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 2/5] test: remove qemu-ga reference Stefan Hajnoczi
` (4 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2012-03-26 12:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Eduardo Habkost
From: Eduardo Habkost <ehabkost@redhat.com>
Fix stupid copy&paste mistake at commit
ecf40beae7dcbb057d4f115207f9d8276832a774: I moved code around but kept
"optarg" on the cpu_list() call.
Reported-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
vl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vl.c b/vl.c
index 112b0e0..0fccf50 100644
--- a/vl.c
+++ b/vl.c
@@ -3196,7 +3196,7 @@ int main(int argc, char **argv, char **envp)
cpudef_init();
if (cpu_model && *cpu_model == '?') {
- list_cpus(stdout, &fprintf, optarg);
+ list_cpus(stdout, &fprintf, cpu_model);
exit(0);
}
--
1.7.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 2/5] test: remove qemu-ga reference
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 1/5] vl.c: fix '-cpu ?' segfault Stefan Hajnoczi
@ 2012-03-26 12:07 ` Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 3/5] qapi: remove print statements from test-qmp-commands Stefan Hajnoczi
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2012-03-26 12:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Michael Roth
From: Michael Roth <mdroth@linux.vnet.ibm.com>
This was added by mistake a while back.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
Makefile | 1 +
tests/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 8d6b558..d8e1f36 100644
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,7 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
$(qapi-obj-y): $(GENERATED_HEADERS)
qapi-dir := $(BUILD_DIR)/qapi-generated
qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
+qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
gen-out-type = $(subst .,-,$(suffix $@))
diff --git a/tests/Makefile b/tests/Makefile
index c78ade1..354fdbb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,7 @@ test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y)
test-qmp-input-visitor.o test-qmp-output-visitor.o \
test-string-input-visitor.o test-string-output-visitor.o \
- test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir)
+ test-qmp-commands.o: QEMU_CFLAGS += -I $(qapi-dir)
$(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\
$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
--
1.7.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 3/5] qapi: remove print statements from test-qmp-commands
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 1/5] vl.c: fix '-cpu ?' segfault Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 2/5] test: remove qemu-ga reference Stefan Hajnoczi
@ 2012-03-26 12:07 ` Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 4/5] test: add test-qmp-commands to make check Stefan Hajnoczi
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2012-03-26 12:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Michael Roth
From: Michael Roth <mdroth@linux.vnet.ibm.com>
This is necessary for nicer make check integration.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
test-qmp-commands.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/test-qmp-commands.c b/test-qmp-commands.c
index fa5a7bd..60cbf01 100644
--- a/test-qmp-commands.c
+++ b/test-qmp-commands.c
@@ -46,7 +46,6 @@ static void test_dispatch_cmd(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json(resp)));
qobject_decref(resp);
QDECREF(req);
@@ -63,7 +62,6 @@ static void test_dispatch_cmd_error(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
qobject_decref(resp);
QDECREF(req);
@@ -92,7 +90,6 @@ static void test_dispatch_cmd_io(void)
resp = qmp_dispatch(QOBJECT(req));
assert(resp != NULL);
assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
- g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
qobject_decref(resp);
QDECREF(req);
--
1.7.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 4/5] test: add test-qmp-commands to make check
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
` (2 preceding siblings ...)
2012-03-26 12:07 ` [Qemu-devel] [PATCH 3/5] qapi: remove print statements from test-qmp-commands Stefan Hajnoczi
@ 2012-03-26 12:07 ` Stefan Hajnoczi
2012-03-26 12:07 ` [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier Stefan Hajnoczi
2012-03-26 21:10 ` [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Anthony Liguori
5 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2012-03-26 12:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, Stefan Hajnoczi, Michael Roth
From: Michael Roth <mdroth@linux.vnet.ibm.com>
All the deps are here but the test was never added to the list of tests
for make check
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
tests/Makefile | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 354fdbb..94ea342 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,6 +3,7 @@ export SRC_PATH
CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist
CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor
CHECKS += test-string-input-visitor test-string-output-visitor test-coroutine
+CHECKS += test-qmp-commands
CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh
check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)
--
1.7.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
` (3 preceding siblings ...)
2012-03-26 12:07 ` [Qemu-devel] [PATCH 4/5] test: add test-qmp-commands to make check Stefan Hajnoczi
@ 2012-03-26 12:07 ` Stefan Hajnoczi
2012-03-26 12:41 ` Andreas Färber
2012-03-26 21:10 ` [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Anthony Liguori
5 siblings, 1 reply; 9+ messages in thread
From: Stefan Hajnoczi @ 2012-03-26 12:07 UTC (permalink / raw)
To: Anthony Liguori; +Cc: Stefan Weil, qemu-devel, Stefan Hajnoczi
From: Stefan Weil <sw@weilnetz.de>
mem is an uint64_t value, so %lx was wrong.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
trace-events | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/trace-events b/trace-events
index 70f059d..db2cd39 100644
--- a/trace-events
+++ b/trace-events
@@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
# hw/qxl.c
disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
-qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
+qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
qxl_destroy_primary(int qid) "%d"
qxl_enter_vga_mode(int qid) "%d"
--
1.7.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier
2012-03-26 12:07 ` [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier Stefan Hajnoczi
@ 2012-03-26 12:41 ` Andreas Färber
2012-03-26 12:48 ` Alon Levy
0 siblings, 1 reply; 9+ messages in thread
From: Andreas Färber @ 2012-03-26 12:41 UTC (permalink / raw)
To: Alon Levy; +Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi, qemu-devel
Am 26.03.2012 14:07, schrieb Stefan Hajnoczi:
> From: Stefan Weil <sw@weilnetz.de>
>
> mem is an uint64_t value, so %lx was wrong.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
Alon, you replied with an "ACK". Should an Acked-by be inserted here?
Andreas
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
> trace-events | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/trace-events b/trace-events
> index 70f059d..db2cd39 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
> # hw/qxl.c
> disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
> disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
> -qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
> +qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
> qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
> qxl_destroy_primary(int qid) "%d"
> qxl_enter_vga_mode(int qid) "%d"
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier
2012-03-26 12:41 ` Andreas Färber
@ 2012-03-26 12:48 ` Alon Levy
0 siblings, 0 replies; 9+ messages in thread
From: Alon Levy @ 2012-03-26 12:48 UTC (permalink / raw)
To: Andreas Färber
Cc: Stefan Weil, Anthony Liguori, Stefan Hajnoczi, qemu-devel
On Mon, Mar 26, 2012 at 02:41:23PM +0200, Andreas Färber wrote:
> Am 26.03.2012 14:07, schrieb Stefan Hajnoczi:
> > From: Stefan Weil <sw@weilnetz.de>
> >
> > mem is an uint64_t value, so %lx was wrong.
> >
> > Signed-off-by: Stefan Weil <sw@weilnetz.de>
>
> Alon, you replied with an "ACK". Should an Acked-by be inserted here?
Yes, should have been verbose, sorry. But I don't think it matters much
for this kind of small patch.
>
> Andreas
>
> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> > ---
> > trace-events | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/trace-events b/trace-events
> > index 70f059d..db2cd39 100644
> > --- a/trace-events
> > +++ b/trace-events
> > @@ -726,7 +726,7 @@ ppm_save(const char *filename, void *display_surface) "%s surface=%p"
> > # hw/qxl.c
> > disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
> > disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t val) "%d %s addr=%u val=%u"
> > -qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %dx%d mem=%lx %d,%d"
> > +qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t mem, uint32_t format, uint32_t position) "%d %ux%u mem=%" PRIx64 " %u,%u"
> > qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t flags) "%d %d,%d,%d"
> > qxl_destroy_primary(int qid) "%d"
> > qxl_enter_vga_mode(int qid) "%d"
>
> --
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012
2012-03-26 12:07 [Qemu-devel] [PULL 0/5] Trivial patches for 20 to 26 March 2012 Stefan Hajnoczi
` (4 preceding siblings ...)
2012-03-26 12:07 ` [Qemu-devel] [PATCH 5/5] trace-events: Fix broken build caused by wrong format specifier Stefan Hajnoczi
@ 2012-03-26 21:10 ` Anthony Liguori
5 siblings, 0 replies; 9+ messages in thread
From: Anthony Liguori @ 2012-03-26 21:10 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel
On 03/26/2012 07:07 AM, Stefan Hajnoczi wrote:
> The following changes since commit cb1977d308f6e1d6bf398d42e6148187b82456c1:
>
> tcg-sparc: Add debug_frame support. (2012-03-24 19:57:58 +0000)
>
> are available in the git repository at:
>
> git://github.com/stefanha/qemu.git trivial-patches
>
> for you to fetch changes up to 95b752bc32ccabe48430c0d0062b7c6947d864d0:
>
> trace-events: Fix broken build caused by wrong format specifier (2012-03-26 12:34:20 +0100)
Pulled. Thanks.
Regards,
Anthony Liguori
>
> ----------------------------------------------------------------
> Eduardo Habkost (1):
> vl.c: fix '-cpu ?' segfault
>
> Michael Roth (3):
> test: remove qemu-ga reference
> qapi: remove print statements from test-qmp-commands
> test: add test-qmp-commands to make check
>
> Stefan Weil (1):
> trace-events: Fix broken build caused by wrong format specifier
>
> Makefile | 1 +
> test-qmp-commands.c | 3 ---
> tests/Makefile | 3 ++-
> trace-events | 2 +-
> vl.c | 2 +-
> 5 files changed, 5 insertions(+), 6 deletions(-)
>
^ permalink raw reply [flat|nested] 9+ messages in thread