From nobody Tue Feb 10 04:17:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1646916062; cv=none; d=zohomail.com; s=zohoarc; b=Uuoj9hLvSZUCBNjPVcht+5d0/aEfg4CGbJziwZ7nv8OxM06mCuQSs3PLWdvvvjseQK0ozRTFMgFMwMKbK6x7EilXH+L3cAjK0A9maGL7GDVsacBzJvlQoKOCW7mXL3keiBTPGpdJ21nrcr3uC3xWItpxr0hHrTvsEisP+z44aD4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646916062; 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=AofDM/lC6x1b0oz6QryFG3TBr9D14I6JNIXgkPSlFaQ=; b=HeTMRVgKsoLi+FVvBIUJbh0N2uSoBzYxqs51Li7ayQb/xnyE2MUnkt/hK9hTImNIFgxquXDHinB1IOgU4+Fcvd6tD8R8IxJ1M+FvuUz0XJXs7fd8mkFI/KI0MGpmKuLMvoTxID192DVA0Ik6F/sqiqGWoe2bz/I4hlDmZK2B3E4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646916062431287.98005108216205; Thu, 10 Mar 2022 04:41:02 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-249-c0ULhRRwNdyab2CLDdwL3Q-1; Thu, 10 Mar 2022 07:40:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DDE580231F; Thu, 10 Mar 2022 12:40:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8759A141DC2C; Thu, 10 Mar 2022 12:40:57 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4D013195FD6D; Thu, 10 Mar 2022 12:40:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 674EA1953573 for ; Thu, 10 Mar 2022 12:40:55 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 24E4B7C0FF; Thu, 10 Mar 2022 12:40:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 723607D3CC for ; Thu, 10 Mar 2022 12:40:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646916061; 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=AofDM/lC6x1b0oz6QryFG3TBr9D14I6JNIXgkPSlFaQ=; b=XrJQtbaKAzQXyrjh3drifv/AvvczPiTNriq2BYDDgy3FV9UcvFsDFHjvlVv1pvmrV0q4fb P/Cy5oXSCOUmKP8R2soR+XiTE9G2nieuJ6XEA5Sutx5yX77hyThqtOEfAOqdmKLyCQDwJ8 szQlb60OID06bOD1Nv1k73xJ1Fk67w4= X-MC-Unique: c0ULhRRwNdyab2CLDdwL3Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/14] conf: snapshot: Remove VIR_DOMAIN_SNAPSHOT_PARSE_DISKS flag Date: Thu, 10 Mar 2022 13:40:37 +0100 Message-Id: <7842c5c71c67bd0104e0aee7703283506e4d9ff1.1646915960.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646916063292100001 Content-Type: text/plain; charset="utf-8" All callers except the one in the 'esx' driver pass the flag. The 'esx' driver has a check that 'def->ndisks' is zero after parsing the definition. This means that we can simply always parse the disks. Signed-off-by: Peter Krempa --- src/conf/snapshot_conf.c | 22 ++++++++-------------- src/conf/snapshot_conf.h | 7 +++---- src/qemu/qemu_driver.c | 1 - src/qemu/qemu_snapshot.c | 2 +- src/test/test_driver.c | 3 +-- src/vbox/vbox_common.c | 4 +--- src/vz/vz_driver.c | 2 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- 8 files changed, 16 insertions(+), 27 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index f5ae2ee212..f477b67785 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -359,21 +359,15 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if ((n =3D virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) goto cleanup; - if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_DISKS) { - if (n) - def->disks =3D g_new0(virDomainSnapshotDiskDef, n); - def->ndisks =3D n; - for (i =3D 0; i < def->ndisks; i++) { - if (virDomainSnapshotDiskDefParseXML(nodes[i], ctxt, &def->dis= ks[i], - flags, xmlopt) < 0) - goto cleanup; - } - VIR_FREE(nodes); - } else if (n) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("unable to handle disk requests in snapshot")); - goto cleanup; + if (n) + def->disks =3D g_new0(virDomainSnapshotDiskDef, n); + def->ndisks =3D n; + for (i =3D 0; i < def->ndisks; i++) { + if (virDomainSnapshotDiskDefParseXML(nodes[i], ctxt, &def->disks[i= ], + flags, xmlopt) < 0) + goto cleanup; } + VIR_FREE(nodes); if (flags & VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL) { if (!current) { diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index b7e0d441ff..8823af1ac1 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -84,10 +84,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainSnapshotDef, virO= bjectUnref); typedef enum { VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE =3D 1 << 0, - VIR_DOMAIN_SNAPSHOT_PARSE_DISKS =3D 1 << 1, - VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL =3D 1 << 2, - VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE =3D 1 << 3, - VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE =3D 1 << 4, + VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL =3D 1 << 1, + VIR_DOMAIN_SNAPSHOT_PARSE_OFFLINE =3D 1 << 2, + VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE =3D 1 << 3, } virDomainSnapshotParseFlags; typedef enum { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c1b3bd8536..de7d2b93b9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -347,7 +347,6 @@ qemuDomainSnapshotLoad(virDomainObj *vm, virDomainMomentObj *current =3D NULL; bool cur; unsigned int flags =3D (VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE | - VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; int direrr; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c5fc7dcf67..3fb1d3abe0 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1530,7 +1530,7 @@ qemuSnapshotCreateXMLParse(virDomainObj *vm, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; - unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + unsigned int parse_flags =3D 0; if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE) parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index da1c6c8f6e..9ceb0b45c8 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -978,7 +978,6 @@ testParseDomainSnapshots(testDriver *privconn, privconn->xmlopt, NULL, &cur, - VIR_DOMAIN_SNAPSHOT_PARSE_DISK= S | VIR_DOMAIN_SNAPSHOT_PARSE_INTE= RNAL | VIR_DOMAIN_SNAPSHOT_PARSE_REDE= FINE); if (!def) @@ -8777,7 +8776,7 @@ testDomainSnapshotCreateXML(virDomainPtr domain, virObjectEvent *event =3D NULL; bool update_current =3D true; bool redefine =3D flags & VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE; - unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + unsigned int parse_flags =3D 0; g_autoptr(virDomainSnapshotDef) def =3D NULL; /* diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 36db6e06be..acd18494d3 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5364,8 +5364,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, nsresult rc; resultCodeUnion result; virDomainSnapshotPtr ret =3D NULL; - unsigned int parse_flags =3D (VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | - VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); + unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE; g_autoptr(virDomainSnapshotDef) def =3D NULL; if (!data->vboxObj) @@ -6783,7 +6782,6 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) } def =3D virDomainSnapshotDefParseString(defXml, data->xmlopt, NULL, NULL, - VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_REDEFI= NE); if (!def) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index fdd776282e..2107785ab2 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2580,7 +2580,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, virDomainObj *dom; struct _vzConn *privconn =3D domain->conn->privateData; struct _vzDriver *driver =3D privconn->driver; - unsigned int parse_flags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + unsigned int parse_flags =3D 0; virDomainSnapshotObjList *snapshots =3D NULL; virDomainMomentObj *current; bool job =3D false; diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index 735d0e21a1..3fa932e755 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -34,7 +34,7 @@ testCompareXMLToXMLFiles(const char *inxml, g_autofree char *inXmlData =3D NULL; g_autofree char *outXmlData =3D NULL; g_autofree char *actual =3D NULL; - unsigned int parseflags =3D VIR_DOMAIN_SNAPSHOT_PARSE_DISKS; + unsigned int parseflags =3D 0; unsigned int formatflags =3D VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE; bool cur =3D false; g_autoptr(virDomainSnapshotDef) def =3D NULL; --=20 2.35.1