| commit | a6e4c00b28d7d57b133d2d1108c5a0bfc423f0a5 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 22 Nov 2009 13:18:27 +0000 (22 15:18 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 22 Nov 2009 13:18:51 +0000 (22 15:18 +0200) | ||
| tree | 0bba695f6792903566698f2bce95c54c7a1fc2b5 | treesnapshot (tar.gz zip) |
| parent | 0b04e23bfe861522689765229143d9671e2308df | commitdiff |
| parent | 1945120112e93aa96af6d6004b36599f783ac563 | commitdiff |
Merge commit '1945120112e93aa96af6d6004b36599f783ac563' into upstream-merge
* commit '1945120112e93aa96af6d6004b36599f783ac563':
Update SeaBIOS to latest
Add test suite for json marshalling
Provide marshalling mechanism for json
QDict: Introduce qdict_iter()
Add a unit test for JSON support
Add a QObject JSON wrapper
Add a JSON parser
Add a JSON message boundary identifier
Add a lexer for JSON
Add a QBool type
Add unit test for QFloat
Add a QFloat datatype
Allow strings to grow in size
Add operations to qlist to allow it to be used as a stack
Properly escape QDECREF macro arguments
Cleanup configure checks for dup3 and fallocate
Conflicts:
pc-bios/bios.bin (pick qemu-kvm)
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '1945120112e93aa96af6d6004b36599f783ac563':
Update SeaBIOS to latest
Add test suite for json marshalling
Provide marshalling mechanism for json
QDict: Introduce qdict_iter()
Add a unit test for JSON support
Add a QObject JSON wrapper
Add a JSON parser
Add a JSON message boundary identifier
Add a lexer for JSON
Add a QBool type
Add unit test for QFloat
Add a QFloat datatype
Allow strings to grow in size
Add operations to qlist to allow it to be used as a stack
Properly escape QDECREF macro arguments
Cleanup configure checks for dup3 and fallocate
Conflicts:
pc-bios/bios.bin (pick qemu-kvm)
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |