From nobody Fri Apr 26 02:24:46 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=1619174290; cv=none; d=zohomail.com; s=zohoarc; b=jYsiFadeSpidjMu9I8sydmabgFMYf0+WNUuxdrHHAocSSxQ1TTV/Ga8ItSZSwDhyQgdopm5uup40W3sJMXJzq5mqtIr1sg3Nsky/6MmRBLvjQEq6N3ME1nX5hQzpd99Ho3Vn2LIG7LCrol/0WhzBTpMXZDm3zP2rEoTtcjkV1fs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174290; h=Content-Type:Content-Transfer-Encoding:Cc: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=SkSRP9FXighrme12Ccv/Y+5TQ3sVjwCar/N1B2L/2es=; b=IoC4gosGqGrH9pvkr2VDcz5W9Gla5/7fE5ddJtMCeKJ0yl5vAx5p7VNz6w7hta2XT7DZBpjFGAKETB4pOPxYaPSnYR/EGChMUHcI2fwK4JBhvgOq3V9Gw0vk2dy4Lve4ywKU3rZkU1jZE+aaa8wjrxG/nVijSruFLjw2MTZpLWM= 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 1619174290903557.2802355793906; Fri, 23 Apr 2021 03:38:10 -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-153-Ca_W0Op_OEa9bKU4RMnN1g-1; Fri, 23 Apr 2021 06:38:07 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C68718BA286; Fri, 23 Apr 2021 10:38:01 +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 433EE60C5A; Fri, 23 Apr 2021 10:38:00 +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 7EBED1806D1A; Fri, 23 Apr 2021 10:37:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAbsu5004020 for ; Fri, 23 Apr 2021 06:37:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DFC85C3FD; Fri, 23 Apr 2021 10:37:54 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A8645C5E0; Fri, 23 Apr 2021 10:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174289; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=SkSRP9FXighrme12Ccv/Y+5TQ3sVjwCar/N1B2L/2es=; b=MxiLwTd1vaDEdTbftU/FTT5zwdbM2UodsDcf39EJbsN1DMgoU4bOIukbsSyYuoysHeH/3P wUJHyp7wZW3eXPvNvzhy9yIN0OpXs4ddfWDb25joFiyFRa39b2KupwJzIale9mqfX8S/TI 8zWcFAAOJ6THivnMnUjN8G+g7/g9DhQ= X-MC-Unique: Ca_W0Op_OEa9bKU4RMnN1g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virXMLPropEnum: Fix return value Date: Fri, 23 Apr 2021 12:37:32 +0200 Message-Id: <20210423103741.65814-2-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.13 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" Function incorrectly returns 0 when property was successfully read. Fixes: ab5d2776c925ec45eb54ec5432f5645cebb80c85 Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/util/virxml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virxml.c b/src/util/virxml.c index b79050db35..01c0114072 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -856,7 +856,7 @@ virXMLPropEnum(xmlNodePtr node, } =20 *result =3D ret; - return 0; + return 1; } =20 /** --=20 2.26.3 From nobody Fri Apr 26 02:24:46 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=1619174314; cv=none; d=zohomail.com; s=zohoarc; b=MJHsku2BhuhlCxaPRXHtpEp0yEFndwM22h3SsbFrSCfTabCAFubRMNbZvxbkkj1ti7ezLNQxjVi7gyTdP9aYpmu4OLoEmQryiDUmSKMDWYmJevcNDiwrYPUXUbHZL6wrKs+CnNJPHxf8kavHwoBrq+kgvnfUasKBjxpqRspDcsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174314; h=Content-Type:Content-Transfer-Encoding:Cc: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=+lsAIsFYkC2qwTQfX9Axb6h8uBUvSmS3kU1QYvt1i6E=; b=j85IRE1O7J79OouNGtVfl2/QkW7mORORH7hOb/JxWLRJN1P0TelBaVfu2dFNmfeS0lH1oY9QnR7dYne8ox9l9hvGgVpmvUKZS9UI3tZFKVTE1FwOcCmRtAUuovVYvI7913oFQuS4rMOsd6WL5R86ktW4f8Q4NC8ckEv4NpnlFFo= 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 1619174314548157.3509869952086; Fri, 23 Apr 2021 03:38:34 -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-259-p1ho_BBvOk-49kwQzWvlFg-1; Fri, 23 Apr 2021 06:38:31 -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 BE492107ACCD; Fri, 23 Apr 2021 10:38:24 +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 97CA81383F; Fri, 23 Apr 2021 10:38: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 5B42844A5E; Fri, 23 Apr 2021 10:38:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAbtT4004030 for ; Fri, 23 Apr 2021 06:37:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CA1F5C5E0; Fri, 23 Apr 2021 10:37:55 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77DB25C5B5; Fri, 23 Apr 2021 10:37:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174313; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=+lsAIsFYkC2qwTQfX9Axb6h8uBUvSmS3kU1QYvt1i6E=; b=UV/Ju51g4H31DNJtmbZMnr5apxqRcGRfXylYwLP9si9S1RlszwLpAeDEoU4A5v3foCAljh WNk89e6TRr+VVQ8UZ7V8oKCoAHfdg159NzWzpzCKPlSPNLxNboRunD97BvWE8G+xfwR0dp Rn0QQiX8nR8aLzwWjR3u4CUoPwzzNP4= X-MC-Unique: p1ho_BBvOk-49kwQzWvlFg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] virDomainControllerDef: Change type of ioeventfd to virTristateSwitch Date: Fri, 23 Apr 2021 12:37:33 +0200 Message-Id: <20210423103741.65814-3-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 13 ++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 24c0943d62..4ed7c0ef83 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9619,11 +9619,14 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, return NULL; } =20 - if (ioeventfd && - (def->ioeventfd =3D virTristateSwitchTypeFromString(ioeventfd)) < = 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'ioeventfd' value %s"), ioeventfd); - return NULL; + if (ioeventfd) { + int value; + if ((value =3D virTristateSwitchTypeFromString(ioeventfd)) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'ioeventfd' value %s"), ioeventfd); + return NULL; + } + def->ioeventfd =3D value; } =20 if (iothread) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a7cad31896..d4344a7158 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -763,7 +763,7 @@ struct _virDomainControllerDef { unsigned int queues; unsigned int cmd_per_lun; unsigned int max_sectors; - int ioeventfd; /* enum virTristateSwitch */ + virTristateSwitch ioeventfd; unsigned int iothread; /* unused =3D 0, > 0 specific thread # */ union { virDomainVirtioSerialOpts vioserial; --=20 2.26.3 From nobody Fri Apr 26 02:24:46 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=1619174302; cv=none; d=zohomail.com; s=zohoarc; b=gnsRC8Lk3l3cqWzcknkWoKgtvFCFbagSkUjbonRRFn5ayrMSQStB9gHR8pgXXqtTdpGwXGbGm91/OalQ/5b2f2jbHDtHYQD2jkx4lsri8NziqER+sYokuS82PFhqLu/TGnIlj2eWXS8U0v9CXepn+uqoVRwVnv+9bDqgUDLQRjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174302; h=Content-Type:Content-Transfer-Encoding:Cc: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=nA2XCyvWsyfoqI+GgWRdQb8YOzjrkpdctA29gi68aQU=; b=nX2enPkV2HnlTbZFPfHou4u0z4L+WS4hF1XDOslONrR3BHUTME+JR2OziVW0GQqF9JX/0zOX5GsdVmOUXIFwSn6nIAHIg0tws4ZJlszk9JcxIvcd80WBiEQkokdUldKC/74xlTUOpTMK6TK2TOzWV8vq63ER9b9hhK88qqQT4/U= 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 1619174302555941.9780279974949; Fri, 23 Apr 2021 03:38:22 -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-251-I1GvbWURMrqge4-FgGPEug-1; Fri, 23 Apr 2021 06:38:19 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9150343A2; Fri, 23 Apr 2021 10:38:13 +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 9A5865B4B0; Fri, 23 Apr 2021 10:38:13 +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 666FF1806D1D; Fri, 23 Apr 2021 10:38:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAbunt004037 for ; Fri, 23 Apr 2021 06:37:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 590995C5B5; Fri, 23 Apr 2021 10:37:56 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93E825C5E0; Fri, 23 Apr 2021 10:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174301; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=nA2XCyvWsyfoqI+GgWRdQb8YOzjrkpdctA29gi68aQU=; b=Ra4y87Jj9vVHsGaZIGYVy5XMGk4hlKe9rJu5uuoktta7+d2B7xn3xlyLUBBmZxI4MwJDYB /QRpSaJrfnrm2bihHGc5NK+ED555NfCfjLk7aJVWpBDicpD/4Ib6Bb7Ocfw4z7lFsd6+Sr qdJoeQGRSIKtCublbVqMBGU8skJwLdY= X-MC-Unique: I1GvbWURMrqge4-FgGPEug-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] virDomainPCIControllerOpts: Change type of modelName to virDomainControllerPCIModelName Date: Fri, 23 Apr 2021 12:37:34 +0200 Message-Id: <20210423103741.65814-4-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.11 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 16 +++++++++------- src/conf/domain_conf.h | 2 +- src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4ed7c0ef83..33e79b20e6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9722,13 +9722,15 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, /* Other controller models don't require extra checks */ break; } - if (modelName && - (def->opts.pciopts.modelName - =3D virDomainControllerPCIModelNameTypeFromString(modelName))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown PCI controller model name '%s'"), - modelName); - return NULL; + if (modelName) { + int value; + if ((value =3D virDomainControllerPCIModelNameTypeFromString(m= odelName)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown PCI controller model name '%s'"), + modelName); + return NULL; + } + def->opts.pciopts.modelName =3D value; } if (chassisNr) { if (virStrToLong_i(chassisNr, NULL, 0, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d4344a7158..336b76aa5c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -724,7 +724,7 @@ struct _virDomainPCIControllerOpts { * * ... */ - int modelName; /* the exact name of the device in hypervisor */ + virDomainControllerPCIModelName modelName; =20 /* the following items are attributes of the "target" subelement * of controller type=3D'pci'. They are bits of configuration that diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 1ee75b8f2e..a73f30ddcb 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2456,7 +2456,7 @@ qemuDomainPCIControllerSetDefaultModelName(virDomainC= ontrollerDef *cont, virDomainDef *def, virQEMUCaps *qemuCaps) { - int *modelName =3D &cont->opts.pciopts.modelName; + virDomainControllerPCIModelName *modelName =3D &cont->opts.pciopts.mod= elName; =20 /* make sure it's not already set */ if (*modelName !=3D VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_NONE) --=20 2.26.3 From nobody Fri Apr 26 02:24:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1619174290; cv=none; d=zohomail.com; s=zohoarc; b=BkyqWc5o+wgpc0a0URsJWJvwirTOK4J9kC0Vmm8i75CvATZxJ3Z85c0bpXceeZBkxyLsGksMvzdSwPdl2TQ0/nyxAHPr8OoPODs6KA9gq64inivesiph/C7Wo6a4hq8CWOfgE92Ckb9O63RHZcm9YgrRE5cmn1IQWpY1/tcME9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174290; h=Content-Type:Content-Transfer-Encoding:Cc: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=7e9OeWLi2kculgFke4BadKtntuQ9g6VI0tV6R3eoDvg=; b=QYuGC42yXPC+giFxk645sA60EzHzi3BfwhXetSInO7tIQY9/gy+7m9NqPRw2+GCHnfD9wWFEeXwbGb1j00Vjh9jH8DHpnl8A84Z/hlB1DtcYxTWOyAkHu6FCSJNdpFdiTIYXi3b2CLHE0um7lESVgnGexomKMeJU77oP5CW5hnM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619174290242739.024126736163; Fri, 23 Apr 2021 03:38:10 -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-338-Zr7nRBeUOF-ceirsBmXC4Q-1; Fri, 23 Apr 2021 06:38:06 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26E9218BA290; Fri, 23 Apr 2021 10:38:02 +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 EB8F65C3FD; Fri, 23 Apr 2021 10:38:01 +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 8D78F44A57; Fri, 23 Apr 2021 10:37:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAbvPn004050 for ; Fri, 23 Apr 2021 06:37:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7C2A75C5FD; Fri, 23 Apr 2021 10:37:57 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0BA95C5E0; Fri, 23 Apr 2021 10:37:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174288; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=7e9OeWLi2kculgFke4BadKtntuQ9g6VI0tV6R3eoDvg=; b=iHITDZIOl2dSVBf6BpvYOjlc4igxrQYsy3jY67R3llxrZhFOua+0pqoEQTWwSzl/oeW+Vm 127yGi7KVjL2gji30p5D5KmS8FRGllMV9JDmRp8zQqiOdLANyG+Lc7lRm7N8ZNFpI/z/f4 OdT3aZVFKpfmcZlXYLhlc13rb509cbA= X-MC-Unique: Zr7nRBeUOF-ceirsBmXC4Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] virDomainControllerDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:35 +0200 Message-Id: <20210423103741.65814-5-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.16 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 281 +++++++++++++++-------------------------- 1 file changed, 103 insertions(+), 178 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33e79b20e6..152b4b8813 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9491,7 +9491,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xm= lopt, unsigned int flags) { g_autoptr(virDomainControllerDef) def =3D NULL; - int type =3D 0; + virDomainControllerType type =3D 0; xmlNodePtr cur =3D NULL; bool processedModel =3D false; bool processedTarget =3D false; @@ -9499,39 +9499,19 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, int ports =3D -1; VIR_XPATH_NODE_AUTORESTORE(ctxt) int rc; - g_autofree char *typeStr =3D NULL; g_autofree char *idx =3D NULL; g_autofree char *model =3D NULL; - g_autofree char *queues =3D NULL; - g_autofree char *cmd_per_lun =3D NULL; - g_autofree char *max_sectors =3D NULL; - g_autofree char *modelName =3D NULL; - g_autofree char *chassisNr =3D NULL; - g_autofree char *chassis =3D NULL; - g_autofree char *port =3D NULL; - g_autofree char *busNr =3D NULL; - g_autofree char *targetIndex =3D NULL; - g_autofree char *hotplug =3D NULL; - g_autofree char *ioeventfd =3D NULL; - g_autofree char *portsStr =3D NULL; - g_autofree char *iothread =3D NULL; =20 ctxt->node =3D node; =20 - typeStr =3D virXMLPropString(node, "type"); - if (typeStr) { - if ((type =3D virDomainControllerTypeFromString(typeStr)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown controller type '%s'"), typeStr); - return NULL; - } - } + if (virXMLPropEnum(node, "type", virDomainControllerTypeFromString, + VIR_XML_PROP_NONE, &type) < 0) + return NULL; =20 if (!(def =3D virDomainControllerDefNew(type))) return NULL; =20 - model =3D virXMLPropString(node, "model"); - if (model) { + if ((model =3D virXMLPropString(node, "model"))) { if ((def->model =3D virDomainControllerModelTypeFromString(def, mo= del)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown model type '%s'"), model); @@ -9542,8 +9522,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xm= lopt, idx =3D virXMLPropString(node, "index"); if (idx) { unsigned int idxVal; - if (virStrToLong_ui(idx, NULL, 10, &idxVal) < 0 || - idxVal > INT_MAX) { + if (virStrToLong_ui(idx, NULL, 10, &idxVal) < 0 || idxVal > INT_MA= X) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Cannot parse controller index %s"), idx); return NULL; @@ -9555,11 +9534,26 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, while (cur !=3D NULL) { if (cur->type =3D=3D XML_ELEMENT_NODE) { if (virXMLNodeNameEqual(cur, "driver")) { - queues =3D virXMLPropString(cur, "queues"); - cmd_per_lun =3D virXMLPropString(cur, "cmd_per_lun"); - max_sectors =3D virXMLPropString(cur, "max_sectors"); - ioeventfd =3D virXMLPropString(cur, "ioeventfd"); - iothread =3D virXMLPropString(cur, "iothread"); + if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, + &def->queues) < 0) + return NULL; + + if (virXMLPropUInt(cur, "cmd_per_lun", 10, VIR_XML_PROP_NO= NE, + &def->cmd_per_lun) < 0) + return NULL; + + if (virXMLPropUInt(cur, "max_sectors", 10, VIR_XML_PROP_NO= NE, + &def->max_sectors) < 0) + return NULL; + + if (virXMLPropTristateSwitch(cur, "ioeventfd", + VIR_XML_PROP_NONE, + &def->ioeventfd) < 0) + return NULL; + + if (virXMLPropUInt(cur, "iothread", 10, VIR_XML_PROP_NONE, + &def->iothread) < 0) + return NULL; =20 if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0) return NULL; @@ -9570,7 +9564,15 @@ virDomainControllerDefParseXML(virDomainXMLOption *x= mlopt, "controller definition not allowed")); return NULL; } - modelName =3D virXMLPropString(cur, "name"); + + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + if (virXMLPropEnum(cur, "name", + virDomainControllerPCIModelNameType= FromString, + VIR_XML_PROP_NONE, + &def->opts.pciopts.modelName) < 0) + return NULL; + } + processedModel =3D true; } else if (virXMLNodeNameEqual(cur, "target")) { if (processedTarget) { @@ -9579,12 +9581,39 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, "controller definition not allowed")); return NULL; } - chassisNr =3D virXMLPropString(cur, "chassisNr"); - chassis =3D virXMLPropString(cur, "chassis"); - port =3D virXMLPropString(cur, "port"); - busNr =3D virXMLPropString(cur, "busNr"); - hotplug =3D virXMLPropString(cur, "hotplug"); - targetIndex =3D virXMLPropString(cur, "index"); + if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_PCI) { + if (virXMLPropInt(cur, "chassisNr", 0, VIR_XML_PROP_NO= NE, + &def->opts.pciopts.chassisNr) < 0) + return NULL; + + if (virXMLPropInt(cur, "chassis", 0, VIR_XML_PROP_NONE, + &def->opts.pciopts.chassis) < 0) + return NULL; + + if (virXMLPropInt(cur, "port", 0, VIR_XML_PROP_NONE, + &def->opts.pciopts.port) < 0) + return NULL; + + if (virXMLPropInt(cur, "busNr", 0, VIR_XML_PROP_NONE, + &def->opts.pciopts.busNr) < 0) + return NULL; + + if (virXMLPropTristateSwitch(cur, "hotplug", + VIR_XML_PROP_NONE, + &def->opts.pciopts.hotplu= g) < 0) + return NULL; + + if ((rc =3D virXMLPropInt(cur, "index", 0, VIR_XML_PRO= P_NONE, + &def->opts.pciopts.targetIndex)) < 0) + return NULL; + + if (rc && def->opts.pciopts.targetIndex =3D=3D -1) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid target index '%i' in PCI= controller"), + def->opts.pciopts.targetIndex); + } + } + processedTarget =3D true; } } @@ -9601,42 +9630,6 @@ virDomainControllerDefParseXML(virDomainXMLOption *x= mlopt, return NULL; } =20 - if (queues && virStrToLong_ui(queues, NULL, 10, &def->queues) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'queues' value '%s'"), queues); - return NULL; - } - - if (cmd_per_lun && virStrToLong_ui(cmd_per_lun, NULL, 10, &def->cmd_pe= r_lun) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'cmd_per_lun' value '%s'"), cmd_per_lu= n); - return NULL; - } - - if (max_sectors && virStrToLong_ui(max_sectors, NULL, 10, &def->max_se= ctors) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'max_sectors' value %s"), max_sectors); - return NULL; - } - - if (ioeventfd) { - int value; - if ((value =3D virTristateSwitchTypeFromString(ioeventfd)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Malformed 'ioeventfd' value %s"), ioeventfd); - return NULL; - } - def->ioeventfd =3D value; - } - - if (iothread) { - if (virStrToLong_uip(iothread, NULL, 10, &def->iothread) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid 'iothread' value '%s'"), iothread); - return NULL; - } - } - if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB && def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { VIR_DEBUG("Ignoring device address for none model usb controller"); @@ -9645,30 +9638,28 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, return NULL; } =20 - portsStr =3D virXMLPropString(node, "ports"); - if (portsStr) { - int r =3D virStrToLong_i(portsStr, NULL, 10, &ports); - if (r !=3D 0 || ports < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid ports: %s"), portsStr); - return NULL; - } + if ((rc =3D virXMLPropInt(node, "ports", 10, VIR_XML_PROP_NONE, &ports= )) < 0) + return NULL; + if (rc && ports < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid ports: %i"), ports); + return NULL; } =20 switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: { - g_autofree char *vectors =3D virXMLPropString(node, "vectors"); + if ((rc =3D virXMLPropInt(node, "vectors", 10, VIR_XML_PROP_NONE, + &def->opts.vioserial.vectors)) < 0) + return NULL; =20 - def->opts.vioserial.ports =3D ports; - if (vectors) { - int r =3D virStrToLong_i(vectors, NULL, 10, - &def->opts.vioserial.vectors); - if (r !=3D 0 || def->opts.vioserial.vectors < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid vectors: %s"), vectors); - return NULL; - } + if (rc && def->opts.vioserial.vectors < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid vectors: %i"), + def->opts.vioserial.vectors); + return NULL; } + + def->opts.vioserial.ports =3D ports; break; } case VIR_DOMAIN_CONTROLLER_TYPE_USB: { @@ -9722,98 +9713,32 @@ virDomainControllerDefParseXML(virDomainXMLOption *= xmlopt, /* Other controller models don't require extra checks */ break; } - if (modelName) { - int value; - if ((value =3D virDomainControllerPCIModelNameTypeFromString(m= odelName)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown PCI controller model name '%s'"), - modelName); - return NULL; - } - def->opts.pciopts.modelName =3D value; - } - if (chassisNr) { - if (virStrToLong_i(chassisNr, NULL, 0, - &def->opts.pciopts.chassisNr) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid chassisNr '%s' in PCI controller= "), - chassisNr); - return NULL; - } - } - if (chassis) { - if (virStrToLong_i(chassis, NULL, 0, - &def->opts.pciopts.chassis) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid chassis '%s' in PCI controller"), - chassis); - return NULL; - } - } - if (port) { - if (virStrToLong_i(port, NULL, 0, - &def->opts.pciopts.port) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid port '%s' in PCI controller"), - port); - return NULL; - } - } - if (busNr) { - if (virStrToLong_i(busNr, NULL, 0, - &def->opts.pciopts.busNr) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid busNr '%s' in PCI controller"), - busNr); - return NULL; - } - } - if (targetIndex) { - if (virStrToLong_i(targetIndex, NULL, 0, - &def->opts.pciopts.targetIndex) < 0 || - def->opts.pciopts.targetIndex =3D=3D -1) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid target index '%s' in PCI control= ler"), - targetIndex); - return NULL; - } - } + if (numaNode >=3D 0) def->opts.pciopts.numaNode =3D numaNode; =20 - if (hotplug) { - int val =3D virTristateSwitchTypeFromString(hotplug); - - if (val <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("PCI controller unrecognized hotplug sett= ing '%s'"), - hotplug); - return NULL; - } - def->opts.pciopts.hotplug =3D val; - } break; case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: { - g_autofree char *gntframes =3D virXMLPropString(node, "maxGrantFra= mes"); - g_autofree char *eventchannels =3D virXMLPropString(node, "maxEven= tChannels"); + if ((rc =3D virXMLPropInt(node, "maxGrantFrames", 10, VIR_XML_PROP= _NONE, + &def->opts.xenbusopts.maxGrantFrames)) < 0) + return NULL; =20 - if (gntframes) { - int r =3D virStrToLong_i(gntframes, NULL, 10, - &def->opts.xenbusopts.maxGrantFrames); - if (r !=3D 0 || def->opts.xenbusopts.maxGrantFrames < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid maxGrantFrames: %s"), gntframes); - return NULL; - } + if (rc && def->opts.xenbusopts.maxGrantFrames < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid maxGrantFrames: %i"), + def->opts.xenbusopts.maxGrantFrames); + return NULL; } - if (eventchannels) { - int r =3D virStrToLong_i(eventchannels, NULL, 10, - &def->opts.xenbusopts.maxEventChannels); - if (r !=3D 0 || def->opts.xenbusopts.maxEventChannels < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid maxEventChannels: %s"), eventcha= nnels); - return NULL; - } + + if ((rc =3D virXMLPropInt(node, "maxEventChannels", 10, VIR_XML_PR= OP_NONE, + &def->opts.xenbusopts.maxEventChannels)) <= 0) + return NULL; + + if (rc && def->opts.xenbusopts.maxEventChannels < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid maxEventChannels: %i"), + def->opts.xenbusopts.maxEventChannels); + return NULL; } break; } --=20 2.26.3 From nobody Fri Apr 26 02:24:46 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=1619174308; cv=none; d=zohomail.com; s=zohoarc; b=LpKkmh07LCayOGV+1if7ixHoQZ67Q4sMcsIZ5uXBvNwB/LT78nDbDmTvO7uCaz46s+XZF3zqYZ3A6gP3ypG1r0fg5inDH4bomnZewxdloQFG8GyAmQY6awyhcMQHV2F1bSSu0Quz0nZqMvqff4OGrnR5RoAVc/GntbR2LAQGHIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174308; h=Content-Type:Content-Transfer-Encoding:Cc: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=wVZMEN4gQ0nm3rOpbMfjiYt+X9hxYo7GWkvRPguQbmk=; b=NkH4tDPLANKzWsyNabpYu+NyCLMX2sofVMlF9Y242rM7NiBvIFpNFLdyvdBSYdSfQPgmWCa+U1yA0wQPfcncu3s3/4RO6Aw0ZMlAT6BS+YrF4Ms/xwlc0g0SSE0SMf3JK0DrW5mRmxtpBvp/meVob5jqIK5HC5Jg0q5YqjVM3Dc= 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 1619174308878240.91063308655305; Fri, 23 Apr 2021 03:38:28 -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-27-AEFVMf72N_aEi_j67uWtAQ-1; Fri, 23 Apr 2021 06:38:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35F7581746E; Fri, 23 Apr 2021 10:38:18 +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 0CA0019D9B; Fri, 23 Apr 2021 10:38: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 C751F44A5E; Fri, 23 Apr 2021 10:38:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAbw7b004057 for ; Fri, 23 Apr 2021 06:37:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 969245C5B5; Fri, 23 Apr 2021 10:37:58 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id D31935C5E0; Fri, 23 Apr 2021 10:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174306; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=wVZMEN4gQ0nm3rOpbMfjiYt+X9hxYo7GWkvRPguQbmk=; b=XS7+IM0C9/M8TUO9ywojgE/k4t3CWZ75qkOAPgV73BbmGwQfCHf2OnYxvQy43Ew4AKn5rl nkVqmmMc3c/AVGj6Lf1DYcsv8SWTJ3GPdcisGez7Dn5hsSFhNP1B/cNDJMaYRowafZENef HA6LE5QXroGMDRSc+fcYMSZkCiXv/rA= X-MC-Unique: AEFVMf72N_aEi_j67uWtAQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] virDomainActualNetDef: Change type of type to virDomainNetType Date: Fri, 23 Apr 2021 12:37:36 +0200 Message-Id: <20210423103741.65814-6-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.84 on 10.5.11.23 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 30 ++++++++++++++++++++++++++---- src/conf/domain_conf.h | 2 +- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 152b4b8813..554efe0aea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2468,7 +2468,16 @@ virDomainActualNetDefFree(virDomainActualNetDef *def) case VIR_DOMAIN_NET_TYPE_HOSTDEV: virDomainHostdevDefClear(&def->data.hostdev.def); break; - default: + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_LAST: break; } =20 @@ -10062,6 +10071,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, g_autofree char *addrtype =3D NULL; g_autofree char *trustGuestRxFilters =3D NULL; g_autofree char *macTableManager =3D NULL; + int type_value; =20 actual =3D g_new0(virDomainActualNetDef, 1); =20 @@ -10073,11 +10083,12 @@ virDomainActualNetDefParseXML(xmlNodePtr node, _("missing type attribute in interface's e= lement")); goto error; } - if ((actual->type =3D virDomainNetTypeFromString(type)) < 0) { + if ((type_value =3D virDomainNetTypeFromString(type)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type '%s' in interface's elemen= t"), type); goto error; } + actual->type =3D type_value; if (actual->type !=3D VIR_DOMAIN_NET_TYPE_BRIDGE && actual->type !=3D VIR_DOMAIN_NET_TYPE_DIRECT && actual->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && @@ -30114,9 +30125,20 @@ virDomainNetGetActualVirtPortProfile(const virDoma= inNetDef *iface) case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_HOSTDEV: return iface->data.network.actual->virtPortProfile; - default: - return NULL; + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VDPA: + case VIR_DOMAIN_NET_TYPE_LAST: + break; } + return NULL; case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 336b76aa5c..cb21ee7872 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -990,7 +990,7 @@ typedef enum { * different versions of libvirt may read the same data file. */ struct _virDomainActualNetDef { - int type; /* enum virDomainNetType */ + virDomainNetType type; union { struct { char *brname; --=20 2.26.3 From nobody Fri Apr 26 02:24:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1619174304; cv=none; d=zohomail.com; s=zohoarc; b=CC8KTq4dNay7TLW3afCQquSOG73fNyLY6NDWtKI8wpkJ+2phz8RLMpqgDHfQSBUQ/jiJZV+e9w3lpP/Zr/yiwWn3CO/2nAB10S7g2sYBGrOKNFlJbuUe8Sw/jExlPz81cRCf+/184tihdIcspoPgg/yxBjEGYAExtVU3ZwfWA1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174304; h=Content-Type:Content-Transfer-Encoding:Cc: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=rpGVZr4Ag0imiNPq/LX85ymV6D80dh51g6dSNlD8LpE=; b=ZZhnabUyrAouyhAmuzC3zOND7H7vDS26HkCQ7axFz06pblzR1jXagKYqbdfQCqqr9539212TWctFl+ekD2yROoZ6hZmP9oVvsNk/ozXbvRb1jg49fPJDKdtzb8Wra8qTk4OgKUvsTx/53rwl02EGWpD/WJOhQyo2nqtCyZgnmxU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619174304458222.1409812209049; Fri, 23 Apr 2021 03:38:24 -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-382-EDfvEnQPMxWAaXTfeIxLEQ-1; Fri, 23 Apr 2021 06:38:21 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F96118BA287; Fri, 23 Apr 2021 10:38:16 +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 7490919D9B; Fri, 23 Apr 2021 10:38:16 +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 0CA321806D1F; Fri, 23 Apr 2021 10:38:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc0LK004076 for ; Fri, 23 Apr 2021 06:38:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 262F15C3FD; Fri, 23 Apr 2021 10:38:00 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5867C5C5E0; Fri, 23 Apr 2021 10:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174303; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=rpGVZr4Ag0imiNPq/LX85ymV6D80dh51g6dSNlD8LpE=; b=AcdRlKtYepLuMoQv9bnpUyKmAJunWqb0zVV7Fk+zKEo9Vp5C8Xq8NptOjz+tAW6WXP8Hlg nflvKZ5d0iAmNrMiTSYQc1EJPqvKfGwP+m2IJiTg4Dmzw1RLx+AKFyRzJMNtaWRrKGjL1Q XqjYE79P1VjgxAd7v+r6AbPDRcfaDwI= X-MC-Unique: EDfvEnQPMxWAaXTfeIxLEQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] virDomainActualNetDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:37 +0200 Message-Id: <20210423103741.65814-7-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.84 on 10.5.11.23 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 57 ++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 554efe0aea..3051a5d56d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10066,49 +10066,30 @@ virDomainActualNetDefParseXML(xmlNodePtr node, xmlNodePtr bandwidth_node =3D NULL; xmlNodePtr vlanNode; xmlNodePtr virtPortNode; - g_autofree char *type =3D NULL; - g_autofree char *mode =3D NULL; g_autofree char *addrtype =3D NULL; - g_autofree char *trustGuestRxFilters =3D NULL; g_autofree char *macTableManager =3D NULL; - int type_value; =20 actual =3D g_new0(virDomainActualNetDef, 1); =20 ctxt->node =3D node; =20 - type =3D virXMLPropString(node, "type"); - if (!type) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing type attribute in interface's e= lement")); + if (virXMLPropEnum(node, "type", virDomainNetTypeFromString, + VIR_XML_PROP_REQUIRED, &actual->type) < 0) goto error; - } - if ((type_value =3D virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown type '%s' in interface's elemen= t"), type); - goto error; - } - actual->type =3D type_value; + if (actual->type !=3D VIR_DOMAIN_NET_TYPE_BRIDGE && actual->type !=3D VIR_DOMAIN_NET_TYPE_DIRECT && actual->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && actual->type !=3D VIR_DOMAIN_NET_TYPE_NETWORK) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported type '%s' in interface's el= ement"), - type); + virDomainNetTypeToString(actual->type)); goto error; } =20 - if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; - } - actual->trustGuestRxFilters =3D value; - } + if (virXMLPropTristateBool(node, "trustGuestRxFilters", VIR_XML_PROP_N= ONE, + &actual->trustGuestRxFilters) < 0) + goto error; =20 virtPortNode =3D virXPathNode("./virtualport", ctxt); if (virtPortNode) { @@ -10127,7 +10108,8 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } else { virReportError(VIR_ERR_INTERNAL_ERROR, _(" element unsupported for type= =3D'%s'" - " in interface's element"), type); + " in interface's element"), + virDomainNetTypeToString(actual->type)); goto error; } } @@ -10136,19 +10118,18 @@ virDomainActualNetDefParseXML(xmlNodePtr node, xmlNodePtr sourceNode =3D virXPathNode("./source[1]", ctxt); =20 if (sourceNode) { + int rc; + virNetDevMacVLanMode mode; + actual->data.direct.linkdev =3D virXMLPropString(sourceNode, "= dev"); =20 - mode =3D virXMLPropString(sourceNode, "mode"); - if (mode) { - int m; - if ((m =3D virNetDevMacVLanModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown mode '%s' in interface element"), - mode); - goto error; - } - actual->data.direct.mode =3D m; - } + if ((rc =3D virXMLPropEnum(sourceNode, "mode", + virNetDevMacVLanModeTypeFromString, + VIR_XML_PROP_NONE, &mode)) < 0) + goto error; + + if (rc) + actual->data.direct.mode =3D mode; } } else if (actual->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) { virDomainHostdevDef *hostdev =3D &actual->data.hostdev.def; --=20 2.26.3 From nobody Fri Apr 26 02:24:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1619174369; cv=none; d=zohomail.com; s=zohoarc; b=Dcs/gHDbi2IOPUCt09XQCUsW1debR386zuxegXaKIvOq4yO9r9PvPYLKmooOnzr5TjbyX0wmed/0GoFYZkrbcuy/fiQomc0mao4hOLdYXVTsDxGqsXX1oDmEAN6CKrwLKj7HqY+1gV/DwoSi2fJr+t/UXQQEM/R1+yepqJ0ENsA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174369; h=Content-Type:Content-Transfer-Encoding:Cc: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=yW7QDPUIV8YpMCvZnYQKjJJtJi1ujxzdg9m4d0bE/3Y=; b=D97ldm9m4jnK+67q8y19QWnJ4Nmfi2n0OOJuA0oJ7wMjCodbmWtkqdyzGZXiEtNNEFsGI/bO9gOyTZpVNtlX+cxwxq/c6pjd0OtwCOQ9232WpSfifMvt52g48BN6G/boERpv9ogusSL3EU2UDH/BvKq6ZwRh5SFKdtdjJecO4zw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619174369395194.78102372649892; Fri, 23 Apr 2021 03:39:29 -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-118-jQTodOchPceG5ANrg0yAiA-1; Fri, 23 Apr 2021 06:38:32 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A67D817469; Fri, 23 Apr 2021 10:38:27 +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 7D6295B4B0; Fri, 23 Apr 2021 10:38: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 4722244A65; Fri, 23 Apr 2021 10:38:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc1Em004083 for ; Fri, 23 Apr 2021 06:38:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 48F315C5AE; Fri, 23 Apr 2021 10:38:01 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E7195C3FD; Fri, 23 Apr 2021 10:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174367; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=yW7QDPUIV8YpMCvZnYQKjJJtJi1ujxzdg9m4d0bE/3Y=; b=KxudbtMQlqlFDwxnqXIIIKU+s2Zvs9ghc7decybIrdXaZ0ROm6URxLdPk2XbBnUeCwFcaL N5QExQ27CRuRdEThEOKY4LQdsscHe8M03gYiknZKlCuxvgw6i1yNTIgnE5hVxX0iqfXBHr xC+BhrwoKBTJ0A1ucJ58ujF7ADWyQZg= X-MC-Unique: jQTodOchPceG5ANrg0yAiA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] virDomainNetDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:38 +0200 Message-Id: <20210423103741.65814-8-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.11 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 199 ++++++++++++----------------------------- 1 file changed, 57 insertions(+), 142 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3051a5d56d..2103aae2a3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10329,7 +10329,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *macaddr =3D NULL; g_autofree char *macaddr_type =3D NULL; g_autofree char *macaddr_check =3D NULL; - g_autofree char *type =3D NULL; g_autofree char *network =3D NULL; g_autofree char *portgroup =3D NULL; g_autofree char *portid =3D NULL; @@ -10353,7 +10352,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *queues =3D NULL; g_autofree char *rx_queue_size =3D NULL; g_autofree char *tx_queue_size =3D NULL; - g_autofree char *str =3D NULL; g_autofree char *filter =3D NULL; g_autofree char *internal =3D NULL; g_autofree char *mode =3D NULL; @@ -10363,7 +10361,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *vhostuser_mode =3D NULL; g_autofree char *vhostuser_path =3D NULL; g_autofree char *vhostuser_type =3D NULL; - g_autofree char *trustGuestRxFilters =3D NULL; g_autofree char *vhost_path =3D NULL; const char *prefix =3D xmlopt ? xmlopt->config.netPrefix : NULL; =20 @@ -10372,27 +10369,16 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlop= t, =20 ctxt->node =3D node; =20 - type =3D virXMLPropString(node, "type"); - if (type !=3D NULL) { - if ((int)(def->type =3D virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown interface type '%s'"), type); - goto error; - } - } else { + if ((rv =3D virXMLPropEnum(node, "type", virDomainNetTypeFromString, + VIR_XML_PROP_NONE, &def->type)) < 0) + goto error; + + if (rv =3D=3D 0) def->type =3D VIR_DOMAIN_NET_TYPE_USER; - } =20 - if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; - } - def->trustGuestRxFilters =3D value; - } + if (virXMLPropTristateBool(node, "trustGuestRxFilters", VIR_XML_PROP_N= ONE, + &def->trustGuestRxFilters) < 0) + goto error; =20 cur =3D node->children; while (cur !=3D NULL) { @@ -10484,7 +10470,8 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _(" element unsupported fo= r" - " "), type); + " "), + virDomainNetTypeToString(def->type)); goto error; } } else if (!address && @@ -10962,128 +10949,56 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlo= pt, } =20 if ((tmpNode =3D virXPathNode("./driver/host", ctxt))) { - if ((str =3D virXMLPropString(tmpNode, "csum"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host csum mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.csum =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "gso"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host gso mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.gso =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso4"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host tso4 mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.tso4 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso6"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host tso6 mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.tso6 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ecn"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host ecn mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.ecn =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ufo"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host ufo mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.ufo =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "mrg_rxbuf"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host mrg_rxbuf mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.mrg_rxbuf =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.csum) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "gso", VIR_XML_PROP_NONE, + &def->driver.virtio.host.gso) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.tso4) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.tso6) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, + &def->driver.virtio.host.ecn) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, + &def->driver.virtio.host.ufo) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "mrg_rxbuf", + VIR_XML_PROP_NONE, + &def->driver.virtio.host.mrg_rxbu= f) < 0) + goto error; } =20 if ((tmpNode =3D virXPathNode("./driver/guest", ctxt))) { - if ((str =3D virXMLPropString(tmpNode, "csum"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest csum mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.csum =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso4"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest tso4 mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.tso4 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso6"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest tso6 mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.tso6 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ecn"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest ecn mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.ecn =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ufo"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest ufo mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.ufo =3D val; - } + if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, + &def->driver.virtio.guest.csum) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, + &def->driver.virtio.guest.tso4) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, + &def->driver.virtio.guest.tso6) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, + &def->driver.virtio.guest.ecn) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, + &def->driver.virtio.guest.ufo) < = 0) + goto error; } def->backend.vhost =3D g_steal_pointer(&vhost_path); } --=20 2.26.3 From nobody Fri Apr 26 02:24:46 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=1619174319; cv=none; d=zohomail.com; s=zohoarc; b=nC40WqFPVjrVyBnOWbAJCQnPzhGSMPimMPJLn5r317bxsUtKuUYWka7HSAMdxjuv/JJGbxfn0rUJIOCo4gQQJ4QKD9xgpQTGkfJk2/UrAlY1Zl+bzuun1HXMlY4Ogey2SyieeyL/qIyMB93QRT9iDwjBurr0Q9mrg7vxQE/OI+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174319; h=Content-Type:Content-Transfer-Encoding:Cc: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=OnnByTn4fHumWLifHZBhwE3u8VjT2ag7lKUInt6KNSk=; b=P7ufIwPt9/pFPHkpJtBl1e9JoCVU8PQ0/VLNRue2QZBKCRxZv2RVjOGIQLhM5y+5PdJ1P+ZzlPk/+9mQlDb/qNJEzLbyfLlrM0+UeaJDq6nXel32NRCJj38yc7HQjQ7Ut/0BZP7LhonuZZG2hZDAIRkLTGXKlJG/gjyVHl7J8Cw= 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 1619174319286788.6462266575011; Fri, 23 Apr 2021 03:38:39 -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-187-zazhvD5KMu2owRrrNawSNA-1; Fri, 23 Apr 2021 06:38:36 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CFA6107ACED; Fri, 23 Apr 2021 10:38:30 +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 6D34E690EF; Fri, 23 Apr 2021 10:38:30 +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 2C79044A68; Fri, 23 Apr 2021 10:38:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc2ZI004094 for ; Fri, 23 Apr 2021 06:38:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D2FC5C5B5; Fri, 23 Apr 2021 10:38:02 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7AD65C5AE; Fri, 23 Apr 2021 10:38:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174318; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=OnnByTn4fHumWLifHZBhwE3u8VjT2ag7lKUInt6KNSk=; b=fxGwzS6csTv5iUNcbZrj0tcOrtjQHq3iGZvYdCoZKzNzHoEM/nNDIHovpgdanYihs+ueVa PjL9fc3SAAZZsRkNCNcPHg1OrJy+Co6ZLrke3m0XfxRrjCNVboFybLaAegMJDgBPafJWDq kuoMzBVxE/oTW7C2KwVl6qv1LpnfkCI= X-MC-Unique: zazhvD5KMu2owRrrNawSNA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] virDomainGraphicsListenDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:39 +0200 Message-Id: <20210423103741.65814-9-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.11 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2103aae2a3..1acd692720 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12439,12 +12439,9 @@ virDomainGraphicsListenDefParseXML(virDomainGraphi= csListenDef *def, { int ret =3D -1; const char *graphicsType =3D virDomainGraphicsTypeToString(graphics->t= ype); - int tmp, typeVal; - g_autofree char *type =3D virXMLPropString(node, "type"); g_autofree char *address =3D virXMLPropString(node, "address"); g_autofree char *network =3D virXMLPropString(node, "network"); g_autofree char *socketPath =3D virXMLPropString(node, "socket"); - g_autofree char *fromConfig =3D virXMLPropString(node, "fromConfig"); g_autofree char *autoGenerated =3D virXMLPropString(node, "autoGenerat= ed"); g_autofree char *addressCompat =3D NULL; g_autofree char *socketCompat =3D NULL; @@ -12454,18 +12451,9 @@ virDomainGraphicsListenDefParseXML(virDomainGraphi= csListenDef *def, socketCompat =3D virXMLPropString(parent, "socket"); } =20 - if (!type) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("graphics listen type must be specified")); - goto error; - } - - if ((typeVal =3D virDomainGraphicsListenTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown graphics listen type '%s'"), type); + if (virXMLPropEnum(node, "type", virDomainGraphicsListenTypeFromString, + VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - } - def->type =3D typeVal; =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: @@ -12545,14 +12533,10 @@ virDomainGraphicsListenDefParseXML(virDomainGraph= icsListenDef *def, def->socket =3D g_steal_pointer(&socketPath); } =20 - if (fromConfig && - flags & VIR_DOMAIN_DEF_PARSE_STATUS) { - if (virStrToLong_i(fromConfig, NULL, 10, &tmp) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid fromConfig value: %s"), - fromConfig); - goto error; - } + if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) { + int tmp; + if (virXMLPropInt(node, "fromConfig", 10, VIR_XML_PROP_NONE, &tmp)= < 0) + return -1; def->fromConfig =3D tmp !=3D 0; } =20 --=20 2.26.3 From nobody Fri Apr 26 02:24:46 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=1619174311; cv=none; d=zohomail.com; s=zohoarc; b=mI4YoZ1RQdWKWaPzRXSuXmlxTPtDzOKIHW9OGD195tBculrpJhxxw6FpzEv+oFynqo5/IRaMfvb+6RIt54q8QgN7YU4zx8EtzIw7xZxOlcwsbx8vHuS/r9a0F6fSZqDrb7E06y4e9iZcriySSnr5idho9B6bJSve6KMSFbGdlAQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174311; h=Content-Type:Content-Transfer-Encoding:Cc: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=X38YlQUxPiUlBN1jA3YiAJD/RoQmdKfIPNjZvESV10A=; b=aWsJQGDt5W2bqbJcGpL5zM9KqeuBk1j9hABMY/kp+Xu0/ej1PraqVDLlEx6oXUaQv8gNe9Xv6aRW1txHl3NW825GJ4FoEJJu1P3hy5BjHAOEetIFjCzazF6Pj9x61L7P6s9i2TukGBg8EW6fju/XPjV0eJ498TfKNcMgWjFiuoU= 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 161917431118574.15096384008086; Fri, 23 Apr 2021 03:38:31 -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-277-FCqsUv6PNiaC61wMd0kOnA-1; Fri, 23 Apr 2021 06:38:28 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A2B88030CF; Fri, 23 Apr 2021 10:38:22 +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 0694660BE5; Fri, 23 Apr 2021 10:38:22 +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 C4B2D1806D21; Fri, 23 Apr 2021 10:38:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc335004114 for ; Fri, 23 Apr 2021 06:38:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 887BF5C5AE; Fri, 23 Apr 2021 10:38:03 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3FFD5C3FD; Fri, 23 Apr 2021 10:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174310; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=X38YlQUxPiUlBN1jA3YiAJD/RoQmdKfIPNjZvESV10A=; b=iW1KOoaje6rmQxuznDhmhNl9Lf00iTbW84PsyynEsrD5b7fRywTBbZK+rcZRsq8NpRHCBo JAO7ByrHaop2s0S/txkXzyX9mrKgE+fG8eXF0jlvFRlbBcFucgSu2qvE52JBy8xbg3IiL6 R2FYLbRW8QbwSEE4lq7rJI9FvtS9BBU= X-MC-Unique: FCqsUv6PNiaC61wMd0kOnA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] virDomainGraphicsDef: Change type of sharePolicy to virDomainGraphicsVNCSharePolicy Date: Fri, 23 Apr 2021 12:37:40 +0200 Message-Id: <20210423103741.65814-10-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.12 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" Signed-off-by: Tim Wiederhake Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cb21ee7872..4838687edf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1834,7 +1834,7 @@ struct _virDomainGraphicsDef { bool autoport; char *keymap; virDomainGraphicsAuthDef auth; - int sharePolicy; + virDomainGraphicsVNCSharePolicy sharePolicy; virTristateBool powerControl; unsigned int audioId; } vnc; --=20 2.26.3 From nobody Fri Apr 26 02:24:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1619174321; cv=none; d=zohomail.com; s=zohoarc; b=kV5MNzBTa6YHwQ0BFNxr6Esk+pb/g3lEYdJvxn/9giS4py9EFI9D4k7yminLNAJEKuDBl5aP56GQ0m6vAGoLuRuH3Lt3Bo/ZNWbdojmSEBsTZ+Bxd+y1bRD3aQVoWvmpO9LITu7rozFm9V4qqeDsIoL34tFdylrvLB8c6lrW4mY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619174321; h=Content-Type:Content-Transfer-Encoding:Cc: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=AI/W+F9z66L8R90RX2myY1BhE1qle6ei5F1S9myUSTw=; b=bRAXedZUKdposrDyGbcLOSfILegHbuVIIK9q5ORulNBYmHPBvTI8QA2vpEej452VeXJOCRBX8t+JcRdcmWbWOtN9ZP1E3+InXk2C0BIcerB9qmC0dcOmkexLWNa2O+urnUZwm1UnXfoUj4nq9nesJfydhQfkD8OmyojTcrC6tU4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1619174321530668.4546707402891; Fri, 23 Apr 2021 03:38:41 -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-306-vTcmxZrXPdW0vJstj18uGQ-1; Fri, 23 Apr 2021 06:38:38 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id AEC16802575; Fri, 23 Apr 2021 10:38: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 8CD2C690EF; Fri, 23 Apr 2021 10:38:33 +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 4ECFA44A6B; Fri, 23 Apr 2021 10:38:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NAc4Mr004123 for ; Fri, 23 Apr 2021 06:38:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id A2B1E5C3FD; Fri, 23 Apr 2021 10:38:04 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFF865C5AE; Fri, 23 Apr 2021 10:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619174320; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=AI/W+F9z66L8R90RX2myY1BhE1qle6ei5F1S9myUSTw=; b=iakzIdK4O+39VM6x4tJRnfOO18KcPFsQpUipecw3AmN44UQcBlsiCAQrjFGl+lCukU3fBm PWuAd4Fr3XPwVyQCwyWQ14d8+Kf8BpUbxCIkbx0zslPtnG2YogMiJwlzdmXouQxTgTS2rp UJpSw72B0W6EKICGnrpSEVb5njduODA= X-MC-Unique: vTcmxZrXPdW0vJstj18uGQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virDomainGraphicsDefParseXMLVNC: Use virXMLProp* Date: Fri, 23 Apr 2021 12:37:41 +0200 Message-Id: <20210423103741.65814-11-twiederh@redhat.com> In-Reply-To: <20210423103741.65814-1-twiederh@redhat.com> References: <20210423103741.65814-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.11 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" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 59 ++++++++++-------------------------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1acd692720..b752ccd70b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12645,11 +12645,8 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsD= ef *def, unsigned int flags) { g_autofree char *port =3D virXMLPropString(node, "port"); - g_autofree char *websocket =3D virXMLPropString(node, "websocket"); g_autofree char *websocketGenerated =3D virXMLPropString(node, "websoc= ketGenerated"); - g_autofree char *sharePolicy =3D virXMLPropString(node, "sharePolicy"); g_autofree char *autoport =3D virXMLPropString(node, "autoport"); - g_autofree char *powerControl =3D virXMLPropString(node, "powerControl= "); xmlNodePtr audioNode; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 @@ -12680,62 +12677,32 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphics= Def *def, def->data.vnc.port =3D 0; } =20 - if (websocket) { - if (virStrToLong_i(websocket, - NULL, 10, - &def->data.vnc.websocket) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc WebSocket port %s"), websoc= ket); - return -1; - } - } + if (virXMLPropInt(node, "websocket", 10, VIR_XML_PROP_NONE, + &def->data.vnc.websocket) < 0) + return -1; =20 if (websocketGenerated) ignore_value(virStringParseYesNo(websocketGenerated, &def->data.vnc.websocketGenerated)); =20 - if (sharePolicy) { - int policy =3D - virDomainGraphicsVNCSharePolicyTypeFromString(sharePolicy); - - if (policy < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown vnc display sharing policy '%s'"), - sharePolicy); - return -1; - } else { - def->data.vnc.sharePolicy =3D policy; - } - } + if (virXMLPropEnum(node, "sharePolicy", + virDomainGraphicsVNCSharePolicyTypeFromString, + VIR_XML_PROP_NONE, &def->data.vnc.sharePolicy) < 0) + return -1; =20 - if (powerControl) { - int powerControlVal =3D virTristateBoolTypeFromString(powerControl= ); - if (powerControlVal < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc power control '%s'"), power= Control); - return -1; - } - def->data.vnc.powerControl =3D powerControlVal; - } + if ((virXMLPropTristateBool(node, "powerControl", VIR_XML_PROP_NONE, + &def->data.vnc.powerControl)) < 0) + return -1; =20 def->data.vnc.keymap =3D virXMLPropString(node, "keymap"); =20 ctxt->node =3D node; audioNode =3D virXPathNode("./audio", ctxt); if (audioNode) { - g_autofree char *tmp =3D NULL; - tmp =3D virXMLPropString(audioNode, "id"); - if (!tmp) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing audio 'id' attribute")); - return -1; - } - if (virStrToLong_ui(tmp, NULL, 10, &def->data.vnc.audioId) < 0 || - def->data.vnc.audioId =3D=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid audio 'id' value '%s'"), tmp); + if (virXMLPropUInt(audioNode, "id", 10, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &def->data.vnc.audioId) < 0) return -1; - } } =20 if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth, --=20 2.26.3