From patchwork Fri Jan 16 05:45:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Guihua X-Patchwork-Id: 429726 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B342A14018C for ; Fri, 16 Jan 2015 16:46:48 +1100 (AEDT) Received: from localhost ([::1]:54029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBzk5-0003rE-3N for incoming@patchwork.ozlabs.org; Fri, 16 Jan 2015 00:46:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBzjp-0003Zw-BE for qemu-devel@nongnu.org; Fri, 16 Jan 2015 00:46:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YBzjl-0001WI-A4 for qemu-devel@nongnu.org; Fri, 16 Jan 2015 00:46:29 -0500 Received: from [59.151.112.132] (port=38995 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YBzjk-0001VI-UB for qemu-devel@nongnu.org; Fri, 16 Jan 2015 00:46:25 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="56153581" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 16 Jan 2015 13:42:48 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t0G5jcaU016127; Fri, 16 Jan 2015 13:45:39 +0800 Received: from G08FNSTD140041.g08.fujitsu.local (10.167.226.252) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 16 Jan 2015 13:46:15 +0800 From: Zhu Guihua To: Date: Fri, 16 Jan 2015 13:45:06 +0800 Message-ID: <1421387106-19101-1-git-send-email-zhugh.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-Originating-IP: [10.167.226.252] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: imammedo@redhat.com, Zhu Guihua , mst@redhat.com Subject: [Qemu-devel] [PATCH] pc-dimm: fix checking for backend memory size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If hot add 100MiB memory like this: (monitor) object_add memory-backend-ram,id=ram0,size=100M (monitor) device_add pc-dimm,id=d0,memdev=ram0 The hotplug operation will faile, and the guest will print error message: Section-unaligned hotplug range: start 0x100000000, size 0x6400000 acpi PNP0C80:00: add_memory failed acpi PNP0C80:00: acpi_memory_enable_device() error Then I found that, according to the func check_hotplug_memory_range() in linux kernel, backend memory size must be multiple of 128MiB, not 2MiB. So this patch checks whether backend memory size is multiple of 128MiB. Signed-off-by: Zhu Guihua --- hw/mem/pc-dimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index d431834..3b8a015 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -161,9 +161,9 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start, goto out; } - if (QEMU_ALIGN_UP(size, align) != size) { + if (QEMU_ALIGN_UP(size, align * 64) != size) { error_setg(errp, "backend memory size must be multiple of 0x%" - PRIx64, align); + PRIx64, align * 64); goto out; }