From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LQ5Gm-0001No-91 for qemu-devel@nongnu.org; Thu, 22 Jan 2009 14:31:16 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LQ5Gh-0001IJ-LA for qemu-devel@nongnu.org; Thu, 22 Jan 2009 14:31:12 -0500 Received: from [199.232.76.173] (port=38450 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LQ5Gh-0001I4-Hk for qemu-devel@nongnu.org; Thu, 22 Jan 2009 14:31:11 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:60670) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LQ5Gg-0006Iy-JG for qemu-devel@nongnu.org; Thu, 22 Jan 2009 14:31:11 -0500 Received: from pike.pond.sub.org (pD9E3B496.dip.t-dialin.net [217.227.180.150]) by oxygen.pond.sub.org (Postfix) with ESMTPA id B5C63276CE8 for ; Thu, 22 Jan 2009 20:31:05 +0100 (CET) From: Markus Armbruster Date: Thu, 22 Jan 2009 20:31:00 +0100 Message-Id: <1232652665-1710-4-git-send-email-armbru@redhat.com> In-Reply-To: <87ocxzrvqb.fsf@pike.pond.sub.org> References: <87ocxzrvqb.fsf@pike.pond.sub.org> Subject: [Qemu-devel] [PATCH 4/9] Convert virtio_init_pci() to pci_register_device_2() Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Markus Armbruster This is in preparation of pci=... support for virtio devices. --- hw/virtio-balloon.c | 2 +- hw/virtio-blk.c | 2 +- hw/virtio-console.c | 2 +- hw/virtio-net.c | 3 ++- hw/virtio.c | 5 ++--- hw/virtio.h | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 0765516..0b9f7c9 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -171,7 +171,7 @@ void *virtio_balloon_init(PCIBus *bus) { VirtIOBalloon *s; - s = (VirtIOBalloon *)virtio_init_pci(bus, "virtio-balloon", + s = (VirtIOBalloon *)virtio_init_pci("virtio-balloon", "", PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BALLOON, 0, VIRTIO_ID_BALLOON, diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index e654cc5..f3a0dcb 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -224,7 +224,7 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) int cylinders, heads, secs; static int virtio_blk_id; - s = (VirtIOBlock *)virtio_init_pci(bus, "virtio-blk", + s = (VirtIOBlock *)virtio_init_pci("virtio-blk", "", PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_DEVICE_ID_VIRTIO_BLOCK, 0, VIRTIO_ID_BLOCK, diff --git a/hw/virtio-console.c b/hw/virtio-console.c index deae76d..77ac940 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -125,7 +125,7 @@ void *virtio_console_init(PCIBus *bus, CharDriverState *chr) { VirtIOConsole *s; - s = (VirtIOConsole *)virtio_init_pci(bus, "virtio-console", + s = (VirtIOConsole *)virtio_init_pci("virtio-console", "", 6900, 0x1003, 0, VIRTIO_ID_CONSOLE, 0x03, 0x80, 0x00, diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 54c0030..3c7afb6 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -320,7 +320,8 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) VirtIONet *n; static int virtio_net_id; - n = (VirtIONet *)virtio_init_pci(bus, "virtio-net", 6900, 0x1000, + n = (VirtIONet *)virtio_init_pci("virtio-net", "", + 6900, 0x1000, 0, VIRTIO_ID_NET, 0x02, 0x00, 0x00, sizeof(struct virtio_net_config), diff --git a/hw/virtio.c b/hw/virtio.c index dba80f8..c721c2a 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -805,7 +805,7 @@ void virtio_load(VirtIODevice *vdev, QEMUFile *f) virtio_update_irq(vdev); } -VirtIODevice *virtio_init_pci(PCIBus *bus, const char *name, +VirtIODevice *virtio_init_pci(const char *name, const char *opts, uint16_t vendor, uint16_t device, uint16_t subvendor, uint16_t subdevice, uint8_t class_code, uint8_t subclass_code, @@ -817,8 +817,7 @@ VirtIODevice *virtio_init_pci(PCIBus *bus, const char *name, uint8_t *config; uint32_t size; - pci_dev = pci_register_device(bus, name, struct_size, - -1, NULL, NULL); + pci_dev = pci_register_device_2(name, opts, struct_size, NULL, NULL); if (!pci_dev) return NULL; diff --git a/hw/virtio.h b/hw/virtio.h index 83511e2..18913fb 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -89,7 +89,7 @@ struct VirtIODevice VirtQueue *vq; }; -VirtIODevice *virtio_init_pci(PCIBus *bus, const char *name, +VirtIODevice *virtio_init_pci(const char *name, const char *opts, uint16_t vendor, uint16_t device, uint16_t subvendor, uint16_t subdevice, uint8_t class_code, uint8_t subclass_code, -- 1.6.0.6