Commit 174b2877 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

parents 21bcc590 46c7fc18

Makefile

+6 −6
Original line number Diff line number Diff line
@@ -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

QMP/qmp-events.txt

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ Data: None. 


Example:



{ "event": "SHUTDOWN",

{ "event": "STOP",

    "timestamp": { "seconds": 1267041730, "microseconds": 281295 } }



VNC_CONNECTED

check-qjson.c

+3 −1
Original line number Diff line number Diff line
@@ -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

monitor.c

+5 −0
Original line number Diff line number Diff line
@@ -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))