summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-1/+2
|\
| * PCI: Convert pci_device_hot_add() to QObjectLuiz Capitulino2009-12-121-1/+2
* | Merge commit 'e9b2e81889d9877415710484b876ee57a42b0bcb' into upstream-mergeAvi Kivity2009-12-071-6/+10
|\ \ | |/
| * Introduce rerror option for drivesKevin Wolf2009-12-031-0/+1
| * Rename DriveInfo.onerror to on_write_errorKevin Wolf2009-12-031-2/+4
| * live migration: Propagate output monitor to callback handlerJan Kiszka2009-12-031-5/+5
| * live migration: Allow cleanup after cancellation or errorJan Kiszka2009-12-031-0/+1
* | Merge commit '8204a9180c5f456d30cbd29fddf734e97f7c74fa' into upstream-mergeAvi Kivity2009-12-071-0/+7
|\ \ | |/
| * monitor: QError supportLuiz Capitulino2009-12-031-0/+7
* | Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-mergeAvi Kivity2009-11-221-1/+1
|\ \ | |/
| * Block live migrationlirans@il.ibm.com2009-11-171-1/+1
* | Merge commit '5245d57a7ac830fc015465981db729646a768993' into upstream-mergeMarcelo Tosatti2009-11-061-4/+0
|\ \ | |/
| * net: move more stuff into net/tap-win32.c, add net/tap.hMark McLoughlin2009-10-301-4/+0
* | Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-mergeMark McLoughlin2009-10-281-1/+2
|\ \ | |/
| * monitor: Convert do_pci_device_hot_remove() to QObjectLuiz Capitulino2009-10-271-1/+2
* | Merge commit '9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c' into upstream-mergeMark McLoughlin2009-10-281-4/+0
|\ \ | |/
| * kill dead nic unplug code.Gerd Hoffmann2009-10-271-4/+0
* | Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'Mark McLoughlin2009-10-081-0/+1
|\ \ | |/
| * offer right-ctrl as a grab optionDustin Kirkland2009-10-061-0/+1
* | Merge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-mergeAvi Kivity2009-10-061-2/+1
|\ \ | |/
| * drive cleanup fixes.Gerd Hoffmann2009-10-051-2/+1
* | Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-mergeAvi Kivity2009-10-061-4/+1
|\ \ | |/
| * pci: windup acpi-based hotplugGerd Hoffmann2009-10-051-6/+1
* | Merge commit '6875204c782e7c9aa5c28f96b2583fd31c50468f' into upstream-mergeAvi Kivity2009-10-051-0/+2
|\ \ | |/
| * Enable host-clock-based RTCJan Kiszka2009-10-051-0/+2
* | Merge commit 'ca20cf32ab3d945155141ef737f5d08ebb373e1d' into upstream-mergeAvi Kivity2009-09-211-18/+0
|\ \ | |/
| * Compile loader only onceBlue Swirl2009-09-201-18/+0
* | Merge commit '042eb37a04c9bf0cc76d14038a8ed35e3de713e2' into upstream-mergeMarcelo Tosatti2009-09-141-0/+1
|\ \ | |/
| * x86: move a declaration to headerBlue Swirl2009-09-131-0/+1
* | Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-mergeMarcelo Tosatti2009-09-141-4/+4
|\ \ | |/
| * Fix sys-queue.h conflict for goodBlue Swirl2009-09-121-4/+4
* | Merge commit '1d4daa91ff0b77e86b3944faf8fc7f978cf51c84' into upstream-mergeAvi Kivity2009-09-091-8/+8
|\ \ | |/
| * monitor: Port handler_3 to use QDictLuiz Capitulino2009-09-041-2/+1
| * monitor: Port handler_2 to use QDictLuiz Capitulino2009-09-041-1/+1
| * monitor: Port handler_1 to use QDictLuiz Capitulino2009-09-041-5/+6
* | Merge commit '4d76d2ba9d313a827012d72d8352459d3b7b8833' into upstream-mergeAvi Kivity2009-09-091-0/+1
|\ \ | |/
| * Add wrappers to functions used by the MonitorLuiz Capitulino2009-09-041-0/+1
* | Merge commit '382f074371f7dc32a34c944c845b1698e83d8c36' into upstream-mergeAvi Kivity2009-08-301-2/+0
|\ \ | |/
| * switch balloon initialization to -device.Gerd Hoffmann2009-08-271-2/+0
* | Merge commit 'ec82026c97975e1e327aab76653ff7edeeb27967' into upstream-mergeAvi Kivity2009-08-301-0/+5
|\ \ | |/
| * add qemu_error() + friendsGerd Hoffmann2009-08-271-0/+5
* | Merge commit '695dcf71eb463c93c9b3418cffdf3be437dee14a' into upstream-mergeAvi Kivity2009-08-291-1/+1
|\ \ | |/
| * make load_vmstate() return errorsJuan Quintela2009-08-271-1/+1
| * move do_loadvm() to monitor.cJuan Quintela2009-08-271-1/+0
| * split do_loadvm() into do_loadvm() and load_vmstate()Juan Quintela2009-08-271-0/+1
* | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-mergeAvi Kivity2009-08-241-4/+0
|\ \ | |/
| * Unbreak large mem support by removing kqemuAnthony Liguori2009-08-241-4/+0
* | Merge commit '1452411b25fb207e7f442e5a5128f34b4939d31c' into upstream-mergeAvi Kivity2009-08-241-4/+11
|\ \ | |/
| * QEMU set irq0override in fw_cfgJes Sorensen2009-08-241-0/+1
| * Clean up VGA type selection; far too many variables being used to track one s...Zachary Amsden2009-08-241-4/+11