From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MR2yW-0005l5-1h for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:48:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MR2yP-0005fH-HV for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:48:38 -0400 Received: from [199.232.76.173] (port=53064 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MR2yP-0005fA-00 for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:48:33 -0400 Received: from mx2.redhat.com ([66.187.237.31]:33730) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MR2yO-00042i-Dl for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:48:32 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n6FBmVfZ014742 for ; Wed, 15 Jul 2009 07:48:31 -0400 From: Gerd Hoffmann Date: Wed, 15 Jul 2009 13:48:23 +0200 Message-Id: <1247658505-838-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1247658505-838-1-git-send-email-kraxel@redhat.com> References: <1247658505-838-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] qdev/compat: virtio-blk-pci 0.10 compatibility. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Add class property to virtio-blk-pci allowing to specify the PCI class. Add compat property to pc-0.10 to set the old PCI class. Signed-off-by: Gerd Hoffmann --- hw/pc.c | 5 +++++ hw/virtio-pci.c | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 76b9a48..0913860 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1469,6 +1469,11 @@ static QEMUMachine pc_machine_v0_10 = { .init = pc_init_pci, .max_cpus = 255, .compat_props = (CompatProperty[]) { + { + .driver = "virtio-blk-pci", + .property = "class", + .value = stringify(PCI_CLASS_STORAGE_OTHER), + }, { /* end of list */ } }, }; diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 0671967..41ba574 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -86,6 +86,7 @@ typedef struct { PCIDevice pci_dev; VirtIODevice *vdev; uint32_t addr; + uint32_t class_code; } VirtIOPCIProxy; /* virtio device */ @@ -425,12 +426,15 @@ static void virtio_blk_init_pci(PCIDevice *pci_dev) VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIODevice *vdev; + if (proxy->class_code != PCI_CLASS_STORAGE_SCSI && + proxy->class_code != PCI_CLASS_STORAGE_OTHER) + proxy->class_code = PCI_CLASS_STORAGE_SCSI; + vdev = virtio_blk_init(&pci_dev->qdev); virtio_init_pci(proxy, vdev, PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BLOCK, - PCI_CLASS_STORAGE_OTHER, - 0x00); + proxy->class_code, 0x00); } static void virtio_console_init_pci(PCIDevice *pci_dev) @@ -477,6 +481,14 @@ static PCIDeviceInfo virtio_info[] = { .qdev.name = "virtio-blk-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_blk_init_pci, + .qdev.props = (Property[]) { + { + .name = "class", + .info = &qdev_prop_hex32, + .offset = offsetof(VirtIOPCIProxy, class_code), + }, + {/* end of list */} + }, },{ .qdev.name = "virtio-net-pci", .qdev.size = sizeof(VirtIOPCIProxy), -- 1.6.2.5