From patchwork Thu Jan 15 13:47:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 2488 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0FDhmOF020391 for ; Thu, 15 Jan 2009 05:43:50 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759006AbZAONr4 (ORCPT ); Thu, 15 Jan 2009 08:47:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757811AbZAONrz (ORCPT ); Thu, 15 Jan 2009 08:47:55 -0500 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 Received: (qmail 34778 messnum 4170961 invoked from network[83.71.77.218/83-71-77-218-dynamic.b-ras1.srl.dublin.eircom.net]); 15 Jan 2009 13:47:43 -0000 Received: from 83-71-77-218-dynamic.b-ras1.srl.dublin.eircom.net (HELO blaa.localdomain) (83.71.77.218) by mail17.svc.cra.dublin.eircom.net (qp 34778) with SMTP; 15 Jan 2009 13:47:43 -0000 Received: by blaa.localdomain (Postfix, from userid 500) id BA35F2E412C; Thu, 15 Jan 2009 13:47:42 +0000 (GMT) From: Mark McLoughlin To: avi@redhat.com Cc: kvm@vger.kernel.org, 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> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1232027262-21487-4-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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This QEMU commit: pci: virtio: use pci id defines (Gerd Hoffman) removed the vendor/device id parameters from virtio_blk_init(). Fixes: qemu/hw/device-hotplug.c: In function ‘qemu_system_hot_add_storage’: qemu/hw/device-hotplug.c:165: warning: implicit declaration of function ‘virtio_blk_init’ 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" #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 = virtio_blk_init (pci_bus, 0x1AF4, 0x1001, - drives_table[drive_idx].bdrv); + opaque = virtio_blk_init(pci_bus, drives_table[drive_idx].bdrv); 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" #include "qemu-kvm.h" @@ -625,7 +626,7 @@ static void ipf_init1(ram_addr_t ram_size, int vga_ram_size, int unit_id = 0; while ((index = drive_get_index(IF_VIRTIO, 0, unit_id)) != -1) { - virtio_blk_init(pci_bus, 0x1AF4, 0x1001, drives_table[index].bdrv); + virtio_blk_init(pci_bus, drives_table[index].bdrv); unit_id++; } }