From nobody Wed May 14 20:53:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527515667947820.7418939831742; Mon, 28 May 2018 06:54:27 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id C55B6C0AD420; Mon, 28 May 2018 13:54:25 +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 79F041001951; Mon, 28 May 2018 13:54:25 +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 11B2C4CA87; Mon, 28 May 2018 13:54:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4SDsBCX013013 for ; Mon, 28 May 2018 09:54:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 46A392166BB6; Mon, 28 May 2018 13:54:11 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C27922166BB2 for ; Mon, 28 May 2018 13:54:10 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 28 May 2018 15:54:05 +0200 Message-Id: <9c988a510051d8638620ba6292fad60cea4f2275.1527515594.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] conf: remove 'bootHash' completely 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 28 May 2018 13:54:26 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Its only use is now to check for duplicate boot order values, which is now also done in virDomainDefPostParseCommon. Remove it completely. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 89 ++++++++++++++++++----------------------------= ---- 1 file changed, 31 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6076424bc6..c150b7d7d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6587,8 +6587,7 @@ virDomainDeviceUSBMasterParseXML(xmlNodePtr node, =20 static int virDomainDeviceBootParseXML(xmlNodePtr node, - virDomainDeviceInfoPtr info, - virHashTablePtr bootHash) + virDomainDeviceInfoPtr info) { char *order; char *loadparm =3D NULL; @@ -6608,18 +6607,6 @@ virDomainDeviceBootParseXML(xmlNodePtr node, goto cleanup; } =20 - if (bootHash) { - if (virHashLookup(bootHash, order)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("boot order '%s' used for more than one devic= e"), - order); - goto cleanup; - } - - if (virHashAddEntry(bootHash, order, (void *) 1) < 0) - goto cleanup; - } - loadparm =3D virXMLPropString(node, "loadparm"); if (loadparm) { if (virStringToUpper(&info->loadparm, loadparm) !=3D 1) { @@ -6817,7 +6804,6 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) static int virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, xmlNodePtr node, - virHashTablePtr bootHash, virDomainDeviceInfoPtr info, unsigned int flags) { @@ -6877,7 +6863,7 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xml= opt ATTRIBUTE_UNUSED, } =20 if (boot) { - if (virDomainDeviceBootParseXML(boot, info, bootHash)) + if (virDomainDeviceBootParseXML(boot, info)) goto cleanup; } =20 @@ -9402,7 +9388,6 @@ static virDomainDiskDefPtr virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, xmlXPathContextPtr ctxt, - virHashTablePtr bootHash, virSecurityLabelDefPtr* vmSeclabels, int nvmSeclabels, unsigned int flags) @@ -9769,7 +9754,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, } def->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(xmlopt, node, bootHash, &def->info, + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW= _BOOT) < 0) goto error; } @@ -10260,7 +10245,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPt= r xmlopt, if (def->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_USB && def->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { VIR_DEBUG("Ignoring device address for none model usb controller"); - } else if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, + } else if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) { goto error; } @@ -10648,7 +10633,7 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, def->dst =3D target; target =3D NULL; =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 cleanup: @@ -10938,7 +10923,6 @@ static virDomainNetDefPtr virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, xmlXPathContextPtr ctxt, - virHashTablePtr bootHash, char *prefix, unsigned int flags) { @@ -11226,7 +11210,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, } def->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } else { - if (virDomainDeviceInfoParseXML(xmlopt, node, bootHash, &def->info, + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW= _BOOT | VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) = < 0) goto error; @@ -12525,7 +12509,7 @@ virDomainChrDefParseXML(virDomainXMLOptionPtr xmlop= t, if (def->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && def->targetType =3D=3D VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD= ) { VIR_DEBUG("Ignoring device address for gustfwd channel"); - } else if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, + } else if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) { goto error; } @@ -12663,7 +12647,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOptionPtr= xmlopt, goto error; } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; if (def->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && def->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID) { @@ -12764,7 +12748,7 @@ virDomainTPMDefParseXML(virDomainXMLOptionPtr xmlop= t, goto error; } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 cleanup: @@ -12793,7 +12777,7 @@ virDomainPanicDefParseXML(virDomainXMLOptionPtr xml= opt, if (VIR_ALLOC(panic) < 0) return NULL; =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, + if (virDomainDeviceInfoParseXML(xmlopt, node, &panic->info, flags) < 0) goto error; =20 @@ -12929,7 +12913,7 @@ virDomainInputDefParseXML(virDomainXMLOptionPtr xml= opt, } } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 if (def->bus =3D=3D VIR_DOMAIN_INPUT_BUS_USB && @@ -12993,7 +12977,7 @@ virDomainHubDefParseXML(virDomainXMLOptionPtr xmlop= t, goto error; } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 cleanup: @@ -14150,7 +14134,7 @@ virDomainSoundDefParseXML(virDomainXMLOptionPtr xml= opt, } } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 cleanup: @@ -14204,7 +14188,7 @@ virDomainWatchdogDefParseXML(virDomainXMLOptionPtr = xmlopt, } } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 cleanup: @@ -14316,7 +14300,7 @@ virDomainRNGDefParseXML(virDomainXMLOptionPtr xmlop= t, break; } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 if (virDomainVirtioOptionsParseXML(virXPathNode("./driver", ctxt), @@ -14386,7 +14370,7 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPt= r xmlopt, =20 if (def->model =3D=3D VIR_DOMAIN_MEMBALLOON_MODEL_NONE) VIR_DEBUG("Ignoring device address for none model Memballoon"); - else if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, + else if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 @@ -14417,7 +14401,7 @@ virDomainNVRAMDefParseXML(virDomainXMLOptionPtr xml= opt, if (VIR_ALLOC(def) < 0) return NULL; =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 return def; @@ -14513,7 +14497,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xml= opt, goto cleanup; } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto cleanup; =20 =20 @@ -15167,7 +15151,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, } } =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, NULL, &def->info, flags)= < 0) + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0) goto error; =20 def->driver =3D virDomainVideoDriverDefParseXML(node); @@ -15194,7 +15178,6 @@ static virDomainHostdevDefPtr virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, xmlXPathContextPtr ctxt, - virHashTablePtr bootHash, unsigned int flags) { virDomainHostdevDefPtr def; @@ -15235,7 +15218,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr x= mlopt, } =20 if (def->info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (virDomainDeviceInfoParseXML(xmlopt, node, bootHash, def->info, + if (virDomainDeviceInfoParseXML(xmlopt, node, def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLO= W_BOOT | VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) = < 0) goto error; @@ -15275,7 +15258,6 @@ static virDomainRedirdevDefPtr virDomainRedirdevDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, xmlXPathContextPtr ctxt, - virHashTablePtr bootHash, unsigned int flags) { xmlNodePtr cur; @@ -15322,7 +15304,7 @@ virDomainRedirdevDefParseXML(virDomainXMLOptionPtr = xmlopt, if (def->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEVMC) def->source->data.spicevmc =3D VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; =20 - if (virDomainDeviceInfoParseXML(xmlopt, node, bootHash, &def->info, + if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOO= T) < 0) goto error; =20 @@ -15801,7 +15783,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xm= lopt, goto error; =20 if (virDomainDeviceInfoParseXML(xmlopt, memdevNode, - NULL, &def->info, flags) < 0) + &def->info, flags) < 0) goto error; =20 ctxt->node =3D save; @@ -15931,7 +15913,7 @@ virDomainDeviceDefParse(const char *xmlStr, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: if (!(dev->data.disk =3D virDomainDiskDefParseXML(xmlopt, node, ct= xt, - NULL, def->seclabe= ls, + def->seclabels, def->nseclabels, flags))) goto error; @@ -15947,7 +15929,7 @@ virDomainDeviceDefParse(const char *xmlStr, case VIR_DOMAIN_DEVICE_NET: netprefix =3D caps->host.netprefix; if (!(dev->data.net =3D virDomainNetDefParseXML(xmlopt, node, ctxt, - NULL, netprefix, fla= gs))) + netprefix, flags))) goto error; break; case VIR_DOMAIN_DEVICE_INPUT: @@ -15972,7 +15954,7 @@ virDomainDeviceDefParse(const char *xmlStr, break; case VIR_DOMAIN_DEVICE_HOSTDEV: if (!(dev->data.hostdev =3D virDomainHostdevDefParseXML(xmlopt, no= de, - ctxt, NULL, + ctxt, flags))) goto error; break; @@ -15991,7 +15973,7 @@ virDomainDeviceDefParse(const char *xmlStr, break; case VIR_DOMAIN_DEVICE_REDIRDEV: if (!(dev->data.redirdev =3D virDomainRedirdevDefParseXML(xmlopt, = node, - ctxt, NULL= , flags))) + ctxt, flag= s))) goto error; break; case VIR_DOMAIN_DEVICE_RNG: @@ -16098,7 +16080,7 @@ virDomainDiskDefParse(const char *xmlStr, } =20 disk =3D virDomainDiskDefParseXML(xmlopt, ctxt->node, ctxt, - NULL, seclabels, nseclabels, flags); + seclabels, nseclabels, flags); =20 cleanup: xmlFreeDoc(xml); @@ -18478,8 +18460,7 @@ virDomainVcpuParse(virDomainDefPtr def, =20 static int virDomainDefParseBootOptions(virDomainDefPtr def, - xmlXPathContextPtr ctxt, - virHashTablePtr *bootHash) + xmlXPathContextPtr ctxt) { xmlNodePtr *nodes =3D NULL; char *tmp =3D NULL; @@ -18611,8 +18592,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def, =20 if (virDomainDefParseBootXML(ctxt, def) < 0) goto error; - if (!(*bootHash =3D virHashCreate(5, NULL))) - goto error; } =20 ret =3D 0; @@ -18829,7 +18808,6 @@ virDomainDefParseXML(xmlDocPtr xml, long id =3D -1; virDomainDefPtr def; bool uuid_generated =3D false; - virHashTablePtr bootHash =3D NULL; bool usb_none =3D false; bool usb_other =3D false; bool usb_master =3D false; @@ -19874,7 +19852,7 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); =20 - if (virDomainDefParseBootOptions(def, ctxt, &bootHash) < 0) + if (virDomainDefParseBootOptions(def, ctxt) < 0) goto error; =20 /* analysis of the disk devices */ @@ -19888,7 +19866,6 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainDiskDefPtr disk =3D virDomainDiskDefParseXML(xmlopt, nodes[i], ctxt, - bootHash, def->seclabels, def->nseclabel= s, flags); @@ -19995,7 +19972,6 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainNetDefPtr net =3D virDomainNetDefParseXML(xmlopt, nodes[i], ctxt, - bootHash, netprefix, flags); if (!net) @@ -20237,7 +20213,7 @@ virDomainDefParseXML(xmlDocPtr xml, virDomainHostdevDefPtr hostdev; =20 hostdev =3D virDomainHostdevDefParseXML(xmlopt, nodes[i], ctxt, - bootHash, flags); + flags); if (!hostdev) goto error; =20 @@ -20381,7 +20357,7 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; for (i =3D 0; i < n; i++) { virDomainRedirdevDefPtr redirdev =3D - virDomainRedirdevDefParseXML(xmlopt, nodes[i], ctxt, bootHash,= flags); + virDomainRedirdevDefParseXML(xmlopt, nodes[i], ctxt, flags); if (!redirdev) goto error; =20 @@ -20555,14 +20531,11 @@ virDomainDefParseXML(xmlDocPtr xml, if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) goto error; =20 - virHashFree(bootHash); - return def; =20 error: VIR_FREE(tmp); VIR_FREE(nodes); - virHashFree(bootHash); virDomainDefFree(def); return NULL; } --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list