From patchwork Thu Apr 7 16:31:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 8774801 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 882BBC0553 for ; Thu, 7 Apr 2016 16:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A3DA520263 for ; Thu, 7 Apr 2016 16:34:39 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id C7D48201EC for ; Thu, 7 Apr 2016 16:34:34 +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 1aoCq0-0001AS-N3; Thu, 07 Apr 2016 16:31:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aoCpz-0001AL-H6 for xen-devel@lists.xen.org; Thu, 07 Apr 2016 16:31:19 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id BA/13-02863-65B86075; Thu, 07 Apr 2016 16:31:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsUSuHLSTd2wbrZ wg5UTWC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozl7w+xF5zhqLj34gVjA2MzexcjFweLwGMm iUmNJxm7GDk5JAQ8JR4f6mPuYuQAskUknvxPA6kREljHKHHk5VdWkBo2ASWJvQePg9WLCLhLT H5xmA3EZhbIkti9+ABYXFjASWJ6x0KwehYBVYnXvxewgNi8ArYSF19eZoHYJSdx81wn8wRG7g WMDKsY1YtTi8pSi3RN9ZKKMtMzSnITM3N0DQ1N9HJTi4sT01NzEpOK9ZLzczcxAr3LAAQ7GNc tdj7EKMnBpCTKu7yDLVyILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG9cF1BOsCg1PbUiLTMHGGYw aQkOHiURXiGQNG9xQWJucWY6ROoUo6KUOO/fTqCEAEgiozQPrg0W2pcYZaWEeRmBDhHiKUgty s0sQZV/xSjOwagkzJsEMp4nM68EbvoroMVMQIsv8IMtLklESEk1MFrafk75UfxllnForOOcDT 9MFj56OjfE89/rfQufuUraeEpYpm/W0Jk3K3XBfa8FR7Zd/DXHvdRNYv4HqUjdjH/bm47OY8v 36DVY0WhabfxCtM3A1HajRxP/obPS83sWNkeWHJy7XveZ0W/9rKv//jhHGzK8YWtOnKF4gHeN qeqH1qpSfqOqaiWW4oxEQy3mouJEAOZMD9ZoAgAA X-Env-Sender: olaf@aepfle.de X-Msg-Ref: server-8.tower-27.messagelabs.com!1460046677!32507045!1 X-Originating-IP: [81.169.146.217] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51093 invoked from network); 7 Apr 2016 16:31:18 -0000 Received: from mo4-p00-ob.smtp.rzone.de (HELO mo4-p00-ob.smtp.rzone.de) (81.169.146.217) by server-8.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Apr 2016 16:31:18 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1460046677; l=1050; s=domk; d=aepfle.de; h=Date:Subject:Cc:To:From; bh=qM8HaLYxagODgbYWkRdjDYCFt1gnAkFLE8TQ5XsLOdc=; b=XtsXSIoMxriLoUNLuFb/QfBs3JIGJ/eba3JkJraKh6F6+qmVAKgLVbRWtC7Lf1YE3ub FekMpeDtZ9WRcWOaJERBubFWPYVT9mr/wHNkvIGagaONqtEns5x3Az42aHhm9e1lspaPq 3QtFan6uVqqpaiP506xJltvDEGbNvk2mTHs= X-RZG-AUTH: :P2EQZWCpfu+qG7CngxMFH1J+yackYocTD1iAi8x+OWtrWFmrD4pjkQ2b4qvS X-RZG-CLASS-ID: mo00 Received: from aepfle.de (charybdis-ext.suse.de [195.135.221.2]) by post.strato.de (RZmta 37.22 AUTH) with ESMTPA id 601af7s37GV6jID; Thu, 7 Apr 2016 18:31:06 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xen.org, Andrew Cooper Date: Thu, 7 Apr 2016 18:31:01 +0200 Message-Id: <1460046661-8441-1-git-send-email-olaf@aepfle.de> X-Mailer: git-send-email 2.7.4 Cc: Wei Liu , Olaf Hering , Ian Jackson Subject: [Xen-devel] [PATCH] tools: handle xl migrate --debug in legacy stream 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Doing a 'xl migrate --debug domU host' on xen-4.5 adds a XC_SAVE_ID_ENABLE_VERIFY_MODE marker, which is not handled. Since using --debug is valid usage, handle it by logging the fact instead of aborting the migration. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Wei Liu Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/python/scripts/convert-legacy-stream | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 41fee10..5f80f13 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -389,8 +389,7 @@ def read_chunks(vm): write_page_data(pfns, pages) elif marker == legacy.CHUNK_enable_verify_mode: - # For debugging purposes only. Will not be seen in real migration - raise RuntimeError("Unable to convert a debug stream") + info("This is a debug stream") elif marker == legacy.CHUNK_vcpu_info: max_id, = unpack_exact("i")