From patchwork Fri Dec 9 06:04:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9467559 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 62980602F0 for ; Fri, 9 Dec 2016 06:06:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55FAD2861A for ; Fri, 9 Dec 2016 06:06:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 494862861F; Fri, 9 Dec 2016 06:06:39 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F356A2861A for ; Fri, 9 Dec 2016 06:06:38 +0000 (UTC) Received: from localhost ([::1]:44735 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFEKL-0003MT-RI for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Dec 2016 01:06:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFEJo-000373-2e for qemu-devel@nongnu.org; Fri, 09 Dec 2016 01:06:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFEJk-0002qM-R6 for qemu-devel@nongnu.org; Fri, 09 Dec 2016 01:06:04 -0500 Received: from [59.151.112.132] (port=42593 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFEJk-0002pw-Ft for qemu-devel@nongnu.org; Fri, 09 Dec 2016 01:06:00 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="13758466" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Dec 2016 14:05:49 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id D5E174670069; Fri, 9 Dec 2016 14:05: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; Fri, 9 Dec 2016 14:05:53 +0800 From: Zhang Chen To: qemu devel , Jason Wang , Eric Blake Date: Fri, 9 Dec 2016 14:04:54 +0800 Message-ID: <1481263496-8004-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481263496-8004-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1481263496-8004-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: D5E174670069.AC33A X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH for-2.9 V3 1/3] Migration: Don't load vmdesc when xen is enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Changlong Xie , Zhang Chen , Li Zhijian , "eddie . dong" , Bian Naimeng , zhanghailiang Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Xen doesn't need this. Signed-off-by: Zhang Chen --- migration/savevm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 0363372..bec6c7e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1973,6 +1973,10 @@ int qemu_loadvm_state(QEMUFile *f) ret = qemu_file_get_error(f); } + if (xen_enabled()) { + return ret; + } + /* * Try to read in the VMDESC section as well, so that dumping tools that * intercept our migration stream have the chance to see it.