From nobody Thu Apr 25 09:09:36 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=1619192386; cv=none; d=zohomail.com; s=zohoarc; b=mtDOHA9RZAqttu+QRkKXwPoeFSotnBxCykKNMfZ4fF5EoKSf5Sf+jlehBMi5tUo0RWfhfU3/vLUOtLfqLn5bC0O0tCYjo+vG5ESqW+AC5hAM5Lp1igF9Dxbf0CGZLQqGb0CUvg5mjbUzdHDmQS7bnSbk/m9PDDJneNyfE1Y1mcI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619192386; 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=rJNpFTOJh4MHIVGl3GxI9c59iAnRaAdkxXbPp12ZmLE=; b=aDvTyQ4tqoysX/Y1cyJWJXM6rOMxacWYDHRObfQC8JJTih9PmxrID6DMWQjQ39kObY9SMQmBqbPBr4byg3/eXb7NTwFVKC8DZ0yHo7hb1BtPpS4nnLYpIoWNuWK/8yYLnETmRMfInOio82ISMgdmPwGGX75zdrBekt7lV8SLZQU= 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 1619192386659535.5403759673901; Fri, 23 Apr 2021 08:39:46 -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-v_2ZE_GLPz24_QBOzRa1RA-1; Fri, 23 Apr 2021 11:39:40 -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 7088D10053EC; Fri, 23 Apr 2021 15:39:34 +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 18E725C238; Fri, 23 Apr 2021 15:39:34 +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 528434EA30; Fri, 23 Apr 2021 15:39:33 +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 13NFdUjh004199 for ; Fri, 23 Apr 2021 11:39:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id F404060C5A; Fri, 23 Apr 2021 15:39:29 +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 3AB0660854; Fri, 23 Apr 2021 15:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619192385; 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=rJNpFTOJh4MHIVGl3GxI9c59iAnRaAdkxXbPp12ZmLE=; b=QaXQoUFqJ/brZV0FcIUhJs/m/PwBqO8nZSRFErguhx1xQmBxTO44qNLVDn07355mlxmdb3 e3kY6WE4ltsTRDG7FjZqAC2wM6wqhwtK4c57ZXqgYDDsPEi663ZjyxTKG71mNY2W/ehr4d BlciZatb/9wpjUVLll1SEqGTbV+dL7I= X-MC-Unique: v_2ZE_GLPz24_QBOzRa1RA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virDomainGraphicsDefParseXMLSDL: Use virXMLProp* Date: Fri, 23 Apr 2021 17:39:14 +0200 Message-Id: <20210423153923.339223-2-twiederh@redhat.com> In-Reply-To: <20210423153923.339223-1-twiederh@redhat.com> References: <20210423153923.339223-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a72d58f488..5b0e90f234 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12813,42 +12813,23 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphics= Def *def, xmlXPathContextPtr ctxt) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - int enableVal; xmlNodePtr glNode; - g_autofree char *fullscreen =3D virXMLPropString(node, "fullscreen"); - g_autofree char *enable =3D NULL; + virTristateBool fullscreen =3D VIR_TRISTATE_BOOL_NO; =20 ctxt->node =3D node; =20 - if (fullscreen !=3D NULL) { - if (virStringParseYesNo(fullscreen, &def->data.sdl.fullscreen) < 0= ) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown fullscreen value '%s'"), fullscreen); - return -1; - } - } else { - def->data.sdl.fullscreen =3D false; - } + if (virXMLPropTristateBool(node, "fullscreen", VIR_XML_PROP_NONE, + &fullscreen) < 0) + return -1; =20 + def->data.sdl.fullscreen =3D fullscreen =3D=3D VIR_TRISTATE_BOOL_YES; def->data.sdl.xauth =3D virXMLPropString(node, "xauth"); def->data.sdl.display =3D virXMLPropString(node, "display"); =20 - glNode =3D virXPathNode("./gl", ctxt); - if (glNode) { - enable =3D virXMLPropString(glNode, "enable"); - if (!enable) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("sdl gl element missing enable")); + if ((glNode =3D virXPathNode("./gl", ctxt))) { + if (virXMLPropTristateBool(glNode, "enable", VIR_XML_PROP_REQUIRED, + &def->data.sdl.gl) < 0) return -1; - } - - enableVal =3D virTristateBoolTypeFromString(enable); - if (enableVal < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown enable value '%s'"), enable); - return -1; - } - def->data.sdl.gl =3D enableVal; } =20 return 0; --=20 2.26.3