From nobody Wed Nov 27 00:43:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1561038565; cv=none; d=zoho.com; s=zohoarc; b=kVKgKOSMtYgOgDWccocghbLcDT4976Iy8ANeKddBb/yB4UNz2GcjTjzczI69zV+gZ5X4iOqgaQpNjIvN3rVCp5JCs9RGGdUZBgMyxve3k8apiU1vxY13Ge8PtGJKfyHq8ve8heHgrT9TOheWKQ9LDahMVSAdAHAU4ADd43IwCNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561038565; 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:ARC-Authentication-Results; bh=0yJnUkGvYaJgIvP9J6KCP38n8pSnLkXVdsM8N2eXDN0=; b=K+zuQzrG/7Os8XJ3gM2RwGWdt6+0AHYYqrK8u6g7sNM1wETa+5gJgHGYIPP5t33dES7QjgrzFWPlV0UbrhELsk5TwHhc7eAUULZl3cIcBt4RWla6gIGp/x26P7BnSmd/JJr5Yv6Jc8BcD7uPW1anIEC1yjqq6QGQSnnt1gW5Q5c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1561038565011510.00800252331874; Thu, 20 Jun 2019 06:49:25 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06F87C024920; Thu, 20 Jun 2019 13:49:05 +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 87E011001E77; Thu, 20 Jun 2019 13:48:59 +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 4BF101806B15; Thu, 20 Jun 2019 13:48:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5KDm1an000803 for ; Thu, 20 Jun 2019 09:48:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 935315D9E5; Thu, 20 Jun 2019 13:48:01 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F43A5D9D2 for ; Thu, 20 Jun 2019 13:48:00 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 20 Jun 2019 15:47:56 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] qemu: driver: Fix off-by-one in qemuDomainSnapshotDiskDataCollect 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 20 Jun 2019 13:49:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Commit f34397e51c17 introduced a crash-inducing problem when collecting disk snapshot data, where the array would be filled starting from the second element. The code then dereferenced the first one. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 40a2aa440f..ec08dd939e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15073,8 +15073,8 @@ qemuDomainSnapshotDiskDataCollect(virQEMUDriverPtr = driver, if (snapdef->disks[i].snapshot =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION= _NONE) continue; - ndata++; dd =3D data + ndata; + ndata++; dd->disk =3D vm->def->disks[i]; --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Wed Nov 27 00:43:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1561038568; cv=none; d=zoho.com; s=zohoarc; b=eSbVD8rufJOD4SFRDpaptdPNPoUEJh1kbgINIWengpGeddbWJd8Ke/yNGqeohf/IaKxDfQpkZwHVH5gyk1+UeRwSSxiuJ17L8+qne52d2Exx39XMg81MZwpXi8TlbfDKB+/R/2Q97SMZWOHU1vZLB+biJCpHjZYdcP6DGtoskN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561038568; 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:ARC-Authentication-Results; bh=Jgxb0TEnXUqcDL0pJHcvMaWpc94q1EY6vococF5xv84=; b=KD34Zk7TDWAD+sE9ZuM/qzlXARYA4y0DDqxbR66j3bCRdwqH+tWX6mMqO7h/YHzzjjvdnzXVar+B220xaQsJP65csMmKR7dXgSsjgQOJw6TSwsbFiKWCQhvL7LO3jfXV1o0EuB0mvbwc/j2Adjwm7b69mLQJdi0hAlF0WswDL+8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1561038568402334.76139020845824; Thu, 20 Jun 2019 06:49:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4467C059B9F; Thu, 20 Jun 2019 13:49:26 +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 A5B635D9D2; Thu, 20 Jun 2019 13:49:26 +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 5C615206D2; Thu, 20 Jun 2019 13:49:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5KDm2dV000814 for ; Thu, 20 Jun 2019 09:48:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 619205D9E5; Thu, 20 Jun 2019 13:48:02 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E09815D9D2 for ; Thu, 20 Jun 2019 13:48:01 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 20 Jun 2019 15:47:57 +0200 Message-Id: <79bd12cfe1a866cbfe4cd394905af8cc125ba2b2.1561038370.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] virsh: snapshot: Don't block --no-metadata with --print-xml 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 20 Jun 2019 13:49:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" When testing stuff you might want to print the XML. Interlocking it with no metadata adds exactly 0 value to the user. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tools/virsh-snapshot.c | 8 +------- tools/virsh.pod | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index f6bb38bc96..e9f0ee0810 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -369,14 +369,8 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) unsigned int flags =3D 0; const vshCmdOpt *opt =3D NULL; - if (vshCommandOptBool(cmd, "no-metadata")) { - if (vshCommandOptBool(cmd, "print-xml")) { - vshError(ctl, "%s", - _("--print-xml is incompatible with --no-metadata")); - return false; - } + if (vshCommandOptBool(cmd, "no-metadata")) flags |=3D VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA; - } if (vshCommandOptBool(cmd, "halt")) flags |=3D VIR_DOMAIN_SNAPSHOT_CREATE_HALT; if (vshCommandOptBool(cmd, "disk-only")) diff --git a/tools/virsh.pod b/tools/virsh.pod index 2e70b68a66..dc39004a66 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -4653,7 +4653,7 @@ metadata is silently lost when the domain quits runni= ng (whether by command such as B or by internal guest action). =3Ditem B I {[I<--print-xml>] -| [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I] +[I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I] [I] [I<--disk-only> [I<--quiesce>]] [I<--atomic>] [[I<--live>] [I<--memspec> B]] [I<--diskspec>] B]... @@ -4703,7 +4703,7 @@ If I<--no-metadata> is specified, then the snapshot d= ata is created, but any metadata is immediately discarded (that is, libvirt does not treat the snapshot as current, and cannot revert to the snapshot unless B is later used to teach libvirt about the -metadata again). This flag is incompatible with I<--print-xml>. +metadata again). If I<--atomic> is specified, libvirt will guarantee that the snapshot either succeeds, or fails with no changes; not all hypervisors support --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list