From 7af72c24aed92bfb7ebc999ddd509c3d8c8b3f83 Mon Sep 17 00:00:00 2001 From: Hidetoshi Seto Date: Thu, 14 Oct 2010 09:51:02 +0900 Subject: [PATCH 1/4] Trivial fix for QMP/qmp-events.txt Fix example of STOP event that was just copy-and-pasted. Signed-off-by: Hidetoshi Seto Signed-off-by: Luiz Capitulino --- QMP/qmp-events.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index 01ec85fbb9..aa2021082f 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -89,7 +89,7 @@ Data: None. Example: -{ "event": "SHUTDOWN", +{ "event": "STOP", "timestamp": { "seconds": 1267041730, "microseconds": 281295 } } VNC_CONNECTED From e7a06af838a45be4f92e655fd4628e3351a09c98 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sat, 16 Oct 2010 19:42:43 +0200 Subject: [PATCH 2/4] Silence compiler warning in json test case This avoids error: zero-length gnu_printf format string Signed-off-by: Jan Kiszka Signed-off-by: Luiz Capitulino --- check-qjson.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/check-qjson.c b/check-qjson.c index 0b60e45fa6..64fcdcb4ad 100644 --- a/check-qjson.c +++ b/check-qjson.c @@ -639,7 +639,9 @@ END_TEST START_TEST(empty_input) { - QObject *obj = qobject_from_json(""); + const char *empty = ""; + + QObject *obj = qobject_from_json(empty); fail_unless(obj == NULL); } END_TEST From 945d3e6378fc639925370c62cb5e3d32b8f297c3 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 19 Oct 2010 16:03:15 +0200 Subject: [PATCH 3/4] Fix test suite build with tracing enabled qemu_malloc instrumentations require linking against the trace objects. Signed-off-by: Jan Kiszka Acked-by: Stefan Hajnoczi Signed-off-by: Luiz Capitulino --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 252c817d27..106a4015a8 100644 --- a/Makefile +++ b/Makefile @@ -140,12 +140,12 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS) -check-qint: check-qint.o qint.o qemu-malloc.o -check-qstring: check-qstring.o qstring.o qemu-malloc.o -check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o -check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o -check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o -check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o +check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y) +check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y) +check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y) +check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y) +check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y) +check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o qjson.o json-streamer.o json-lexer.o json-parser.o qemu-malloc.o $(trace-obj-y) clean: # avoid old build problems by removing potentially incorrect old files From 46c7fc182d990a373d6a9197a69ff05bba902005 Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Wed, 20 Oct 2010 18:00:01 +0900 Subject: [PATCH 4/4] monitor: Ignore "." and ".." when completing file name. Signed-off-by: Kusanagi Kouichi Signed-off-by: Luiz Capitulino --- monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/monitor.c b/monitor.c index 260cc02963..61607c5bd6 100644 --- a/monitor.c +++ b/monitor.c @@ -3976,6 +3976,11 @@ static void file_completion(const char *input) d = readdir(ffs); if (!d) break; + + if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) { + continue; + } + if (strstart(d->d_name, file_prefix, NULL)) { memcpy(file, input, input_path_len); if (input_path_len < sizeof(file))