| commit | efa93e407317c8b35a674f8cfe6b32946c24e2d4 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 5 Oct 2009 17:12:35 +0000 (5 19:12 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 5 Oct 2009 17:12:35 +0000 (5 19:12 +0200) | ||
| tree | e6a5f3c0094aec309ea1e1257c471a57dedf5403 | treesnapshot (tar.gz zip) |
| parent | dd9c28382147d04d27b9c1d23f95db33f5a48980 | commitdiff |
| parent | a36a344dcd5c778cc0417df36c5aa8f95c5497c3 | commitdiff |
Merge commit 'a36a344dcd5c778cc0417df36c5aa8f95c5497c3' into upstream-merge
* commit 'a36a344dcd5c778cc0417df36c5aa8f95c5497c3':
pci: use qdev for device destruction.
Implement scsi device destruction
Add exit callback to DeviceInfo.
qdev: device free fixups.
parallel: convert isa to qdev
Conflicts:
hw/pci-hotplug.c
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'a36a344dcd5c778cc0417df36c5aa8f95c5497c3':
pci: use qdev for device destruction.
Implement scsi device destruction
Add exit callback to DeviceInfo.
qdev: device free fixups.
parallel: convert isa to qdev
Conflicts:
hw/pci-hotplug.c
hw/pci.c
hw/pci.h
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| hw/pci.h | diff1 | diff2 | blobhistory |