From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44659)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1Z0sRF-0008Uk-3l
for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:17:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1Z0sRB-0000HK-Ba
for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:17:36 -0400
Received: from mailout4.w1.samsung.com ([210.118.77.14]:45789)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1Z0sRB-0000H2-5S
for qemu-devel@nongnu.org; Fri, 05 Jun 2015 10:17:33 -0400
Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245])
by mailout4.w1.samsung.com
(Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5
2014)) with ESMTP id <0NPH000PH6D6FX60@mailout4.w1.samsung.com> for
qemu-devel@nongnu.org; Fri, 05 Jun 2015 15:17:30 +0100 (BST)
From: Pavel Fedin
Date: Fri, 05 Jun 2015 17:17:29 +0300
Message-id: <02aa01d09f9a$5bb198d0$1314ca70$@samsung.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7bit
Content-language: ru
Subject: [Qemu-devel] [PATCH] Do not fail if id field is present.
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: qemu-devel@nongnu.org
Cc: 'Markus Armbruster'
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;
--
1.9.5.msysgit.0