From patchwork Tue Feb 9 13:15:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sascha Silbe X-Patchwork-Id: 8261931 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20253BEEE5 for ; Tue, 9 Feb 2016 13:28:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7424520263 for ; Tue, 9 Feb 2016 13:28:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5E1620260 for ; Tue, 9 Feb 2016 13:28:23 +0000 (UTC) Received: from localhost ([::1]:56017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8L8-0005wq-Vo for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 08:28:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8J1-0002E8-Ut for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT8Ix-0005mn-Bq for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:11 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:53950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT8Ix-0005lz-3f for qemu-devel@nongnu.org; Tue, 09 Feb 2016 08:26:07 -0500 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 9 Feb 2016 13:26:05 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 9 Feb 2016 13:26:03 -0000 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: silbe@linux.vnet.ibm.com X-IBM-RcptTo: qemu-block@nongnu.org;qemu-devel@nongnu.org Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2F5DE1B0805F; Tue, 9 Feb 2016 13:26:16 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u19DQ2tC17629234; Tue, 9 Feb 2016 13:26:03 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u19DOODm003036; Tue, 9 Feb 2016 06:26:02 -0700 Received: from s38lp35.boeblingen.de.ibm.com (dyn-9-152-222-58.boeblingen.de.ibm.com [9.152.222.58]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u19DG1Wa010128; Tue, 9 Feb 2016 06:16:02 -0700 From: Sascha Silbe To: qemu-devel@nongnu.org, Alexander Graf , Kevin Wolf , qemu-block@nongnu.org Date: Tue, 9 Feb 2016 14:15:12 +0100 Message-Id: <1455023713-104799-3-git-send-email-silbe@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1455023713-104799-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1455023713-104799-1-git-send-email-silbe@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16020913-0009-0000-0000-000007907BFE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.75.94.108 Cc: Tu Bo Subject: [Qemu-devel] [PATCH 2/3] qdev-monitor: add missing aliases for virtio-{9p, balloon, rng, scsi} X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP virtio-{blk,balloon,net,serial} are aliases for their actual, architecture-dependent implementations (*-ccw on s390x, *-pci on other architectures supporting virtio). This makes it a lot easier to craft qemu invocations that work on all supported architectures. Complete the set to cover all virtio devices that are implemented on all architectures supporting virtio. For virtio-balloon, only the CCW implementation was missing. Signed-off-by: Sascha Silbe Reviewed-by: Markus Armbruster --- This leaves out virtio-{gpu,input,input-hid,input-host,keyboard,mouse,tablet} because they're currently only implemented using PCI, so there's no immediate value in having them. It would nevertheless make sense to include them so they can get used already and will start to Just Work™ on s390x once a CCW implementation appears. I can post the corresponding patch if there's any interest. --- qdev-monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qdev-monitor.c b/qdev-monitor.c index 0145deb..9c4217c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -44,12 +44,19 @@ static const QDevAlias qdev_alias_table[] = { { "ich9-ahci", "ahci" }, { "kvm-pci-assign", "pci-assign" }, { "lsi53c895a", "lsi" }, + { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, + { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-balloon-ccw", "virtio-balloon", QEMU_ARCH_S390X }, { "virtio-balloon-pci", "virtio-balloon", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-blk-ccw", "virtio-blk", QEMU_ARCH_S390X }, { "virtio-blk-pci", "virtio-blk", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-net-ccw", "virtio-net", QEMU_ARCH_S390X }, { "virtio-net-pci", "virtio-net", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-rng-ccw", "virtio-rng", QEMU_ARCH_S390X }, + { "virtio-rng-pci", "virtio-rng", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, + { "virtio-scsi-ccw", "virtio-scsi", QEMU_ARCH_S390X }, + { "virtio-scsi-pci", "virtio-scsi", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { "virtio-serial-ccw", "virtio-serial", QEMU_ARCH_S390X }, { "virtio-serial-pci", "virtio-serial", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, { }