60ae3775bf
No major semantic changes, mostly just deprecations and changed function signatures. Drop the extra/ patches, as they have been applied upstream. The added extra/ patch was accepted upstream[0] but has not been picked up for 5.1. It is required for non-4M aligned backups to work with PBS. [0] https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg01671.html 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 5308773811..45aa024acc 100644
|
|
--- a/qemu-img.c
|
|
+++ b/qemu-img.c
|
|
@@ -2955,7 +2955,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) {
|