From nobody Sun Feb 8 12:37:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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=1575469322; cv=none; d=zohomail.com; s=zohoarc; b=S4asxGaxiaYI92IBqaGmn7DCZBF3z0gRnAWw6svnsBBfJVWwrnMrzmxWyrapFmRaFdjNe2siSNlLHZ0je58hfNGE2eBzz1AGW8kqZqKt06Po7DxrpkHqLjxjk7RQa1p79LgvZpWS85DBzZ57LMOmmvyUlDttPk7t6QD9DaMOi/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469322; 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=FXhCmmhQIIHiXhErMb/UQcUEWjdAHcrBK8odTrXlFFo=; b=LoXduel5vRL3MG55+Fjv6boLAYock/egXXTe5fjH+HFR5Vzzwl4LxqeEifuvo79wtiw4BsxRSGdd/JeQjhg4Ph0M2pbyF953ScmfsvrUOCPWAnEt8G2TzcfhrP2rn69Ipq5FTk2W2W4FcgaMOYzdTjTbFPNxmBNYpityaQO4ovc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575469322019451.8557000649654; Wed, 4 Dec 2019 06:22:02 -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-429-mjZMzMuhOWGma-WR-J5Lag-1; Wed, 04 Dec 2019 09:21:56 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 140508D0935; Wed, 4 Dec 2019 14:21:47 +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 DF146694A3; Wed, 4 Dec 2019 14:21:46 +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 9074C5FBF0; Wed, 4 Dec 2019 14:21:46 +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 xB4ELfPi008224 for ; Wed, 4 Dec 2019 09:21:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8A5B1691A2; Wed, 4 Dec 2019 14:21:41 +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 B0437608F7; Wed, 4 Dec 2019 14:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469320; 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=FXhCmmhQIIHiXhErMb/UQcUEWjdAHcrBK8odTrXlFFo=; b=GAFcPpezmFVWlZior76z2LGaaHeSpcKAjHnm2wJ6kLZ+CipTDhIwRiUqIB5whMdQkOFa3F ZmpoNy4it787dmCcyjdq1mAiuUmE7jAlD9iaSOz9u0gYd0L7w9O4wj8N/mK2iR9dI/VT8B vwXV31dKw+BlJse5soiHifCvZSrksgE= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 14:20:59 +0000 Message-Id: <20191204142113.2961028-17-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 16/30] conf: drop virCapsPtr param from domain validate callback 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.13 X-MC-Unique: mjZMzMuhOWGma-WR-J5Lag-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) None of the impls of this callback require the virCapsPtr param. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 1 - src/qemu/qemu_domain.c | 1 - src/vz/vz_driver.c | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef6c8d3f75..7431aad0cf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7107,7 +7107,7 @@ virDomainDefValidateInternal(const virDomainDef *def, */ int virDomainDefValidate(virDomainDefPtr def, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt) { @@ -7122,7 +7122,7 @@ virDomainDefValidate(virDomainDefPtr def, =20 /* call the domain config callback */ if (xmlopt->config.domainValidateCallback && - xmlopt->config.domainValidateCallback(def, caps, xmlopt->config.pr= iv) < 0) + xmlopt->config.domainValidateCallback(def, xmlopt->config.priv) < = 0) return -1; =20 /* iterate the devices */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9864296be1..bbe73f1182 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2671,7 +2671,6 @@ typedef void (*virDomainDefPostParseDataFree)(void *p= arseOpaque); * for configurations that were previously accepted. This shall not modify= the * config. */ typedef int (*virDomainDefValidateCallback)(const virDomainDef *def, - virCapsPtr caps, void *opaque); =20 /* Called once per device, for adjusting per-device settings while diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ac6a0f842..49b6008d5c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4972,7 +4972,6 @@ qemuDomainValidateCpuCount(const virDomainDef *def, =20 static int qemuDomainDefValidate(const virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, void *opaque) { virQEMUDriverPtr driver =3D opaque; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 78aa85825a..35baab1b82 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -259,7 +259,6 @@ vzDomainDefPostParse(virDomainDefPtr def, =20 static int vzDomainDefValidate(const virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, void *opaque) { if (vzCheckUnsupportedControllers(def, opaque) < 0) --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list