Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806815/?format=api
{ "id": 806815, "url": "http://patchwork.ozlabs.org/api/patches/806815/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-13-git-send-email-mdroth@linux.vnet.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<1503965694-10794-13-git-send-email-mdroth@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-29T00:13:47", "name": "[12/79] replication: Make --disable-replication compile again", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "889872d6306e15dd141072fbb2095f42bb4b79a6", "submitter": { "id": 5549, "url": "http://patchwork.ozlabs.org/api/people/5549/?format=api", "name": "Michael Roth", "email": "mdroth@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-13-git-send-email-mdroth@linux.vnet.ibm.com/mbox/", "series": [ { "id": 281, "url": "http://patchwork.ozlabs.org/api/series/281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=281", "date": "2017-08-29T00:13:45", "name": "Patch Round-up for stable 2.9.1, freeze on 2017-09-04", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/281/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806815/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806815/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xh8Sb4dlhz9s65\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 10:21:19 +1000 (AEST)", "from localhost ([::1]:41903 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmUHN-0005co-CS\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 20:21:17 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:47291)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUC5-0000qE-0B\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:53 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUC1-00053G-Aq\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:48 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33132\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUC1-00052v-6A\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:15:45 -0400", "from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8D3017766\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:44 -0400", "from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2wv93-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:15:44 -0400", "from localhost\n\tby e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 20:15:44 -0400", "from b01cxnp23033.gho.pok.ibm.com (9.57.198.28)\n\tby e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:15:41 -0400", "from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com\n\t[9.57.199.108])\n\tby b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0FfNs3539374; Tue, 29 Aug 2017 00:15:41 GMT", "from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id EDCC5B2052;\n\tMon, 28 Aug 2017 20:13:04 -0400 (EDT)", "from localhost (unknown [9.80.85.217])\n\tby b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP id B5D4FB204E;\n\tMon, 28 Aug 2017 20:13:04 -0400 (EDT)" ], "From": "Michael Roth <mdroth@linux.vnet.ibm.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 28 Aug 2017 19:13:47 -0500", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "References": "<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>", "X-TM-AS-GCONF": "00", "x-cbid": "17082900-0040-0000-0000-00000396DE98", "X-IBM-SpamModules-Scores": "", "X-IBM-SpamModules-Versions": "BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:15:42", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082900-0041-0000-0000-0000078B101A", "Message-Id": "<1503965694-10794-13-git-send-email-mdroth@linux.vnet.ibm.com>", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0", "X-Proofpoint-Spam-Details": "rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=3\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]", "X-Received-From": "148.163.158.5", "Subject": "[Qemu-devel] [PATCH 12/79] replication: Make --disable-replication\n\tcompile again", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<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>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "qemu-stable@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>,\n\tMarkus Armbruster <armbru@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Markus Armbruster <armbru@redhat.com>\n\nBroken in commit daa33c5.\n\nCc: qemu-stable@nongnu.org\nSigned-off-by: Markus Armbruster <armbru@redhat.com>\nReviewed-by: Eric Blake <eblake@redhat.com>\nReviewed-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>\nMessage-id: 1493298053-17140-1-git-send-email-armbru@redhat.com\nSigned-off-by: Stefan Hajnoczi <stefanha@redhat.com>\n(cherry picked from commit 38bb54f323bf7c83496b6a044cfd28896e997a00)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n migration/colo.c | 12 ++++++++++++\n monitor.c | 5 +++++\n 2 files changed, 17 insertions(+)", "diff": "diff --git a/migration/colo.c b/migration/colo.c\nindex c19eb3f..963c802 100644\n--- a/migration/colo.c\n+++ b/migration/colo.c\n@@ -153,6 +153,7 @@ void qmp_xen_set_replication(bool enable, bool primary,\n bool has_failover, bool failover,\n Error **errp)\n {\n+#ifdef CONFIG_REPLICATION\n ReplicationMode mode = primary ?\n REPLICATION_MODE_PRIMARY :\n REPLICATION_MODE_SECONDARY;\n@@ -171,10 +172,14 @@ void qmp_xen_set_replication(bool enable, bool primary,\n }\n replication_stop_all(failover, failover ? NULL : errp);\n }\n+#else\n+ abort();\n+#endif\n }\n \n ReplicationStatus *qmp_query_xen_replication_status(Error **errp)\n {\n+#ifdef CONFIG_REPLICATION\n Error *err = NULL;\n ReplicationStatus *s = g_new0(ReplicationStatus, 1);\n \n@@ -189,11 +194,18 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp)\n \n error_free(err);\n return s;\n+#else\n+ abort();\n+#endif\n }\n \n void qmp_xen_colo_do_checkpoint(Error **errp)\n {\n+#ifdef CONFIG_REPLICATION\n replication_do_checkpoint_all(errp);\n+#else\n+ abort();\n+#endif\n }\n \n static void colo_send_message(QEMUFile *f, COLOMessage msg,\ndiff --git a/monitor.c b/monitor.c\nindex be282ec..2799a37 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -974,6 +974,11 @@ static void qmp_unregister_commands_hack(void)\n #ifndef CONFIG_SPICE\n qmp_unregister_command(&qmp_commands, \"query-spice\");\n #endif\n+#ifndef CONFIG_REPLICATION\n+ qmp_unregister_command(&qmp_commands, \"xen-set-replication\");\n+ qmp_unregister_command(&qmp_commands, \"query-xen-replication-status\");\n+ qmp_unregister_command(&qmp_commands, \"xen-colo-do-checkpoint\");\n+#endif\n #ifndef TARGET_I386\n qmp_unregister_command(&qmp_commands, \"rtc-reset-reinjection\");\n #endif\n", "prefixes": [ "12/79" ] }