From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZvHb-0005Q4-P3 for qemu-devel@nongnu.org; Mon, 02 Jul 2018 05:38:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZvHa-0006qv-VQ for qemu-devel@nongnu.org; Mon, 02 Jul 2018 05:38:07 -0400 From: David Hildenbrand Date: Mon, 2 Jul 2018 11:37:54 +0200 Message-Id: <20180702093755.7384-4-david@redhat.com> In-Reply-To: <20180702093755.7384-1-david@redhat.com> References: <20180702093755.7384-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/4] pc: drop memory region alignment check for 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Eduardo Habkost , Igor Mammedov , "Michael S . Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Xiao Guangrong , David Gibson , Alexander Graf , Stefan Weil , David Hildenbrand All applicable memory regions always have an alignment > 0. All memory backends result in file_ram_alloc() or qemu_anon_ram_alloc() getting called, setting the alignment to > 0. So a PCDIMM memory region always has an alignment > 0. NVDIMM copy the alignment of the original memory memory region into the handcrafted memory region that will be used at this place. So the check for 0 can be dropped and we can reduce the special handling. Dropping this check makes factoring out of alignment handling easier as compat handling only has to look at pcmc->enforce_aligned_dimm and not care about the alignment of the memory region. Reviewed-by: David Gibson Reviewed-by: Igor Mammedov Signed-off-by: David Hildenbrand --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bf986baf91..934b7155b1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1712,7 +1712,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_dev, uint64_t align = TARGET_PAGE_SIZE; bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); - if (memory_region_get_alignment(mr) && pcmc->enforce_aligned_dimm) { + if (pcmc->enforce_aligned_dimm) { align = memory_region_get_alignment(mr); } -- 2.17.1