From nobody Sat Apr 20 10:07:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544016029025755.8526218637203; Wed, 5 Dec 2018 05:20:29 -0800 (PST) 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 ACF8DC068BDF; Wed, 5 Dec 2018 13:20:26 +0000 (UTC) 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 77FC3600C4; Wed, 5 Dec 2018 13:20:26 +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 27895181B9E4; Wed, 5 Dec 2018 13:20:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5DKPlm027544 for ; Wed, 5 Dec 2018 08:20:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 66BCF5D978; Wed, 5 Dec 2018 13:20:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B62665D965; Wed, 5 Dec 2018 13:20:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 14:20:12 +0100 Message-Id: <6e122cb567c6d50d14749db45b1c92a9d848c8ec.1544015957.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/5] tests: qemuxml2xml: Add few debug statements for status XML 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: , Content-Transfer-Encoding: quoted-printable 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.32]); Wed, 05 Dec 2018 13:20:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Add markers for allowing test debugging if one of the steps fails without setting a proper error. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/qemuxml2xmltest.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 25ab990a4b..c98b9571ef 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -74,17 +74,20 @@ testCompareStatusXMLToXMLFiles(const void *opaque) VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES= | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE | - VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARS= E_FAIL))) + VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARS= E_FAIL))) { + VIR_TEST_DEBUG("\nfailed to parse '%s'\n", data->inName); goto cleanup; + } if (!(actual =3D virDomainObjFormat(driver.xmlopt, obj, NULL, VIR_DOMAIN_DEF_FORMAT_SECURE | VIR_DOMAIN_DEF_FORMAT_STATUS | VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET | VIR_DOMAIN_DEF_FORMAT_PCI_ORIG_STATE= S | - VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST))) - + VIR_DOMAIN_DEF_FORMAT_CLOCK_ADJUST))= ) { + VIR_TEST_DEBUG("\nfailed to format back '%s'\n", data->inName); goto cleanup; + } if (virTestCompareToFile(actual, data->outActiveName) < 0) goto cleanup; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 10:07:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544016030797218.70047143911415; Wed, 5 Dec 2018 05:20:30 -0800 (PST) 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 681293154847; Wed, 5 Dec 2018 13:20:28 +0000 (UTC) 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 1C0D651C8D; Wed, 5 Dec 2018 13:20:28 +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 C308D3F7D5; Wed, 5 Dec 2018 13:20:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5DKQSB027554 for ; Wed, 5 Dec 2018 08:20:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 61F6F5D982; Wed, 5 Dec 2018 13:20:26 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id B38465D965; Wed, 5 Dec 2018 13:20:25 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 14:20:13 +0100 Message-Id: <7384b05b5b8ed81c08e33c180404fd5db64f5f96.1544015957.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/5] util: xml: Always consume args of virXMLFormatElement 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: , Content-Transfer-Encoding: quoted-printable 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.41]); Wed, 05 Dec 2018 13:20:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The function clears and frees the passed buffers on success, but not in one case of failure. Modify the control flow that the args are always consumed, record it in the docs and remove few pointless cleanup paths in callers. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 12 ++---------- src/qemu/qemu_domain.c | 5 +---- src/util/virxml.c | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0c40a98f6b..b70dca6c61 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24042,7 +24042,6 @@ virDomainDiskDefFormatIotune(virBufferPtr buf, virDomainDiskDefPtr disk) { virBuffer childBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; virBufferSetChildIndent(&childBuf, buf); @@ -24077,10 +24076,7 @@ virDomainDiskDefFormatIotune(virBufferPtr buf, FORMAT_IOTUNE(read_iops_sec_max_length); FORMAT_IOTUNE(write_iops_sec_max_length); - ret =3D virXMLFormatElement(buf, "iotune", NULL, &childBuf); - - virBufferFreeAndReset(&childBuf); - return ret; + return virXMLFormatElement(buf, "iotune", NULL, &childBuf); } #undef FORMAT_IOTUNE @@ -24091,7 +24087,6 @@ virDomainDiskDefFormatDriver(virBufferPtr buf, virDomainDiskDefPtr disk) { virBuffer driverBuf =3D VIR_BUFFER_INITIALIZER; - int ret =3D -1; virBufferEscapeString(&driverBuf, " name=3D'%s'", virDomainDiskGetDriv= er(disk)); @@ -24143,10 +24138,7 @@ virDomainDiskDefFormatDriver(virBufferPtr buf, virDomainVirtioOptionsFormat(&driverBuf, disk->virtio); - ret =3D virXMLFormatElement(buf, "driver", &driverBuf, NULL); - - virBufferFreeAndReset(&driverBuf); - return ret; + return virXMLFormatElement(buf, "driver", &driverBuf, NULL); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dd17174e25..77814a0c2a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2234,14 +2234,11 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr= buf, { virBuffer attrBuf =3D VIR_BUFFER_INITIALIZER; bool bj =3D qemuDomainHasBlockjob(vm, false); - int ret; virBufferAsprintf(&attrBuf, " active=3D'%s'", virTristateBoolTypeToString(virTristateBoolFromBool(= bj))); - ret =3D virXMLFormatElement(buf, "blockjobs", &attrBuf, NULL); - virBufferFreeAndReset(&attrBuf); - return ret; + return virXMLFormatElement(buf, "blockjobs", &attrBuf, NULL); } diff --git a/src/util/virxml.c b/src/util/virxml.c index 998d974882..3ed44e9036 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1359,6 +1359,8 @@ virXMLValidatorFree(virXMLValidatorPtr validator) * @childBuf are NULL or are empty buffers the element is not * formatted. * + * Both passed buffers are always consumed and freed. + * * Returns 0 on success, -1 on error. */ int @@ -1367,15 +1369,16 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr attrBuf, virBufferPtr childBuf) { + int ret =3D -1; + if ((!attrBuf || virBufferUse(attrBuf) =3D=3D 0) && (!childBuf || virBufferUse(childBuf) =3D=3D 0)) { return 0; } if ((attrBuf && virBufferCheckError(attrBuf) < 0) || - (childBuf && virBufferCheckError(childBuf) < 0)) { - return -1; - } + (childBuf && virBufferCheckError(childBuf) < 0)) + goto cleanup; virBufferAsprintf(buf, "<%s", name); @@ -1390,5 +1393,10 @@ virXMLFormatElement(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - return 0; + ret =3D 0; + + cleanup: + virBufferFreeAndReset(attrBuf); + virBufferFreeAndReset(childBuf); + return ret; } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 10:07:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544016036100235.22539593381737; Wed, 5 Dec 2018 05:20:36 -0800 (PST) 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 4638980F9F; Wed, 5 Dec 2018 13:20:33 +0000 (UTC) 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 F0577519C0; Wed, 5 Dec 2018 13:20: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 A772F181B9EA; Wed, 5 Dec 2018 13:20:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5DKRqg027564 for ; Wed, 5 Dec 2018 08:20:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5AFF05D982; Wed, 5 Dec 2018 13:20:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE36A5D978; Wed, 5 Dec 2018 13:20:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 14:20:14 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/5] qemu: domain: Initialize proper element in qemuDomainPrepareStorageSourceBlockdev 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: , Content-Transfer-Encoding: quoted-printable 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]); Wed, 05 Dec 2018 13:20:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We are preparing a certain disk source passed in as '@src' so the individual functions should use that rather than disk->src which corresponds to the top level element of the chain only. Without this change TLS and persistent reservations would not work for backing images of a chain when using -blockdev. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 77814a0c2a..382da53b7a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -13462,10 +13462,10 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainD= iskDefPtr disk, src->nodeformat) < 0) return -1; - if (qemuDomainPrepareStorageSourcePR(disk->src, priv, src->nodestorage= ) < 0) + if (qemuDomainPrepareStorageSourcePR(src, priv, src->nodestorage) < 0) return -1; - if (qemuDomainPrepareStorageSourceTLS(disk->src, cfg, src->nodestorage, + if (qemuDomainPrepareStorageSourceTLS(src, cfg, src->nodestorage, priv->qemuCaps) < 0) return -1; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 10:07:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544016039456936.9261819708006; Wed, 5 Dec 2018 05:20:39 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13DDD80F9A; Wed, 5 Dec 2018 13:20:37 +0000 (UTC) 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 C2536648A6; Wed, 5 Dec 2018 13:20:36 +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 77480181BA1A; Wed, 5 Dec 2018 13:20:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5DKStG027575 for ; Wed, 5 Dec 2018 08:20:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 57CCA5D978; Wed, 5 Dec 2018 13:20:28 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A8AE04F9AB; Wed, 5 Dec 2018 13:20:27 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 14:20:15 +0100 Message-Id: <4592530b36a00d62dd765464e0707387c8cdab20.1544015957.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/5] conf: snapshot: Remove file format check from parser 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 05 Dec 2018 13:20:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We already have a way stricter check in the code which is doing the snapshot so duplicating it in the parser does not make much sense. Also gets rid of an ugly ternary operator. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/snapshot_conf.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index adba149241..5a511b4495 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -159,17 +159,11 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0) goto cleanup; - if ((driver =3D virXPathString("string(./driver/@type)", ctxt))) { - def->src->format =3D virStorageFileFormatTypeFromString(driver); - if (def->src->format < VIR_STORAGE_FILE_BACKING) { + if ((driver =3D virXPathString("string(./driver/@type)", ctxt)) && + (def->src->format =3D virStorageFileFormatTypeFromString(driver)) = <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - def->src->format <=3D 0 - ? _("unknown disk snapshot driver '%s'") - : _("disk format '%s' lacks backing file " - "support"), - driver); + _("unknown disk snapshot driver '%s'"), driver); goto cleanup; - } } /* validate that the passed path is absolute */ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 10:07:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1544016035190440.4627310194883; Wed, 5 Dec 2018 05:20:35 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03431307CDC8; Wed, 5 Dec 2018 13:20:33 +0000 (UTC) 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 C2AA2105704C; Wed, 5 Dec 2018 13:20: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 764193F602; Wed, 5 Dec 2018 13:20:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wB5DKT5l027580 for ; Wed, 5 Dec 2018 08:20:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5738B18B95; Wed, 5 Dec 2018 13:20:29 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A5BC25D982; Wed, 5 Dec 2018 13:20:28 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 5 Dec 2018 14:20:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 5/5] tests: qemuxml2argv: Remove disks from few tests which don't need them 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 05 Dec 2018 13:20:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Remove the disk from tests focusing on other aspects so that change to -blockdev will touch less tests. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- .../channel-unix-guestfwd.x86_64-2.5.0.args | 2 -- .../channel-unix-guestfwd.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/channel-unix-guestfwd.xml | 5 ----- .../qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args | 2 -- .../qemuxml2argvdata/console-virtio-unix.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/console-virtio-unix.xml | 5 ----- tests/qemuxml2argvdata/net-vhostuser.args | 3 --- tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args | 2 -- tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/net-vhostuser.xml | 6 ------ .../parallel-unix-chardev.x86_64-2.5.0.args | 2 -- .../parallel-unix-chardev.x86_64-latest.args | 2 -- tests/qemuxml2argvdata/parallel-unix-chardev.xml | 5 ----- tests/qemuxml2xmloutdata/net-vhostuser.xml | 6 ------ 14 files changed, 46 deletions(-) diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args= b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args index f0e718e4a2..e8776ca24e 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args @@ -23,8 +23,6 @@ server,nowait \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharchannel0,path=3D/tmp/guestfwd-listen.socket,serve= r,nowait \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Duser-c= hannel0 \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index f9b9ee5fdb..db14217c1b 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -24,8 +24,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Duser-c= hannel0 \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.xml b/tests/qemux= ml2argvdata/channel-unix-guestfwd.xml index c9698a1259..01c9a24ff0 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.xml +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-x86_64 - - - -
- diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b= /tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args index 425bdc5d12..5c37b1903e 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args @@ -24,8 +24,6 @@ server,nowait \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharconsole0,path=3D/tmp/listen.socket,server,nowait \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 193d4b1295..0749b888b6 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -25,8 +25,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharconsole0,fd=3D1729,server,nowait \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ diff --git a/tests/qemuxml2argvdata/console-virtio-unix.xml b/tests/qemuxml= 2argvdata/console-virtio-unix.xml index 941e5a4a8a..1e11960c26 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.xml +++ b/tests/qemuxml2argvdata/console-virtio-unix.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-x86_64 - - - -
- diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argv= data/net-vhostuser.args index 1b35a61e27..516cb23123 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.args +++ b/tests/qemuxml2argvdata/net-vhostuser.args @@ -20,9 +20,6 @@ QEMU_AUDIO_DRV=3Dnone \ -no-shutdown \ -no-acpi \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0,\ -bootindex=3D1 \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server \ -netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests= /qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args index 677a3c9e49..8f67b14a2b 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args @@ -23,8 +23,6 @@ server,nowait \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server \ -netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index 7dee2bdf58..d96d8ca3a6 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -24,8 +24,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server \ -netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,\ diff --git a/tests/qemuxml2argvdata/net-vhostuser.xml b/tests/qemuxml2argvd= ata/net-vhostuser.xml index 917d67b9eb..1c491549b6 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.xml +++ b/tests/qemuxml2argvdata/net-vhostuser.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
- diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args= b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args index d7d55ac611..eb504a7210 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args @@ -23,8 +23,6 @@ server,nowait \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharparallel0,path=3D/tmp/parport0.socket,server,nowa= it \ -device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index 94841ea8c0..e3fa87c503 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -24,8 +24,6 @@ file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ -no-acpi \ -boot strict=3Don \ -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -chardev socket,id=3Dcharparallel0,fd=3D1729,server,nowait \ -device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.xml b/tests/qemux= ml2argvdata/parallel-unix-chardev.xml index d4fe94779e..2d0bae3589 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.xml +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-x86_64 - - - -
- diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xml= outdata/net-vhostuser.xml index b7f1bdc57f..9655c21ede 100644 --- a/tests/qemuxml2xmloutdata/net-vhostuser.xml +++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml @@ -14,12 +14,6 @@ destroy /usr/bin/qemu-system-i686 - - - - -
-
--=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list