From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 8 Jan 2020 08:46:27 +0000 (+0100)
Subject: vz: Don't try to jump on a non-existent label in prlsdkRemoveBootDevices()
X-Git-Tag: v6.0.0-rc1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08cb201dccc43d16a5d0c739d35774f2bfb44d4d;p=thirdparty%2Flibvirt.git

vz: Don't try to jump on a non-existent label in prlsdkRemoveBootDevices()

Commit v5.10.0-522-g9000b2f298 was too aggressive and removed the
'error' label from prlsdkRemoveBootDevices() even though it's
used. Luckily, it's used only from one place and we have an
alternative for it that doesn't require the label.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 473719dcfe..32e0046763 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -2725,7 +2725,7 @@ prlsdkRemoveBootDevices(PRL_HANDLE sdkdom)
     PRL_DEVICE_TYPE devType;
 
     pret = PrlVmCfg_GetBootDevCount(sdkdom, &devCount);
-    prlsdkCheckRetGoto(pret, error);
+    prlsdkCheckRetExit(pret, -1);
 
     for (i = 0; i < devCount; i++) {