817b7667e8
Lots of patches touched and some slight changes to the build process since QEMU switched to meson as their build system. Functionality-wise very little rebasing required. New patches introduced: * pve/0058: to fix VMA backups and clean up some code in general with new 5.2 features now available to us (namely coroutine-enabled QMP). * extra/0002: don't build man pages for guest agent when disabled * extra/0003: fix live-migration with hugepages * 0017 and 0018 are adjusted to fix snapshot abort and improve snap performance a bit Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
25 lines
802 B
Diff
25 lines
802 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:39 +0200
|
|
Subject: [PATCH] PVE: [Up] qemu-img: return success on info without snapshots
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
qemu-img.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
|
index f9050bfaad..7e6666b5f7 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -3022,7 +3022,8 @@ static int img_info(int argc, char **argv)
|
|
list = collect_image_info_list(image_opts, filename, fmt, chain,
|
|
force_share);
|
|
if (!list) {
|
|
- return 1;
|
|
+ // return success if snapshot does not exist
|
|
+ return 0;
|
|
}
|
|
|
|
switch (output_format) {
|