From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 05/18] kvm: qemu: Fix virtio_blk_init() calls Date: Thu, 15 Jan 2009 13:47:29 +0000 Message-ID: <1232027262-21487-5-git-send-email-markmc@redhat.com> References: <1232027262-21487-1-git-send-email-markmc@redhat.com> <1232027262-21487-2-git-send-email-markmc@redhat.com> <1232027262-21487-3-git-send-email-markmc@redhat.com> <1232027262-21487-4-git-send-email-markmc@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: kvm@vger.kernel.org, Mark McLoughlin To: avi@redhat.com Return-path: Received: from mail17.svc.cra.dublin.eircom.net ([159.134.118.216]:31851 "HELO mail17.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1759006AbZAONrp (ORCPT ); Thu, 15 Jan 2009 08:47:45 -0500 In-Reply-To: <1232027262-21487-4-git-send-email-markmc@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This QEMU commit: pci: virtio: use pci id defines (Gerd Hoffman) removed the vendor/device id parameters from virtio_blk_init(). =46ixes: qemu/hw/device-hotplug.c: In function =E2=80=98qemu_system_hot_add_st= orage=E2=80=99: qemu/hw/device-hotplug.c:165: warning: implicit declaration of functi= on =E2=80=98virtio_blk_init=E2=80=99 qemu/hw/device-hotplug.c:166: warning: assignment makes pointer from = integer without a cast (Note: the ia64 fix is untested) Signed-off-by: Mark McLoughlin --- qemu/hw/device-hotplug.c | 4 ++-- qemu/hw/ipf.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qemu/hw/device-hotplug.c b/qemu/hw/device-hotplug.c index 56172e1..d8f0fcc 100644 --- a/qemu/hw/device-hotplug.c +++ b/qemu/hw/device-hotplug.c @@ -8,6 +8,7 @@ #include "block_int.h" #include "device-assignment.h" #include "config.h" +#include "virtio-blk.h" =20 #define PCI_BASE_CLASS_STORAGE 0x01 #define PCI_BASE_CLASS_NETWORK 0x02 @@ -162,8 +163,7 @@ static PCIDevice *qemu_system_hot_add_storage(const= char *opts, int bus_nr) drives_table[drive_idx].unit); break; case IF_VIRTIO: - opaque =3D virtio_blk_init (pci_bus, 0x1AF4, 0x1001, - drives_table[drive_idx].bdrv); + opaque =3D virtio_blk_init(pci_bus, drives_table[drive_idx].bd= rv); break; default: term_printf ("type %s not a hotpluggable PCI device.\n", buf); diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c index 74a7703..9654494 100644 --- a/qemu/hw/ipf.c +++ b/qemu/hw/ipf.c @@ -39,6 +39,7 @@ #include "ia64intrin.h" #include #include "device-assignment.h" +#include "virtio-blk.h" =20 #include "qemu-kvm.h" =20 @@ -625,7 +626,7 @@ static void ipf_init1(ram_addr_t ram_size, int vga_= ram_size, int unit_id =3D 0; =20 while ((index =3D drive_get_index(IF_VIRTIO, 0, unit_id)) !=3D -1) { - virtio_blk_init(pci_bus, 0x1AF4, 0x1001, drives_table[index].bdrv= ); + virtio_blk_init(pci_bus, drives_table[index].bdrv); unit_id++; } } --=20 1.6.0.6