From patchwork Mon Jun 26 18:01:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106371 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp275906qge; Mon, 26 Jun 2017 11:03:23 -0700 (PDT) X-Received: by 10.200.52.129 with SMTP id w1mr1904709qtb.77.1498500203557; Mon, 26 Jun 2017 11:03:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500203; cv=none; d=google.com; s=arc-20160816; b=UQrBZbN7DGhYA71gf33YaGv6Qpevj/hWFz8g2ztAaUN+GGs6/59I7unFiJ4UoHtgyj qHAfONrDKGvLqkpC4BvrgErI6MAzH6CDd9jvDvc1+m8fIPo/QR4h6w6KblgiXYP0Fo8F Oz26eBkUlkTdipkEQIaSCU61h6QuXXGu85fjIKffq/mf6qxLJX2O+ojrdIG+r5nj1jRm BI0XuYdw1XKzvvtYBXYg4JhGNye2ti6U6YFVsKP+iUHJdFTVXrrMWrvczUMlxwx/HJqd TE+/s87+fwMoKW6d7Ul+hrBAfxuD+R0UK5GCSfxQGS3iBqBuwYBQ0xejzRE2FUcU5AgY TYjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=bnMi5iVV3y68hJGWDWLAI1rM6qlbtOeeDTCov67G5ks=; b=SH/g+7+RhFExIEMJ00fDKvFTgwDM19FzkzO/ivla2qvEDtEHa+TQHYwlA23H1jgrK5 jfsqTnexatTKf4ofjBW2dvXwdH9i+XBpwL3FD5tYXLmDt3xouWuYh9L42hlZhJjHyh5m 9wVpKQ5/AsaF1FIu7k40CmEQU55qs7D7y+X823quvycmWPsAfRNfXVVX6QF16X1E3VdZ ipsrXHLNxH1p6K//OdeTycpcyf6DOcvCPlJ+vmIVLGgkOmWxpBBHp0N6vD/Sb/lqCVzG +7BJ1T9kiy63gd6KQm98aakosNFHzlqETe6i4V3PHeyJ+FeMDbGX/m8Ziw/0THpz2qVt jjhQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id m28si615141qki.156.2017.06.26.11.03.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:03:23 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC37A40F10; Mon, 26 Jun 2017 18:03:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EC37A40F10 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com EC37A40F10 Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6C1E7EA3A; Mon, 26 Jun 2017 18:03:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6758127F; Mon, 26 Jun 2017 18:03:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI22om007877 for ; Mon, 26 Jun 2017 14:02:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 794497E48D; Mon, 26 Jun 2017 18:02:02 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id E2E7B7E497; Mon, 26 Jun 2017 18:02:00 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:42 -0400 Message-Id: <7bd360f9f9510cfa9ff3a04def6ef1f2d537c2b6.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 01/12] Revert "qemu: Support chardevs with ARM virt machines" X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 26 Jun 2017 18:03:22 +0000 (UTC) This reverts commit 70c9b44270f75bfb7a5701d81aa49380d139e8f0. This commit breaks existing aarch64 machvirt configs with: Which fails with: error: Failed to start domain fedora25-aarch64 error: internal error: process exited while connecting to monitor: 2017-06-26T13:55:34.726293Z qemu-system-aarch64: -chardev pty,id=charserial0: char device redirected to /dev/pts/5 (label charserial0) 2017-06-26T13:55:34.782121Z qemu-system-aarch64: -device isa-serial,chardev=charserial0,id=serial0: No 'ISA' bus found for device 'isa-serial' Signed-off-by: Cole Robinson --- src/qemu/qemu_capabilities.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 12d9477cf..61c9a1066 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5573,11 +5573,6 @@ virQEMUCapsSupportsChardev(const virDomainDef *def, if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; - /* The virt machine has a PCIe bus and allows plugging in the same type of - * devices as x86 systems do on a PCIe bus. */ - if (qemuDomainIsVirt(def)) - return true; - /* This may not be true for all ARM machine types, but at least * the only supported non-virtio serial devices of vexpress and versatile * don't have the -chardev property wired up. */ From patchwork Mon Jun 26 18:01:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106375 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp282402qge; Mon, 26 Jun 2017 11:09:20 -0700 (PDT) X-Received: by 10.55.127.199 with SMTP id a190mr2045763qkd.100.1498500560467; Mon, 26 Jun 2017 11:09:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500560; cv=none; d=google.com; s=arc-20160816; b=yxtrxYvPSV0+sbZ8b8kmQ6lYg8zXS4HN1E4ru6TTVa8mS1YiRgk/00RcopTJjwS3lv FHWkVp45Awlw/Iq77cgoifZSAKE0xGPFPoNxxC4xpdJZzDYl9FVXo3omi30xnODZDCLe eOwizuarAdaiflmb3Q6kes1+E4uTNz7kVjiLBYZBpcMAW/Vgh34YaOa0KPZbuSRvF6/b F5sxVSvh+JGhdh2xfuvO6+Ry3okTxu9cmQF3tQmh5QkDEh4eBv60XFT0d6L2cXm6wfjN 3WpHMF+YoxHCw3fnI8S48X4tptWnEVv1Pn0aKxkd41hXCpnY6X4E9Agntk4msj6orfb8 gNDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=+WJ7NCF2O36Mc9eQMoSJWhRYGnNiurRKNPZHczgg/kk=; b=WN74tk99C/TSupy8NPDYAB2BVb9SxsSD/ed/ye0qENZji7AOAQWYR8PSn79cjKHrSR vEkmPB3tcwH5jN6GzElJ4eL/Gh2CvuM/GcYAPEx1RJG8jVTEJ8YEe7ayoXYc5CwrN1JG 3qG3t4x2TdFnjDAdqI8MGsAPirxi8jBTwQsu86Jay2yjUG5VYTi0kY0G3C08kAesoyMe 8iij28TUGNfboXu+mFnMPY3hhF6nAUAmApybl98S1VcaAea7rIQrkC67WOgmeIy1ByRj ZCitgyRDx9Vkqhs5daIMkZOHpfWaCmGtTYToU4LyrNFUv5QGaBi57+nt3ncf8EMdohku sCzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id i18si637273qtc.237.2017.06.26.11.09.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:09:20 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E44FB40F15; Mon, 26 Jun 2017 18:09:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E44FB40F15 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E44FB40F15 Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74BD97EE69; Mon, 26 Jun 2017 18:09:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1D18A27E; Mon, 26 Jun 2017 18:09:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI25Nx007891 for ; Mon, 26 Jun 2017 14:02:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28FC578396; Mon, 26 Jun 2017 18:02:05 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id D4D0A784AD; Mon, 26 Jun 2017 18:02:02 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:43 -0400 Message-Id: <928a81ffa60f891b2ae9a908d763bfe1e9ccc27b.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 02/12] qemu: caps: Tweak arm conditional in SupportsChardev X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 26 Jun 2017 18:09:19 +0000 (UTC) Rather than try to whitelist all device configs that can't use -chardev, blacklist the only one that really can't, which is the default serial/console target type=isa case. ISA specifically isn't a valid config for arm/aarch64, but we've always implicitly treated it to mean 'default platform device'. Signed-off-by: Cole Robinson --- src/qemu/qemu_capabilities.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 61c9a1066..d0bc50bd7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5568,17 +5568,22 @@ virQEMUCapsSupportsChardev(const virDomainDef *def, if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) return false; + return true; } - if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) + if ((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) { + /* TARGET_TYPE_ISA here really means 'the default', which we + treat as whatever the built in platform serial device is on. + And for platform devices we can't use -chardev */ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) + return false; + return true; + } - /* This may not be true for all ARM machine types, but at least - * the only supported non-virtio serial devices of vexpress and versatile - * don't have the -chardev property wired up. */ - return (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO || - (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO)); + return true; } From patchwork Mon Jun 26 18:01:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106376 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp282516qge; Mon, 26 Jun 2017 11:09:26 -0700 (PDT) X-Received: by 10.233.221.70 with SMTP id r67mr1842131qkf.81.1498500566391; Mon, 26 Jun 2017 11:09:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500566; cv=none; d=google.com; s=arc-20160816; b=zY9WAcqyAHAQebfVQ5JcH7f4btC63WkUYJB5yRJXL7tsL40gen/ZOBU4hWtgPCjg77 X5VPwRz/uJkatxP1WmsehxXxNQ2WIg6yX8W6EqwK4GWzGQCuEIhdkLQiZM6G/KA+Soon IkPXTAMi79kgKbHVlnI7+TSJXk5Q3/nxYJxvrW6B3YWJDSKeMRxvRJbVp09gHB1pSfhH 8mF2r8Tj5ohvWZp22ke+kcpS/1xDPN+6glVCsV3rOw26t507y5whekRmqcAovMEceAhG QG4Zuo77MTI7cyZiM+XSdfLNpBkg4J+qUvJ+O32xPptZ0Oi4GTX4xuV61i/uiQYOpyrd NXWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=P/u+nEfOvzNsnGumQ6DrCslT/B9boG1WHqirMTx5Cl8=; b=NMvr6IlXH1ZN4E/zQxvdCpShuVf8n+eBtXcrutn+sd9bakLLfMX0DylDdx3FR7TvIv Ii7yTXDUxtluw9VM13Chy4WYWAmeJURSvhcg07CyIeATzwa3JrR41MKXp5nbE5CveuF1 y8TyBwFXJJFP1b1rfNoKROS3HZX3b0wQ4jFLN6r+GStCSey3eDfbVZ10EQXNO0Q03z1A ZE5IJ+XSLsmc3EJk3NC7xvRzsj6bic0XqBObjWqY6288H3kDMZzVpf0StbM+S2f8Kuoy rpxvEu84J+NjgDMikVl5LBIWtscP1SIOEIj2nW7EC4uoV2Ia2FjcNiloquPyLS+7tair YNTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id g7si603859qkb.287.2017.06.26.11.09.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:09:26 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D047B80C0A; Mon, 26 Jun 2017 18:09:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D047B80C0A Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com D047B80C0A Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA4107EE89; Mon, 26 Jun 2017 18:09:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4EFF21853E31; Mon, 26 Jun 2017 18:09:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI26dL007901 for ; Mon, 26 Jun 2017 14:02:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A78F878352; Mon, 26 Jun 2017 18:02:06 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A78378396; Mon, 26 Jun 2017 18:02:05 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:44 -0400 Message-Id: <7f54b32ba02a389cd28f3d859ae352f8de1c4df9.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 03/12] tests: qemuxml2argv: Add an aarch64 pci-serial test X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 26 Jun 2017 18:09:25 +0000 (UTC) This demonstrates that the previous qemu caps changes will use -chardev for pci-serial on aarch64 machvirt Signed-off-by: Cole Robinson --- .../qemuxml2argv-aarch64-pci-serial.args | 26 ++++++++++++++++++++++ .../qemuxml2argv-aarch64-pci-serial.xml | 17 ++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++++ 3 files changed, 50 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args new file mode 100644 index 000000000..79153d2f4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-M virt \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-chardev socket,id=charmonitor,\ +path=/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ +-chardev pty,id=charserial0,logfile=/tmp/log,logappend=on \ +-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml new file mode 100644 index 000000000..f3d04a2a5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-pci-serial.xml @@ -0,0 +1,17 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + + + /usr/bin/qemu-system-aarch64 + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 27eea70ae..b41c41a96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2342,6 +2342,13 @@ mymain(void) DO_TEST_FAILURE("aarch64-kvm-32-on-64", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); + DO_TEST("aarch64-pci-serial", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_CHARDEV, + QEMU_CAPS_DEVICE_PCI_SERIAL, QEMU_CAPS_CHARDEV_LOGFILE, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_IOH3420); /* Make sure all combinations of ACPI and UEFI behave as expected */ DO_TEST("aarch64-acpi-uefi", NONE); From patchwork Mon Jun 26 18:01:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106369 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp274714qge; Mon, 26 Jun 2017 11:02:20 -0700 (PDT) X-Received: by 10.233.223.65 with SMTP id t62mr1991428qkf.80.1498500140065; Mon, 26 Jun 2017 11:02:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500140; cv=none; d=google.com; s=arc-20160816; b=fcAYl48btWSgVDkdENWLvGRbuO0SiC7wgeExt1e/r+3JMiIRS3ZTeyCOm+s99DyLs7 3ePekIV3X6UsxHvlHElXbwiLg3QGkfpakd/kbVT6HJXjZ4tq7KmY59Fk9Io4SUrawdMn ieMDOqB78hJOwKeKnKwEcK39XKDYd7xPYsVfgaRFnzVjG0h8QHpuv2zIEFgnNgHALqf0 RrolDCPMUbL32D9nCBOYqjUGZCl4kb7jRnHqwE2HWZQsSKLeZxIVkxepQ3n+L7cmYNUH bzBeGCxkMQJs5VQK1cKjMW8Z7UQnSynWWqeqH5DJ3zKXrPVsNxHViMOAANiTTBzvsdNp FK3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=QAfnAJBvvF3ol8+ZYEXkYBi6p+o636l4zm2uhs39oOI=; b=nOULtw0XQSXJYKJiUz0Bo6zzqWXyaZO8BfOpbytpQa4/MBqKIGfDm0nCo7XP8SNHyk vg0/GVdM+NYTI3DmCZX0qRyqhzlR7MsIDbzQijTxccy3jviuXbmjWQ9S8+/zQ07jC4/Q 8byud151ohqWmFbJlSaGem1jRY7kJxeQqWpXvyXFKd7V5AVIAt74CIxMAPhGJAhrZ6ey PAUf014+JfbGfCEy6h6JnnlndBjPH031+VRVnAW2sjgaO5pIYXTj2IBr4boU21JjJ97j ZmZfWqBuERSOSOedc3zNSvdQlHsFxDSKKn5ErmWDLwWB8OPyhkJOdrve0iPluM2RbEFL 2vmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id h2si609606qte.246.2017.06.26.11.02.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:02:20 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 804D07D0C3; Mon, 26 Jun 2017 18:02:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 804D07D0C3 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 804D07D0C3 Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46163784DB; Mon, 26 Jun 2017 18:02:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C01F51853E30; Mon, 26 Jun 2017 18:02:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI28wB007909 for ; Mon, 26 Jun 2017 14:02:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AF467E487; Mon, 26 Jun 2017 18:02:08 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3BD47E46F; Mon, 26 Jun 2017 18:02:06 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:45 -0400 Message-Id: <1d5aa426e2c7a8fcc4a18048ce26d5ad1d31a784.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 04/12] qemu: command: Remove old style -parallel building X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 26 Jun 2017 18:02:19 +0000 (UTC) AFAIK there aren't any qemu arch/machine types with platform parallel devices that would require old style -parallel config, so we shouldn't ever need this nowadays. Remove a now redundant test Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 33 ++++++++------------ .../qemuxml2argv-parallel-tcp.args | 22 -------------- .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 35 ---------------------- tests/qemuxml2argvtest.c | 1 - tests/qemuxml2xmltest.c | 1 - 5 files changed, 12 insertions(+), 80 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c53ab97b9..997d73d4b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9284,28 +9284,19 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, virDomainChrDefPtr parallel = def->parallels[i]; char *devstr; - /* Use -chardev with -device if they are available */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) { - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - parallel->source, - parallel->info.alias, - qemuCaps, true, - chardevStdioLogd))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); + if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + parallel->source, + parallel->info.alias, + qemuCaps, true, + chardevStdioLogd))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); - if (qemuBuildChrDeviceCommandLine(cmd, def, parallel, - qemuCaps) < 0) - return -1; - } else { - virCommandAddArg(cmd, "-parallel"); - if (!(devstr = qemuBuildChrArgStr(parallel->source, NULL))) - return -1; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); - } + if (qemuBuildChrDeviceCommandLine(cmd, def, parallel, + qemuCaps) < 0) + return -1; } return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args deleted file mode 100644 index 22d551fd8..000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --nographic \ --nodefaults \ --monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --parallel tcp:127.0.0.1:9999,server,nowait diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml deleted file mode 100644 index 705e8c3c1..000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ /dev/null @@ -1,35 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - - - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b41c41a96..3610c71bf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1186,7 +1186,6 @@ mymain(void) QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("parallel-tcp", NONE); DO_TEST("console-compat", NONE); DO_TEST("console-compat-auto", NONE); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 13072996c..dd4cc2452 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -549,7 +549,6 @@ mymain(void) DO_TEST("serial-many", NONE); DO_TEST("serial-spiceport", NONE); DO_TEST("serial-spiceport-nospice", NONE); - DO_TEST("parallel-tcp", NONE); DO_TEST("console-compat", NONE); DO_TEST("console-compat2", NONE); DO_TEST("console-virtio-many", NONE); From patchwork Mon Jun 26 18:01:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106370 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp274829qge; Mon, 26 Jun 2017 11:02:25 -0700 (PDT) X-Received: by 10.55.56.133 with SMTP id f127mr1978395qka.122.1498500145643; Mon, 26 Jun 2017 11:02:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500145; cv=none; d=google.com; s=arc-20160816; b=jkHLJ/p2TvChcKNMKpuxXTfpqVwi0wVplWKGkLF2G1RxqdaMkgkihT2VD/JkXhjLsc L2RB1Rgu8Y+wcFXmzz+yANsqTADh+JTCb076emtmcWMb9kS56E2YYMIdfIR69mEd3+SK creiwT6sPH3bG/iBzOnVJ3PIN12Pc9VUoUvAIke9z8V4iJYttqnhvy8tyeD4YZoLyW5/ AegqRDf1OLZhSitNnZcBS3s04kFbEhRtusZR7ZQRbyzeRPg1qXtdiO1bZhV0A2NNZJ5R LoPhcHai4G7SdXowECZ34nkvveyz49GaXopcNvjpNLsL2zecJbi6IZiwum8XqZRHtSRU lP9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=jllBKFRbtxaGTrfT4v3r6FOUCRnFSlE1euhXaPC2sLU=; b=AxNu5rsjX3QiQ0ofM5CKJ6vwiOCCvQaTgBduLKd4vWFnmStafrBMouxteS71Pg5Qgd ctn6qnTQIbiLdV6J4j9WrrHTVonjV+UWplf0a0rUQv93Oao5OqRA5pg3uVVJWMgJS9Zr RQip8SI3to13rmJKY+odWo9mtKuzTk1tZiYOvLI39HUNIWbOan+0WQSKsZgjslb6va3h SDVOYNuA50nuGtWyGnRQnfSXxymiLibYE1heLrE0CsoMwM6yTUAN5F+CUXL9E4WPy0Ys z1+Vm9HArXN87cOigjV9PEjRIXihi/ESwuqZ43IEXIOXCzuxCZDr1450eYHKBkQPzEXr PRuQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id v3si594579qkh.41.2017.06.26.11.02.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:02:25 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A2263DBEE; Mon, 26 Jun 2017 18:02:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2A2263DBEE Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2A2263DBEE Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBD4D7EE6D; Mon, 26 Jun 2017 18:02:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4A4D41853E32; Mon, 26 Jun 2017 18:02:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI2ErX007931 for ; Mon, 26 Jun 2017 14:02:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C33F78396; Mon, 26 Jun 2017 18:02:14 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id C91967E48D; Mon, 26 Jun 2017 18:02:08 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:46 -0400 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 05/12] qemu: command: Drop some QEMU_CAPS_CHARDEV checks X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 26 Jun 2017 18:02:24 +0000 (UTC) AFAIK there aren't any cases where we should fail these checks with supported qemu versions, so just drop them. Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 997d73d4b..ca9329bb5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8880,8 +8880,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, switch (smartcard->type) { case VIR_DOMAIN_SMARTCARD_TYPE_HOST: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary lacks smartcard host " "mode support")); @@ -8892,8 +8891,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_EMULATED)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary lacks smartcard host " "mode support")); @@ -8928,8 +8926,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_PASSTHRU)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCID_PASSTHRU)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary lacks smartcard " "passthrough mode support")); @@ -9319,12 +9316,6 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, switch (channel->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("guestfwd requires QEMU to support -chardev & -device")); - return -1; - } - if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, channel->source, channel->info.alias, From patchwork Mon Jun 26 18:01:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106372 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp275994qge; Mon, 26 Jun 2017 11:03:28 -0700 (PDT) X-Received: by 10.55.192.197 with SMTP id v66mr1797256qkv.175.1498500208723; Mon, 26 Jun 2017 11:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500208; cv=none; d=google.com; s=arc-20160816; b=yvX63We1DKVrFx15E2mEeXPN3Y3xXX8cwOtMTw7tVMwFu2hKuXeo2c1N4u1HyskkH0 3rJb6HhjtbE28U63OpLm52GYOI78CgCrY18t63lUW2qPii1P7XrOK6J1NF/dzPLLVct4 aRAv3wonBHjFZifOEHhLFmchXmFq4L7+wEjPdBymKmnmmcnMsz3OzO9DQYnxzQnQAUII LpnFuWULSmVW2idiRgtdJItvNLW2VvFsrJxcYm+VjKoSpSwRj49Pbkg7zfsORzmSBL5F BEsy55JaRC+3N2xuTFDz8FlgAa9gIajeI58bi8UMZtAUN5mDPVIxgcTe1iICa40UrfVK 3XCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=4cxrYd6TqPkD7jRsfap+H5T9PIIkx/5GNimpcAIYzIs=; b=fIArwqUTlr97dNLGszTrWd5GlrUieLSUNJmrR0enlZ3Gs8TWz46A0j+1IegWp7bOUh 9nGGKV2x6Oj4Xw+n6jozKNVn/xyB/TNCvAez+wf7JGwBoDFTJfmKHry56BBc69vJ9g9p gPuyQa2yAC80hkhoTr0etjXqJlZWkqHkXa7wz3xFoDrNfMl8JgRE+dDKJVhgyJoRNR3C ZI1J9xFRr7pNNBX7iBHv9YmwecP5IK5i4m5EF8OJ3v6mpyt/dU2Eetxxrtb0odacfZMe lbgAB9fCDYuWPAdaTJcNdxrDjJpLWd75cy6P51w6/ZZXnGyopTn8ejevcmV9mdT69bFA 6+xQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id a11si624783qtd.334.2017.06.26.11.03.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:03:28 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 32B787F6BB; Mon, 26 Jun 2017 18:03:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 32B787F6BB Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 32B787F6BB Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 032E71718B; Mon, 26 Jun 2017 18:03:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A35DD1833033; Mon, 26 Jun 2017 18:03:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI2bbC007973 for ; Mon, 26 Jun 2017 14:02:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0209D6BF6C; Mon, 26 Jun 2017 18:02:37 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD52C78396; Mon, 26 Jun 2017 18:02:14 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:47 -0400 Message-Id: <3ee20d5b2792f4f535a6c461c522e83d49283129.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 06/12] qemu: command: always use -chardev for monitor config X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 26 Jun 2017 18:03:27 +0000 (UTC) AFAIK there aren't any cases where we will/should hit the old code path for our supported qemu versions, so drop the old code. Massive test suite churn follows Signed-off-by: Cole Robinson --- src/qemu/qemu_command.c | 38 +++++++--------------- .../qemuxml2argv-aarch64-aavmf-virtio-mmio.args | 4 ++- .../qemuxml2argv-aarch64-acpi-uefi.args | 4 ++- .../qemuxml2argv-aarch64-cpu-passthrough.args | 4 ++- .../qemuxml2argv-aarch64-gic-host.args | 4 ++- .../qemuxml2argv-aarch64-gic-none-tcg.args | 4 ++- .../qemuxml2argv-aarch64-gic-v2.args | 4 ++- .../qemuxml2argv-aarch64-gic-v3.args | 4 ++- .../qemuxml2argv-aarch64-kvm-32-on-64.args | 4 ++- .../qemuxml2argv-aarch64-noacpi-nouefi.args | 4 ++- .../qemuxml2argv-aarch64-noacpi-uefi.args | 4 ++- ...muxml2argv-aarch64-usb-controller-nec-xhci.args | 4 ++- ...uxml2argv-aarch64-usb-controller-qemu-xhci.args | 4 ++- .../qemuxml2argv-aarch64-video-virtio-gpu-pci.args | 4 ++- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 4 ++- .../qemuxml2argv-aarch64-virt-default-nic.args | 5 +-- .../qemuxml2argv-aarch64-virt-virtio.args | 4 ++- .../qemuxml2argv-aarch64-virtio-pci-default.args | 4 ++- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-acpi-table.args | 4 ++- .../qemuxml2argv-arm-vexpressa9-basic.args | 4 ++- .../qemuxml2argv-arm-vexpressa9-nodevs.args | 4 ++- .../qemuxml2argv-arm-vexpressa9-virtio.args | 4 ++- .../qemuxml2argv-arm-virt-virtio.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 4 ++- .../qemuxml2argv-balloon-ccw-deflate.args | 4 ++- .../qemuxml2argv-balloon-device-auto.args | 4 ++- .../qemuxml2argv-balloon-device-deflate-off.args | 4 ++- .../qemuxml2argv-balloon-device-deflate.args | 4 ++- .../qemuxml2argv-balloon-device-period.args | 4 ++- .../qemuxml2argv-balloon-device.args | 4 ++- .../qemuxml2argv-balloon-mmio-deflate.args | 4 ++- .../qemuxml2argv-bios-nvram-secure.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 4 ++- .../qemuxml2argv-blkdeviotune-group-num.args | 4 ++- .../qemuxml2argv-blkdeviotune-max-length.args | 4 ++- .../qemuxml2argv-blkdeviotune-max.args | 4 ++- .../qemuxml2argv-blkdeviotune.args | 4 ++- .../qemuxml2argv-blkiotune-device.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 4 ++- .../qemuxml2argv-boot-complex-bootindex.args | 4 ++- .../qemuxml2argv-boot-complex.args | 4 ++- .../qemuxml2argv-boot-floppy-q35.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 4 ++- ...xml2argv-boot-menu-disable-drive-bootindex.args | 4 ++- .../qemuxml2argv-boot-menu-disable-drive.args | 4 ++- .../qemuxml2argv-boot-menu-disable.args | 4 ++- .../qemuxml2argv-boot-menu-enable-bootindex.args | 4 ++- ...qemuxml2argv-boot-menu-enable-with-timeout.args | 4 ++- .../qemuxml2argv-boot-menu-enable.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 4 ++- .../qemuxml2argv-boot-network.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 4 ++- .../qemuxml2argv-bootindex-floppy-q35.args | 4 ++- .../qemuxml2argv-channel-spicevmc-old.args | 4 ++- .../qemuxml2argv-channel-spicevmc.args | 4 ++- .../qemuxml2argv-clock-catchup.args | 4 ++- .../qemuxml2argv-clock-france.args | 4 ++- .../qemuxml2argv-clock-hpet-off.args | 4 ++- ...muxml2argv-clock-localtime-basis-localtime.args | 4 ++- .../qemuxml2argv-clock-localtime.args | 4 ++- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 4 ++- .../qemuxml2argv-clock-variable.args | 4 ++- .../qemuxml2argv-console-compat-auto.args | 4 ++- .../qemuxml2argv-console-compat.args | 4 ++- .../qemuxml2argv-cpu-Haswell-noTSX.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 4 ++- .../qemuxml2argv-cpu-Haswell2.args | 4 ++- .../qemuxml2argv-cpu-Haswell3.args | 4 ++- .../qemuxml2argv-cpu-cache-disable.args | 4 ++- .../qemuxml2argv-cpu-cache-disable2.args | 4 ++- .../qemuxml2argv-cpu-cache-disable3.args | 4 ++- .../qemuxml2argv-cpu-cache-emulate-l3.args | 4 ++- .../qemuxml2argv-cpu-cache-passthrough.args | 4 ++- .../qemuxml2argv-cpu-cache-passthrough2.args | 4 ++- .../qemuxml2argv-cpu-check-default-none.args | 4 ++- .../qemuxml2argv-cpu-check-default-none2.args | 4 ++- .../qemuxml2argv-cpu-check-default-partial.args | 4 ++- .../qemuxml2argv-cpu-check-default-partial2.args | 4 ++- .../qemuxml2argv-cpu-check-none.args | 4 ++- .../qemuxml2argv-cpu-eoi-disabled.args | 4 ++- .../qemuxml2argv-cpu-eoi-enabled.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 4 ++- .../qemuxml2argv-cpu-exact2-nofallback.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 4 ++- .../qemuxml2argv-cpu-fallback.args | 4 ++- .../qemuxml2argv-cpu-host-kvmclock.args | 4 ++- .../qemuxml2argv-cpu-host-model-cmt.args | 4 ++- .../qemuxml2argv-cpu-host-model-fallback.args | 4 ++- .../qemuxml2argv-cpu-host-model-vendor.args | 4 ++- .../qemuxml2argv-cpu-host-model.args | 4 ++- ...qemuxml2argv-cpu-host-passthrough-features.args | 4 ++- .../qemuxml2argv-cpu-host-passthrough.args | 4 ++- .../qemuxml2argv-cpu-hotplug-startup.args | 4 ++- .../qemuxml2argv-cpu-kvmclock.args | 4 ++- .../qemuxml2argv-cpu-minimum1.args | 4 ++- .../qemuxml2argv-cpu-minimum2.args | 4 ++- .../qemuxml2argv-cpu-numa-disjoint.args | 4 ++- .../qemuxml2argv-cpu-numa-memshared.args | 4 ++- .../qemuxml2argv-cpu-numa-no-memory-element.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 4 ++- .../qemuxml2argv-cpu-s390-features.args | 4 ++- .../qemuxml2argv-cpu-s390-zEC12.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 4 ++- .../qemuxml2argv-cpu-topology1.args | 4 ++- .../qemuxml2argv-cpu-topology2.args | 4 ++- .../qemuxml2argv-cpu-topology3.args | 4 ++- .../qemuxml2argv-cpu-tsc-frequency.args | 4 ++- .../qemuxml2argv-cputune-numatune.args | 4 ++- .../qemuxml2argv-cputune-zero-shares.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 4 ++- .../qemuxml2argv-debug-threads.args | 4 ++- .../qemuxml2argv-default-kvm-host-arch.args | 4 ++- .../qemuxml2argv-default-qemu-host-arch.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 4 ++- .../qemuxml2argv-disk-blockio.args | 4 ++- .../qemuxml2argv-disk-cdrom-empty.args | 4 ++- .../qemuxml2argv-disk-cdrom-network-ftp.args | 4 ++- .../qemuxml2argv-disk-cdrom-network-ftps.args | 4 ++- .../qemuxml2argv-disk-cdrom-network-http.args | 4 ++- .../qemuxml2argv-disk-cdrom-network-https.args | 4 ++- .../qemuxml2argv-disk-cdrom-network-tftp.args | 4 ++- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 4 ++- .../qemuxml2argv-disk-cdrom-tray.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 4 ++- .../qemuxml2argv-disk-copy_on_read.args | 4 ++- .../qemuxml2argv-disk-drive-boot-cdrom.args | 4 ++- .../qemuxml2argv-disk-drive-boot-disk.args | 4 ++- .../qemuxml2argv-disk-drive-cache-directsync.args | 4 ++- .../qemuxml2argv-disk-drive-cache-unsafe.args | 4 ++- .../qemuxml2argv-disk-drive-cache-v2-none.args | 4 ++- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 4 ++- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 4 ++- .../qemuxml2argv-disk-drive-copy-on-read.args | 4 ++- .../qemuxml2argv-disk-drive-detect-zeroes.args | 4 ++- .../qemuxml2argv-disk-drive-discard.args | 4 ++- ...uxml2argv-disk-drive-error-policy-enospace.args | 4 ++- .../qemuxml2argv-disk-drive-error-policy-stop.args | 4 ++- ...gv-disk-drive-error-policy-wreport-rignore.args | 4 ++- .../qemuxml2argv-disk-drive-fmt-qcow.args | 4 ++- .../qemuxml2argv-disk-drive-network-gluster.args | 4 ++- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 4 ++- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 4 ++- .../qemuxml2argv-disk-drive-network-iscsi.args | 4 ++- ...qemuxml2argv-disk-drive-network-nbd-export.args | 4 ++- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 4 ++- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 4 ++- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 4 ++- .../qemuxml2argv-disk-drive-network-nbd.args | 4 ++- ...muxml2argv-disk-drive-network-rbd-auth-AES.args | 4 ++- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 4 ++- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 4 ++- .../qemuxml2argv-disk-drive-network-rbd.args | 4 ++- .../qemuxml2argv-disk-drive-network-sheepdog.args | 4 ++- .../qemuxml2argv-disk-drive-no-boot.args | 4 ++- .../qemuxml2argv-disk-drive-readonly-disk.args | 4 ++- ...qemuxml2argv-disk-drive-readonly-no-device.args | 4 ++- .../qemuxml2argv-disk-drive-shared.args | 4 ++- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 4 ++- .../qemuxml2argv-disk-floppy-tray.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 4 ++- .../qemuxml2argv-disk-geometry.args | 4 ++- .../qemuxml2argv-disk-ide-drive-split.args | 4 ++- .../qemuxml2argv-disk-ide-wwn.args | 4 ++- .../qemuxml2argv-disk-ioeventfd.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 4 ++- .../qemuxml2argv-disk-sata-device.args | 4 ++- .../qemuxml2argv-disk-scsi-device-auto.args | 4 ++- .../qemuxml2argv-disk-scsi-device.args | 4 ++- .../qemuxml2argv-disk-scsi-disk-split.args | 4 ++- .../qemuxml2argv-disk-scsi-disk-vpd.args | 4 ++- .../qemuxml2argv-disk-scsi-disk-wwn.args | 4 ++- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 4 ++- .../qemuxml2argv-disk-scsi-megasas.args | 4 ++- .../qemuxml2argv-disk-scsi-mptsas1068.args | 4 ++- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 4 ++- .../qemuxml2argv-disk-scsi-vscsi.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-serial.args | 4 ++- .../qemuxml2argv-disk-snapshot.args | 4 ++- .../qemuxml2argv-disk-source-pool-mode.args | 4 ++- .../qemuxml2argv-disk-source-pool.args | 4 ++- .../qemuxml2argv-disk-usb-device-removable.args | 4 ++- .../qemuxml2argv-disk-usb-device.args | 4 ++- .../qemuxml2argv-disk-virtio-ccw-many.args | 4 ++- .../qemuxml2argv-disk-virtio-ccw.args | 4 ++- .../qemuxml2argv-disk-virtio-s390.args | 4 ++- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 4 ++- .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args | 4 ++- .../qemuxml2argv-disk-virtio-scsi-ioeventfd.args | 4 ++- .../qemuxml2argv-disk-virtio-scsi-max_sectors.args | 4 ++- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 4 ++- .../qemuxml2argv-encrypted-disk-usage.args | 4 ++- .../qemuxml2argv-encrypted-disk.args | 4 ++- .../qemuxml2argv-eoi-disabled.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 4 ++- .../qemuxml2argv-fd-memory-no-numa-topology.args | 4 ++- .../qemuxml2argv-fd-memory-numa-topology.args | 4 ++- .../qemuxml2argv-fd-memory-numa-topology2.args | 4 ++- .../qemuxml2argv-fd-memory-numa-topology3.args | 4 ++- .../qemuxml2argv-fips-enabled.args | 4 ++- .../qemuxml2argv-floppy-drive-fat.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 4 ++- .../qemuxml2argv-graphics-sdl-fullscreen.args | 4 ++- .../qemuxml2argv-graphics-sdl.args | 4 ++- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 4 ++- .../qemuxml2argv-graphics-spice-agentmouse.args | 4 ++- ...emuxml2argv-graphics-spice-auto-socket-cfg.args | 4 ++- .../qemuxml2argv-graphics-spice-auto-socket.args | 4 ++- .../qemuxml2argv-graphics-spice-compression.args | 4 ++- .../qemuxml2argv-graphics-spice-no-args.args | 4 ++- .../qemuxml2argv-graphics-spice-qxl-vga.args | 4 ++- .../qemuxml2argv-graphics-spice-sasl.args | 4 ++- .../qemuxml2argv-graphics-spice-socket.args | 4 ++- .../qemuxml2argv-graphics-spice-timeout.args | 4 ++- .../qemuxml2argv-graphics-spice.args | 4 ++- .../qemuxml2argv-graphics-vnc-auto-socket-cfg.args | 4 ++- .../qemuxml2argv-graphics-vnc-auto-socket.args | 4 ++- .../qemuxml2argv-graphics-vnc-no-listen-attr.args | 4 ++- .../qemuxml2argv-graphics-vnc-none.args | 4 ++- .../qemuxml2argv-graphics-vnc-policy.args | 4 ++- ...2argv-graphics-vnc-remove-generated-socket.args | 4 ++- .../qemuxml2argv-graphics-vnc-sasl.args | 4 ++- .../qemuxml2argv-graphics-vnc-socket.args | 4 ++- .../qemuxml2argv-graphics-vnc-tls.args | 4 ++- .../qemuxml2argv-graphics-vnc-websocket.args | 4 ++- .../qemuxml2argv-graphics-vnc.args | 4 ++- .../qemuxml2argv-hostdev-mdev-precreated.args | 4 ++- .../qemuxml2argv-hostdev-pci-address-device.args | 4 ++- .../qemuxml2argv-hostdev-pci-address.args | 4 ++- .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args | 4 ++- .../qemuxml2argv-hostdev-scsi-lsi-iscsi.args | 4 ++- .../qemuxml2argv-hostdev-scsi-lsi.args | 4 ++- .../qemuxml2argv-hostdev-scsi-readonly.args | 4 ++- .../qemuxml2argv-hostdev-scsi-vhost-scsi-ccw.args | 4 ++- .../qemuxml2argv-hostdev-scsi-vhost-scsi-pci.args | 4 ++- ...emuxml2argv-hostdev-scsi-virtio-iscsi-auth.args | 4 ++- .../qemuxml2argv-hostdev-scsi-virtio-iscsi.args | 4 ++- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 4 ++- ...muxml2argv-hostdev-usb-address-device-boot.args | 4 ++- .../qemuxml2argv-hostdev-usb-address-device.args | 4 ++- .../qemuxml2argv-hostdev-usb-address.args | 4 ++- .../qemuxml2argv-hostdev-vfio-multidomain.args | 4 ++- .../qemuxml2argv-hostdev-vfio.args | 4 ++- .../qemuxml2argv-hotplug-base.args | 4 ++- .../qemuxml2argv-hugepages-memaccess.args | 4 ++- .../qemuxml2argv-hugepages-memaccess2.args | 4 ++- .../qemuxml2argv-hugepages-numa.args | 4 ++- .../qemuxml2argv-hugepages-pages.args | 4 ++- .../qemuxml2argv-hugepages-pages2.args | 5 +-- .../qemuxml2argv-hugepages-pages3.args | 5 +-- .../qemuxml2argv-hugepages-pages5.args | 5 +-- .../qemuxml2argv-hugepages-pages6.args | 5 +-- .../qemuxml2argv-hugepages-shared.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 4 ++- .../qemuxml2argv-hyperv-panic.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 4 ++- .../qemuxml2argv-input-usbmouse-addr.args | 4 ++- .../qemuxml2argv-input-usbmouse.args | 4 ++- .../qemuxml2argv-input-usbtablet.args | 4 ++- .../qemuxml2argv-intel-iommu-caching-mode.args | 4 ++- .../qemuxml2argv-intel-iommu-device-iotlb.args | 4 ++- .../qemuxml2argv-intel-iommu-eim.args | 4 ++- .../qemuxml2argv-intel-iommu-ioapic.args | 4 ++- .../qemuxml2argv-intel-iommu-machine.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-intel-iommu.args | 4 ++- .../qemuxml2argv-iothreads-disk-virtio-ccw.args | 4 ++- .../qemuxml2argv-iothreads-disk.args | 4 ++- .../qemuxml2argv-iothreads-ids-partial.args | 4 ++- .../qemuxml2argv-iothreads-ids.args | 4 ++- .../qemuxml2argv-iothreads-virtio-scsi-ccw.args | 4 ++- .../qemuxml2argv-iothreads-virtio-scsi-pci.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 4 ++- .../qemuxml2argv-kvm-features-off.args | 4 ++- .../qemuxml2argv-kvm-features.args | 4 ++- .../qemuxml2argv-kvm-pit-delay.args | 4 ++- .../qemuxml2argv-kvm-pit-discard.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 4 ++- .../qemuxml2argv-kvmclock+eoi-disabled.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-luks-disks.args | 4 ++- .../qemuxml2argv-machine-aeskeywrap-off-cap.args | 4 ++- .../qemuxml2argv-machine-aeskeywrap-off-caps.args | 4 ++- .../qemuxml2argv-machine-aeskeywrap-on-cap.args | 4 ++- .../qemuxml2argv-machine-aeskeywrap-on-caps.args | 4 ++- .../qemuxml2argv-machine-aliases1.args | 4 ++- .../qemuxml2argv-machine-aliases2.args | 4 ++- .../qemuxml2argv-machine-core-cfg-off.args | 4 ++- .../qemuxml2argv-machine-core-off.args | 4 ++- .../qemuxml2argv-machine-core-on.args | 4 ++- .../qemuxml2argv-machine-deakeywrap-off-cap.args | 4 ++- .../qemuxml2argv-machine-deakeywrap-off-caps.args | 4 ++- .../qemuxml2argv-machine-deakeywrap-on-cap.args | 4 ++- .../qemuxml2argv-machine-deakeywrap-on-caps.args | 4 ++- .../qemuxml2argv-machine-keywrap-none-caps.args | 4 ++- .../qemuxml2argv-machine-keywrap-none.args | 4 ++- ...-machine-loadparm-multiple-disks-nets-s390.args | 4 ++- .../qemuxml2argv-machine-loadparm-net-s390.args | 4 ++- .../qemuxml2argv-machine-loadparm-s390.args | 4 ++- .../qemuxml2argv-machine-smm-opt.args | 4 ++- .../qemuxml2argv-machine-usb-opt.args | 4 ++- .../qemuxml2argv-machine-vmport-opt.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-master-key.args | 4 ++- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 4 ++- .../qemuxml2argv-memory-hotplug-dimm.args | 4 ++- .../qemuxml2argv-memory-hotplug-nvdimm-access.args | 4 ++- .../qemuxml2argv-memory-hotplug-nvdimm-label.args | 4 ++- .../qemuxml2argv-memory-hotplug-nvdimm.args | 4 ++- .../qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 4 ++- .../qemuxml2argv-memory-hotplug.args | 4 ++- .../qemuxml2argv-memtune-unlimited.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 4 ++- .../qemuxml2argv-migrate-numa-unaligned.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 4 ++- .../qemuxml2argv-minimal-msg-timestamp.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 4 ++- .../qemuxml2argv-misc-disable-s3.args | 4 ++- .../qemuxml2argv-misc-disable-suspends.args | 4 ++- .../qemuxml2argv-misc-enable-s4.args | 4 ++- .../qemuxml2argv-misc-no-reboot.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 4 ++- .../qemuxml2argv-mlock-unsupported.args | 4 ++- .../qemuxml2argv-multifunction-pci-device.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 ++- .../qemuxml2argv-net-eth-hostip.args | 4 ++- .../qemuxml2argv-net-eth-ifname.args | 4 ++- .../qemuxml2argv-net-eth-names.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 ++- .../qemuxml2argv-net-hostdev-multidomain.args | 4 ++- .../qemuxml2argv-net-hostdev-vfio-multidomain.args | 4 ++- .../qemuxml2argv-net-hostdev-vfio.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 4 ++- .../qemuxml2argv-net-vhostuser-multiq.args | 4 ++- .../qemuxml2argv-net-vhostuser.args | 4 ++- .../qemuxml2argv-net-virtio-ccw.args | 4 ++- .../qemuxml2argv-net-virtio-device.args | 4 ++- .../qemuxml2argv-net-virtio-disable-offloads.args | 4 ++- .../qemuxml2argv-net-virtio-netdev.args | 4 ++- .../qemuxml2argv-net-virtio-rxqueuesize.args | 4 ++- .../qemuxml2argv-net-virtio-s390.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 4 ++- .../qemuxml2argv-no-kvm-pit-device.args | 4 ++- .../qemuxml2argv-nographics-display.args | 4 ++- .../qemuxml2argv-nographics-vga.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 4 ++- .../qemuxml2argv-nosharepages.args | 4 ++- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 4 ++- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 4 ++- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 4 ++- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 4 ++- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 ++- .../qemuxml2argv-numatune-auto-prefer.args | 4 ++- .../qemuxml2argv-numatune-memnode-no-memory.args | 4 ++- .../qemuxml2argv-numatune-memnode.args | 4 ++- .../qemuxml2argv-numatune-memory.args | 4 ++- .../qemuxml2argv-panic-double.args | 4 ++- .../qemuxml2argv-panic-no-address.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-panic.args | 4 ++- .../qemuxml2argv-pci-autoadd-addr.args | 4 ++- .../qemuxml2argv-pci-autoadd-idx.args | 4 ++- .../qemuxml2argv-pci-autofill-addr.args | 4 ++- .../qemuxml2argv-pci-bridge-many-disks.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-pci-bridge.args | 4 ++- .../qemuxml2argv-pci-expander-bus.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-many.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 4 ++- .../qemuxml2argv-pcie-expander-bus.args | 5 +-- .../qemuxml2argv-pcie-root-port-model-generic.args | 4 ++- .../qemuxml2argv-pcie-root-port-model-ioh3420.args | 4 ++- .../qemuxml2argv-pcie-root-port.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 4 ++- .../qemuxml2argv-pcie-switch-downstream-port.args | 4 ++- .../qemuxml2argv-pcie-switch-upstream-port.args | 4 ++- .../qemuxml2argv-pcihole64-q35.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 4 ++- .../qemuxml2argv-pmu-feature-off.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 4 ++- .../qemuxml2argv-ppc64-usb-controller-legacy.args | 4 ++- ...emuxml2argv-ppc64-usb-controller-qemu-xhci.args | 4 ++- .../qemuxml2argv-ppc64-usb-controller.args | 4 ++- .../qemuxml2argv-pseries-nvram.args | 4 ++- .../qemuxml2argv-pv-spinlock-disabled.args | 4 ++- .../qemuxml2argv-pv-spinlock-enabled.args | 4 ++- .../qemuxml2argv-q35-acpi-nouefi.args | 4 ++- .../qemuxml2argv-q35-acpi-uefi.args | 4 ++- .../qemuxml2argv-q35-default-devices-only.args | 4 ++- .../qemuxml2argv-q35-multifunction.args | 4 ++- .../qemuxml2argv-q35-noacpi-nouefi.args | 4 ++- .../qemuxml2argv-q35-pci-force-address.args | 4 ++- .../qemuxml2argv-q35-pcie-autoadd.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-q35-pcie.args | 4 ++- .../qemuxml2argv-q35-pm-disable-fallback.args | 4 ++- .../qemuxml2argv-q35-pm-disable.args | 4 ++- .../qemuxml2argv-q35-usb2-multi.args | 4 ++- .../qemuxml2argv-q35-usb2-reorder.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 4 ++- .../qemuxml2argv-q35-virt-manager-basic.args | 4 ++- .../qemuxml2argv-q35-virtio-pci.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 4 ++- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 4 ++- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 4 ++- .../qemuxml2argv-qemu-ns-commandline.args | 4 ++- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 4 ++- .../qemuxml2argv-qemu-ns-domain-commandline.args | 4 ++- .../qemuxml2argv-qemu-ns-domain-ns0.args | 4 ++- .../qemuxml2argv-qemu-ns-no-env.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 ++- .../qemuxml2argv-reboot-timeout-disabled.args | 4 ++- .../qemuxml2argv-reboot-timeout-enabled.args | 4 ++- .../qemuxml2argv-restore-v2-fd.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 4 ++- .../qemuxml2argv-seclabel-dac-none.args | 4 ++- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 4 ++- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 4 ++- .../qemuxml2argv-seclabel-dynamic-override.args | 4 ++- .../qemuxml2argv-seclabel-dynamic-relabel.args | 4 ++- .../qemuxml2argv-seclabel-dynamic.args | 4 ++- .../qemuxml2argv-seclabel-none.args | 4 ++- .../qemuxml2argv-seclabel-static-labelskip.args | 4 ++- .../qemuxml2argv-seclabel-static-relabel.args | 4 ++- .../qemuxml2argv-seclabel-static.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 4 ++- .../qemuxml2argv-serial-spiceport-nospice.args | 4 ++- .../qemuxml2argv-serial-tcp-telnet.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 4 ++- .../qemuxml2argv-shmem-plain-doorbell.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 4 ++- .../qemuxml2argv-sound-device.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 4 ++- .../qemuxml2argv-tpm-passthrough.args | 4 ++- .../qemuxml2argv-usb-controller-default-q35.args | 4 ++- .../qemuxml2argv-usb-controller-explicit-q35.args | 4 ++- .../qemuxml2argv-usb-controller-qemu-xhci.args | 4 ++- .../qemuxml2argv-vcpu-placement-static.args | 4 ++- .../qemuxml2argv-video-device-pciaddr-default.args | 4 ++- .../qemuxml2argv-video-qxl-device-vgamem.args | 4 ++- .../qemuxml2argv-video-qxl-device.args | 4 ++- .../qemuxml2argv-video-qxl-heads.args | 4 ++- .../qemuxml2argv-video-qxl-nodevice.args | 4 ++- .../qemuxml2argv-video-qxl-noheads.args | 4 ++- .../qemuxml2argv-video-qxl-sec-device-vgamem.args | 4 ++- .../qemuxml2argv-video-qxl-sec-device.args | 4 ++- .../qemuxml2argv-video-vga-device-vgamem.args | 4 ++- .../qemuxml2argv-video-vga-device.args | 4 ++- .../qemuxml2argv-video-vga-nodevice.args | 4 ++- .../qemuxml2argv-video-vga-qxl-heads.args | 4 ++- .../qemuxml2argv-video-virtio-gpu-device.args | 4 ++- .../qemuxml2argv-video-virtio-gpu-secondary.args | 4 ++- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 4 ++- .../qemuxml2argv-video-virtio-gpu-virgl.args | 4 ++- .../qemuxml2argv-video-virtio-vga.args | 4 ++- .../qemuxml2argv-virtio-input-passthrough.args | 4 ++- .../qemuxml2argv-virtio-input.args | 4 ++- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 4 ++- .../qemuxml2argv-virtio-options.args | 4 ++- .../qemuxml2argv-virtio-rng-default.args | 4 ++- .../qemuxml2argv-virtio-rng-egd.args | 4 ++- .../qemuxml2argv-virtio-rng-multiple.args | 4 ++- .../qemuxml2argv-virtio-rng-random.args | 4 ++- .../qemuxml2argv-watchdog-device.args | 4 ++- .../qemuxml2argv-watchdog-dump.args | 4 ++- .../qemuxml2argv-watchdog-injectnmi.args | 4 ++- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 4 ++- 490 files changed, 1479 insertions(+), 521 deletions(-) -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Signed-off-by: Cole Robinson Reviewed-by: Andrea Bolognani diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ca9329bb5..056e62129 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5630,33 +5630,19 @@ qemuBuildMonitorCommandLine(virLogManagerPtr logManager, if (!monitor_chr) return 0; - /* Use -chardev if it's available */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV)) { - - if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, - monitor_chr, "monitor", - qemuCaps, true, - chardevStdioLogd))) - return -1; - virCommandAddArg(cmd, "-chardev"); - virCommandAddArg(cmd, chrdev); - VIR_FREE(chrdev); - - virCommandAddArg(cmd, "-mon"); - virCommandAddArgFormat(cmd, - "chardev=charmonitor,id=monitor,mode=%s", - monitor_json ? "control" : "readline"); - } else { - const char *prefix = NULL; - if (monitor_json) - prefix = "control,"; + if (!(chrdev = qemuBuildChrChardevStr(logManager, cmd, cfg, def, + monitor_chr, "monitor", + qemuCaps, true, + chardevStdioLogd))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, chrdev); + VIR_FREE(chrdev); - virCommandAddArg(cmd, "-monitor"); - if (!(chrdev = qemuBuildChrArgStr(monitor_chr, prefix))) - return -1; - virCommandAddArg(cmd, chrdev); - VIR_FREE(chrdev); - } + virCommandAddArg(cmd, "-mon"); + virCommandAddArgFormat(cmd, + "chardev=charmonitor,id=monitor,mode=%s", + monitor_json ? "control" : "readline"); return 0; } From patchwork Mon Jun 26 18:01:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 106373 Delivered-To: patch@linaro.org Received: by 10.140.101.48 with SMTP id t45csp276101qge; Mon, 26 Jun 2017 11:03:35 -0700 (PDT) X-Received: by 10.237.62.58 with SMTP id l55mr1956287qtf.20.1498500215547; Mon, 26 Jun 2017 11:03:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498500215; cv=none; d=google.com; s=arc-20160816; b=VhvOzI50IE5NOAweWWF1h4i3vb5AIWsceoMH8/yu2uVXSfUkoQKhDrF8QuyMqHTBiQ cB0s+fFGXFntr40hCJ1QQuForqaJ+/mwXgeErrif4RY+gcgjE1DV00RisRTxDKTn3ooV qAz0pt0koQhMuNiJOmo9vblc1kRamrZfBG/AvaWHqhCR7Kviq3X3OM0QcIRjv8OKkXy0 xZ1BA5S8qGmAorageG9ju2Z9NI+l7Lw/sPUUafC242nvkSIWLZyyMetuKVk0ccsZErPr LBwlHoVThQOUIwFa7MQj5+3Uk7Zoq7Tapy9yaW2LLngDBeksY6/ndkW7vlO8Qs05qTAi g89w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to:dkim-filter :dmarc-filter:arc-authentication-results; bh=6rvaA1/s/r0/HM/N2recfp4l53M++mfKsFWToqu7jGQ=; b=O93KdpDBIdgdHeRpVgcYC8VCJNmlW5fDUl8VRAuan9O2dhLeQoJ08a9XftkH+Dm18Y +1pFSOAkrpmMXRLYsZlT59Bq1rq9nfO/mUyfSks1IihbRfCSzagsammocNPPhQbg7oV3 ap0RDpcRitEFoSKRG44gjv8kcGMvt7z0PTBk8W89JupQozjF2PDUEKfXzK/u4n5ItraL wQvQnOdTw3eZ4AHZqquBQRVMODAmFxwbJ6qdpuJztoMr5q6V8LQWicFi7OIcAx/DR6r5 Ci+hYFEbEVcdarPXI+rS8X1/NtTAp9A/5bUE7C7O6StDeOeKYq/qh98wEvjwBkUiWJp4 LMHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d10si616222qtg.184.2017.06.26.11.03.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 11:03:35 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31D0130EF76; Mon, 26 Jun 2017 18:03:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 31D0130EF76 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 31D0130EF76 Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E643E179E5; Mon, 26 Jun 2017 18:03:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 95A91281; Mon, 26 Jun 2017 18:03:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v5QI2jxd008008 for ; Mon, 26 Jun 2017 14:02:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 915677E49C; Mon, 26 Jun 2017 18:02:45 +0000 (UTC) Delivered-To: libvir-list@redhat.com Received: from worklaptop.redhat.com (ovpn-117-115.phx2.redhat.com [10.3.117.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B2197E491; Mon, 26 Jun 2017 18:02:37 +0000 (UTC) From: Cole Robinson To: libvir-list@redhat.com Date: Mon, 26 Jun 2017 14:01:48 -0400 Message-Id: <078de2f1ced1b6e4fc0af4db046b23de408aac11.1498499391.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: cdall@linaro.org, drjones@redhat.com, riku.voipio@linaro.org, Andrea Bolognani Subject: [libvirt] [PATCH 07/12] tests: qemuxml2argv: drop redundant serial testing X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 26 Jun 2017 18:03:34 +0000 (UTC) Several cases have incidental or XML which aren't the features being tested for. Upcoming changes will cause some churn here, so instead drop these bits now. Signed-off-by: Cole Robinson --- tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.xml | 6 ------ .../qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.xml | 6 ------ tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 6 ------ tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml | 6 ------ tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml | 6 ------ tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml | 6 ------ tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml | 6 ------ tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml | 6 ------ 23 files changed, 93 deletions(-) -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args index 887e8b3bb..571c8ae78 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.args @@ -28,5 +28,4 @@ server,nowait \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-scsi0-0-0-0 \ -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,\ drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ --serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x2 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml index f25055734..5eb84c868 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram-secure.xml @@ -28,12 +28,6 @@ - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args index 395d5bbdd..155e605c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args @@ -23,6 +23,5 @@ server,nowait \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --serial pty \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml index d3a2465f8..9cc7853e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml @@ -28,12 +28,6 @@ - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args index 046b7e01e..1aead9944 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args @@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=on \ -device virtio-net-pci,tx=bh,vlan=0,id=net0,mac=52:54:00:e5:48:58,bus=pci.0,\ addr=0x3 \ -net user,vlan=0,name=hostnet0 \ --serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index 9b1fc018d..52b219613 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -40,12 +40,6 @@ - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args index 29fc7ba8b..a14fbd19b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args @@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=on \ -device virtio-net-pci,tx=bh,ioeventfd=off,vlan=0,id=net0,\ mac=52:54:00:e5:48:58,bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ --serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml index 313150609..55c111772 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml @@ -37,11 +37,5 @@
- - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args index d1399bddd..1c9f4f115 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.args @@ -30,5 +30,4 @@ media=cdrom,id=drive-ide0-1-0,readonly=on \ -device virtio-net-pci,event_idx=off,vlan=0,id=net0,mac=52:54:00:e5:48:58,\ bus=pci.0,addr=0x3 \ -net user,vlan=0,name=hostnet0 \ --serial pty \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml index 848bfeab9..c17713985 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml @@ -40,12 +40,6 @@ - - - - - - diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 9b06db12c..bb9d61395 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -29,7 +29,6 @@ media=cdrom,id=drive-ide0-1-0,readonly=on \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \ -net tap,fd=3,vlan=0,name=hostnet0 \ --serial pty \ -device usb-tablet,id=input0,bus=usb.0,port=1 \ -spice port=5900,addr=127.0.0.1 \ -vga std \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml index b8edb7056..b6714e651 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml @@ -63,12 +63,6 @@