{"id":812362,"url":"http://patchwork.ozlabs.org/api/patches/812362/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911110623.24981-46-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-46-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2017-09-11T11:06:18","name":"[v3,45/50] qapi: make rtc-reset-reinjection depend on TARGET_I386","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"01c9c5d0d448828b8f64bbf313597c177da71e33","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-46-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/812362/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812362/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.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 3xrR8M3v6tz9sxR\n\tfor ;\n\tMon, 11 Sep 2017 21:50:59 +1000 (AEST)","from localhost ([::1]:56980 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drNEv-0000ce-4w\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 07:50:57 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43828)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drMa4-0006qY-P2\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:45 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drMZy-0007Ol-Oy\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:44 -0400","from mx1.redhat.com ([209.132.183.28]:33264)\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 1drMZy-0007OG-HA\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 07:08:38 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 A542111A28A\n\tfor ; Mon, 11 Sep 2017 11:08:37 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 277585C548;\n\tMon, 11 Sep 2017 11:08:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A542111A28A","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 13:06:18 +0200","Message-Id":"<20170911110623.24981-46-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.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tMon, 11 Sep 2017 11:08:37 +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 45/50] qapi: make rtc-reset-reinjection\n\tdepend on TARGET_I386","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":"\"Michael S. Tsirkin\" , armbru@redhat.com, \"Dr. David Alan\n\tGilbert\" , \tPaolo Bonzini ,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Move rtc-reset-reinjection in target.json and make it conditional on\nTARGET_I386.\n\nSigned-off-by: Marc-André Lureau \n---\n qapi-schema.json | 18 ------------------\n qapi/target.json | 19 +++++++++++++++++++\n hw/timer/mc146818rtc.c | 2 +-\n monitor.c | 10 ----------\n 4 files changed, 20 insertions(+), 29 deletions(-)","diff":"diff --git a/qapi-schema.json b/qapi-schema.json\nindex 42b6aebddb..5b689c71ad 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -2919,24 +2919,6 @@\n { 'event': 'ACPI_DEVICE_OST',\n 'data': { 'info': 'ACPIOSTInfo' } }\n \n-##\n-# @rtc-reset-reinjection:\n-#\n-# This command will reset the RTC interrupt reinjection backlog.\n-# Can be used if another mechanism to synchronize guest time\n-# is in effect, for example QEMU guest agent's guest-set-time\n-# command.\n-#\n-# Since: 2.1\n-#\n-# Example:\n-#\n-# -> { \"execute\": \"rtc-reset-reinjection\" }\n-# <- { \"return\": {} }\n-#\n-##\n-{ 'command': 'rtc-reset-reinjection' }\n-\n ##\n # @RTC_CHANGE:\n #\ndiff --git a/qapi/target.json b/qapi/target.json\nindex e9644f52c2..a764377ebf 100644\n--- a/qapi/target.json\n+++ b/qapi/target.json\n@@ -1,3 +1,22 @@\n # -*- Mode: Python -*-\n \n { 'pragma': { 'unit': 'target' } }\n+\n+##\n+# @rtc-reset-reinjection:\n+#\n+# This command will reset the RTC interrupt reinjection backlog.\n+# Can be used if another mechanism to synchronize guest time\n+# is in effect, for example QEMU guest agent's guest-set-time\n+# command.\n+#\n+# Since: 2.1\n+#\n+# Example:\n+#\n+# -> { \"execute\": \"rtc-reset-reinjection\" }\n+# <- { \"return\": {} }\n+#\n+##\n+{ 'command': 'rtc-reset-reinjection',\n+ 'if': 'defined(TARGET_I386)' }\ndiff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c\nindex 82843ed03f..3a5ddd074a 100644\n--- a/hw/timer/mc146818rtc.c\n+++ b/hw/timer/mc146818rtc.c\n@@ -31,7 +31,7 @@\n #include \"hw/timer/mc146818rtc.h\"\n #include \"qapi/visitor.h\"\n #include \"qapi-event.h\"\n-#include \"qmp-commands.h\"\n+#include \"target-qmp-commands.h\"\n \n #ifdef TARGET_I386\n #include \"hw/i386/apic.h\"\ndiff --git a/monitor.c b/monitor.c\nindex af4eaeca5e..ff93d9a9a9 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_I386\n- qmp_unregister_command(&qmp_commands, \"rtc-reset-reinjection\");\n-#endif\n #ifndef TARGET_S390X\n qmp_unregister_command(&qmp_commands, \"dump-skeys\");\n #endif\n@@ -4155,13 +4152,6 @@ QemuOptsList qemu_mon_opts = {\n },\n };\n \n-#ifndef TARGET_I386\n-void qmp_rtc_reset_reinjection(Error **errp)\n-{\n- error_setg(errp, QERR_FEATURE_DISABLED, \"rtc-reset-reinjection\");\n-}\n-#endif\n-\n #ifndef TARGET_S390X\n void qmp_dump_skeys(const char *filename, Error **errp)\n {\n","prefixes":["v3","45/50"]}