diff options
| author | Peter Maydell | 2016-04-08 13:45:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-04-08 13:45:53 +0200 |
| commit | 8227e2d16705b8c94df93f465d4e1659c28c69ce (patch) | |
| tree | 6d96c8b445f7eee8ca3c723f65362032bd3bbb10 /hw/ide/piix.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160408' into... (diff) | |
| parent | hw/pci-bridge: Add missing unref in case register-bus fails (diff) | |
| download | qemu-8227e2d16705b8c94df93f465d4e1659c28c69ce.tar.gz qemu-8227e2d16705b8c94df93f465d4e1659c28c69ce.tar.xz qemu-8227e2d16705b8c94df93f465d4e1659c28c69ce.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pci, virtio, acpi: fixes for 2.6
Fixes all over the place. Most notably, fixes migration
for systems with pci express bridges, and random crashes
observed with virtio blk and scsi dataplane.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Fri 08 Apr 2016 08:53:46 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
hw/pci-bridge: Add missing unref in case register-bus fails
virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio
virtio-scsi: use aio handler for data plane
virtio-blk: use aio handler for data plane
virtio: add aio handler
virtio-scsi: fix disabled mode
virtio-blk: fix disabled mode
virtio: make virtio_queue_notify_vq static
tests/bios-tables-test: fix assert
virtio-balloon: reset the statistic timer to load device
Migration: Add i82801b11 migration data
Sort the fw_cfg file list
xen: piix reuse pci generic class init function
pci-testdev: fast mmio support
acpi: Add missing GCC_FMT_ATTR
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/piix.c')
| -rw-r--r-- | hw/ide/piix.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index df46147c65..0a4cbcbcbb 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -258,22 +258,10 @@ static const TypeInfo piix3_ide_info = { .class_init = piix3_ide_class_init, }; -static void piix3_ide_xen_class_init(ObjectClass *klass, void *data) -{ - DeviceClass *dc = DEVICE_CLASS(klass); - PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - - k->realize = pci_piix_ide_realize; - k->vendor_id = PCI_VENDOR_ID_INTEL; - k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1; - k->class_id = PCI_CLASS_STORAGE_IDE; - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); -} - static const TypeInfo piix3_ide_xen_info = { .name = "piix3-ide-xen", .parent = TYPE_PCI_IDE, - .class_init = piix3_ide_xen_class_init, + .class_init = piix3_ide_class_init, }; static void piix4_ide_class_init(ObjectClass *klass, void *data) |