From: Dominik Csapak <d.csapak@proxmox.com>
Date: Mon, 29 May 2017 08:37:23 +0000 (+0200)
Subject: check also pending changes when reverting/deleting
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=af6d2db4b3dd54dee517a3ae6a49eac43c068af9

check also pending changes when reverting/deleting

otherwise we are not able to revert/delete pending changes which
introduce a new config line

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index eb61cb8..54db5ab 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -1012,7 +1012,7 @@ my $update_vm_api  = sub {
 	    foreach my $opt (@delete) {
 		$modified->{$opt} = 1;
 		$conf = PVE::QemuConfig->load_config($vmid); # update/reload
-		if (!defined($conf->{$opt})) {
+		if (!defined($conf->{$opt}) && !defined($conf->{pending}->{$opt})) {
 		    warn "cannot delete '$opt' - not set in current configuration!\n";
 		    $modified->{$opt} = 0;
 		    next;