Commit 13baae8a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qmp/queue/qmp' into staging

parents 220724ca 69faeee1

check-qjson.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ START_TEST(escaped_string) 
        { "\"\\n\"", "\n" },

        { "\"\\r\"", "\r" },

        { "\"\\t\"", "\t" },

        { "\"\\/\"", "\\/" },

        { "\"/\"", "/" },

        { "\"\\/\"", "/", .skip = 1 },

        { "\"\\\\\"", "\\" },

        { "\"\\\"\"", "\"" },

        { "\"hello world \\\"embedded string\\\"\"",

configure

+1 −1
Original line number Diff line number Diff line
@@ -3614,7 +3614,7 @@ DIRS="$DIRS roms/seabios roms/vgabios" 
DIRS="$DIRS fsdev ui"

DIRS="$DIRS qapi"

DIRS="$DIRS qga trace"

FILES="Makefile tests/Makefile"

FILES="Makefile tests/Makefile qdict-test-data.txt"

FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"

FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"

FILES="$FILES pc-bios/spapr-rtas/Makefile"