mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Anthony Liguori 2011-09-08 09:07:13 -05:00
commit 13baae8aff
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
check-qjson.c
View File

@ -33,7 +33,8 @@ START_TEST(escaped_string)
{ "\"\\n\"", "\n" }, { "\"\\n\"", "\n" },
{ "\"\\r\"", "\r" }, { "\"\\r\"", "\r" },
{ "\"\\t\"", "\t" }, { "\"\\t\"", "\t" },
{ "\"\\/\"", "\\/" }, { "\"/\"", "/" },
{ "\"\\/\"", "/", .skip = 1 },
{ "\"\\\\\"", "\\" }, { "\"\\\\\"", "\\" },
{ "\"\\\"\"", "\"" }, { "\"\\\"\"", "\"" },
{ "\"hello world \\\"embedded string\\\"\"", { "\"hello world \\\"embedded string\\\"\"",

2
configure vendored
View File

@ -3614,7 +3614,7 @@ DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS fsdev ui" DIRS="$DIRS fsdev ui"
DIRS="$DIRS qapi" DIRS="$DIRS qapi"
DIRS="$DIRS qga trace" 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 tests/cris/Makefile tests/cris/.gdbinit"
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES pc-bios/spapr-rtas/Makefile"