From patchwork Mon Oct 12 15:04:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liran Schour X-Patchwork-Id: 35765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2472AB7063 for ; Tue, 13 Oct 2009 01:48:31 +1100 (EST) Received: from localhost ([127.0.0.1]:57088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MxMCJ-0001Ba-Lx for incoming@patchwork.ozlabs.org; Mon, 12 Oct 2009 10:48:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MxLxS-0000Fn-G6 for qemu-devel@nongnu.org; Mon, 12 Oct 2009 10:33:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MxLxN-00009v-GD for qemu-devel@nongnu.org; Mon, 12 Oct 2009 10:33:06 -0400 Received: from [199.232.76.173] (port=55407 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MxLxN-00009b-7A for qemu-devel@nongnu.org; Mon, 12 Oct 2009 10:33:01 -0400 Received: from mtagate6.uk.ibm.com ([195.212.29.139]:51005) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MxLxM-0007q1-Nq for qemu-devel@nongnu.org; Mon, 12 Oct 2009 10:33:01 -0400 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate6.uk.ibm.com (8.14.3/8.13.8) with ESMTP id n9CEWgD2659878 for ; Mon, 12 Oct 2009 14:32:47 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n9CEWWOL2310166 for ; Mon, 12 Oct 2009 15:32:32 +0100 Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n9CEWVMk010339 for ; Mon, 12 Oct 2009 15:32:32 +0100 Received: from localhost.localdomain (im4-64s.haifa.ibm.com [9.148.27.41]) by d06av04.portsmouth.uk.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n9CEWVai010317; Mon, 12 Oct 2009 15:32:31 +0100 From: lirans@il.ibm.com To: qemu-devel@nongnu.org Date: Mon, 12 Oct 2009 17:04:39 +0200 Message-Id: <12553598791065-git-send-email-lirans@il.ibm.com> X-Mailer: git-send-email 1.5.2.4 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.0.3x (2) Cc: Liran Schour Subject: [Qemu-devel] [PATCH 3/3 v4] Enable migration without shared storage from the monitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds the option to activate non-shared storage migration from the monitor. The migration command is as follows: (qemu) migrate -d tcp:0:4444 # for ordinary live migration (qemu) migrate -d -b tcp:0:4444 # for live migration with complete storage copy (qemu) migrate -d -i tcp:0:4444 # for live migration with incremental storage copy, storage is cow based. Signed-off-by: Liran Schour diff --git a/monitor.c b/monitor.c index 3424e60..ae29181 100644 --- a/monitor.c +++ b/monitor.c @@ -2907,6 +2907,18 @@ static int default_fmt_size = 4; #define MAX_ARGS 16 +static int is_valid_option(const char *c, const char *typestr) +{ + char option[3]; + + option[0] = '-'; + option[1] = *c; + option[2] = '\0'; + + typestr = strstr(typestr, option); + return (typestr != NULL); +} + static const mon_cmd_t *monitor_parse_command(Monitor *mon, const char *cmdline, QDict *qdict) @@ -3099,8 +3111,9 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, break; case '-': { - int has_option; - /* option */ + const char *tmp = p; + int has_option, skip_key = 0; + /* option */ c = *typestr++; if (c == '\0') @@ -3110,15 +3123,24 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, has_option = 0; if (*p == '-') { p++; - if (*p != c) { - monitor_printf(mon, "%s: unsupported option -%c\n", + if(c != *p) { + if(!is_valid_option(p, typestr)) { + + monitor_printf(mon, "%s: unsupported option -%c\n", cmdname, *p); - goto fail; + goto fail; + } else { + skip_key = 1; + } } - p++; - has_option = 1; + if(skip_key) { + p = tmp; + } else { + p++; + has_option = 1; + } } - qdict_put(qdict, key, qint_from_int(has_option)); + qdict_put(qdict, key, qint_from_int(has_option)); } break; default: diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 29999c6..ec856d9 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -721,15 +721,22 @@ ETEXI { .name = "migrate", - .args_type = "detach:-d,uri:s", - .params = "[-d] uri", - .help = "migrate to URI (using -d to not wait for completion)", + .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)", .mhandler.cmd = do_migrate, }, + STEXI @item migrate [-d] @var{uri} 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) ETEXI {