From nobody Sun May 5 20:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500447892784875.7251699109037; Wed, 19 Jul 2017 00:04:52 -0700 (PDT) Received: from localhost ([::1]:60169 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXj2R-0008Dn-8r for importer@patchew.org; Wed, 19 Jul 2017 03:04:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXj1c-0007hn-5i for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:04:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXj1Y-0005Q2-8k for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:04:00 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:38607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXj1X-0005Ha-Mi for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:03:56 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 19 Jul 2017 06:53:36 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v6J73a8E053273; Wed, 19 Jul 2017 15:03:36 +0800 (GMT-8) (envelope-from peng.hao2@zte.com.cn) Received: from localhost.localdomain ([10.74.120.59]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017071915034075-4289301 ; Wed, 19 Jul 2017 15:03:40 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170719145336 From: Peng Hao To: mst@redhat.com, imammedo@redhat.com Date: Wed, 19 Jul 2017 23:17:32 +0800 Message-Id: <1500477452-59643-1-git-send-email-peng.hao2@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-07-19 15:03:41, Serialize by Router on notes_smtp/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-07-19 15:03:29, Serialize complete at 2017-07-19 15:03:29 X-MAIL: mse01.zte.com.cn v6J73a8E053273 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH] vhost: fix a migration failed because of vhost region merge 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: Peng Hao , Wang Yechao , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When a guest that has several hotplugged dimms is migrated, in destination host it will fail to resume. Because vhost regions of several dimms in source host are merged and in the restore stage in destination host it computes whether more than vhost slot limit before merging vhost regions of several dimms. Signed-off-by: Peng Hao Signed-off-by: Wang Yechao --- hw/mem/pc-dimm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index ea67b46..bb0fa08 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -101,7 +101,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplu= gState *hpms, goto out; } =20 - if (!vhost_has_free_slot()) { + if (!vhost_has_free_slot() && runstate_is_running()) { error_setg(&local_err, "a used vhost backend has no free" " memory slots left"); goto out; --=20 1.8.3.1