From 4666b762b9ec45055adc8821f299112589af5acb Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Fri, 11 Mar 2016 19:36:23 -0500
Subject: [PATCH] qemu: Introduce qemuBuildWatchdogCommandLine

Add new function to manage adding the watchdog device options to the
command line removing that task from the mainline qemuBuildCommandLine.

Also since qemuBuildWatchdogDevStr was only local here, make it static as
well as modifying the const virDomainDef.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_command.c | 93 +++++++++++++++++++++++------------------
 src/qemu/qemu_command.h |  4 --
 2 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ebc15a102e..437f93127b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3329,8 +3329,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
 }
 
 
-char *
-qemuBuildWatchdogDevStr(virDomainDefPtr def,
+static char *
+qemuBuildWatchdogDevStr(const virDomainDef *def,
                         virDomainWatchdogDefPtr dev,
                         virQEMUCapsPtr qemuCaps)
 {
@@ -3358,6 +3358,55 @@ qemuBuildWatchdogDevStr(virDomainDefPtr def,
 }
 
 
+static int
+qemuBuildWatchdogCommandLine(virCommandPtr cmd,
+                             const virDomainDef *def,
+                             virQEMUCapsPtr qemuCaps)
+{
+    virDomainWatchdogDefPtr watchdog = def->watchdog;
+    char *optstr;
+    const char *action;
+
+    if (!def->watchdog)
+        return 0;
+
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
+        virCommandAddArg(cmd, "-device");
+
+        optstr = qemuBuildWatchdogDevStr(def, watchdog, qemuCaps);
+        if (!optstr)
+            return -1;
+    } else {
+        virCommandAddArg(cmd, "-watchdog");
+
+        const char *model = virDomainWatchdogModelTypeToString(watchdog->model);
+        if (!model) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           "%s", _("missing watchdog model"));
+            return -1;
+        }
+
+        if (VIR_STRDUP(optstr, model) < 0)
+            return -1;
+    }
+    virCommandAddArg(cmd, optstr);
+    VIR_FREE(optstr);
+
+    if (watchdog->action == VIR_DOMAIN_WATCHDOG_ACTION_DUMP)
+        watchdog->action = VIR_DOMAIN_WATCHDOG_ACTION_PAUSE;
+
+    action = virDomainWatchdogActionTypeToString(watchdog->action);
+    if (!action) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       "%s", _("invalid watchdog action"));
+        return -1;
+    }
+    virCommandAddArgList(cmd, "-watchdog-action", action, NULL);
+
+    return 0;
+}
+
+
 char *
 qemuBuildMemballoonDevStr(virDomainDefPtr def,
                           virDomainMemballoonDefPtr dev,
@@ -8863,44 +8912,8 @@ qemuBuildCommandLine(virConnectPtr conn,
     if (qemuBuildSoundCommandLine(cmd, def, qemuCaps) < 0)
         goto error;
 
-    /* Add watchdog hardware */
-    if (def->watchdog) {
-        virDomainWatchdogDefPtr watchdog = def->watchdog;
-        char *optstr;
-
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-            virCommandAddArg(cmd, "-device");
-
-            optstr = qemuBuildWatchdogDevStr(def, watchdog, qemuCaps);
-            if (!optstr)
-                goto error;
-        } else {
-            virCommandAddArg(cmd, "-watchdog");
-
-            const char *model = virDomainWatchdogModelTypeToString(watchdog->model);
-            if (!model) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               "%s", _("missing watchdog model"));
-                goto error;
-            }
-
-            if (VIR_STRDUP(optstr, model) < 0)
-                goto error;
-        }
-        virCommandAddArg(cmd, optstr);
-        VIR_FREE(optstr);
-
-        int act = watchdog->action;
-        if (act == VIR_DOMAIN_WATCHDOG_ACTION_DUMP)
-            act = VIR_DOMAIN_WATCHDOG_ACTION_PAUSE;
-        const char *action = virDomainWatchdogActionTypeToString(act);
-        if (!action) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           "%s", _("invalid watchdog action"));
-            goto error;
-        }
-        virCommandAddArgList(cmd, "-watchdog-action", action, NULL);
-    }
+    if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0)
+        goto error;
 
     /* Add redirected devices */
     for (i = 0; i < def->nredirdevs; i++) {
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index d7f13448b2..e5b4445eee 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -130,10 +130,6 @@ char *qemuBuildControllerDevStr(const virDomainDef *domainDef,
                                 virQEMUCapsPtr qemuCaps,
                                 int *nusbcontroller);
 
-char *qemuBuildWatchdogDevStr(virDomainDefPtr domainDef,
-                              virDomainWatchdogDefPtr dev,
-                              virQEMUCapsPtr qemuCaps);
-
 char *qemuBuildMemballoonDevStr(virDomainDefPtr domainDef,
                                 virDomainMemballoonDefPtr dev,
                                 virQEMUCapsPtr qemuCaps);
-- 
GitLab