From nobody Sun Feb 8 14:52:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; 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 205.139.110.61 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=1575469401; cv=none; d=zohomail.com; s=zohoarc; b=mwtTfzfhLuax9ikpjTzxygCjqLZ1V8ALwDowUu38QbZl77okcurasV09r2LGUtqWUp7hLKBTZ54jbI+3iTaX15xsDIjSqsOQz412kg1yaOY5PimMh1jTUB+rR/QCG+pXpO1RZ5Pjf964yLnLZBhQZFRnEbKgojLDdBUBSQfK1EY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469401; 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=5p85a/JdZUwqBkViMqLvrTQLf6TwHblbkD0jXPB8yEM=; b=H6cYcEwC3nTyCuQzEUADCYknAb1reobSafXgcSTT1KMAdra43eDy4cLMbcie5UD3zHcxQmj4ZjzqnU3ZzfrWqNMEgR2UKVGXuuzzoaw2OiZZ3FhEEFsrzCU7gP+m26NflCU5Wonwl8CSBMd6NRTY2hI3w2k5KLy6Eilt596TTuE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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 [205.139.110.61]) by mx.zohomail.com with SMTPS id 1575469401237177.71919601214074; Wed, 4 Dec 2019 06:23:21 -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-65-b0j0o0DVPS2wNe2N1ATJMQ-1; Wed, 04 Dec 2019 09:21:55 -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 A7CE1107ACFE; Wed, 4 Dec 2019 14:21:47 +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 8467367E62; Wed, 4 Dec 2019 14:21:47 +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 3C8361800B6F; Wed, 4 Dec 2019 14:21:47 +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 xB4ELbJb008193 for ; Wed, 4 Dec 2019 09:21:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id B9FF8691A7; Wed, 4 Dec 2019 14:21:37 +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 ED49E67E62; Wed, 4 Dec 2019 14:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469400; 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=5p85a/JdZUwqBkViMqLvrTQLf6TwHblbkD0jXPB8yEM=; b=d8bDd58BALcc7z68Bw+c/400wN/cX6qr+trXnzw8slT/qGIWu1tUN8lplDBmLs4kJtPRaD WIQQ8u5Pc41/AHdXEECtn9LzLeBozdQ6fQbfnIxQ50u7gt4K04Q2wIzSYZKJmaZ1gvNreI gUge5DHDGmBhV+Ia7XpvcZR5jtolnqE= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 14:20:56 +0000 Message-Id: <20191204142113.2961028-14-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 13/30] conf: drop virCapsPtr param from post parse data alloc 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: b0j0o0DVPS2wNe2N1ATJMQ-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) The only user of this callback did not require the virCapsPtr parameter. 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 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7327752810..164c313ac6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5498,7 +5498,7 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr = dev, int ret; =20 if (!parseOpaque && xmlopt->config.domainPostParseDataAlloc) { - if (xmlopt->config.domainPostParseDataAlloc(def, caps, flags, + if (xmlopt->config.domainPostParseDataAlloc(def, flags, xmlopt->config.priv, &data) < 0) return -1; @@ -5833,7 +5833,7 @@ virDomainDefPostParse(virDomainDefPtr def, =20 if (!data.parseOpaque && xmlopt->config.domainPostParseDataAlloc) { - ret =3D xmlopt->config.domainPostParseDataAlloc(def, caps, parseFl= ags, + ret =3D xmlopt->config.domainPostParseDataAlloc(def, parseFlags, xmlopt->config.priv, &data.parseOpaque); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cdbd42351f..86d0b47a66 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2664,7 +2664,6 @@ typedef int (*virDomainDefAssignAddressesCallback)(vi= rDomainDef *def, void *parseOpaque); =20 typedef int (*virDomainDefPostParseDataAlloc)(const virDomainDef *def, - virCapsPtr caps, unsigned int parseFlags, void *opaque, void **parseOpaque); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3c06b8a104..70683eb83a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8143,7 +8143,6 @@ qemuDomainDefAssignAddresses(virDomainDef *def, =20 static int qemuDomainPostParseDataAlloc(const virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void **parseOpaque) --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list