From patchwork Tue Jun 18 15:59:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 805233 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:144:b0:362:4979:7f74 with SMTP id r4csp274005wrx; Tue, 18 Jun 2024 09:07:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7K9LJyxhyl0PjjeHfH85K6QPBV86+YZpuNs4T2H0SK76jcF7bayynwBdpgi6hK4FyG4l7SFxHtsMI0nlUiI5S X-Google-Smtp-Source: AGHT+IGgZHJPzYMxGwz304yMgjHoyueag0+rBoeYpRjs+l0kyJYUsORCM1soi7DmQAoXL07FmAPV X-Received: by 2002:a05:6870:6394:b0:254:c62e:440d with SMTP id 586e51a60fabf-25c94990924mr264336fac.23.1718726878055; Tue, 18 Jun 2024 09:07:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718726878; cv=none; d=google.com; s=arc-20160816; b=y4OewpjJ+o+E4XhhLKnxDEpVH2pPdZIWKZCoewW6YJoW7ga4nBYdlfifDy9nhXATg9 XE1V9RmYV8FvsdYGOdbYGEJwqCj7ZDUz28VaV/rHHtEIbpwlDBi85WtTSUmoismUInk+ hclv9otG420SvWbepc5UrCy7xSUaYaxxbeU3CO4bD9uLiWckviN9ApE9CXYmB3iolpsj 1bJDo7pb3kZhWiPFJ8z9scEtnbWYVl3GwypwXz2wiwaWSfaPZ5npA2bPBBIsiFlCheoM /b2o+E3RS0LYzyADzId+30vTnITQn923kXvDA5SA3dSBmOB3cPxYWRsn8wLweDvxrlKA 3BvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8eJa9WK/V7TqG4Hnua6nIYiEaeNBOHfc3aooKNXlT7w=; fh=7ciXtIFtKgrEEslf8qyrTQ2ZRTVTrQ4XgPfZ1EtPt9A=; b=RQBCXJQQoR5cd7qbzxRJVE9HD3AYJ85eT8AkMXqNUf5dJP9T4qd9CnjbuQrTE5695N tZq8NB/hGWXgX2kby2Jyf1r6UzR4MCCWeHmXZPomMB2vTC/wn0TFOlvJlt04qI73pafB NslH6DzhvgJGpCq0bjWmQPKxKWAdeA4QFocMS9G7KFtSGo36jR0XKuBORCnK9jhqJdkf 5Cf8Kq+I+L7wIWa5AO7Bd0EaXN2XY5pW9gNsG5yX+E0BMMg3DAKcydz900kKiY1WAPRS 4QYNpFuveBhCkh0+FgrwY1fA6pp6vYLZbBGenOU90EpvwJXixYlMaFdFgmaiucgoGNXp hitQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AnIMnEVR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-48da4498157si2033669137.478.2024.06.18.09.07.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jun 2024 09:07:58 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AnIMnEVR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJbI5-0005ca-5v; Tue, 18 Jun 2024 12:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJbHj-0005G6-Hv for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:17 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJbHf-0006vZ-Sa for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:02:13 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a6f1c4800easo697027666b.3 for ; Tue, 18 Jun 2024 09:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718726530; x=1719331330; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8eJa9WK/V7TqG4Hnua6nIYiEaeNBOHfc3aooKNXlT7w=; b=AnIMnEVRwudsIzXSTDDZJNNnzyG9NvRT9ZOfDITV9KJCsO0Ot3oDYLSNlKuFn/+ZHB FLxoedZ8QP/CL8dZlzJJLzEkJsFCXUBkWMAPf4yjnyEE7VSdOTo2FRSYd1Y3quQOp13k +ukEIGRQuca4qYl7UOOn+oEUpWXzanh7NDDZLflu4IGZeQPzP37fntybp/cgPM1ok7Fp 7wIHCG8O6DQZABbdHjpsssBkNuRPVjbaGWCVkJkaMXy896Ev9jrjAdPky6LrpdE7x7LA /Pj20kYA43F4+1aLd9EO9hZPk4ijKD//DWpiLqINbrypKt9ZkXG8FaFz3s7OIuZ3YQem HtxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718726530; x=1719331330; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8eJa9WK/V7TqG4Hnua6nIYiEaeNBOHfc3aooKNXlT7w=; b=DaoYYbqNjVsplGyEIEfn92rjn1SYZzEKYEVxLBphhwBfFCaRaBiNrPjPYWC3ydZLSX PrTaIm1uzbWX3FLAM6T7RIvK7p4SN3OlRvRZ6OawpGX09Saejvr2WJ+zhZWlz0laxniU 0JK0240ugN/gr8ukNd5Rc+2EU3WoNRz+AU0t8pJuiC+Tl01Ud+WJMW+q9D359UrXpVOT w55JZg3RD755fJVrPWKizdg0oXDx2eC636xuiTb0k6nJHM1Xgy6ri/lBpq0ULOnBvvdA IzjEcxAEHQEQbBTHhgu12OIrBgKlkOusJhpMhsGOzHlhIyzMOLmQ6qaADVhPRmzLMXvs FReg== X-Gm-Message-State: AOJu0Yzs9f23dsrdiNmymfRxMXmseLkXHHUJJceOW/eOsaXpgHR/xPZX ugfTcWgBRrTv/bA2saKAniNU3T3L42hMn0FywIjRM7GGAI/+V6uzQ9Jej2cNWeYw7JoOBw8HuG3 X X-Received: by 2002:a17:907:198e:b0:a6f:98b6:365 with SMTP id a640c23a62f3a-a6f98b60a51mr169213366b.10.1718726529924; Tue, 18 Jun 2024 09:02:09 -0700 (PDT) Received: from m1x-phil.lan ([176.187.212.55]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56f411a7sm631061766b.158.2024.06.18.09.02.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Jun 2024 09:02:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , David Hildenbrand , Zhao Liu , Igor Mammedov Subject: [PULL 15/76] hw/mem/memory-device: Remove legacy_align from memory_device_pre_plug() Date: Tue, 18 Jun 2024 17:59:37 +0200 Message-ID: <20240618160039.36108-16-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240618160039.36108-1-philmd@linaro.org> References: <20240618160039.36108-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=philmd@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 'legacy_align' is always NULL, remove it, simplifying memory_device_pre_plug(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Message-Id: <20240617071118.60464-16-philmd@linaro.org> --- include/hw/mem/memory-device.h | 2 +- hw/i386/pc.c | 3 +-- hw/mem/memory-device.c | 12 ++++-------- hw/mem/pc-dimm.c | 2 +- hw/virtio/virtio-md-pci.c | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index e0571c8a31..c0a58087cc 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -169,7 +169,7 @@ uint64_t get_plugged_memory_size(void); unsigned int memory_devices_get_reserved_memslots(void); bool memory_devices_memslot_auto_decision_active(void); void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, - const uint64_t *legacy_align, Error **errp); + Error **errp); void memory_device_plug(MemoryDeviceState *md, MachineState *ms); void memory_device_unplug(MemoryDeviceState *md, MachineState *ms); uint64_t memory_device_get_region_size(const MemoryDeviceState *md, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2d0a517c4c..8a9c025754 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1395,8 +1395,7 @@ static void pc_hv_balloon_pre_plug(HotplugHandler *hotplug_dev, { /* The vmbus handler has no hotplug handler; we should never end up here. */ g_assert(!dev->hotplugged); - memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), NULL, - errp); + memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), errp); } static void pc_hv_balloon_plug(HotplugHandler *hotplug_dev, diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index e098585cda..a5f279adcc 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -345,7 +345,7 @@ uint64_t get_plugged_memory_size(void) } void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, - const uint64_t *legacy_align, Error **errp) + Error **errp) { const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md); Error *local_err = NULL; @@ -388,14 +388,10 @@ void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms, return; } - if (legacy_align) { - align = *legacy_align; - } else { - if (mdc->get_min_alignment) { - align = mdc->get_min_alignment(md); - } - align = MAX(align, memory_region_get_alignment(mr)); + if (mdc->get_min_alignment) { + align = mdc->get_min_alignment(md); } + align = MAX(align, memory_region_get_alignment(mr)); addr = mdc->get_addr(md); addr = memory_device_get_free_addr(ms, !addr ? NULL : &addr, align, memory_region_size(mr), &local_err); diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 836384a90f..27919ca45d 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -69,7 +69,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp) &error_abort); trace_mhp_pc_dimm_assigned_slot(slot); - memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, NULL, errp); + memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, errp); } void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine) diff --git a/hw/virtio/virtio-md-pci.c b/hw/virtio/virtio-md-pci.c index 62bfb7920b..9ec5067662 100644 --- a/hw/virtio/virtio-md-pci.c +++ b/hw/virtio/virtio-md-pci.c @@ -37,7 +37,7 @@ void virtio_md_pci_pre_plug(VirtIOMDPCI *vmd, MachineState *ms, Error **errp) * First, see if we can plug this memory device at all. If that * succeeds, branch of to the actual hotplug handler. */ - memory_device_pre_plug(md, ms, NULL, &local_err); + memory_device_pre_plug(md, ms, &local_err); if (!local_err && bus_handler) { hotplug_handler_pre_plug(bus_handler, dev, &local_err); }