Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807506/?format=api
{ "id": 807506, "url": "http://patchwork.ozlabs.org/api/patches/807506/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-24-git-send-email-peterx@redhat.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": "<1504081950-2528-24-git-send-email-peterx@redhat.com>", "list_archive_url": null, "date": "2017-08-30T08:32:20", "name": "[RFC,v2,23/33] migration: introduce SaveVMHandlers.resume_prepare", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "7b29352edf8766ce8f20c019ef0b80992d5decbb", "submitter": { "id": 67717, "url": "http://patchwork.ozlabs.org/api/people/67717/?format=api", "name": "Peter Xu", "email": "peterx@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-24-git-send-email-peterx@redhat.com/mbox/", "series": [ { "id": 552, "url": "http://patchwork.ozlabs.org/api/series/552/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=552", "date": "2017-08-30T08:31:59", "name": "Migration: postcopy failure recovery", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/552/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807506/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807506/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>)", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@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 3xhzfW2xg1z9t2Q\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 18:47:47 +1000 (AEST)", "from localhost ([::1]:49078 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 1dmyf3-0002Yl-2i\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:47:45 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:35069)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmySi-0000Du-KQ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:01 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmySh-00043R-Kj\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:00 -0400", "from mx1.redhat.com ([209.132.183.28]:38202)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <peterx@redhat.com>) id 1dmySh-000434-CG\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:34:59 -0400", "from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 60288267C5;\n\tWed, 30 Aug 2017 08:34:58 +0000 (UTC)", "from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 83548871ED;\n\tWed, 30 Aug 2017 08:34:54 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 60288267C5", "From": "Peter Xu <peterx@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 30 Aug 2017 16:32:20 +0800", "Message-Id": "<1504081950-2528-24-git-send-email-peterx@redhat.com>", "In-Reply-To": "<1504081950-2528-1-git-send-email-peterx@redhat.com>", "References": "<1504081950-2528-1-git-send-email-peterx@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.15", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 30 Aug 2017 08:34:58 +0000 (UTC)", "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] [RFC v2 23/33] migration: introduce\n\tSaveVMHandlers.resume_prepare", "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": "Laurent Vivier <lvivier@redhat.com>,\n\tAndrea Arcangeli <aarcange@redhat.com>, \n\tJuan Quintela <quintela@redhat.com>,\n\tAlexey Perevalov <a.perevalov@samsung.com>, peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" <dgilbert@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": "This is hook function to be called when a postcopy migration wants to\nresume from a failure. For each module, it should provide its own\nrecovery logic before we switch to the postcopy-active state.\n\nSigned-off-by: Peter Xu <peterx@redhat.com>\n---\n include/migration/register.h | 2 ++\n migration/migration.c | 20 +++++++++++++++++++-\n migration/savevm.c | 25 +++++++++++++++++++++++++\n migration/savevm.h | 1 +\n migration/trace-events | 1 +\n 5 files changed, 48 insertions(+), 1 deletion(-)", "diff": "diff --git a/include/migration/register.h b/include/migration/register.h\nindex a0f1edd..b669362 100644\n--- a/include/migration/register.h\n+++ b/include/migration/register.h\n@@ -41,6 +41,8 @@ typedef struct SaveVMHandlers {\n LoadStateHandler *load_state;\n int (*load_setup)(QEMUFile *f, void *opaque);\n int (*load_cleanup)(void *opaque);\n+ /* Called when postcopy migration wants to resume from failure */\n+ int (*resume_prepare)(MigrationState *s, void *opaque);\n } SaveVMHandlers;\n \n int register_savevm_live(DeviceState *dev,\ndiff --git a/migration/migration.c b/migration/migration.c\nindex 4dc564a..19b7f3a5 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -2172,7 +2172,25 @@ typedef enum MigThrError {\n /* Return zero if success, or <0 for error */\n static int postcopy_do_resume(MigrationState *s)\n {\n- /* TODO: do the resume logic */\n+ int ret;\n+\n+ /*\n+ * Call all the resume_prepare() hooks, so that modules can be\n+ * ready for the migration resume.\n+ */\n+ ret = qemu_savevm_state_resume_prepare(s);\n+ if (ret) {\n+ error_report(\"%s: resume_prepare() failure detected: %d\",\n+ __func__, ret);\n+ return ret;\n+ }\n+\n+ /*\n+ * TODO: handshake with dest using MIG_CMD_RESUME,\n+ * MIG_RP_MSG_RESUME_ACK, then switch source state to\n+ * \"postcopy-active\"\n+ */\n+\n return 0;\n }\n \ndiff --git a/migration/savevm.c b/migration/savevm.c\nindex 7fd5390..b86c9c6 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -1004,6 +1004,31 @@ void qemu_savevm_state_setup(QEMUFile *f)\n }\n }\n \n+int qemu_savevm_state_resume_prepare(MigrationState *s)\n+{\n+ SaveStateEntry *se;\n+ int ret;\n+\n+ trace_savevm_state_resume_prepare();\n+\n+ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {\n+ if (!se->ops || !se->ops->resume_prepare) {\n+ continue;\n+ }\n+ if (se->ops && se->ops->is_active) {\n+ if (!se->ops->is_active(se->opaque)) {\n+ continue;\n+ }\n+ }\n+ ret = se->ops->resume_prepare(s, se->opaque);\n+ if (ret < 0) {\n+ return ret;\n+ }\n+ }\n+\n+ return 0;\n+}\n+\n /*\n * this function has three return values:\n * negative: there was one error, and we have -errno.\ndiff --git a/migration/savevm.h b/migration/savevm.h\nindex a5f3879..3193f04 100644\n--- a/migration/savevm.h\n+++ b/migration/savevm.h\n@@ -31,6 +31,7 @@\n \n bool qemu_savevm_state_blocked(Error **errp);\n void qemu_savevm_state_setup(QEMUFile *f);\n+int qemu_savevm_state_resume_prepare(MigrationState *s);\n void qemu_savevm_state_header(QEMUFile *f);\n int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);\n void qemu_savevm_state_cleanup(void);\ndiff --git a/migration/trace-events b/migration/trace-events\nindex a929bc7..61b0d49 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -38,6 +38,7 @@ savevm_send_postcopy_run(void) \"\"\n savevm_send_postcopy_resume(void) \"\"\n savevm_send_recv_bitmap(char *name) \"%s\"\n savevm_state_setup(void) \"\"\n+savevm_state_resume_prepare(void) \"\"\n savevm_state_header(void) \"\"\n savevm_state_iterate(void) \"\"\n savevm_state_cleanup(void) \"\"\n", "prefixes": [ "RFC", "v2", "23/33" ] }