From nobody Thu Mar 28 22:18:43 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=1619192394; cv=none; d=zohomail.com; s=zohoarc; b=Oi5yvkw7W884iR43mPmac/9jNDXGNZPubfaydABeIaAZuT5Y5hUgdyOr6rMuktKgp+/pKiIiysJWL0RaU2q+vDEIaacHArWiqtTtuxQOcAglYMByhzhNJNmGCNQvWaWEF+PsnvzQXkMGHUaHuZ+iAn4IrNAFTXCX6uBKhg4zBSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619192394; 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=Jq0CvnOK/pVVS00bBLpQ38TG/xsi2Qrwq8Y/UQXXviE=; b=jzwPcby8lKq9j1TXLf3UG7PEgYIFun5BsjKd2Lt7E8xIPBjY1sJ5UII1wb5KpLG0YwIvdRyhk06hfIGObV/SSLbauvZS0Hz1PFBQQcQuN2Yc04GG5TvDN8T2iojTttzWJmAcjlnNRzRCHMKZzS51cuWaE/hVoquRPrOubfzYYXo= 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 1619192394639588.5682756897069; Fri, 23 Apr 2021 08:39:54 -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-313-o6NS4zrpM1q2QXjb8UdXmg-1; Fri, 23 Apr 2021 11:39:49 -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 980F318B62AE; Fri, 23 Apr 2021 15:39:42 +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 7869959454; Fri, 23 Apr 2021 15:39:42 +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 3F9D044A5C; Fri, 23 Apr 2021 15:39:42 +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 13NFdXBT004227 for ; Fri, 23 Apr 2021 11:39:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8526E60613; Fri, 23 Apr 2021 15:39:33 +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 C4E2A60854; Fri, 23 Apr 2021 15:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619192393; 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=Jq0CvnOK/pVVS00bBLpQ38TG/xsi2Qrwq8Y/UQXXviE=; b=XR9KTlKrsXBr4Gs4b9NwN2ecbuKB0sccpnCIcCTxblsUbc2GURBcot+T3TrVD6SynWH2Ee tEHh4TfNC/dIgzbBPZ7VXiAyJV+uLfBCmsNH5/THw2/EdZXFl+RTvL4zoejj7DAPurXqrT MLIqDYsI7UrByWK37VukT3VKZcOM+pI= X-MC-Unique: o6NS4zrpM1q2QXjb8UdXmg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] virDomainGraphicsDefParseXML: Use virXMLProp* Date: Fri, 23 Apr 2021 17:39:17 +0200 Message-Id: <20210423153923.339223-5-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.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 | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9aba2edf0a..f599d1afe7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13097,25 +13097,13 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *= xmlopt, unsigned int flags) { virDomainGraphicsDef *def; - int typeVal; - g_autofree char *type =3D NULL; =20 if (!(def =3D virDomainGraphicsDefNew(xmlopt))) return NULL; =20 - type =3D virXMLPropString(node, "type"); - if (!type) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing graphics device type")); - goto error; - } - - if ((typeVal =3D virDomainGraphicsTypeFromString(type)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown graphics device type '%s'"), type); + if (virXMLPropEnum(node, "type", virDomainGraphicsTypeFromString, + VIR_XML_PROP_REQUIRED, &def->type) < 0) goto error; - } - def->type =3D typeVal; =20 switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: --=20 2.26.3