On Wed, May 27, 2015 at 02:35:26PM +0200, Paolo Bonzini wrote: > case QEMU_OPTION_watchdog: > - if (watchdog) { > - fprintf(stderr, > - "qemu: only one watchdog option may be given\n"); > - return 1; > + olist = qemu_find_opts("watchdog"); > + opts = qemu_opts_parse(olist, optarg, 1); > + if (!opts) { > + exit(1); > }
Is there an error message missing (before the call to exit)? Patch seems OK otherwise. libvirt still uses -watchdog <model> -watchdog-action <action> Should it be changed to use -device? I'm guessing for backwards compatibility with old and current qemu it probably shouldn't be changed for a few years. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW