From nobody Mon Feb 9 17:22:23 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=1618566155; cv=none; d=zohomail.com; s=zohoarc; b=AaDAKxjVuDxcDg8J3JHwJpHKEfEqx/os6tpvRd8+sVkEiP8TEVh6h/nLp6slOXSH1dv5KJvbr6tN5pllRMTzlOazP9QGMlXLH8yN6+YQmXgv+e9GFRaKOrO8JAM8eS/nkjnmftds5aHcFzodT/MHcup86tKvWiIrkRA/8i/ah2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618566155; 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=H5W0hFVuFlmJzII/WU3leHrXoLS4d5LaYTfgkwuKg+s=; b=FEkbOSZD4/Y8mOFV8DkNE+JR9aXZ+t/5C5PQNmV8zaiUSkCKDAwuCwDg7UD0WfCiQn2mIFRw7p/CeUBm0VfMn38gNIJ50k3E3QajVG7KCtdtUY2HrYQhyNmZLAEt7zWPGbLfxXTvBiHJolra0RZjIEN0eb43xsMKNl7hXEr1OP4= 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 1618566155406612.2617844881264; Fri, 16 Apr 2021 02:42:35 -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-602-m7wAGVQeP6qn3cI5t9DUdQ-1; Fri, 16 Apr 2021 05:42:32 -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 62C5D87A842; Fri, 16 Apr 2021 09:42:23 +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 305E519715; Fri, 16 Apr 2021 09:42:23 +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 6AE701806D1D; Fri, 16 Apr 2021 09:42:22 +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 13G9g7ol006235 for ; Fri, 16 Apr 2021 05:42:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3FD4C6A04C; Fri, 16 Apr 2021 09:42:07 +0000 (UTC) Received: from work.redhat.com (ovpn-113-12.ams2.redhat.com [10.36.113.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 647D26A046; Fri, 16 Apr 2021 09:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618566154; 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=H5W0hFVuFlmJzII/WU3leHrXoLS4d5LaYTfgkwuKg+s=; b=UrZFnDyX1baq90JOk6DWvLq+HBk2nLF4s2ajYJFberxfeGDYaNu6lGw4ZaihbSGR4/C9N2 FEpPmp3Yyfaqg/c9RyY7i5+vMxPfKwZnuTaylFLGhIu5BasfC/Fclt73tIHFQBzbFD0Nik bslj04eX0WXYvEaaYsXq+O4F5DnJbhM= X-MC-Unique: m7wAGVQeP6qn3cI5t9DUdQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v6 8/8] virCPUDefParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 11:41:52 +0200 Message-Id: <20210416094152.202334-9-twiederh@redhat.com> In-Reply-To: <20210416094152.202334-1-twiederh@redhat.com> References: <20210416094152.202334-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: Peter Krempa , 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: Peter Krempa --- src/conf/cpu_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c095ab0e89..c7bea8ae00 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -423,7 +423,6 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, =20 if (def->type =3D=3D VIR_CPU_TYPE_GUEST) { g_autofree char *match =3D virXMLPropString(ctxt->node, "match"); - g_autofree char *check =3D NULL; =20 if (match) { def->match =3D virCPUMatchTypeFromString(match); @@ -435,16 +434,9 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, } } =20 - if ((check =3D virXMLPropString(ctxt->node, "check"))) { - int value =3D virCPUCheckTypeFromString(check); - if (value < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Invalid check attribute for CPU " - "specification")); - return -1; - } - def->check =3D value; - } + if (virXMLPropEnum(ctxt->node, "check", virCPUCheckTypeFromString, + VIR_XML_PROP_OPTIONAL, &def->check) < 0) + return -1; } =20 if (def->type =3D=3D VIR_CPU_TYPE_HOST) { --=20 2.26.2