From nobody Wed Feb 11 01:27:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1575469386; cv=none; d=zohomail.com; s=zohoarc; b=JQ1xeE/E4Js5oMwjJD7O+Wec5Db7MbEE73e+ztCkLczgNBzv0qiwZvC5eAUQJ89fWWhCM15M8f9ix9kGwA3TJttXqp/405iKjmhDGFMUsh/vTmQCulWlBHL33egf5pwZH4q6+KhjPEhWipoeYDOw95akxfOwb3ELmEOfT38mZq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469386; 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=0kZvKlMScBHszglQrKuhbMRO5fGc9dKHlPplwPjE+xM=; b=BFw52dTbIdvWx6A3g7pEFGCk3ocDFGxN92URa3Nb7sSoc44Qa9kvTMsFJg1XtMG0uqFuG2SqD8xU1Sm4QdFrAB0VwKrZj7Ik2Yzeqnl95R10JgpfB5MBtp3OrGeUDwLc5RrngLzPQMwwE8Nri3fNHQPuAncG1tZHK7GVeYljc7Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1575469386932693.1432841550155; Wed, 4 Dec 2019 06:23:06 -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-278-ZIKEFnnaOxGHFQuXrAEfVA-1; Wed, 04 Dec 2019 09:22:04 -0500 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 486C9DBEF; Wed, 4 Dec 2019 14:21:57 +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 1C35819C68; Wed, 4 Dec 2019 14:21:57 +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 CC56218034EA; Wed, 4 Dec 2019 14:21:56 +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 xB4ELiLm008241 for ; Wed, 4 Dec 2019 09:21:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 10F04691B7; Wed, 4 Dec 2019 14:21:44 +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 4E8F4608F7; Wed, 4 Dec 2019 14:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469385; 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=0kZvKlMScBHszglQrKuhbMRO5fGc9dKHlPplwPjE+xM=; b=BddSR/xLEDsNUnAmup/0gCK6zleCVRqHob95KmHSGuRi4DAwqypUu0a5VIdW7WplXtNKcb cWiV853wect0aW+e9axKwSJYMPakEwuLZWTEuvDMR56jvLGC2uoPuSQKJmpQwaRqacirLk QutFv6OJHKOMzYWxRCtP2vy5wKuM71w= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 14:21:01 +0000 Message-Id: <20191204142113.2961028-19-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 18/30] conf: drop virCapsPtr param from domain post parse & validate 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.84 on 10.5.11.23 X-MC-Unique: ZIKEFnnaOxGHFQuXrAEfVA-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/conf/domain_conf.c | 10 ++++------ src/conf/domain_conf.h | 2 -- src/libxl/xen_xl.c | 2 +- src/libxl/xen_xm.c | 2 +- src/lxc/lxc_native.c | 4 ++-- src/qemu/qemu_driver.c | 12 ++++++------ src/qemu/qemu_process.c | 4 ++-- src/vmx/vmx.c | 4 ++-- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 44e56976d9..b1384a1487 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5802,7 +5802,6 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def, =20 int virDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, void *parseOpaque) @@ -7107,7 +7106,6 @@ virDomainDefValidateInternal(const virDomainDef *def, */ int virDomainDefValidate(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt) { @@ -21518,11 +21516,11 @@ virDomainObjParseXML(xmlDocPtr xml, parseOpaque =3D xmlopt->privateData.getParseOpaque(obj); =20 /* callback to fill driver specific domain aspects */ - if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) = < 0) + if (virDomainDefPostParse(obj->def, flags, xmlopt, parseOpaque) < 0) goto error; =20 /* validate configuration */ - if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0) + if (virDomainDefValidate(obj->def, flags, xmlopt) < 0) goto error; =20 return obj; @@ -21607,11 +21605,11 @@ virDomainDefParseNode(xmlDocPtr xml, return NULL; =20 /* callback to fill driver specific domain aspects */ - if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0) + if (virDomainDefPostParse(def, flags, xmlopt, parseOpaque) < 0) return NULL; =20 /* validate configuration */ - if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) + if (virDomainDefValidate(def, flags, xmlopt) < 0) return NULL; =20 return g_steal_pointer(&def); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b98fe5eba5..4f3c9fdc8b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2783,7 +2783,6 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *d= ef, const virDomainDeviceDriveAddress *addr); =20 int virDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, void *parseOpaque); @@ -2796,7 +2795,6 @@ int virDomainDeviceValidateAliasForHotplug(virDomainO= bjPtr vm, bool virDomainDeviceAliasIsUserAlias(const char *aliasStr); =20 int virDomainDefValidate(virDomainDefPtr def, - virCapsPtr caps, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt); =20 diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 396adf6dac..18ea4a8d95 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1213,7 +1213,7 @@ xenParseXL(virConfPtr conf, if (xenParseXLChannel(conf, def) < 0) goto cleanup; =20 - if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, + if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) goto cleanup; =20 diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 88cf9ac5b0..1b462d0487 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -467,7 +467,7 @@ xenParseXM(virConfPtr conf, if (xenParseXMInputDevs(conf, def) < 0) goto cleanup; =20 - if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, + if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) goto cleanup; =20 diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 7e696fd2f0..e9b83653b5 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -1055,7 +1055,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr propert= ies) =20 virDomainDefPtr lxcParseConfigString(const char *config, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt) { virDomainDefPtr vmdef =3D NULL; @@ -1166,7 +1166,7 @@ lxcParseConfigString(const char *config, /* lxc.cap.drop */ lxcSetCapDrop(vmdef, properties); =20 - if (virDomainDefPostParse(vmdef, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, + if (virDomainDefPostParse(vmdef, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) goto error; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 93a92dad36..32eae175ed 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8101,7 +8101,7 @@ qemuCheckDiskConfigAgainstDomain(const virDomainDef *= def, static int qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps, unsigned int parse_flags, virDomainXMLOptionPtr xmlopt) @@ -8301,7 +8301,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; } =20 - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) = < 0) + if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0) return -1; =20 return 0; @@ -8311,7 +8311,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, static int qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps, unsigned int parse_flags, virDomainXMLOptionPtr xmlopt) @@ -8494,7 +8494,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, return -1; } =20 - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) = < 0) + if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0) return -1; =20 return 0; @@ -8503,7 +8503,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, static int qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps, unsigned int parse_flags, virDomainXMLOptionPtr xmlopt) @@ -8602,7 +8602,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, return -1; } =20 - if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) = < 0) + if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0) return -1; =20 return 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 79ac5f3d95..33ebdce01e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5382,7 +5382,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver, * VM that was running before (migration, snapshots, save). It's more * important to start such VM than keep the configuration clean */ if ((flags & VIR_QEMU_PROCESS_START_NEW) && - virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0) + virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0) return -1; =20 if (qemuProcessStartValidateGraphics(vm) < 0) @@ -5581,7 +5581,7 @@ qemuProcessInit(virQEMUDriverPtr driver, VIR_DEBUG("re-running the post parse callback"); =20 /* we don't have the private copy of qemuCaps at this point */ - if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) = < 0) + if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0) goto cleanup; } =20 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 093092b701..df5eafbd44 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1276,7 +1276,7 @@ virVMXConfigScanResultsCollector(const char* name, virDomainDefPtr virVMXParseConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, const char *vmx) { bool success =3D false; @@ -1845,7 +1845,7 @@ virVMXParseConfig(virVMXContext *ctx, } } =20 - if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, + if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, xmlopt, NULL) < 0) goto cleanup; =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list