From nobody Sun Nov 10 22:16:29 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=1624364643; cv=none; d=zohomail.com; s=zohoarc; b=CD88U6jQNVbVIKzlC2RfkGHIOa5Yjk/p4/1vZvkdGSnf/zOwh96sMGqjtS/g2jMidRCnW33ad5Nan9fBgvr+92CYsumRLRbUoIN43WTvfAalsnG0vnVSVXxF9B7597EzKfoWBzCWRBuoW+6ladXAUUSXBTOdcLrJX2SVFC7777I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624364643; 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=H2IOgOUpjRUsbza7/GMHJQ9HbkTs0NZDHEAaJ2BXCuk=; b=SN8aPQfpUn6GN+OR0Ucd/q2O6IEQn3MUoAJ7PfKBbYvmITKlPPUzP3B6Z2G1pdhdVOlpJP5JyZnRRgP8bGYaoe883kL4WNCT3ZG1sBIyQw/ortaTlm5zR/pJHgf+JLxyfkBlpKZQosEdTesOyVoG331427ZIbaDf0C5rt6hfkkw= 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 1624364643497782.9485170322033; Tue, 22 Jun 2021 05:24:03 -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-248-0CR7bbpqOHeLF8dSq3T7Lw-1; Tue, 22 Jun 2021 08:24:00 -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 BE5748042A8; Tue, 22 Jun 2021 12:23:55 +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 981D619C66; Tue, 22 Jun 2021 12:23:55 +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 635D91809CB3; Tue, 22 Jun 2021 12:23:55 +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 15MCNGAl005209 for ; Tue, 22 Jun 2021 08:23:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A81E19C46; Tue, 22 Jun 2021 12:23:16 +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 B7ADE19C66; Tue, 22 Jun 2021 12:23:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624364642; 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=H2IOgOUpjRUsbza7/GMHJQ9HbkTs0NZDHEAaJ2BXCuk=; b=ZccLqg7iAa/JX1bCSraKO3BfSgRKFdRytiMrm3CGz45wA8CBc25J8+HlPMrXeb20bsfiXE lhlDXyn3gbG18ScYmSGZT4eaHFg5ikdlzxxy5jWd4yDzH48fJpVdu0OiqbIHx45P5ib1ci Ud2EBNZ1frLa92byM6yIWHqPjYSOjC0= X-MC-Unique: 0CR7bbpqOHeLF8dSq3T7Lw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/16] virDomainFeaturesDefParse: Factor out XEN parsing into separate function Date: Tue, 22 Jun 2021 14:22:50 +0200 Message-Id: <20210622122257.12528-10-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.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" Only moving code, cleanup to follow. Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 108 ++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 45 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 24529f3093..e687f18afe 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17430,6 +17430,64 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, } =20 =20 +static int +virDomainFeaturesXENDefParse(virDomainDef *def, + xmlXPathContext *ctxt) +{ + g_autofree xmlNodePtr *nodes =3D NULL; + size_t i; + int n; + + def->features[VIR_DOMAIN_FEATURE_XEN] =3D VIR_TRISTATE_SWITCH_ON; + + if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { + int feature; + virTristateSwitch value; + + if ((n =3D virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) + return -1; + + for (i =3D 0; i < n; i++) { + feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); + if (feature < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported Xen feature: %s"), + nodes[i]->name); + return -1; + } + + if (virXMLPropTristateSwitch(nodes[i], "state", + VIR_XML_PROP_REQUIRED, &value) < = 0) + return -1; + + def->xen_features[feature] =3D value; + + switch ((virDomainXen) feature) { + case VIR_DOMAIN_XEN_E820_HOST: + break; + + case VIR_DOMAIN_XEN_PASSTHROUGH: + if (value !=3D VIR_TRISTATE_SWITCH_ON) + break; + + if (virXMLPropEnum(nodes[i], "mode", + virDomainXenPassthroughModeTypeFromStri= ng, + VIR_XML_PROP_NONZERO, + &def->xen_passthrough_mode) < 0) + return -1; + break; + + case VIR_DOMAIN_XEN_LAST: + break; + } + } + VIR_FREE(nodes); + } + + return 0; +} + + static int virDomainFeaturesDefParse(virDomainDef *def, xmlXPathContextPtr ctxt) @@ -17468,7 +17526,6 @@ virDomainFeaturesDefParse(virDomainDef *def, case VIR_DOMAIN_FEATURE_VIRIDIAN: case VIR_DOMAIN_FEATURE_PRIVNET: case VIR_DOMAIN_FEATURE_MSRS: - case VIR_DOMAIN_FEATURE_XEN: def->features[val] =3D VIR_TRISTATE_SWITCH_ON; break; =20 @@ -17482,6 +17539,11 @@ virDomainFeaturesDefParse(virDomainDef *def, return -1; break; =20 + case VIR_DOMAIN_FEATURE_XEN: + if (virDomainFeaturesXENDefParse(def, ctxt) < 0) + return -1; + break; + case VIR_DOMAIN_FEATURE_CAPABILITIES: { virDomainCapabilitiesPolicy policy; =20 @@ -17615,50 +17677,6 @@ virDomainFeaturesDefParse(virDomainDef *def, } VIR_FREE(nodes); =20 - if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { - int feature; - virTristateSwitch value; - - if ((n =3D virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) - return -1; - - for (i =3D 0; i < n; i++) { - feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); - if (feature < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported Xen feature: %s"), - nodes[i]->name); - return -1; - } - - if (virXMLPropTristateSwitch(nodes[i], "state", - VIR_XML_PROP_REQUIRED, &value) < = 0) - return -1; - - def->xen_features[feature] =3D value; - - switch ((virDomainXen) feature) { - case VIR_DOMAIN_XEN_E820_HOST: - break; - - case VIR_DOMAIN_XEN_PASSTHROUGH: - if (value !=3D VIR_TRISTATE_SWITCH_ON) - break; - - if (virXMLPropEnum(nodes[i], "mode", - virDomainXenPassthroughModeTypeFromStri= ng, - VIR_XML_PROP_NONZERO, - &def->xen_passthrough_mode) < 0) - return -1; - break; - - case VIR_DOMAIN_XEN_LAST: - break; - } - } - VIR_FREE(nodes); - } - if (def->features[VIR_DOMAIN_FEATURE_SMM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { int rv =3D virParseScaledValue("string(./features/smm/tseg)", "string(./features/smm/tseg/@unit)", --=20 2.31.1