From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48082)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rjones@redhat.com>) id 1Yxaef-0006xf-IW
	for qemu-devel@nongnu.org; Wed, 27 May 2015 08:41:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rjones@redhat.com>) id 1YxaeZ-0001bQ-Su
	for qemu-devel@nongnu.org; Wed, 27 May 2015 08:41:53 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42076)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rjones@redhat.com>) id 1YxaeZ-0001Z6-MS
	for qemu-devel@nongnu.org; Wed, 27 May 2015 08:41:47 -0400
Received: from int-mx14.intmail.prod.int.phx2.redhat.com
	(int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4RCfkKs011332
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
	verify=FAIL)
	for <qemu-devel@nongnu.org>; Wed, 27 May 2015 08:41:46 -0400
Date: Wed, 27 May 2015 13:41:44 +0100
From: "Richard W.M. Jones" <rjones@redhat.com>
Message-ID: <20150527124144.GM29283@redhat.com>
References: <1432730126-33400-1-git-send-email-pbonzini@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1432730126-33400-1-git-send-email-pbonzini@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] watchdog: convert to QemuOpts
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, armbru@redhat.com

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