ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'qmp/for-anthony' into staging

This commit is contained in:
Anthony Liguori 2010-10-26 09:51:03 -05:00
parent 21bcc5907f 46c7fc182d
commit 174b2877b0
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -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.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-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y)
check-qstring: check-qstring.o qstring.o qemu-malloc.o 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 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 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 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 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: clean:
# avoid old build problems by removing potentially incorrect old files # avoid old build problems by removing potentially incorrect old files

2
QMP/qmp-events.txt
View File

@ -89,7 +89,7 @@ Data: None.
Example: Example:
{ "event": "SHUTDOWN", { "event": "STOP",
"timestamp": { "seconds": 1267041730, "microseconds": 281295 } } "timestamp": { "seconds": 1267041730, "microseconds": 281295 } }
VNC_CONNECTED VNC_CONNECTED

4
check-qjson.c
View File

@ -639,7 +639,9 @@ END_TEST
START_TEST(empty_input) START_TEST(empty_input)
{ {
QObject *obj = qobject_from_json(""); const char *empty = "";
QObject *obj = qobject_from_json(empty);
fail_unless(obj == NULL); fail_unless(obj == NULL);
} }
END_TEST END_TEST

5
monitor.c
View File

@ -3976,6 +3976,11 @@ static void file_completion(const char *input)
d = readdir(ffs); d = readdir(ffs);
if (!d) if (!d)
break; break;
if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) {
continue;
}
if (strstart(d->d_name, file_prefix, NULL)) { if (strstart(d->d_name, file_prefix, NULL)) {
memcpy(file, input, input_path_len); memcpy(file, input, input_path_len);
if (input_path_len < sizeof(file)) if (input_path_len < sizeof(file))