From nobody Tue May 21 05:25:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1620224226; cv=none; d=zohomail.com; s=zohoarc; b=HjsiuARFn3DmcWUzWC0C34i7Zfa/T3tXrcpTroCAzui1JVHwI//k6ew68PR784fEvGFok51qoRY7gp80wvHIQ1YUEQUOUyJ8bdG4jiMDGPwBzwexmVmZkH5VmZ1gSoLQZh/6/lyuxkdIECIaEErRxRf3P3Cb9WnNv+tWv2iiaXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620224226; 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=l5rE9cvKBO/6GfxHYdYSiTDS6rH3k7sFgH/qvTJ1Z00=; b=QBLvKrMcgE/PF5GFvvqL35KoGVT/H+V16DxkCyr4NR8zU20Xhlj6Ac1PBmuwfUHUxGqfuQ765kRfaB6+J1SKHUU+n0ebQ7B7+KKvylvuDL+DGkrIECXugqpCsVPmx1jr0j94slS6gKCCxxmTVEE0+xKyDZgU74BAP4PZ/t94v9k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1620224226097998.3561747793992; Wed, 5 May 2021 07:17:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-OgPYXWHWOPWyO1Ed8zkljg-1; Wed, 05 May 2021 10:16:11 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E27984A5E4; Wed, 5 May 2021 14:16:03 +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 EE27C5D9D5; Wed, 5 May 2021 14:16:02 +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 BE13C180B465; Wed, 5 May 2021 14:16:02 +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 145EFrpN016410 for ; Wed, 5 May 2021 10:15:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B37760875; Wed, 5 May 2021 14:15:53 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id A150F60864 for ; Wed, 5 May 2021 14:15:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620224223; 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=l5rE9cvKBO/6GfxHYdYSiTDS6rH3k7sFgH/qvTJ1Z00=; b=FoW3Hxp2g/EUsSm6bT3DNROqkq0Xnq7gGqJiA5+EpQBnOO/oH8WvG2S+Wej3zbQuDW0a9U ursgDc+kN2yFmKZIDVEoVKlExvSNrvUH2pteNUZPRfWHpEfC9bgLBGi9leDJZCErJqtQop GbeUqvZq0LRripDJBS3sAIL5Gvp3JAI= X-MC-Unique: OgPYXWHWOPWyO1Ed8zkljg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/2] virDomainChrSourceDefParseXML: Fix attribute names for nmdm type Date: Wed, 5 May 2021 16:15:44 +0200 Message-Id: <4aef15c9752b329af5eabb631b99c3f0d6cab7e2.1620222585.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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) Content-Type: text/plain; charset="utf-8" While reworking the patch I've mistakenly mangled the attribute names for VIR_DOMAIN_CHR_TYPE_NMDM. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5d8bd0a01..3319cb49cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11314,7 +11314,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= *def, int nsources =3D 0; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 - ctxt->node =3D cur; + ctxt->node =3D cur; =20 if ((nsources =3D virXPathNodeSet("./source", ctxt, &sources)) < 0) { goto error; @@ -11372,8 +11372,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef= *def, break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: - def->data.nmdm.master =3D virXMLPropString(sources[0], "master= )"); - def->data.nmdm.slave =3D virXMLPropString(sources[0], "slave)"= ); + def->data.nmdm.master =3D virXMLPropString(sources[0], "master= "); + def->data.nmdm.slave =3D virXMLPropString(sources[0], "slave"); break; =20 case VIR_DOMAIN_CHR_TYPE_LAST: --=20 2.26.3 From nobody Tue May 21 05:25:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1620224169; cv=none; d=zohomail.com; s=zohoarc; b=eQGxTxCNwVqysZcvrfQXZExNqbIhZRY92LKWqxE7inksoKBQgX//rFH4DzHqipHARc09otSHN6CPM+fQ67/4RJNPNJ2ZXVBJqALINfev2wlZQmc/RTqyNN5k270X+/nu5Aa7bqS3h9ohM2LpJH+H3KVjRuqw1gXD8vTciqd24PE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620224169; 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=HuEjgFIx0nelx3HtucG6ilbOY+p8y7je3vCD4qBhqQk=; b=QbCHPSuf0OQy618ViHj/29rs6/GA73ioqh5GCsBk5qoorLGuN1EO8y2T2MIdhsnbB+o3fPdvKBpUSzNbb2f+Yc9ZwkT6GFbhKPgy7KH5G8ukPg9AzkhAZHHFb/t9oxl6ePDKSu2NDHf4lPLQNom89KEVQxKLnI1hlCkNdx0X6C0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1620224169528869.3163647700884; Wed, 5 May 2021 07:16:09 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-601-gRbsNkzzOQisEd3KzyxVmA-1; Wed, 05 May 2021 10:16:04 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64AD884A5E3; Wed, 5 May 2021 14:15:57 +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 3FAC15D9D5; Wed, 5 May 2021 14:15:57 +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 C949818005B6; Wed, 5 May 2021 14:15:56 +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 145EFsEd016416 for ; Wed, 5 May 2021 10:15:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 08C5360875; Wed, 5 May 2021 14:15:54 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7DB2560864 for ; Wed, 5 May 2021 14:15:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620224167; 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=HuEjgFIx0nelx3HtucG6ilbOY+p8y7je3vCD4qBhqQk=; b=WkwbVyWOyggC2nlSnvxusFNlXmY3xzGOJphbGhPqR0pz2eipCBkZqniKyciKvF3ZCpLAUx yM5VBhgf83eozcQ8sU03uSRzSYFWPIhNcGhyJpaRCQeq+ikQr/fhRqCN7VudVXQPhO2OAl FHAv5C2x8m3eWSHpDBZHf09C0txIMHA= X-MC-Unique: gRbsNkzzOQisEd3KzyxVmA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/2] virDomainVideoDriverDefParseXML: Allow zero value for @vgaconf Date: Wed, 5 May 2021 16:15:45 +0200 Message-Id: <6fe1846a37e3eb1fc1f184c0bc78df3a217da2dc.1620222585.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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) Content-Type: text/plain; charset="utf-8" It was always allowed, but in a very unusual and weird way. Just look at the original commit that introduced it (78fc843c7b5). Also, we document that "io" value is accepted (which translates to VIR_DOMAIN_VIDEO_VGACONF_IO with value of zero). Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3319cb49cf..77105e6a07 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14326,7 +14326,7 @@ virDomainVideoDriverDefParseXML(xmlNodePtr node, =20 if (virXMLPropEnum(driver, "vgaconf", virDomainVideoVGAConfTypeFromString, - VIR_XML_PROP_NONZERO, &def->vgaconf) < 0) + VIR_XML_PROP_NONE, &def->vgaconf) < 0) return NULL; =20 return g_steal_pointer(&def); --=20 2.26.3