From nobody Wed Feb 11 05:17:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1648225754; cv=none; d=zohomail.com; s=zohoarc; b=c31pLqqEj5UTgYoIb8sEs+Um+/fpw1vFVW+Prdwmu3IAkIcHq/uKzw0Q35KXkT81MxhrM1o4li1FqfJJ8IiIaZONvAsMrxCWueTMBCT4H1NqPo33iQfGVm20UV3MtpfBsWJTcGvQSHfxkVqghPEUjsegC/8o1DnpJ2QAntI+0e4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648225754; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IZqrxB461ZYJoy6niJJUTFbh/oYNcQvIvT00ntPel4E=; b=az48oRVGt/VxM0I1EYiUoeXP+MCBi7G2BziwfAkU4kzj6LTt44JtiStTxcTYS/dd43CVUXZ43mgrbVDNNka3yUY4WzJP2tpeFXsrcm+tSW8eMQTujWcPjVdejRqnhWwv8UUAs3xviiAv2ASdYIINWP0myTXbsSPz6o/jnRbEL8o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1648225754183294.5106381901702; Fri, 25 Mar 2022 09:29:14 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-Zac1yxwCOveg395OBcosMw-1; Fri, 25 Mar 2022 12:27:08 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 679A882404E; Fri, 25 Mar 2022 16:27:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42BDC40CF8EC; Fri, 25 Mar 2022 16:27:05 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 02DD7193F6E5; Fri, 25 Mar 2022 16:27:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B115D1940367 for ; Fri, 25 Mar 2022 16:27:00 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 932915E8A4C; Fri, 25 Mar 2022 16:27:00 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21E475E8A42 for ; Fri, 25 Mar 2022 16:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648225753; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IZqrxB461ZYJoy6niJJUTFbh/oYNcQvIvT00ntPel4E=; b=U+yQN+t6o1Qa4NMPl390xzjEKqswmooFC3fJFFFv+2AiVE75rCpUJ9EHgAvADhUZGTW2Vs L+5bTTMAnSiuHommlte8lAMbZFjLKocjx1wkmOVHvSbj7dkXaYjuMSGAdLhh1H8qhuIJ5Q gyhhitOkh4Kuz38pQDr9k4lhocl6uc8= X-MC-Unique: Zac1yxwCOveg395OBcosMw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [PATCH 8/9] conf: Format managed property of hostdev-pci ports correctly Date: Fri, 25 Mar 2022 17:26:51 +0100 Message-Id: <20220325162652.328686-9-abologna@redhat.com> In-Reply-To: <20220325162652.328686-1-abologna@redhat.com> References: <20220325162652.328686-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648225754458100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The property is parsed using virTristateBoolTypeFromString() but formatted as if it was a regular bool, which results in the following incorrect conversion: BOOL_ABSENT -> managed=3D'no' BOOL_YES -> managed=3D'yes' BOOL_NO -> managed=3D'yes' Use the virTristateBoolTypeToString() helper to ensure the setting can survive a roundtrip conversion. Fixes: 4b4a981d60d3372fb73bb3546ab1052844b2e3d5 Signed-off-by: Andrea Bolognani --- src/conf/virnetworkportdef.c | 7 +++++-- .../plug-hostdev-pci-unmanaged.xml | 12 ++++++++++++ tests/virnetworkportxml2xmltest.c | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 tests/virnetworkportxml2xmldata/plug-hostdev-pci-unmana= ged.xml diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index fcd9e55a55..aa35374fb0 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -384,8 +384,11 @@ virNetworkPortDefFormatBuf(virBuffer *buf, break; =20 case VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI: - virBufferAsprintf(buf, " managed=3D'%s'>\n", - def->plug.hostdevpci.managed ? "yes" : "no"); + if (def->plug.hostdevpci.managed) { + virBufferAsprintf(buf, " managed=3D'%s'", + virTristateBoolTypeToString(def->plug.ho= stdevpci.managed)); + } + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (def->plug.hostdevpci.driver) virBufferEscapeString(buf, "\n", diff --git a/tests/virnetworkportxml2xmldata/plug-hostdev-pci-unmanaged.xml= b/tests/virnetworkportxml2xmldata/plug-hostdev-pci-unmanaged.xml new file mode 100644 index 0000000000..da5f568031 --- /dev/null +++ b/tests/virnetworkportxml2xmldata/plug-hostdev-pci-unmanaged.xml @@ -0,0 +1,12 @@ + + 5d744f21-ba4a-4d6e-bdb2-30a35ff3207d + + memtest + d54df46f-1ab5-4a22-8618-4560ef5fac2c + + + + +
+ + diff --git a/tests/virnetworkportxml2xmltest.c b/tests/virnetworkportxml2xm= ltest.c index 093d855633..176f52d675 100644 --- a/tests/virnetworkportxml2xmltest.c +++ b/tests/virnetworkportxml2xmltest.c @@ -85,6 +85,7 @@ mymain(void) DO_TEST("plug-bridge-mactbl"); DO_TEST("plug-direct"); DO_TEST("plug-hostdev-pci"); + DO_TEST("plug-hostdev-pci-unmanaged"); DO_TEST("plug-network"); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; --=20 2.35.1