From patchwork Thu Jan 26 14:24:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 137946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 669BD1007D3 for ; Fri, 27 Jan 2012 02:15:29 +1100 (EST) Received: from localhost ([::1]:38524 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQI6-0000mM-1y for incoming@patchwork.ozlabs.org; Thu, 26 Jan 2012 09:27:06 -0500 Received: from eggs.gnu.org ([140.186.70.92]:59937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHa-0008HI-EJ for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RqQHU-0001kI-Ds for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RqQHT-0001jp-Vi for qemu-devel@nongnu.org; Thu, 26 Jan 2012 09:26:28 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q0QEQQh8015059 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Jan 2012 09:26:26 -0500 Received: from dhcp-1-120.tlv.redhat.com (dhcp-4-39.tlv.redhat.com [10.35.4.39]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q0QEPnS3012411; Thu, 26 Jan 2012 09:26:23 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 26 Jan 2012 16:24:56 +0200 Message-Id: <1327587897-31192-11-git-send-email-owasserm@redhat.com> In-Reply-To: <1327587897-31192-1-git-send-email-owasserm@redhat.com> References: <1327587897-31192-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: blauwirbel@gmail.com, stefanha@gmail.com, Orit Wasserman , avi@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v7 10/11] Add XBZRLE option to migrate command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Orit Wasserman --- hmp-commands.hx | 21 +++++++++++++-------- qmp-commands.hx | 18 +++++++++++------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 3b7255d..daa8aae 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -744,24 +744,29 @@ ETEXI { .name = "migrate", - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", - .params = "[-d] [-b] [-i] uri", - .help = "migrate to URI (using -d to not wait for completion)" - "\n\t\t\t -b for migration without shared storage with" - " full copy of disk\n\t\t\t -i for migration without " - "shared storage with incremental copy of disk " - "(base image shared between src and destination)", + .args_type = "detach:-d,blk:-b,inc:-i,xbzrle:-x,uri:s", + .params = "[-d] [-b] [-i] [-x] uri", + .help = "migrate to URI" + "\n\t -d to not wait for completion" + "\n\t -b for migration without shared storage with" + " full copy of disk" + "\n\t -i for migration without" + " shared storage with incremental copy of disk" + " (base image shared between source and destination)" + "\n\t -x to use XBZRLE page delta compression", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate, }, STEXI -@item migrate [-d] [-b] [-i] @var{uri} +@item migrate [-d] [-b] [-i] [-x] @var{uri} @findex migrate Migrate to @var{uri} (using -d to not wait for completion). -b for migration with full copy of disk -i for migration with incremental copy of disk (base image is shared) + -x to use XBZRLE page delta compression + ETEXI { diff --git a/qmp-commands.hx b/qmp-commands.hx index ad4e328..6108de7 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -424,13 +424,16 @@ EQMP { .name = "migrate", - .args_type = "detach:-d,blk:-b,inc:-i,uri:s", - .params = "[-d] [-b] [-i] uri", - .help = "migrate to URI (using -d to not wait for completion)" - "\n\t\t\t -b for migration without shared storage with" - " full copy of disk\n\t\t\t -i for migration without " - "shared storage with incremental copy of disk " - "(base image shared between src and destination)", + .args_type = "detach:-d,blk:-b,inc:-i,xbzrle:-x,uri:s", + .params = "[-d] [-b] [-i] [-x] uri", + .help = "migrate to URI" + "\n\t -d to not wait for completion" + "\n\t -b for migration without shared storage with" + " full copy of disk" + "\n\t -i for migration without" + " shared storage with incremental copy of disk" + " (base image shared between source and destination)" + "\n\t -x to use XBZRLE page delta compression", .user_print = monitor_user_noop, .mhandler.cmd_new = do_migrate, }, @@ -446,6 +449,7 @@ Arguments: - "blk": block migration, full disk copy (json-bool, optional) - "inc": incremental disk copy (json-bool, optional) - "uri": Destination URI (json-string) +- "xbzrle": to use XBZRLE page delta compression Example: