From patchwork Wed Nov 30 09:47:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9453943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 223E260235 for ; Wed, 30 Nov 2016 09:50:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DF2D728249 for ; Wed, 30 Nov 2016 09:50:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3CF228419; Wed, 30 Nov 2016 09:50:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5580328249 for ; Wed, 30 Nov 2016 09:50:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cC1Ub-0006JP-V8; Wed, 30 Nov 2016 09:47:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cC1Ua-0006ID-0N for xen-devel@lists.xenproject.org; Wed, 30 Nov 2016 09:47:56 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id E8/1B-22495-B40AE385; Wed, 30 Nov 2016 09:47:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrJIsWRWlGSWpSXmKPExsViPb2gRddrgV2 EwaFXehbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aTxf2sBeu5K54sOcLSwHiSo4uRk0NCwE/i 9J517CC2kECtxIL375kg7JWMEvd/63YxcgHZuxgl3j9YxAiSYBMwkJhzZSKYLSKgJ7Fk21FGk CJmgalMEhOu3GIFSQgLWEg07Z8OZrMIqEoc23mTGcTmFfCV2LtjPivEZjmJm+c6weKcQFc8mz CbFWKzr8TNtm1MEPWCEidnPmEBsZkFJCQOvngBVM8B1Kso0XaNF2KMrsSTwxPYIWxNiW2rz7F BlFhJTN3qCREWlNj5/ALbBEaRWUiGzkIydAEj0ypGjeLUorLUIl1DY72kosz0jJLcxMwcXUMD Y73c1OLixPTUnMSkYr3k/NxNjMAgZwCCHYzbtnseYpTkYFIS5eXrtIsQ4kvKT6nMSCzOiC8qz UktPsQow8GhJMHLMA8oJ1iUmp5akZaZA4w3mLQEB4+SCK8RSJq3uCAxtzgzHSJ1ilFRSpz3Ik hCACSRUZoH1waL8UuMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5j0GMoUnM68EbvoroMVMQIv fvrYGWVySiJCSamAUZjKelq/1q3rTiv7FoT7bFb7yHs5VC3tV0p079wubwPT6Iu5sdSc304tF Dbvvfb9ZcfFXmNifCWk31+RUBrv5uBxe8ET+lQ2T26Py7LnBfG3SO+qL56zv4c1eqnrL2uTba okj+St2FP9b/yE3eMef6S8vvZxy8blW/G1rxmvHpBceqbrJWVCuxFKckWioxVxUnAgArEQ5Lu wCAAA= X-Env-Sender: zhangchen.fnst@cn.fujitsu.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1480499273!47318667!1 X-Originating-IP: [59.151.112.132] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51510 invoked from network); 30 Nov 2016 09:47:54 -0000 Received: from cn.fujitsu.com (HELO heian.cn.fujitsu.com) (59.151.112.132) by server-6.tower-31.messagelabs.com with SMTP; 30 Nov 2016 09:47:54 -0000 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="13459453" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 30 Nov 2016 17:47:50 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id C8FF147AC8C0; Wed, 30 Nov 2016 17:47:48 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 30 Nov 2016 17:47:46 +0800 From: Zhang Chen To: Xen devel Date: Wed, 30 Nov 2016 17:47:52 +0800 Message-ID: <1480499272-11893-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480499272-11893-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1480499272-11893-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: C8FF147AC8C0.A0865 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com Cc: Changlong Xie , Wei Liu , Zhang Chen , Wen Congyang , Ian Jackson , "eddie . dong" , Yang Hongyang Subject: [Xen-devel] [PATCH 3/3] Add COLO replication top-id support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Because of qemu colo add the top-id, so we update it. Signed-off-by: Zhang Chen --- tools/libxl/libxl_dm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index ad366a8..815938e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -826,8 +826,10 @@ static char *qemu_disk_scsi_drive_string(libxl__gc *gc, const char *target_path, * file.backing.backing=exportname, */ drive = GCSPRINTF( - "if=scsi,bus=0,unit=%d,cache=writeback,driver=replication," + "if=scsi,id=top-colo,bus=0,unit=%d,cache=writeback," + "driver=replication," "mode=secondary," + "top-id=top-colo," "file.driver=qcow2," "file.file.filename=%s," "file.backing.driver=qcow2," @@ -889,8 +891,10 @@ static char *qemu_disk_ide_drive_string(libxl__gc *gc, const char *target_path, * file.backing.backing=exportname, */ drive = GCSPRINTF( - "if=ide,index=%d,media=disk,cache=writeback,driver=replication," + "if=ide,index=%d,id=top-colo,media=disk,cache=writeback," + "driver=replication," "mode=secondary," + "top-id=top-colo," "file.driver=qcow2," "file.file.filename=%s," "file.backing.driver=qcow2,"