summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-mergeAvi Kivity2009-12-201-5/+1
|\
| * Fix backcompat for hotplug of SCSI controllersDaniel P. Berrange2009-12-191-5/+1
* | Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-mergeAvi Kivity2009-12-141-4/+36
|\|
| * PCI: Convert pci_device_hot_add() to QObjectLuiz Capitulino2009-12-121-4/+36
* | Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-mergeAvi Kivity2009-12-141-1/+17
|\|
| * scsi: fix drive hotplug.Gerd Hoffmann2009-12-121-0/+1
| * pci: don't abort() when trying to hotplug with acpi off.Gerd Hoffmann2009-12-121-1/+16
* | Merge commit '98304c846d8866dae6322ef400ce6595b23cfc41' into upstream-mergeAvi Kivity2009-12-021-2/+2
|\|
| * pci: s/pci_find_host_bus/pci_find_root_bus/gIsaku Yamahata2009-12-011-2/+2
* | Merge commit '260c0cd3d985e51b15870ff47e17b7b930efbda1' into upstream-mergeAvi Kivity2009-11-221-2/+2
|\|
| * pci: make pci configuration transaction more accurate.Isaku Yamahata2009-11-091-2/+2
* | Merge commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551' into upstream-mergeAvi Kivity2009-11-221-1/+1
|\|
| * scsi: move scsi-disk.h -> scsi.hGerd Hoffmann2009-11-091-1/+1
* | Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-mergeMark McLoughlin2009-10-281-10/+46
|\|
| * monitor: Convert do_pci_device_hot_remove() to QObjectLuiz Capitulino2009-10-271-1/+2
| * hotplug: more fixes for scsi disk hotplug.Gerd Hoffmann2009-10-271-10/+34
| * hotplug: fix "pci_add storage if=scsi"Gerd Hoffmann2009-10-271-2/+13
* | Merge commit '9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c' into upstream-mergeMark McLoughlin2009-10-281-24/+0
|\|
| * kill dead nic unplug code.Gerd Hoffmann2009-10-271-25/+0
* | Merge commit '5869c4d515128cd3a938a7346a8037abcc232220' into upstream-mergeMark McLoughlin2009-10-151-1/+1
|\|
| * net: handle -netdevice optionsMark McLoughlin2009-10-151-1/+1
* | Merge commit 'd549db5a732ef2ec145b84c5008a7585cf17cf67' into upstream-mergeMarcelo Tosatti2009-10-141-1/+1
|\|
| * TARGET_I386 is always defined if TARGET_X86_64 is definedJuan Quintela2009-10-121-1/+1
* | Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-mergeMarcelo Tosatti2009-10-141-2/+2
|\|
| * Check return value of qdev_init()Markus Armbruster2009-10-071-2/+2
* | Merge branch 'for-avi' of git://git.et.redhat.com/qemu-netAvi Kivity2009-10-081-6/+14
|\ \
| * | Merge commit 'dc1c9fe8b759d4e70222d8f94838a6f6ef5c4ef1'Mark McLoughlin2009-10-081-1/+1
| |\|
| | * Final net cleanup after conversion to QemuOptsMark McLoughlin2009-10-061-1/+1
| * | Merge commit 'c59c7ea94796a4fce2fe79b8f9aa3628dc2e0b2a'Mark McLoughlin2009-10-081-2/+14
| |\|
| | * Port PCI NIC hotplug to QemuOptsMark McLoughlin2009-10-061-2/+14
| * | Merge commit '8a1c5235510da01a200693fe3cfd87acd2dc1fca'Mark McLoughlin2009-10-081-4/+0
| |\|
| | * Revert "Fix exit on 'pci_add' Monitor command"Anthony Liguori2009-10-061-4/+0
* | | qdev-ify device assignmentGerd Hoffmann2009-10-081-40/+7
|/ /
* | Merge commit '499cf1027f9387081f73767c7872c9123896817c' into upstream-mergeAvi Kivity2009-10-061-2/+2
|\|
| * Rename pci_create_noinit() to pci_create()Markus Armbruster2009-10-051-2/+2
* | Merge commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5' into upstream-mergeAvi Kivity2009-10-061-2/+10
|\|
| * Fix pci_add storage not to exit on bad first argumentMarkus Armbruster2009-10-051-2/+10
* | Merge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-mergeAvi Kivity2009-10-061-22/+22
|\|
| * allow if=none for drive_addGerd Hoffmann2009-10-051-0/+3
| * refactor drive_hot_addGerd Hoffmann2009-10-051-19/+19
| * drive cleanup fixes.Gerd Hoffmann2009-10-051-3/+0
* | Merge commit '3f84865ade594a2ec1ef613ab5fd11949f3d49de' into upstream-mergeAvi Kivity2009-10-061-14/+3
|\|
| * pci: windup acpi-based hotplugGerd Hoffmann2009-10-051-13/+2
* | Merge commit 'a36a344dcd5c778cc0417df36c5aa8f95c5497c3' into upstream-mergeAvi Kivity2009-10-051-1/+1
|\|
| * pci: use qdev for device destruction.Gerd Hoffmann2009-10-051-1/+1
* | Merge commit '6875204c782e7c9aa5c28f96b2583fd31c50468f' into upstream-mergeAvi Kivity2009-10-051-0/+4
|\|
| * Fix exit on 'pci_add' Monitor commandLuiz Capitulino2009-10-051-0/+4
* | Rename USE_KVM_* to CONFIG_KVM_*Juan Quintela2009-09-181-7/+7
* | Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-mergeMarcelo Tosatti2009-09-141-1/+1
|\|
| * Fix sys-queue.h conflict for goodBlue Swirl2009-09-121-1/+1