qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Stefano Stabellini <sstabellini@kernel.org>,
	John Snow <jsnow@redhat.com>,
	qemu-block@nongnu.org
Subject: [Qemu-devel] [PULL 03/15] xen: piix reuse pci generic class init function
Date: Fri, 8 Apr 2016 11:02:12 +0300	[thread overview]
Message-ID: <1460102154-16096-4-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1460102154-16096-1-git-send-email-mst@redhat.com>

piix3_ide_xen_class_init is identical to piix3_ide_class_init
except it's buggy as it does not set exit and does not disable
hotplug properly.

Switch to the generic one.

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/ide/piix.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index df46147..0a4cbcb 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)
-- 
MST

  parent reply	other threads:[~2016-04-08  8:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-08  8:02 [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6 Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 01/15] acpi: Add missing GCC_FMT_ATTR Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 02/15] pci-testdev: fast mmio support Michael S. Tsirkin
2016-04-08  8:02 ` Michael S. Tsirkin [this message]
2016-04-08  8:02 ` [Qemu-devel] [PULL 04/15] Sort the fw_cfg file list Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 05/15] Migration: Add i82801b11 migration data Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 06/15] virtio-balloon: reset the statistic timer to load device Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 07/15] tests/bios-tables-test: fix assert Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 08/15] virtio: make virtio_queue_notify_vq static Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 09/15] virtio-blk: fix disabled mode Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 10/15] virtio-scsi: " Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 11/15] virtio: add aio handler Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 12/15] virtio-blk: use aio handler for data plane Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 13/15] virtio-scsi: " Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 14/15] virtio: merge virtio_queue_aio_set_host_notifier_handler with virtio_queue_set_aio Michael S. Tsirkin
2016-04-08  8:02 ` [Qemu-devel] [PULL 15/15] hw/pci-bridge: Add missing unref in case register-bus fails Michael S. Tsirkin
2016-04-08 12:45 ` [Qemu-devel] [PULL 00/15] pci, virtio, acpi: fixes for 2.6 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460102154-16096-4-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sstabellini@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).