From nobody Thu Nov 14 07:06:12 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=1624364803; cv=none; d=zohomail.com; s=zohoarc; b=QNHBK+H6VblBOn4lRkBANQ7/Zdwj1aLguaK9vS+oJFRWhXwWgcgy4FZ+zVCv7ImUfIFC/evc4isiO10ajx6EpFoQbw+sPfAbyW0CnWMpr09oGZegnlmYh/GVhseNVuzisz/uVt1MXQzHJgIdf6B7jsUjF2Jvc2mDHFuwjaqg7LA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364803; 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=fxGXziu1iA4qO5KLJHwiu+eIM0clbkiTP3zwBQE50Ys=; b=K1QsNQtaKYZy7ZoPAVYZViQKyYcXdrvPHSYhKyR4scoNCqrHMchc1CfQE5BzPQDG+qVRhhwcofgPf1VZpMdCeE+FnxWvcrNahWFXLh8gJAlXLS3zbZhbV+9sHWGNdp8YUGjTgK8S+CcM0hltmnEJ0vKIyAspIs2eZkol9ux586A= 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) 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 162436480374919.7060305034679; Tue, 22 Jun 2021 05:26:43 -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-558-78Mcw00rPG-q2Im3IAKYFA-1; Tue, 22 Jun 2021 08:26:12 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 232FD8030D6; Tue, 22 Jun 2021 12:26:07 +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 EEFFF1000320; Tue, 22 Jun 2021 12:26:06 +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 B7AA51826D29; Tue, 22 Jun 2021 12:26:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15MCNQfb005289 for ; Tue, 22 Jun 2021 08:23:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id CEF8F19C46; Tue, 22 Jun 2021 12:23:26 +0000 (UTC) Received: from work.redhat.com (ovpn-113-16.ams2.redhat.com [10.36.113.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 23B8619D7C; Tue, 22 Jun 2021 12:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364773; 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=fxGXziu1iA4qO5KLJHwiu+eIM0clbkiTP3zwBQE50Ys=; b=Qq5TsVI0OPkzVF/k8DPFn2TFJpWCLBR6g/qZcpzpqf6yO9VyrS0/QBUTrPaihcBq+ax85M oKfPiMnHc0mTE4rF3f4n7rYarVIWRjhLGtN4SdJYAwy5fh/2ySdUCkH28hkyhsCmeTVYCY 7ijgd7CPLiuknYr8gidbXTzT6JC9ok4= X-MC-Unique: 78Mcw00rPG-q2Im3IAKYFA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 16/16] virDomainFeaturesDefParse: Simplify APIC parsing Date: Tue, 22 Jun 2021 14:22:57 +0200 Message-Id: <20210622122257.12528-17-twiederh@redhat.com> In-Reply-To: <20210622122257.12528-1-twiederh@redhat.com> References: <20210622122257.12528-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 50717c4f44..d78f846a52 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17532,7 +17532,6 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; int val =3D virDomainFeatureTypeFromString((const char *)nodes[i]-= >name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -17541,18 +17540,6 @@ virDomainFeaturesDefParse(virDomainDef *def, } =20 switch ((virDomainFeature) val) { - case VIR_DOMAIN_FEATURE_APIC: - if ((tmp =3D virXPathString("string(./features/apic/@eoi)", ct= xt))) { - int eoi; - if ((eoi =3D virTristateSwitchTypeFromString(tmp)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown value for attribute eoi: '%s= '"), - tmp); - return -1; - } - def->apic_eoi =3D eoi; - } - G_GNUC_FALLTHROUGH; case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_PAE: case VIR_DOMAIN_FEATURE_VIRIDIAN: @@ -17560,6 +17547,16 @@ virDomainFeaturesDefParse(virDomainDef *def, def->features[val] =3D VIR_TRISTATE_SWITCH_ON; break; =20 + case VIR_DOMAIN_FEATURE_APIC: { + virTristateSwitch eoi; + if (virXMLPropTristateSwitch(nodes[i], "eoi", VIR_XML_PROP_NON= E, &eoi) < 0) + return -1; + + def->features[val] =3D VIR_TRISTATE_SWITCH_ON; + def->apic_eoi =3D eoi; + break; + } + case VIR_DOMAIN_FEATURE_MSRS: { virDomainMsrsUnknown unknown; if (virXMLPropEnum(nodes[i], "unknown", --=20 2.31.1