From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sg1-0008MK-Nl for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0sg0-00084J-Lr for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0sg0-000846-Hk for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:32:52 -0400 Date: Fri, 5 Jun 2015 15:32:47 +0100 From: "Daniel P. Berrange" Message-ID: <20150605143247.GJ11483@redhat.com> References: <02aa01d09f9a$5bb198d0$1314ca70$@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <02aa01d09f9a$5bb198d0$1314ca70$@samsung.com> Subject: Re: [Qemu-devel] [PATCH] Do not fail if id field is present. Reply-To: "Daniel P. Berrange" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Fedin Cc: qemu-devel@nongnu.org, 'Markus Armbruster' On Fri, Jun 05, 2015 at 05:17:29PM +0300, Pavel Fedin wrote: > This fixes QMP regression: > http://lists.gnu.org/archive/html/qemu-devel/2015-06/msg01795.html > > Signed-off-by: Pavel Fedin > --- > monitor.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/monitor.c b/monitor.c > index c7baa91..ef21bba 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -4955,6 +4955,8 @@ static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp) > "arguments", "object"); > return NULL; > } > + } else if (!strcmp(arg_name, "id")) { > + /* Ignored, necessary for backwards compatibility */ > } else { > error_set(errp, QERR_QMP_EXTRA_MEMBER, arg_name); > return NULL; This should probably be accompanied by an update to docs/qmp/qmp-spec.txt to say this is ignored and remove the bit about it being copied into the replies Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|