From nobody Sat Feb 7 09:04:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1616054510; cv=none; d=zohomail.com; s=zohoarc; b=kd6zz40rr2zZ33PYUWA2YtKCFy3BtAQ8fSq+JbiIK1LROXXVQV+ZSPbcWURmZL7zAfGgJYgxb78UxCp+rE6u3U+dsjb0kCK4r6+CC5GzpmL4U1U1bCR0IjsF158qz1cMCh5AEtiU2v8b0fZpt5OBPxWNAsfUt38NoKiY79h8Fsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054510; 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=72yxgYViobxy3G8l77eAovb+cAtqTTJuw1E+kOWTzYE=; b=HHMZfasZVPJHy7Q3yoD+JsLZ6jh0Xf2mt9h/IIuxRNPLvvUS7kB85abjvAT4hjN4BZlSmpnbNpZVBYX9M9HnqXDxpDtsFn2EviNVIWS+gdWNqZ1h/VMyAio749tj3EKMNFt8UTNwPSuFRRxMd7FwkgeP9Cd01gBafqamBG84Ik4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616054510855889.5838551432809; Thu, 18 Mar 2021 01:01:50 -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-544-18daMksLMs6SdM-NHgSqzA-1; Thu, 18 Mar 2021 04:01:46 -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 C19AC10866BC; Thu, 18 Mar 2021 08:01:40 +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 9A4805FC17; Thu, 18 Mar 2021 08:01:40 +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 527ED4A701; Thu, 18 Mar 2021 08:01:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I81TVd028169 for ; Thu, 18 Mar 2021 04:01:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B8CA66A05; Thu, 18 Mar 2021 08:01:29 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0AC7669F2; Thu, 18 Mar 2021 08:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054509; 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=72yxgYViobxy3G8l77eAovb+cAtqTTJuw1E+kOWTzYE=; b=ZFA1gOBQr71eCX6e+a5CuavwzzYcOCghUBKWd/7st8XAmt2p8Y+8Vxl6S+CK7Hdn/FwKS/ uReUKEiXsa9DWqjq5Iu2vU9mpzoFpg4QMHYIJfu65oBEMcr5tG/OEC6JOWuAjEYEpQr/oQ /u0OMEcmtgnzcWK+0iw/+J7n0nXNtQg= X-MC-Unique: 18daMksLMs6SdM-NHgSqzA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDeviceInfoParseXML Date: Thu, 18 Mar 2021 09:00:45 +0100 Message-Id: <20210318080117.70255-7-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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 --- src/conf/domain_conf.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3a4b01ad1e..e1b2baf621 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6620,8 +6620,6 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xml= opt, xmlNodePtr boot =3D NULL; xmlNodePtr rom =3D NULL; int ret =3D -1; - g_autofree char *romenabled =3D NULL; - g_autofree char *rombar =3D NULL; g_autofree char *aliasStr =3D NULL; =20 virDomainDeviceInfoClear(info); @@ -6673,18 +6671,17 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr x= mlopt, } =20 if (rom) { - if ((romenabled =3D virXMLPropString(rom, "enabled")) && - ((info->romenabled =3D virTristateBoolTypeFromString(romenable= d)) <=3D 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom enabled value '%s'"), romenabled= ); + virTristateBool romenabled =3D VIR_TRISTATE_BOOL_ABSENT; + virTristateSwitch rombar =3D VIR_TRISTATE_SWITCH_ABSENT; + + if (virXMLPropYesNo(rom, "enabled", &romenabled) < 0) goto cleanup; - } - if ((rombar =3D virXMLPropString(rom, "bar")) && - ((info->rombar =3D virTristateSwitchTypeFromString(rombar)) <= =3D 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom bar value '%s'"), rombar); + + if (virXMLPropOnOff(rom, "bar", &rombar) < 0) goto cleanup; - } + + info->romenabled =3D romenabled; + info->rombar =3D rombar; info->romfile =3D virXMLPropString(rom, "file"); =20 if (info->romenabled =3D=3D VIR_TRISTATE_BOOL_NO && --=20 2.26.2