{"id":807503,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807503/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1504081950-2528-15-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:11","name":"[RFC,v2,14/33] qmp: hmp: add migrate \"resume\" option","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4dae0c9d7df7670d8475024a159407714a139c0f","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-15-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807503/checks/","tags":{},"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=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 3xhzcP1wbdz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 18:45:57 +1000 (AEST)","from localhost ([::1]:49073 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmydH-0000t8-2a\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:45:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:34306)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyRS-0007Sl-Th\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyRO-0003Qd-1I\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:42 -0400","from mx1.redhat.com ([209.132.183.28]:47936)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyRN-0003QK-Nk\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:37 -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 B29AB7E433;\n\tWed, 30 Aug 2017 08:33:36 +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 4F9CE8479A;\n\tWed, 30 Aug 2017 08:33:33 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B29AB7E433","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:11 +0800","Message-Id":"<1504081950-2528-15-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.27]);\n\tWed, 30 Aug 2017 08:33:36 +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 14/33] qmp: hmp: add migrate \"resume\" option","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":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"It will be used when we want to resume one paused migration.\n\nReviewed-by: Dr. David Alan Gilbert \nSigned-off-by: Peter Xu \n---\n hmp-commands.hx | 7 ++++---\n hmp.c | 4 +++-\n migration/migration.c | 2 +-\n qapi-schema.json | 5 ++++-\n 4 files changed, 12 insertions(+), 6 deletions(-)","diff":"diff --git a/hmp-commands.hx b/hmp-commands.hx\nindex 1941e19..7adb029 100644\n--- a/hmp-commands.hx\n+++ b/hmp-commands.hx\n@@ -928,13 +928,14 @@ ETEXI\n \n {\n .name = \"migrate\",\n- .args_type = \"detach:-d,blk:-b,inc:-i,uri:s\",\n- .params = \"[-d] [-b] [-i] uri\",\n+ .args_type = \"detach:-d,blk:-b,inc:-i,resume:-r,uri:s\",\n+ .params = \"[-d] [-b] [-i] [-r] uri\",\n .help = \"migrate to URI (using -d to not wait for completion)\"\n \t\t \"\\n\\t\\t\\t -b for migration without shared storage with\"\n \t\t \" full copy of disk\\n\\t\\t\\t -i for migration without \"\n \t\t \"shared storage with incremental copy of disk \"\n-\t\t \"(base image shared between src and destination)\",\n+\t\t \"(base image shared between src and destination)\"\n+ \"\\n\\t\\t\\t -r to resume a paused migration\",\n .cmd = hmp_migrate,\n },\n \ndiff --git a/hmp.c b/hmp.c\nindex fd80dce..ebc1563 100644\n--- a/hmp.c\n+++ b/hmp.c\n@@ -1891,10 +1891,12 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)\n bool detach = qdict_get_try_bool(qdict, \"detach\", false);\n bool blk = qdict_get_try_bool(qdict, \"blk\", false);\n bool inc = qdict_get_try_bool(qdict, \"inc\", false);\n+ bool resume = qdict_get_try_bool(qdict, \"resume\", false);\n const char *uri = qdict_get_str(qdict, \"uri\");\n Error *err = NULL;\n \n- qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);\n+ qmp_migrate(uri, !!blk, blk, !!inc, inc,\n+ false, false, true, resume, &err);\n if (err) {\n error_report_err(err);\n return;\ndiff --git a/migration/migration.c b/migration/migration.c\nindex 722f8ac..394e84b 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -1238,7 +1238,7 @@ bool migration_is_blocked(Error **errp)\n \n void qmp_migrate(const char *uri, bool has_blk, bool blk,\n bool has_inc, bool inc, bool has_detach, bool detach,\n- Error **errp)\n+ bool has_resume, bool resume, Error **errp)\n {\n Error *local_err = NULL;\n MigrationState *s = migrate_get_current();\ndiff --git a/qapi-schema.json b/qapi-schema.json\nindex 368b592..ba41f2c 100644\n--- a/qapi-schema.json\n+++ b/qapi-schema.json\n@@ -3208,6 +3208,8 @@\n # @detach: this argument exists only for compatibility reasons and\n # is ignored by QEMU\n #\n+# @resume: resume one paused migration, default \"off\". (since 2.11)\n+#\n # Returns: nothing on success\n #\n # Since: 0.14.0\n@@ -3229,7 +3231,8 @@\n #\n ##\n { 'command': 'migrate',\n- 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } }\n+ 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool',\n+ '*detach': 'bool', '*resume': 'bool' } }\n \n ##\n # @migrate-incoming:\n","prefixes":["RFC","v2","14/33"]}