From patchwork Thu Mar 24 15:58:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 88230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id 4C4F31007D1 for ; Fri, 25 Mar 2011 03:17:55 +1100 (EST) Received: from localhost ([127.0.0.1]:54124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2n9R-00075G-6X for incoming@patchwork.ozlabs.org; Thu, 24 Mar 2011 12:12:45 -0400 Received: from [140.186.70.92] (port=56303 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2mw7-0001Jg-GO for qemu-devel@nongnu.org; Thu, 24 Mar 2011 11:59:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2mw5-0005Iw-Ur for qemu-devel@nongnu.org; Thu, 24 Mar 2011 11:58:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32865 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2mw5-0005II-If for qemu-devel@nongnu.org; Thu, 24 Mar 2011 11:58:57 -0400 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) by mx2.suse.de (Postfix) with ESMTP id 3BAE88730A; Thu, 24 Mar 2011 16:58:55 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Thu, 24 Mar 2011 16:58:38 +0100 Message-Id: <1300982333-12802-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1300982333-12802-1-git-send-email-agraf@suse.de> References: <1300982333-12802-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH 02/17] virtio: use generic name when possible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We have two different virtio buses: pci and s390. The abstraction path taken in qemu is to have generic aliases for each device type in the architecture specific qdev devices. So let's make use of these aliases whenever we can and define them whenever we can. Signed-off-by: Alexander Graf --- blockdev.c | 2 +- hw/s390-virtio-bus.c | 2 ++ hw/virtio-pci.c | 3 +++ vl.c | 6 +++--- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/blockdev.c b/blockdev.c index 0690cc8..bc598ed 100644 --- a/blockdev.c +++ b/blockdev.c @@ -503,7 +503,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) case IF_VIRTIO: /* add virtio block device */ opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0); - qemu_opt_set(opts, "driver", "virtio-blk-pci"); + qemu_opt_set(opts, "driver", "virtio-blk"); qemu_opt_set(opts, "drive", dinfo->id); if (devaddr) qemu_opt_set(opts, "addr", devaddr); diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 784dc01..d44eff2 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -325,6 +325,7 @@ static const VirtIOBindings virtio_s390_bindings = { static VirtIOS390DeviceInfo s390_virtio_net = { .init = s390_virtio_net_init, .qdev.name = "virtio-net-s390", + .qdev.alias = "virtio-net", .qdev.size = sizeof(VirtIOS390Device), .qdev.props = (Property[]) { DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic), @@ -340,6 +341,7 @@ static VirtIOS390DeviceInfo s390_virtio_net = { static VirtIOS390DeviceInfo s390_virtio_blk = { .init = s390_virtio_blk_init, .qdev.name = "virtio-blk-s390", + .qdev.alias = "virtio-blk", .qdev.size = sizeof(VirtIOS390Device), .qdev.props = (Property[]) { DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, block), diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 3911b09..96cfe8b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -873,6 +873,7 @@ static PCIDeviceInfo virtio_info[] = { .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-net-pci", + .qdev.alias = "virtio-net", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_net_init_pci, .exit = virtio_net_exit_pci, @@ -909,6 +910,7 @@ static PCIDeviceInfo virtio_info[] = { .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-balloon-pci", + .qdev.alias = "virtio-balloon", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, .exit = virtio_exit_pci, @@ -920,6 +922,7 @@ static PCIDeviceInfo virtio_info[] = { },{ #ifdef CONFIG_VIRTFS .qdev.name = "virtio-9p-pci", + .qdev.alias = "virtio-9p", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_9p_init_pci, .qdev.props = (Property[]) { diff --git a/vl.c b/vl.c index b1a94aa..8d77e43 100644 --- a/vl.c +++ b/vl.c @@ -1572,7 +1572,7 @@ static int balloon_parse(const char *arg) /* create empty opts */ opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0); } - qemu_opt_set(opts, "driver", "virtio-balloon-pci"); + qemu_opt_set(opts, "driver", "virtio-balloon"); return 0; } @@ -2450,12 +2450,12 @@ int main(int argc, char **argv, char **envp) qemu_opt_get(opts, "path"), qemu_opt_get(opts, "security_model")); - len = strlen("virtio-9p-pci,fsdev=,mount_tag="); + len = strlen("virtio-9p,fsdev=,mount_tag="); len += 2*strlen(qemu_opt_get(opts, "mount_tag")); arg_9p = qemu_malloc((len + 1) * sizeof(*arg_9p)); snprintf(arg_9p, (len + 1) * sizeof(*arg_9p), - "virtio-9p-pci,fsdev=%s,mount_tag=%s", + "virtio-9p,fsdev=%s,mount_tag=%s", qemu_opt_get(opts, "mount_tag"), qemu_opt_get(opts, "mount_tag"));