{"id":812350,"url":"http://patchwork.ozlabs.org/api/patches/812350/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-49-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911110623.24981-49-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:21","name":"[v3,48/50] qapi: make query-gic-capabilities depend on TARGET_ARM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cc879b4081765212f0afc49cd1453f62517f6d3e","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-49-marcandre.lureau@redhat.com/mbox/","series":[{"id":2480,"url":"http://patchwork.ozlabs.org/api/series/2480/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2480","date":"2017-09-11T11:05:33","name":"Hi,","version":3,"mbox":"http://patchwork.ozlabs.org/series/2480/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812350/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812350/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrQnQ36s7z9sBd\n\tfor ;\n\tMon, 11 Sep 2017 21:34:34 +1000 (AEST)","from localhost ([::1]:56861 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drMz2-00042p-F7\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:34:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43937)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMaF-00071B-BG\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:59 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMaE-0007cM-AC\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:55 -0400","from mx1.redhat.com ([209.132.183.28]:39822)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1drMa9-0007Yb-1v; Mon, 11 Sep 2017 07:08:49 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2734113D08D;\n\tMon, 11 Sep 2017 11:08:48 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4AA175F925;\n\tMon, 11 Sep 2017 11:08:45 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 2734113D08D","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:06:21 +0200","Message-Id":"<20170911110623.24981-49-marcandre.lureau@redhat.com>","In-Reply-To":"<20170911110623.24981-1-marcandre.lureau@redhat.com>","References":"<20170911110623.24981-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tMon, 11 Sep 2017 11:08:48 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v3 48/50] qapi: make query-gic-capabilities\n\tdepend on TARGET_ARM","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Peter Maydell , armbru@redhat.com, \"Dr. David\n\tAlan Gilbert\" , \"open list:ARM\"\n\t, =?utf-8?q?Marc-Andr=C3=A9_Lureau?=\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Marc-André Lureau \n---\n qapi-schema.json | 43 -------------------------------------------\n qapi/target.json | 45 +++++++++++++++++++++++++++++++++++++++++++++\n monitor.c | 11 -----------\n target/arm/monitor.c | 2 +-\n 4 files changed, 46 insertions(+), 55 deletions(-)","diff":"diff --git a/qapi-schema.json b/qapi-schema.json\nindex b4a5f9abc5..23151506e7 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -2879,49 +2879,6 @@\n ##\n { 'command': 'xen-load-devices-state', 'data': {'filename': 'str'} }\n \n-##\n-# @GICCapability:\n-#\n-# The struct describes capability for a specific GIC (Generic\n-# Interrupt Controller) version. These bits are not only decided by\n-# QEMU/KVM software version, but also decided by the hardware that\n-# the program is running upon.\n-#\n-# @version: version of GIC to be described. Currently, only 2 and 3\n-# are supported.\n-#\n-# @emulated: whether current QEMU/hardware supports emulated GIC\n-# device in user space.\n-#\n-# @kernel: whether current QEMU/hardware supports hardware\n-# accelerated GIC device in kernel.\n-#\n-# Since: 2.6\n-##\n-{ 'struct': 'GICCapability',\n- 'data': { 'version': 'int',\n- 'emulated': 'bool',\n- 'kernel': 'bool' } }\n-\n-##\n-# @query-gic-capabilities:\n-#\n-# This command is ARM-only. It will return a list of GICCapability\n-# objects that describe its capability bits.\n-#\n-# Returns: a list of GICCapability objects.\n-#\n-# Since: 2.6\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"query-gic-capabilities\" }\n-# <- { \"return\": [{ \"version\": 2, \"emulated\": true, \"kernel\": false },\n-# { \"version\": 3, \"emulated\": false, \"kernel\": true } ] }\n-#\n-##\n-{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] }\n-\n ##\n # @CpuInstanceProperties:\n #\ndiff --git a/qapi/target.json b/qapi/target.json\nindex 12002b54d5..daf4bfa8f1 100644\n--- a/qapi/target.json\n+++ b/qapi/target.json\n@@ -130,3 +130,48 @@\n 'modelb': 'CpuModelInfo' },\n 'returns': 'CpuModelBaselineInfo',\n 'if': 'defined(TARGET_S390X)' }\n+\n+##\n+# @GICCapability:\n+#\n+# The struct describes capability for a specific GIC (Generic\n+# Interrupt Controller) version. These bits are not only decided by\n+# QEMU/KVM software version, but also decided by the hardware that\n+# the program is running upon.\n+#\n+# @version: version of GIC to be described. Currently, only 2 and 3\n+# are supported.\n+#\n+# @emulated: whether current QEMU/hardware supports emulated GIC\n+# device in user space.\n+#\n+# @kernel: whether current QEMU/hardware supports hardware\n+# accelerated GIC device in kernel.\n+#\n+# Since: 2.6\n+##\n+{ 'struct': 'GICCapability',\n+ 'data': { 'version': 'int',\n+ 'emulated': 'bool',\n+ 'kernel': 'bool' },\n+ 'if': 'defined(TARGET_ARM)' }\n+\n+##\n+# @query-gic-capabilities:\n+#\n+# This command is ARM-only. It will return a list of GICCapability\n+# objects that describe its capability bits.\n+#\n+# Returns: a list of GICCapability objects.\n+#\n+# Since: 2.6\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"query-gic-capabilities\" }\n+# <- { \"return\": [{ \"version\": 2, \"emulated\": true, \"kernel\": false },\n+# { \"version\": 3, \"emulated\": false, \"kernel\": true } ] }\n+#\n+##\n+{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'],\n+ 'if': 'defined(TARGET_ARM)' }\ndiff --git a/monitor.c b/monitor.c\nindex 622ba3b819..acf4721b30 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -971,9 +971,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,\n */\n static void qmp_unregister_commands_hack(void)\n {\n-#ifndef TARGET_ARM\n- qmp_unregister_command(&qmp_commands, \"query-gic-capabilities\");\n-#endif\n #if !defined(TARGET_S390X) && !defined(TARGET_I386)\n qmp_unregister_command(&qmp_commands, \"query-cpu-model-expansion\");\n #endif\n@@ -4145,14 +4142,6 @@ QemuOptsList qemu_mon_opts = {\n },\n };\n \n-#ifndef TARGET_ARM\n-GICCapabilityList *qmp_query_gic_capabilities(Error **errp)\n-{\n- error_setg(errp, QERR_FEATURE_DISABLED, \"query-gic-capabilities\");\n- return NULL;\n-}\n-#endif\n-\n HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)\n {\n MachineState *ms = MACHINE(qdev_get_machine());\ndiff --git a/target/arm/monitor.c b/target/arm/monitor.c\nindex 299cb80ae7..a46b0f98b4 100644\n--- a/target/arm/monitor.c\n+++ b/target/arm/monitor.c\n@@ -20,7 +20,7 @@\n * THE SOFTWARE.\n */\n #include \"qemu/osdep.h\"\n-#include \"qmp-commands.h\"\n+#include \"target-qmp-commands.h\"\n #include \"hw/boards.h\"\n #include \"kvm_arm.h\"\n \n","prefixes":["v3","48/50"]}