From nobody Sun Feb 8 12:37:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1575469333; cv=none; d=zohomail.com; s=zohoarc; b=WcG9prq0TiWPilYBoM7pNFo1CygkuxNUwy6/gEJBEJYfYCMrk1PaWYUuLvxOjjdQhFBpTmf8dKIaqf/xU4suIETekLHuIjeXGHlT7Z81cNoUoXTs6O15I5ZaObDRLihJpFOvDPHYNa7R7cFlQNFNNHxecyidyNx3tIakA/rqBws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469333; h=Content-Type:Content-Transfer-Encoding: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=ZU7HC0sZSjcOZk0DM9q3a4uj56tKjwUaYcPII0KPidc=; b=K1PEnwcKfNsQkMz2zGxvRFWm3UojE1lUL6qGkzyN9UndbFc2dKG4JcUOsD7AzJLLT8rcBxvjI8CjQbXAbzcKDmEAzuV+Dxd0iqLbxVl7GkWr63R7s6iBdN4/vv2y0nXl08NyALakqBuZFGEqwkul3YtC/KOaXzR2l/kMRJeG2Wo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1575469333963153.19817980182825; Wed, 4 Dec 2019 06:22:13 -0800 (PST) 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-385-7B5UbOF2Nv-4diE9oZpfoQ-1; Wed, 04 Dec 2019 09:22:10 -0500 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 0F76EDBED; Wed, 4 Dec 2019 14:22:01 +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 DD1DF600CD; Wed, 4 Dec 2019 14:22:00 +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 8E61E18034F0; Wed, 4 Dec 2019 14:22:00 +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 xB4ELjmm008255 for ; Wed, 4 Dec 2019 09:21:45 -0500 Received: by smtp.corp.redhat.com (Postfix) id 44D24691B4; Wed, 4 Dec 2019 14:21:45 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D20E608F7; Wed, 4 Dec 2019 14:21:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469332; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=ZU7HC0sZSjcOZk0DM9q3a4uj56tKjwUaYcPII0KPidc=; b=hZz2rZBYSZdHolN9OWLAzhq5RSriFnSS1gp9zLRwXR+cJYZfS17JcqLF6QIvKGY5jOW/tK A4E7RdZYaEDtIJEUHOhcPGM585/mnGPUQcVtQdGBv5AFN7VOzg9JwlX0NVALBkf2dlQyGx HwnjfzY/S14Z6ujEh7VBD28oKfZj22Q= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 14:21:02 +0000 Message-Id: <20191204142113.2961028-20-berrange@redhat.com> In-Reply-To: <20191204142113.2961028-1-berrange@redhat.com> References: <20191204142113.2961028-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 19/30] conf: drop virCapsPtr param from domain parse APIs 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 X-MC-Unique: 7B5UbOF2Nv-4diE9oZpfoQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Daniel P. Berrang=C3=A9 --- src/bhyve/bhyve_driver.c | 17 +++--------- src/conf/checkpoint_conf.c | 4 +-- src/conf/domain_conf.c | 29 +++++++------------- src/conf/domain_conf.h | 6 ----- src/conf/snapshot_conf.c | 6 ++--- src/conf/virdomainobjlist.c | 8 +++--- src/esx/esx_driver.c | 4 +-- src/libxl/libxl_domain.c | 4 +-- src/libxl/libxl_driver.c | 18 ++++++------- src/libxl/libxl_migration.c | 7 +++-- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 10 +++---- src/openvz/openvz_driver.c | 8 +++--- src/phyp/phyp_driver.c | 4 +-- src/qemu/qemu_checkpoint.c | 4 +-- src/qemu/qemu_domain.c | 7 +---- src/qemu/qemu_driver.c | 46 ++++++++------------------------ src/qemu/qemu_migration.c | 21 +++------------ src/qemu/qemu_migration_cookie.c | 8 +----- src/security/virt-aa-helper.c | 2 +- src/test/test_driver.c | 10 +++---- src/vbox/vbox_common.c | 6 ++--- src/vmware/vmware_driver.c | 4 +-- src/vz/vz_driver.c | 4 +-- tests/bhyvexml2argvtest.c | 2 +- tests/domainconftest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/qemuagenttest.c | 2 +- tests/qemuhotplugtest.c | 3 +-- tests/qemumemlocktest.c | 2 +- tests/qemusecuritytest.c | 1 - tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/testutils.c | 5 ++-- tests/xlconfigtest.c | 4 +-- tests/xmconfigtest.c | 2 +- tests/xml2vmxtest.c | 2 +- 38 files changed, 97 insertions(+), 175 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 8432044b60..0e627f2dc8 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -519,7 +519,7 @@ bhyveDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flag if (!caps) return NULL; =20 - if ((def =3D virDomainDefParseString(xml, caps, privconn->xmlopt, + if ((def =3D virDomainDefParseString(xml, privconn->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -681,7 +681,6 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, bhyveConnPtr privconn =3D conn->privateData; virDomainDefPtr def =3D NULL; virCommandPtr cmd =3D NULL, loadcmd =3D NULL; - virCapsPtr caps =3D NULL; char *ret =3D NULL; =20 virCheckFlags(0, NULL); @@ -695,10 +694,7 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, goto cleanup; } =20 - if (!(caps =3D bhyveDriverGetCapabilities(privconn))) - goto cleanup; - - if (!(def =3D virDomainDefParseString(xmlData, caps, privconn->xmlopt, + if (!(def =3D virDomainDefParseString(xmlData, privconn->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIV= E))) goto cleanup; =20 @@ -741,7 +737,6 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, virCommandFree(loadcmd); virCommandFree(cmd); virDomainDefFree(def); - virObjectUnref(caps); return ret; } =20 @@ -898,7 +893,6 @@ bhyveDomainCreateXML(virConnectPtr conn, virDomainDefPtr def =3D NULL; virDomainObjPtr vm =3D NULL; virObjectEventPtr event =3D NULL; - virCapsPtr caps =3D NULL; unsigned int start_flags =3D 0; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 @@ -910,11 +904,7 @@ bhyveDomainCreateXML(virConnectPtr conn, if (flags & VIR_DOMAIN_START_AUTODESTROY) start_flags |=3D VIR_BHYVE_PROCESS_START_AUTODESTROY; =20 - caps =3D bhyveDriverGetCapabilities(privconn); - if (!caps) - return NULL; - - if ((def =3D virDomainDefParseString(xml, caps, privconn->xmlopt, + if ((def =3D virDomainDefParseString(xml, privconn->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -947,7 +937,6 @@ bhyveDomainCreateXML(virConnectPtr conn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 cleanup: - virObjectUnref(caps); virDomainDefFree(def); virDomainObjEndAPI(&vm); virObjectEventStateQueue(privconn->domainEventState, event); diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 37cc8e5e6c..581e382b6d 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -121,7 +121,7 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, */ static virDomainCheckpointDefPtr virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -170,7 +170,7 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, return NULL; } def->parent.dom =3D virDomainDefParseNode(ctxt->node->doc, dom= ainNode, - caps, xmlopt, parseOpa= que, + xmlopt, parseOpaque, domainflags); if (!def->parent.dom) return NULL; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b1384a1487..00b5da8d52 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16371,7 +16371,6 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xml= opt, virDomainDeviceDefPtr virDomainDeviceDefParse(const char *xmlStr, const virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -19725,7 +19724,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlXPathContextPtr ctxt, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -21430,7 +21428,6 @@ virDomainDefParseXML(xmlDocPtr xml, static virDomainObjPtr virDomainObjParseXML(xmlDocPtr xml, xmlXPathContextPtr ctxt, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -21457,7 +21454,7 @@ virDomainObjParseXML(xmlDocPtr xml, =20 oldnode =3D ctxt->node; ctxt->node =3D config; - obj->def =3D virDomainDefParseXML(xml, ctxt, caps, xmlopt, flags); + obj->def =3D virDomainDefParseXML(xml, ctxt, xmlopt, flags); ctxt->node =3D oldnode; if (!obj->def) goto error; @@ -21534,7 +21531,6 @@ virDomainObjParseXML(xmlDocPtr xml, static virDomainDefPtr virDomainDefParse(const char *xmlStr, const char *filename, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -21556,7 +21552,7 @@ virDomainDefParse(const char *xmlStr, goto cleanup; } =20 - def =3D virDomainDefParseNode(xml, root, caps, xmlopt, parseOpaque, fl= ags); + def =3D virDomainDefParseNode(xml, root, xmlopt, parseOpaque, flags); =20 cleanup: xmlFreeDoc(xml); @@ -21566,29 +21562,26 @@ virDomainDefParse(const char *xmlStr, =20 virDomainDefPtr virDomainDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) { - return virDomainDefParse(xmlStr, NULL, caps, xmlopt, parseOpaque, flag= s); + return virDomainDefParse(xmlStr, NULL, xmlopt, parseOpaque, flags); } =20 virDomainDefPtr virDomainDefParseFile(const char *filename, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) { - return virDomainDefParse(NULL, filename, caps, xmlopt, parseOpaque, fl= ags); + return virDomainDefParse(NULL, filename, xmlopt, parseOpaque, flags); } =20 =20 virDomainDefPtr virDomainDefParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -21601,7 +21594,7 @@ virDomainDefParseNode(xmlDocPtr xml, =20 ctxt->node =3D root; =20 - if (!(def =3D virDomainDefParseXML(xml, ctxt, caps, xmlopt, flags))) + if (!(def =3D virDomainDefParseXML(xml, ctxt, xmlopt, flags))) return NULL; =20 /* callback to fill driver specific domain aspects */ @@ -21619,7 +21612,6 @@ virDomainDefParseNode(xmlDocPtr xml, virDomainObjPtr virDomainObjParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -21637,13 +21629,12 @@ virDomainObjParseNode(xmlDocPtr xml, return NULL; =20 ctxt->node =3D root; - return virDomainObjParseXML(xml, ctxt, caps, xmlopt, flags); + return virDomainObjParseXML(xml, ctxt, xmlopt, flags); } =20 =20 virDomainObjPtr virDomainObjParseFile(const char *filename, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -21653,7 +21644,7 @@ virDomainObjParseFile(const char *filename, =20 if ((xml =3D virXMLParseFile(filename))) { obj =3D virDomainObjParseNode(xml, xmlDocGetRootElement(xml), - caps, xmlopt, flags); + xmlopt, flags); xmlFreeDoc(xml); } =20 @@ -29330,7 +29321,7 @@ virDomainDefCopy(virDomainDefPtr src, if (!(xml =3D virDomainDefFormat(src, xmlopt, format_flags))) return NULL; =20 - return virDomainDefParseString(xml, caps, xmlopt, parseOpaque, parse_f= lags); + return virDomainDefParseString(xml, xmlopt, parseOpaque, parse_flags); } =20 virDomainDefPtr @@ -29787,7 +29778,7 @@ virDomainNetFindByName(virDomainDefPtr def, virDomainDeviceDefPtr virDomainDeviceDefCopy(virDomainDeviceDefPtr src, const virDomainDef *def, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque) { @@ -29875,7 +29866,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, return NULL; =20 xmlStr =3D virBufferContentAndReset(&buf); - return virDomainDeviceDefParse(xmlStr, def, caps, xmlopt, parseOpaque, + return virDomainDeviceDefParse(xmlStr, def, xmlopt, parseOpaque, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4f3c9fdc8b..5255c8190e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3032,7 +3032,6 @@ typedef enum { =20 virDomainDeviceDefPtr virDomainDeviceDefParse(const char *xmlStr, const virDomainDef *def, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags); @@ -3040,28 +3039,23 @@ virDomainDiskDefPtr virDomainDiskDefParse(const cha= r *xmlStr, virDomainXMLOptionPtr xmlopt, unsigned int flags); virDomainDefPtr virDomainDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags); virDomainDefPtr virDomainDefParseFile(const char *filename, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags); virDomainDefPtr virDomainDefParseNode(xmlDocPtr doc, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags); virDomainObjPtr virDomainObjParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags); virDomainObjPtr virDomainObjParseFile(const char *filename, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags); =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index 015d54a128..af882c6048 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -222,7 +222,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, */ static virDomainSnapshotDefPtr virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque, bool *current, @@ -301,7 +301,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, goto cleanup; } def->parent.dom =3D virDomainDefParseNode(ctxt->node->doc, dom= ainNode, - caps, xmlopt, parseOpa= que, + xmlopt, parseOpaque, domainflags); if (!def->parent.dom) goto cleanup; @@ -314,7 +314,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, * parent.dom for config and live XML. */ if ((inactiveDomNode =3D virXPathNode("./inactiveDomain", ctxt))) { def->parent.inactiveDom =3D virDomainDefParseNode(ctxt->node->= doc, inactiveDomNode, - caps, xmlopt, = NULL, domainflags); + xmlopt, NULL, = domainflags); if (!def->parent.inactiveDom) goto cleanup; } diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 744dd87296..ae18a4544f 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -483,7 +483,7 @@ virDomainObjListRename(virDomainObjListPtr doms, =20 static virDomainObjPtr virDomainObjListLoadConfig(virDomainObjListPtr doms, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, const char *configDir, const char *autostartDir, @@ -499,7 +499,7 @@ virDomainObjListLoadConfig(virDomainObjListPtr doms, =20 if ((configFile =3D virDomainConfigFile(configDir, name)) =3D=3D NULL) goto error; - if (!(def =3D virDomainDefParseFile(configFile, caps, xmlopt, NULL, + if (!(def =3D virDomainDefParseFile(configFile, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE | VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARS= E_FAIL))) @@ -536,7 +536,7 @@ static virDomainObjPtr virDomainObjListLoadStatus(virDomainObjListPtr doms, const char *statusDir, const char *name, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, virDomainLoadConfigNotify notify, void *opaque) @@ -548,7 +548,7 @@ virDomainObjListLoadStatus(virDomainObjListPtr doms, if ((statusFile =3D virDomainConfigFile(statusDir, name)) =3D=3D NULL) goto error; =20 - if (!(obj =3D virDomainObjParseFile(statusFile, caps, xmlopt, + if (!(obj =3D virDomainObjParseFile(statusFile, xmlopt, VIR_DOMAIN_DEF_PARSE_STATUS | VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES= | diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 8e3da589c9..9cfdd3bf49 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2744,7 +2744,7 @@ esxConnectDomainXMLToNative(virConnectPtr conn, const= char *nativeFormat, if (virtualHW_version < 0) return NULL; =20 - def =3D virDomainDefParseString(domainXml, priv->caps, priv->xmlopt, + def =3D virDomainDefParseString(domainXml, priv->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); =20 if (!def) @@ -2960,7 +2960,7 @@ esxDomainDefineXMLFlags(virConnectPtr conn, const cha= r *xml, unsigned int flags) return NULL; =20 /* Parse domain XML */ - def =3D virDomainDefParseString(xml, priv->caps, priv->xmlopt, + def =3D virDomainDefParseString(xml, priv->xmlopt, NULL, parse_flags); =20 if (!def) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index f4f1781bae..fea20ba477 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -732,7 +732,7 @@ libxlDomainManagedSavePath(libxlDriverPrivatePtr driver= , virDomainObjPtr vm) */ int libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, - libxlDriverConfigPtr cfg, + libxlDriverConfigPtr cfg G_GNUC_UNUSED, const char *from, virDomainDefPtr *ret_def, libxlSavefileHeaderPtr ret_hdr) @@ -780,7 +780,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivatePtr driver, goto error; } =20 - if (!(def =3D virDomainDefParseString(xml, cfg->caps, driver->xmlopt, = NULL, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) goto error; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ed754452f0..abf359ad1b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1042,7 +1042,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *= xml, if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if (!(def =3D virDomainDefParseString(xml, cfg->caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -2730,7 +2730,7 @@ libxlConnectDomainXMLToNative(virConnectPtr conn, con= st char * nativeFormat, goto cleanup; =20 if (!(def =3D virDomainDefParseString(domainXml, - cfg->caps, driver->xmlopt, NULL, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; =20 @@ -2850,7 +2850,7 @@ libxlDomainDefineXMLFlags(virConnectPtr conn, const c= har *xml, unsigned int flag if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if (!(def =3D virDomainDefParseString(xml, cfg->caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -4116,7 +4116,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const = char *xml, =20 if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)= )) goto endjob; =20 @@ -4133,7 +4133,7 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const = char *xml, /* If dev exists it was created to modify the domain config. Free = it. */ virDomainDeviceDefFree(dev); if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)= )) goto endjob; =20 @@ -4205,7 +4205,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const = char *xml, =20 if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALI= DATE))) goto endjob; @@ -4223,7 +4223,7 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const = char *xml, /* If dev exists it was created to modify the domain config. Free = it. */ virDomainDeviceDefFree(dev); if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALI= DATE))) goto endjob; @@ -4293,7 +4293,7 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const = char *xml, =20 if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)= )) goto cleanup; =20 @@ -4312,7 +4312,7 @@ libxlDomainUpdateDeviceFlags(virDomainPtr dom, const = char *xml, /* If dev exists it was created to modify the domain config. Free = it. */ virDomainDeviceDefFree(dev); if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, NUL= L, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)= )) goto cleanup; =20 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index f9bd004b2e..d744816510 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -402,7 +402,7 @@ libxlDomainMigrationSrcBegin(virConnectPtr conn, goto endjob; =20 if (xmlin) { - if (!(tmpdef =3D virDomainDefParseString(xmlin, cfg->caps, + if (!(tmpdef =3D virDomainDefParseString(xmlin, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTI= VE | @@ -450,7 +450,7 @@ libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr= driver, return NULL; } =20 - if (!(def =3D virDomainDefParseString(dom_xml, cfg->caps, driver->xmlo= pt, + if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) @@ -477,7 +477,6 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, bool *taint_hook) { libxlDriverPrivatePtr driver =3D dconn->privateData; - libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); =20 if (libxlMigrationEatCookie(cookiein, cookieinlen, mig) < 0) return -1; @@ -514,7 +513,7 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, virDomainDefPtr newdef; =20 VIR_DEBUG("Using hook-filtered domain XML: %s", *xmlout); - newdef =3D virDomainDefParseString(*xmlout, cfg->caps, dri= ver->xmlopt, + newdef =3D virDomainDefParseString(*xmlout, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INAC= TIVE | VIR_DOMAIN_DEF_PARSE_SKIP= _VALIDATE); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c869e2e7c4..e572c3f5fd 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -212,7 +212,7 @@ static virLXCControllerPtr virLXCControllerNew(const ch= ar *name) goto error; =20 if ((ctrl->vm =3D virDomainObjParseFile(configFile, - driver->caps, driver->xmlopt, + driver->xmlopt, 0)) =3D=3D NULL) goto error; ctrl->def =3D ctrl->vm->def; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4639e603e0..1ef15bfcf8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -416,7 +416,7 @@ lxcDomainDefineXMLFlags(virConnectPtr conn, const char = *xml, unsigned int flags) if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 - if (!(def =3D virDomainDefParseString(xml, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -1164,7 +1164,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto cleanup; =20 - if (!(def =3D virDomainDefParseString(xml, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -4699,7 +4699,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr do= m, goto endjob; =20 dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, - caps, driver->xmlopt, NULL, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE= ); if (dev =3D=3D NULL) goto endjob; @@ -4818,7 +4818,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr do= m, if (!(caps =3D virLXCDriverGetCapabilities(driver, false))) goto endjob; =20 - if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlo= pt, NULL, + if (!(dev =3D virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, NU= LL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto endjob; =20 @@ -4882,7 +4882,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, goto endjob; =20 dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, - caps, driver->xmlopt, NULL, + driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE= | VIR_DOMAIN_DEF_PARSE_SKIP_VAL= IDATE); if (dev =3D=3D NULL) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 33c28a2721..0c472601d3 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -858,7 +858,7 @@ openvzDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 openvzDriverLock(driver); - if ((vmdef =3D virDomainDefParseString(xml, driver->caps, driver->xmlo= pt, + if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -948,7 +948,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *x= ml, parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 openvzDriverLock(driver); - if ((vmdef =3D virDomainDefParseString(xml, driver->caps, driver->xmlo= pt, + if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -1909,7 +1909,7 @@ openvzDomainUpdateDeviceFlags(virDomainPtr dom, const= char *xml, if (!(def =3D virDomainObjGetOneDef(vm, flags))) goto cleanup; =20 - dev =3D virDomainDeviceDefParse(xml, def, driver->caps, driver->xmlopt= , NULL, + dev =3D virDomainDeviceDefParse(xml, def, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!dev) goto cleanup; @@ -2113,7 +2113,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, goto error; } =20 - if (!(def =3D virDomainDefParseString(dom_xml, driver->caps, driver->x= mlopt, + if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index a5cb1b91b3..640d90585a 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1684,7 +1684,7 @@ phypDomainAttachDeviceFlags(virDomainPtr domain, =20 def->os.type =3D VIR_DOMAIN_OSTYPE_LINUX; =20 - dev =3D virDomainDeviceDefParse(xml, def, phyp_driver->caps, NULL, NUL= L, + dev =3D virDomainDeviceDefParse(xml, def, NULL, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!dev) goto cleanup; @@ -3531,7 +3531,7 @@ phypDomainCreateXML(virConnectPtr conn, if (flags & VIR_DOMAIN_START_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if (!(def =3D virDomainDefParseString(xml, phyp_driver->caps, + if (!(def =3D virDomainDefParseString(xml, phyp_driver->xmlopt, NULL, parse_flags))) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index d5af6b99bf..a601030637 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -239,7 +239,7 @@ qemuCheckpointDiscardAllMetadata(virQEMUDriverPtr drive= r, /* Called inside job lock */ static int qemuCheckpointPrepare(virQEMUDriverPtr driver, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainObjPtr vm, virDomainCheckpointDefPtr def) { @@ -253,7 +253,7 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver, if (!(xml =3D qemuDomainDefFormatLive(driver, priv->qemuCaps, vm->def, priv->origCPU, true, true)) || - !(def->parent.dom =3D virDomainDefParseString(xml, caps, driver->x= mlopt, + !(def->parent.dom =3D virDomainDefParseString(xml, driver->xmlopt, priv->qemuCaps, VIR_DOMAIN_DEF_PARSE_I= NACTIVE | VIR_DOMAIN_DEF_PARSE_S= KIP_VALIDATE))) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 926ec80ec8..4c589eec05 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8976,17 +8976,12 @@ qemuDomainDefFromXML(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, const char *xml) { - virCapsPtr caps; virDomainDefPtr def; =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - return NULL; - - def =3D virDomainDefParseString(xml, caps, driver->xmlopt, qemuCaps, + def =3D virDomainDefParseString(xml, driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); =20 - virObjectUnref(caps); return def; } =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 32eae175ed..00788e7aca 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1748,7 +1748,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virObjectEventPtr event =3D NULL; virObjectEventPtr event2 =3D NULL; unsigned int start_flags =3D VIR_QEMU_PROCESS_START_COLD; - g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -1765,10 +1764,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPt= r conn, =20 virNWFilterReadLockFilterUpdates(); =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - - if (!(def =3D virDomainDefParseString(xml, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -3277,13 +3273,9 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, int ret =3D -1; virObjectEventPtr event =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - g_autoptr(virCaps) caps =3D NULL; virQEMUSaveDataPtr data =3D NULL; qemuDomainSaveCookiePtr cookie =3D NULL; =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; =20 @@ -3326,7 +3318,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, if (xmlin) { virDomainDefPtr def =3D NULL; =20 - if (!(def =3D virDomainDefParseString(xmlin, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xmlin, driver->xmlopt, priv->qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALI= DATE))) { @@ -6581,12 +6573,8 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virDomainDefPtr ret =3D NULL; virDomainDefPtr newdef_migr =3D NULL; virDomainDefPtr newdef =3D NULL; - g_autoptr(virCaps) caps =3D NULL; - - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; =20 - if (!(newdef =3D virDomainDefParseString(newxml, caps, driver->xmlopt,= NULL, + if (!(newdef =3D virDomainDefParseString(newxml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; =20 @@ -6659,7 +6647,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, virQEMUSaveHeaderPtr header; virDomainDefPtr def =3D NULL; int oflags =3D open_write ? O_RDWR : O_RDONLY; - g_autoptr(virCaps) caps =3D NULL; size_t xml_len; size_t cookie_len; =20 @@ -6673,9 +6660,6 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, oflags |=3D directFlag; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto error; - if ((fd =3D qemuOpenFile(driver, NULL, path, oflags, NULL)) < 0) goto error; if (bypass_cache && @@ -6770,7 +6754,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, } =20 /* Create a domain from this XML */ - if (!(def =3D virDomainDefParseString(data->xml, caps, driver->xmlopt,= qemuCaps, + if (!(def =3D virDomainDefParseString(data->xml, driver->xmlopt, qemuC= aps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) goto error; @@ -7343,7 +7327,6 @@ static char *qemuConnectDomainXMLToNative(virConnectP= tr conn, virCommandPtr cmd =3D NULL; char *ret =3D NULL; size_t i; - g_autoptr(virCaps) caps =3D NULL; =20 virCheckFlags(0, NULL); =20 @@ -7356,13 +7339,10 @@ static char *qemuConnectDomainXMLToNative(virConnec= tPtr conn, goto cleanup; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - if (!(vm =3D virDomainObjNew(driver->xmlopt))) goto cleanup; =20 - if (!(vm->def =3D virDomainDefParseString(xmlData, caps, driver->xmlop= t, NULL, + if (!(vm->def =3D virDomainDefParseString(xmlData, driver->xmlopt, NUL= L, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDAT= E))) goto cleanup; @@ -7587,7 +7567,6 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, virDomainPtr dom =3D NULL; virObjectEventPtr event =3D NULL; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - g_autoptr(virCaps) caps =3D NULL; unsigned int parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; =20 @@ -7596,10 +7575,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - - if (!(def =3D virDomainDefParseString(xml, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags))) goto cleanup; =20 @@ -8641,7 +8617,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, if (!vmdef) goto cleanup; =20 - if (!(devConf =3D virDomainDeviceDefParse(xml, vmdef, caps, + if (!(devConf =3D virDomainDeviceDefParse(xml, vmdef, driver->xmlopt, priv->qemu= Caps, parse_flags))) goto cleanup; @@ -8662,7 +8638,7 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObjPtr v= m, } =20 if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (!(devLive =3D virDomainDeviceDefParse(xml, vm->def, caps, + if (!(devLive =3D virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, priv->qemu= Caps, parse_flags))) goto cleanup; @@ -8793,7 +8769,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 - dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, caps, + dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, priv->qemuCap= s, parse_flags); if (dev =3D=3D NULL) @@ -8890,7 +8866,7 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriverPtr = driver, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 - dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, caps, + dev =3D dev_copy =3D virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, priv->qemuCap= s, parse_flags); if (dev =3D=3D NULL) @@ -15930,7 +15906,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, if (!(xml =3D qemuDomainDefFormatLive(driver, priv->qemuCaps, vm->def, priv->origCPU, true, true)) || - !(def->parent.dom =3D virDomainDefParseString(xml, caps, drive= r->xmlopt, + !(def->parent.dom =3D virDomainDefParseString(xml, driver->xml= opt, priv->qemuCaps, VIR_DOMAIN_DEF_PAR= SE_INACTIVE | VIR_DOMAIN_DEF_PAR= SE_SKIP_VALIDATE))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e9470cc62c..9086a3a95a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1945,7 +1945,6 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, qemuMigrationCookiePtr mig =3D NULL; virDomainDefPtr def =3D NULL; qemuDomainObjPrivatePtr priv =3D vm->privateData; - virCapsPtr caps =3D NULL; unsigned int cookieFlags =3D QEMU_MIGRATION_COOKIE_LOCKSTATE; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, xmlin=3D%s, dname=3D%s," @@ -1955,9 +1954,6 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, cookieout, cookieoutlen, nmigrate_disks, migrate_disks, flags); =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - /* Only set the phase if we are inside QEMU_ASYNC_JOB_MIGRATION_OUT. * Otherwise we will start the async job later in the perform phase lo= sing * change protection. @@ -2074,7 +2070,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, } =20 if (xmlin) { - if (!(def =3D virDomainDefParseString(xmlin, caps, driver->xmlopt,= priv->qemuCaps, + if (!(def =3D virDomainDefParseString(xmlin, driver->xmlopt, priv-= >qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALI= DATE))) goto cleanup; @@ -2090,7 +2086,6 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, =20 cleanup: qemuMigrationCookieFree(mig); - virObjectUnref(caps); virDomainDefFree(def); return rv; } @@ -2289,7 +2284,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, char *xmlout =3D NULL; unsigned int cookieFlags; unsigned int startFlags; - virCapsPtr caps =3D NULL; qemuProcessIncomingDefPtr incoming =3D NULL; bool taint_hook =3D false; bool stopProcess =3D false; @@ -2340,9 +2334,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, goto cleanup; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - if (!qemuMigrationSrcIsAllowedHostdev(*def)) goto cleanup; =20 @@ -2371,7 +2362,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, virDomainDefPtr newdef; =20 VIR_DEBUG("Using hook-filtered domain XML: %s", xmlout); - newdef =3D virDomainDefParseString(xmlout, caps, driver->x= mlopt, NULL, + newdef =3D virDomainDefParseString(xmlout, driver->xmlopt,= NULL, VIR_DOMAIN_DEF_PARSE_INAC= TIVE | VIR_DOMAIN_DEF_PARSE_SKIP= _VALIDATE); if (!newdef) @@ -2619,7 +2610,6 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); qemuMigrationCookieFree(mig); - virObjectUnref(caps); virNWFilterUnlockFilterUpdates(); virErrorRestore(&origErr); return ret; @@ -2857,7 +2847,6 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, const char *dname, char **origname) { - virCapsPtr caps =3D NULL; virDomainDefPtr def; char *name =3D NULL; =20 @@ -2867,10 +2856,7 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, return NULL; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - return NULL; - - if (!(def =3D virDomainDefParseString(dom_xml, caps, driver->xmlopt, + if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) @@ -2882,7 +2868,6 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, } =20 cleanup: - virObjectUnref(caps); if (def && origname) *origname =3D name; else diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 33b3529f8c..9cfb08951c 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1198,10 +1198,6 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr m= ig, xmlNodePtr *nodes =3D NULL; size_t i; int n; - virCapsPtr caps =3D NULL; - - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto error; =20 /* We don't store the uuid, name, hostname, or hostuuid * values. We just compare them to local data to do some @@ -1330,7 +1326,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mi= g, goto error; } mig->persistent =3D virDomainDefParseNode(doc, nodes[0], - caps, driver->xmlopt, qemu= Caps, + driver->xmlopt, qemuCaps, VIR_DOMAIN_DEF_PARSE_INACT= IVE | VIR_DOMAIN_DEF_PARSE_ABI_U= PDATE_MIGRATION | VIR_DOMAIN_DEF_PARSE_SKIP_= VALIDATE); @@ -1369,13 +1365,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr = mig, !(mig->caps =3D qemuMigrationCookieCapsXMLParse(ctxt))) goto error; =20 - virObjectUnref(caps); return 0; =20 error: VIR_FREE(tmp); VIR_FREE(nodes); - virObjectUnref(caps); return -1; } =20 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 820db5b911..c93dddb228 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -690,7 +690,7 @@ get_definition(vahControl * ctl, const char *xmlStr) } =20 ctl->def =3D virDomainDefParseString(xmlStr, - ctl->caps, ctl->xmlopt, NULL, + ctl->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_SKIP_SECLABEL | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); =20 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 630cfa1574..c5c533d369 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -945,7 +945,7 @@ testParseDomains(testDriverPtr privconn, goto error; =20 def =3D virDomainDefParseNode(ctxt->doc, node, - privconn->caps, privconn->xmlopt, NULL, + privconn->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!def) goto error; @@ -1678,7 +1678,7 @@ testDomainCreateXML(virConnectPtr conn, const char *x= ml, parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 virObjectLock(privconn); - if ((def =3D virDomainDefParseString(xml, privconn->caps, privconn->xm= lopt, + if ((def =3D virDomainDefParseString(xml, privconn->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -2294,7 +2294,7 @@ testDomainSaveImageOpen(testDriverPtr driver, } xml[len] =3D '\0'; =20 - if (!(def =3D virDomainDefParseString(xml, driver->caps, driver->xmlop= t, NULL, + if (!(def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE= ))) goto error; @@ -2437,7 +2437,7 @@ testDomainSaveImageDefineXML(virConnectPtr conn, goto cleanup; VIR_FORCE_CLOSE(fd); =20 - if ((newdef =3D virDomainDefParseString(dxml, privconn->caps, privconn= ->xmlopt, NULL, + if ((newdef =3D virDomainDefParseString(dxml, privconn->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE)) = =3D=3D NULL) goto cleanup; =20 @@ -3989,7 +3989,7 @@ static virDomainPtr testDomainDefineXMLFlags(virConne= ctPtr conn, if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if ((def =3D virDomainDefParseString(xml, privconn->caps, privconn->xm= lopt, + if ((def =3D virDomainDefParseString(xml, privconn->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 1feb76c0a5..1703120928 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1858,7 +1858,7 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int flags if (!data->vboxObj) return ret; =20 - if (!(def =3D virDomainDefParseString(xml, data->caps, data->xmlopt, + if (!(def =3D virDomainDefParseString(xml, data->xmlopt, NULL, parse_flags))) return ret; =20 @@ -4257,7 +4257,7 @@ static int vboxDomainAttachDeviceImpl(virDomainPtr do= m, =20 def->os.type =3D VIR_DOMAIN_OSTYPE_HVM; =20 - dev =3D virDomainDeviceDefParse(xml, def, data->caps, data->xmlopt, NU= LL, + dev =3D virDomainDeviceDefParse(xml, def, data->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); if (dev =3D=3D NULL) goto cleanup; @@ -4376,7 +4376,7 @@ static int vboxDomainDetachDevice(virDomainPtr dom, c= onst char *xml) =20 def->os.type =3D VIR_DOMAIN_OSTYPE_HVM; =20 - dev =3D virDomainDeviceDefParse(xml, def, data->caps, data->xmlopt, NU= LL, + dev =3D virDomainDeviceDefParse(xml, def, data->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); if (dev =3D=3D NULL) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index b30c8847d3..32c81b13a0 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -421,7 +421,7 @@ vmwareDomainDefineXMLFlags(virConnectPtr conn, const ch= ar *xml, unsigned int fla ctx.datacenterPath =3D NULL; =20 vmwareDriverLock(driver); - if ((vmdef =3D virDomainDefParseString(xml, driver->caps, driver->xmlo= pt, + if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -683,7 +683,7 @@ vmwareDomainCreateXML(virConnectPtr conn, const char *x= ml, =20 vmwareDriverLock(driver); =20 - if ((vmdef =3D virDomainDefParseString(xml, driver->caps, driver->xmlo= pt, + if ((vmdef =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index a76c56334d..0acdcb9760 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -792,7 +792,7 @@ vzDomainDefineXMLFlags(virConnectPtr conn, const char *= xml, unsigned int flags) if (flags & VIR_DOMAIN_DEFINE_VALIDATE) parse_flags |=3D VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA; =20 - if ((def =3D virDomainDefParseString(xml, driver->caps, driver->xmlopt, + if ((def =3D virDomainDefParseString(xml, driver->xmlopt, NULL, parse_flags)) =3D=3D NULL) goto cleanup; =20 @@ -2992,7 +2992,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, | VZ_MIGRATION_COOKIE_DOMAIN_NAME) < 0) goto cleanup; =20 - if (!(def =3D virDomainDefParseString(dom_xml, driver->caps, driver->x= mlopt, + if (!(def =3D virDomainDefParseString(dom_xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index f5dbb4e154..3c9c61f024 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -35,7 +35,7 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(conn =3D virGetConnect())) goto out; =20 - if (!(vmdef =3D virDomainDefParseFile(xml, driver.caps, driver.xmlopt, + if (!(vmdef =3D virDomainDefParseFile(xml, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIV= E))) { if (flags & FLAG_EXPECT_PARSE_ERROR) { ret =3D 0; diff --git a/tests/domainconftest.c b/tests/domainconftest.c index f48c3ca682..754ef2eb3d 100644 --- a/tests/domainconftest.c +++ b/tests/domainconftest.c @@ -49,7 +49,7 @@ static int testGetFilesystem(const void *opaque) filename =3D g_strdup_printf("%s/domainconfdata/%s.xml", abs_srcdir, data->filename); =20 - if (!(def =3D virDomainDefParseFile(filename, caps, xmlopt, NULL, 0))) + if (!(def =3D virDomainDefParseFile(filename, xmlopt, NULL, 0))) goto cleanup; =20 fsdef =3D virDomainGetFilesystemForTarget(def, diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index 5c8dcf8503..35f0ce8f7d 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -76,7 +76,7 @@ testCompareXMLToDomConfig(const char *xmlfile, if (!(gports =3D virPortAllocatorRangeNew("vnc", 5900, 6000))) goto cleanup; =20 - if (!(vmdef =3D virDomainDefParseFile(xmlfile, cfg->caps, driver->xmlo= pt, + if (!(vmdef =3D virDomainDefParseFile(xmlfile, driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; =20 diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 9dbbfb3cfe..d8824b8f09 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -185,7 +185,7 @@ testQemuAgentGetFSInfoCommon(virDomainXMLOptionPtr xmlo= pt, =20 domain_filename =3D g_strdup_printf("%s/qemuagentdata/fsinfo.xml", abs= _srcdir); =20 - if (!(ret_def =3D virDomainDefParseFile(domain_filename, driver.caps, = xmlopt, + if (!(ret_def =3D virDomainDefParseFile(domain_filename, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACT= IVE))) goto cleanup; =20 diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index b1e53505be..e80545056d 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -87,7 +87,6 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt, return -1; =20 if (!((*vm)->def =3D virDomainDefParseString(domxml, - driver.caps, driver.xmlopt, NULL, parseFlags))) @@ -277,7 +276,7 @@ testQemuHotplug(const void *data) device_parse_flags =3D VIR_DOMAIN_DEF_PARSE_INACTIVE; =20 if (!(dev =3D virDomainDeviceDefParse(device_xml, vm->def, - caps, driver.xmlopt, NULL, + driver.xmlopt, NULL, device_parse_flags))) goto cleanup; =20 diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 55f65dcb6a..986dfb77bd 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -37,7 +37,7 @@ testCompareMemLock(const void *data) xml =3D g_strdup_printf("%s/qemumemlockdata/qemumemlock-%s.xml", abs_s= rcdir, info->name); =20 - if (!(def =3D virDomainDefParseFile(xml, driver.caps, driver.xmlopt, N= ULL, + if (!(def =3D virDomainDefParseFile(xml, driver.xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) { goto cleanup; } diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 8c0a48bb65..380c3fed8c 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -68,7 +68,6 @@ prepareObjects(virQEMUDriverPtr driver, return -1; =20 if (!(vm->def =3D virDomainDefParseString(domxml, - driver->caps, driver->xmlopt, NULL, 0))) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6890de101b..fe8fa776be 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -450,7 +450,7 @@ testCompareXMLToArgv(const void *data) =20 parseFlags |=3D VIR_DOMAIN_DEF_PARSE_INACTIVE; if (!(vm->def =3D virDomainDefParseFile(info->infile, - driver.caps, driver.xmlopt, + driver.xmlopt, NULL, parseFlags))) { if (flags & FLAG_EXPECT_PARSE_ERROR) goto ok; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f849869735..e5bbd8dec4 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -58,7 +58,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) char *actual =3D NULL; int ret =3D -1; =20 - if (!(obj =3D virDomainObjParseFile(data->infile, driver.caps, driver.= xmlopt, + if (!(obj =3D virDomainObjParseFile(data->infile, driver.xmlopt, VIR_DOMAIN_DEF_PARSE_STATUS | VIR_DOMAIN_DEF_PARSE_ACTUAL_NET | VIR_DOMAIN_DEF_PARSE_PCI_ORIG_STATES= | diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabelt= est.c index cbc7018e27..192f2dc84f 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -175,7 +175,7 @@ testSELinuxLoadDef(const char *testname) xmlfile =3D g_strdup_printf("%s/securityselinuxlabeldata/%s.xml", abs_= srcdir, testname); =20 - if (!(def =3D virDomainDefParseFile(xmlfile, driver.caps, driver.xmlop= t, + if (!(def =3D virDomainDefParseFile(xmlfile, driver.xmlopt, NULL, 0))) goto cleanup; =20 diff --git a/tests/testutils.c b/tests/testutils.c index 94a0e9068f..c55450de96 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1107,7 +1107,8 @@ virDomainXMLOptionPtr virTestGenericDomainXMLConfInit= (void) =20 =20 int -testCompareDomXML2XMLFiles(virCapsPtr caps, virDomainXMLOptionPtr xmlopt, +testCompareDomXML2XMLFiles(virCapsPtr caps G_GNUC_UNUSED, + virDomainXMLOptionPtr xmlopt, const char *infile, const char *outfile, bool l= ive, unsigned int parseFlags, testCompareDomXML2XMLResult expectResult) @@ -1129,7 +1130,7 @@ testCompareDomXML2XMLFiles(virCapsPtr caps, virDomain= XMLOptionPtr xmlopt, if (!live) format_flags |=3D VIR_DOMAIN_DEF_FORMAT_INACTIVE; =20 - if (!(def =3D virDomainDefParseFile(infile, caps, xmlopt, NULL, parse_= flags))) { + if (!(def =3D virDomainDefParseFile(infile, xmlopt, NULL, parse_flags)= )) { result =3D TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE; goto out; } diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index cdc2c37ed3..3c0469be85 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -83,11 +83,11 @@ testCompareParseXML(const char *xlcfg, const char *xml,= bool replaceVars) if (replaceVars) { if (!(replacedXML =3D testReplaceVarsXML(xml))) goto fail; - if (!(def =3D virDomainDefParseString(replacedXML, cfg->caps, driv= er->xmlopt, + if (!(def =3D virDomainDefParseString(replacedXML, driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE)= )) goto fail; } else { - if (!(def =3D virDomainDefParseFile(xml, cfg->caps, driver->xmlopt, + if (!(def =3D virDomainDefParseFile(xml, driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE))) goto fail; } diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index f8652e228c..7e324eb5d2 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -53,7 +53,7 @@ testCompareParseXML(const char *xmcfg, const char *xml) conn =3D virGetConnect(); if (!conn) goto fail; =20 - if (!(def =3D virDomainDefParseFile(xml, cfg->caps, driver->xmlopt, NU= LL, + if (!(def =3D virDomainDefParseFile(xml, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto fail; =20 diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 39781beafd..8f0a2a72a4 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -74,7 +74,7 @@ testCompareFiles(const char *xml, const char *vmx, int vi= rtualHW_version) char *formatted =3D NULL; virDomainDefPtr def =3D NULL; =20 - def =3D virDomainDefParseFile(xml, caps, xmlopt, NULL, + def =3D virDomainDefParseFile(xml, xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE); =20 if (def =3D=3D NULL) --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list