[libvirt] [PATCH 03/10] Convert watchdog to -device

[Daniel P. Berrange]

The current syntax for watchdogs is

    -watchdog i6300esb

The new syntax will now be

    -device i6300esb
---
 src/qemu/qemu_conf.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 16e8d2c..79b7b00 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -2574,7 +2574,10 @@ int qemudBuildCommandLine(virConnectPtr conn,
                              "%s", _("invalid watchdog model"));
             goto error;
         }
-        ADD_ARG_LIT("-watchdog");
+        if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)
+            ADD_ARG_LIT("-device");
+        else
+            ADD_ARG_LIT("-watchdog");
         ADD_ARG_LIT(model);
 
         const char *action = virDomainWatchdogActionTypeToString(watchdog->action);
-- 
1.6.5.2