[libvirt] [PATCH 03/10] Convert watchdog to -device
Daniel Veillard
veillard at redhat.com
Thu Dec 17 09:00:43 UTC 2009
On Tue, Dec 15, 2009 at 03:14:43PM +0000, Daniel P. Berrange wrote:
> 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);
ACK
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel at veillard.com | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
More information about the libvir-list
mailing list