summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-mergeAvi Kivity2009-12-201-1/+1
|\
| * Fix a make -j raceJuergen Lock2009-12-171-1/+1
* | Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-3/+3
|\ \ | |/
| * block: Convert bdrv_info() to QObjectLuiz Capitulino2009-12-121-3/+3
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-3/+8
|\ \ | |/
| * QDict: Introduce qdict_get_qlist()Luiz Capitulino2009-12-121-1/+1
| * QDict: Introduce qdict_get_qbool()Luiz Capitulino2009-12-121-1/+1
| * Makefile: move QObject objs to their own entryLuiz Capitulino2009-12-121-2/+7
* | Merge commit 'd08d6f04d6eeedce5090ff66d0676162d7d8d788' into upstream-mergeAvi Kivity2009-12-071-1/+1
|\ \ | |/
| * Fix build for mingw32 on windows ($$ expansion)Stefan Weil2009-12-031-1/+1
* | Merge commit 'e9b2e81889d9877415710484b876ee57a42b0bcb' into upstream-mergeAvi Kivity2009-12-071-1/+5
|\ \ | |/
| * net: move parse_macaddr() to net/util.[ch]Mark McLoughlin2009-12-031-1/+1
| * net: move dump backend code from net.c to net/dump.cMark McLoughlin2009-12-031-0/+1
| * net: move socket backend code from net.c to net/socket.cMark McLoughlin2009-12-031-0/+1
| * net: move vde code from net.c to net/vde.cMark McLoughlin2009-12-031-0/+1
| * net: move slirp code from net.c to net/slirp.cMark McLoughlin2009-12-031-0/+1
* | Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-mergeAvi Kivity2009-12-071-4/+2
|\ \ | |/
| * Introduce QErrorLuiz Capitulino2009-12-031-1/+1
| * Makefile: Remove unneeded prerequisitesStefan Weil2009-12-021-3/+1
* | Merge commit '98304c846d8866dae6322ef400ce6595b23cfc41' into upstream-mergeAvi Kivity2009-12-021-1/+1
|\ \ | |/
| * Makefile: Fix spellingStefan Weil2009-11-241-1/+1
* | Merge commit 'b0293e54af32bcf08f4b4e5b4b472534de343972' into upstream-mergeAvi Kivity2009-12-021-5/+16
|\ \ | |/
| * DS1338 RTCPaul Brook2009-11-221-0/+1
| * Makefile dependencies for device configsPaul Brook2009-11-221-5/+15
* | Merge commit 'cfc6d90a98ec420998ef2009e359ea04456735ff' into upstream-mergeAvi Kivity2009-11-221-1/+1
|\ \ | |/
| * Add linuxboot to BLOBSAlexander Graf2009-11-171-1/+1
* | Merge commit '1945120112e93aa96af6d6004b36599f783ac563' into upstream-mergeAvi Kivity2009-11-221-2/+5
|\ \ | |/
| * Add a unit test for JSON supportAnthony Liguori2009-11-171-0/+1
| * Add a QObject JSON wrapperAnthony Liguori2009-11-171-1/+1
| * Add a JSON parserAnthony Liguori2009-11-171-1/+1
| * Add a JSON message boundary identifierAnthony Liguori2009-11-171-0/+1
| * Add a lexer for JSONAnthony Liguori2009-11-171-1/+1
| * Add a QBool typeAnthony Liguori2009-11-171-1/+1
| * Add unit test for QFloatAnthony Liguori2009-11-171-0/+1
| * Add a QFloat datatypeAnthony Liguori2009-11-171-2/+2
* | Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-mergeAvi Kivity2009-11-221-2/+4
|\ \ | |/
| * Block live migrationlirans@il.ibm.com2009-11-171-0/+1
| * fix make clean targetsMagnus Damm2009-11-141-2/+3
* | Merge commit 'f527c57935e22b56952d1ed1af36070b682ecf70' into upstream-mergeAvi Kivity2009-11-221-6/+9
|\ \ | |/
| * fix parallel buildJuan Quintela2009-11-121-3/+5
| * Makefile: Fix definition of pxe-*.bin blobsStefan Weil2009-11-121-2/+3
| * Makefile: Prettify loggingStefan Weil2009-11-121-1/+1
* | Merge commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551' into upstream-mergeAvi Kivity2009-11-221-1/+3
|\ \ | |/
| * Makefile: make qemu-io dependent on config-host.hPaolo Bonzini2009-11-091-0/+2
| * Makefile: make qemu-img dependant on config-host.hUri Lublin2009-11-091-1/+1
* | Merge commit '04095e5ff305fc25a214b52e005153af9d009d66' into upstream-mergeMarcelo Tosatti2009-11-061-0/+1
|\ \ | |/
| * Switch from etherboot to gPXEAnthony Liguori2009-10-301-0/+1
* | Merge commit '5245d57a7ac830fc015465981db729646a768993' into upstream-mergeMarcelo Tosatti2009-11-061-5/+14
|\ \ | |/
| * net: move linux code into net/tap-linux.cMark McLoughlin2009-10-301-0/+1
| * net: move AIX code into net/tap-aix.cMark McLoughlin2009-10-301-0/+1