From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 8 Jan 2020 10:13:55 +0000 (+0100)
Subject: bhyve_parse_command.c: Don't jump onto non-existent label in CONSUME_ARG()
X-Git-Tag: v6.0.0-rc1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbb3bbc66a7885f7b9c1fbf4c5d376e55a5ad359;p=thirdparty%2Flibvirt.git

bhyve_parse_command.c: Don't jump onto non-existent label in CONSUME_ARG()

In v5.10.0-508-gfbf3f3d86a, the 'error' label was removed from
bhyveParseBhyveCommandLine(), however the CONSUME_ARG() macro
still uses it. Fix the macro to return an error instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index f7cedf5c65..30927ff10c 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -628,7 +628,7 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def,
     if ((opti + 1) == argc) { \
         virReportError(VIR_ERR_INVALID_ARG, _("Missing argument for '%s'"), \
                        argv[opti]); \
-        goto error; \
+        return -1; \
     } \
     var = argv[++opti]