From patchwork Tue Sep 4 15:13:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 1402901 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4EB2FDF280 for ; Tue, 4 Sep 2012 15:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932464Ab2IDPOR (ORCPT ); Tue, 4 Sep 2012 11:14:17 -0400 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:52962 "EHLO e06smtp14.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932525Ab2IDPOG (ORCPT ); Tue, 4 Sep 2012 11:14:06 -0400 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 4 Sep 2012 16:14:04 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 4 Sep 2012 16:13:59 +0100 Received: from d06av06.portsmouth.uk.ibm.com (d06av06.portsmouth.uk.ibm.com [9.149.37.217]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q84FDqeA34734144; Tue, 4 Sep 2012 15:13:52 GMT Received: from d06av06.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q84FDvR4029137; Tue, 4 Sep 2012 09:13:58 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av06.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q84FDraV028933; Tue, 4 Sep 2012 09:13:56 -0600 From: Cornelia Huck To: KVM , linux-s390 , qemu-devel Cc: Avi Kivity , Marcelo Tosatti , Anthony Liguori , Rusty Russell , Christian Borntraeger , Carsten Otte , Alexander Graf , Heiko Carstens , Martin Schwidefsky , Sebastian Ott Subject: [PATCH v2 5/5] [HACK] Handle multiple virtio aliases. Date: Tue, 4 Sep 2012 17:13:53 +0200 Message-Id: <1346771633-53081-6-git-send-email-cornelia.huck@de.ibm.com> X-Mailer: git-send-email 1.7.11.5 In-Reply-To: <1346771633-53081-1-git-send-email-cornelia.huck@de.ibm.com> References: <1346771633-53081-1-git-send-email-cornelia.huck@de.ibm.com> x-cbid: 12090415-1948-0000-0000-000002DB7CEA Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch enables using both virtio-xxx-s390 and virtio-xxx-ccw by making the alias lookup code verify that a driver is actually registered. (Only included in order to allow testing of virtio-ccw; should be replaced by cleaning up the virtio bus model.) Not-signed-off-by: Cornelia Huck --- blockdev.c | 6 +--- hw/qdev-monitor.c | 85 +++++++++++++++++++++++++++++++++---------------------- vl.c | 6 +--- 3 files changed, 53 insertions(+), 44 deletions(-) diff --git a/blockdev.c b/blockdev.c index 7c83baa..a7c39b6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -560,11 +560,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, NULL); - if (arch_type == QEMU_ARCH_S390X) { - qemu_opt_set(opts, "driver", "virtio-blk-s390"); - } else { - 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/qdev-monitor.c b/hw/qdev-monitor.c index 92b7c59..9245a1e 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -118,9 +118,53 @@ static int set_property(const char *name, const char *value, void *opaque) return 0; } -static const char *find_typename_by_alias(const char *alias) +static BusState *qbus_find_recursive(BusState *bus, const char *name, + const char *bus_typename) +{ + BusChild *kid; + BusState *child, *ret; + int match = 1; + + if (name && (strcmp(bus->name, name) != 0)) { + match = 0; + } + if (bus_typename && + (strcmp(object_get_typename(OBJECT(bus)), bus_typename) != 0)) { + match = 0; + } + if (match) { + return bus; + } + + QTAILQ_FOREACH(kid, &bus->children, sibling) { + DeviceState *dev = kid->child; + QLIST_FOREACH(child, &dev->child_bus, sibling) { + ret = qbus_find_recursive(child, name, bus_typename); + if (ret) { + return ret; + } + } + } + return NULL; +} + +static bool qdev_verify_bus(DeviceClass *dc) +{ + BusState *bus; + + if (dc) { + bus = qbus_find_recursive(sysbus_get_default(), NULL, dc->bus_type); + if (bus) { + return true; + } + } + return false; +} + +static const char *find_typename_by_alias(const char *alias, bool check_bus) { int i; + ObjectClass *oc; for (i = 0; qdev_alias_table[i].alias; i++) { if (qdev_alias_table[i].arch_mask && @@ -129,7 +173,10 @@ static const char *find_typename_by_alias(const char *alias) } if (strcmp(qdev_alias_table[i].alias, alias) == 0) { - return qdev_alias_table[i].typename; + oc = object_class_by_name(qdev_alias_table[i].typename); + if (oc && (!check_bus || qdev_verify_bus(DEVICE_CLASS(oc)))) { + return qdev_alias_table[i].typename; + } } } @@ -155,7 +202,7 @@ int qdev_device_help(QemuOpts *opts) klass = object_class_by_name(driver); if (!klass) { - const char *typename = find_typename_by_alias(driver); + const char *typename = find_typename_by_alias(driver, false); if (typename) { driver = typename; @@ -283,36 +330,6 @@ static DeviceState *qbus_find_dev(BusState *bus, char *elem) return NULL; } -static BusState *qbus_find_recursive(BusState *bus, const char *name, - const char *bus_typename) -{ - BusChild *kid; - BusState *child, *ret; - int match = 1; - - if (name && (strcmp(bus->name, name) != 0)) { - match = 0; - } - if (bus_typename && - (strcmp(object_get_typename(OBJECT(bus)), bus_typename) != 0)) { - match = 0; - } - if (match) { - return bus; - } - - QTAILQ_FOREACH(kid, &bus->children, sibling) { - DeviceState *dev = kid->child; - QLIST_FOREACH(child, &dev->child_bus, sibling) { - ret = qbus_find_recursive(child, name, bus_typename); - if (ret) { - return ret; - } - } - } - return NULL; -} - static BusState *qbus_find(const char *path) { DeviceState *dev; @@ -417,7 +434,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) /* find driver */ obj = object_class_by_name(driver); if (!obj) { - const char *typename = find_typename_by_alias(driver); + const char *typename = find_typename_by_alias(driver, true); if (typename) { driver = typename; diff --git a/vl.c b/vl.c index 2b8cae6..788a536 100644 --- a/vl.c +++ b/vl.c @@ -2113,11 +2113,7 @@ static int virtcon_parse(const char *devname) } bus_opts = qemu_opts_create(device, NULL, 0, NULL); - if (arch_type == QEMU_ARCH_S390X) { - qemu_opt_set(bus_opts, "driver", "virtio-serial-s390"); - } else { - qemu_opt_set(bus_opts, "driver", "virtio-serial-pci"); - } + qemu_opt_set(bus_opts, "driver", "virtio-serial"); dev_opts = qemu_opts_create(device, NULL, 0, NULL); qemu_opt_set(dev_opts, "driver", "virtconsole");