From patchwork Mon Jun 17 07:11:09 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: 804859 Delivered-To: patch@linaro.org Received: by 2002:adf:fb90:0:b0:360:93e7:1765 with SMTP id a16csp434671wrr; Mon, 17 Jun 2024 00:14:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOMdWKbFLGkilcjSOaFDN73PXa0TklSbiBLJtav1Du2rUBAhg/uY75PzbZK+LLjNv7ApPfqw+Smh7XwVTx2B7a X-Google-Smtp-Source: AGHT+IFdDIRhK6vjQNgAyup2xzV5qcajXkeUcbyJCpjQHv8/lwO4SbQTGnDdceSm5ScI1xBJZoTT X-Received: by 2002:a05:620a:254e:b0:795:813b:fa3d with SMTP id af79cd13be357-798d23fb7c8mr1118313185a.10.1718608463894; Mon, 17 Jun 2024 00:14:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718608463; cv=none; d=google.com; s=arc-20160816; b=1IeoshBn4tQUBVBo/4lw+YpEZGf6PRxZJTvV2BzSs/H8iMLLZNcY0BXyMsulGPE5AT 1XA5HKj8dsrbAkny1/SOrt+DMSdGJxKuSWUIeyCnT32t2Uf3doIfzLkgaoV8b6nHSjJ5 78X/O/bmfOvX+HbirPRtDLVJk/Ub3EN+aCleIENKvVtmW5gw75iXWdbkHmaOCPMWYp8W KNnxwx0BjMBZivtI7cIjbaQ/uU0Xu+AI/jSdrO2wwUZSaMgFdOMPj6MsRq9x0Wst/hJ8 Fk6XrRQo39pB6sHhf16g7B1BwtImK63IxoB/ZPuSAwbicFVcSsvcsnN2K7JtxYH3A8a5 qk1Q== 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=+bjM946pseWmaLm8Jdsuc2Raq0zFD/WoYM9/3eFjO3k=; fh=9hRd7LaHH17BLGyK0dL14LbVs/1RFaqe1fMw44lA9A0=; b=mBt73huN6+2q7+dqVNt+1LdnqGzhF8IVHewYkdVwiSeB4hhQYCxiygBEqQjUuWoG6E yAYwfXuElz68Ytbbl4cGsxmW9st4SKuihZAB9lVrEIN7x0M59IANE6HSrrk6YcDuU57E AGOQxYmCUjHbfPfwctCyXH71ta7SwT+GrYwJ1ZUNiAgPGGNDENnZS6a/qaBYxoHNBhiH xY3+6AtPqSCPcbhA1PfDTuU8U2tMF1ADqz2U06UFzDxU770NNgtD2ZQNwOwhNpgN92o7 KCTxQoRdCECcajxeNhd4Jl6EmpAPd9l1HBHP+wDIN1zmFR2vxV8t1+et4MX7/9+68kLo 1ubA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fnhLw0wQ; 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 af79cd13be357-798ac096d91si972596085a.772.2024.06.17.00.14.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Jun 2024 00:14:23 -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=fnhLw0wQ; 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 1sJ6Xl-0006ff-Bb; Mon, 17 Jun 2024 03:12:45 -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 1sJ6Xk-0006Ta-1o for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:12:44 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sJ6Xi-0002KN-3P for qemu-devel@nongnu.org; Mon, 17 Jun 2024 03:12:43 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a63359aaacaso614173466b.1 for ; Mon, 17 Jun 2024 00:12:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718608360; x=1719213160; 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=+bjM946pseWmaLm8Jdsuc2Raq0zFD/WoYM9/3eFjO3k=; b=fnhLw0wQpRejAHwx1COFZZDiY5nZCu03zTAUcCu/js+iS9jpZGXiJ5ZCuERiCCfOMo 4a9kyAo6RI0oArwdISC8uPioWhbAS/46hcGSKFs/E6bdkG+frni33qG5nJDlw85sHZZl q7qK+PomAFBnA2vJPeSZXTn450cLVFn7pEjouZXLnKe3W+hL4C5+B0FnOubJWY8VbVAW Lm6oh0Blq7M/D4kHEKgsUyDOF98Pe4WMHRgSVlOr/u2KdlDOYXk+XLNOfP9vA/kb2v60 wfWIVwxN8qQ5/398+KMLLJv3LLcR47IDUnG0g2raT7APPgx8kfLaw8u8pQcVB1dadapX Wuhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718608360; x=1719213160; 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=+bjM946pseWmaLm8Jdsuc2Raq0zFD/WoYM9/3eFjO3k=; b=VY7KNnBGS1HMbrP0SiyyB4C59Kkps6+/1MlCXZMfxSbTyDL8NWK52aqLdGMURyAUp8 ueP/AgGukwV5dFnbkUin3DqK531x5L77LdyPMkSus4ukjh7qrvOqhI0oM1a66b+kc44G dAUKbosvh5623BgxIrVlTRyCdNLBjrvFxINreq7UXBRmGbKL6D7+4kifXPvNoaiVRjq3 0USipvKGx/Yksk2i2gl3VyUeT/m1EyINaOxd4pknpB0i942/7txGNJ9suQL339bIfCM9 Mm0WGWi1gM8BJqk1lcS26N5K01SVh7FyyZzFlwBobCWtN1dVhACqfrS4f64Ptyv+VUyv 8LHA== X-Gm-Message-State: AOJu0Yzk8YfDmQum/VPeTf340B/jJSt4BnpMLpQA3QybB0K/rqCtkY/S uXqnrNcW9dN+wm7C3MVbXs4VlAEA7Q8dxe0DKMjGF71RCPlN59GltVT/6VQkEWK2FWaMttfTUoC 5aoY= X-Received: by 2002:a17:906:1754:b0:a6f:593f:d337 with SMTP id a640c23a62f3a-a6f60cefc1emr596226766b.7.1718608359852; Mon, 17 Jun 2024 00:12:39 -0700 (PDT) Received: from m1x-phil.lan ([176.176.169.90]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db62e5sm484678566b.84.2024.06.17.00.12.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Jun 2024 00:12:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Igor Mammedov , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Thomas Huth , David Hildenbrand , Zhao Liu Subject: [PATCH v6 14/23] hw/mem/pc-dimm: Remove legacy_align argument from pc_dimm_pre_plug() Date: Mon, 17 Jun 2024 09:11:09 +0200 Message-ID: <20240617071118.60464-15-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240617071118.60464-1-philmd@linaro.org> References: <20240617071118.60464-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=philmd@linaro.org; helo=mail-ej1-x62e.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. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: David Hildenbrand Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov --- include/hw/mem/pc-dimm.h | 3 +-- hw/arm/virt.c | 2 +- hw/i386/pc.c | 2 +- hw/loongarch/virt.c | 2 +- hw/mem/pc-dimm.c | 6 ++---- hw/ppc/spapr.c | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 322bebe555..fe0f3ea963 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -66,8 +66,7 @@ struct PCDIMMDeviceClass { void (*unrealize)(PCDIMMDevice *dimm); }; -void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, - const uint64_t *legacy_align, Error **errp); +void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp); void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine); void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine); #endif diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 268b25e332..c7a1f754e7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2763,7 +2763,7 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, return; } - pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp); } static void virt_memory_plug(HotplugHandler *hotplug_dev, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ff5683a8ee..2d0a517c4c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1327,7 +1327,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, return; } - pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp); } static void pc_memory_plug(HotplugHandler *hotplug_dev, diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c index b7ea17d5f3..8be2d2ff6a 100644 --- a/hw/loongarch/virt.c +++ b/hw/loongarch/virt.c @@ -1245,7 +1245,7 @@ static bool memhp_type_supported(DeviceState *dev) static void virt_mem_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); + pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp); } static void virt_device_pre_plug(HotplugHandler *hotplug_dev, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 37f1f4ccfd..836384a90f 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -44,8 +44,7 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp) return host_memory_backend_get_memory(dimm->hostmem); } -void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, - const uint64_t *legacy_align, Error **errp) +void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp) { Error *local_err = NULL; int slot; @@ -70,8 +69,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, &error_abort); trace_mhp_pc_dimm_assigned_slot(slot); - memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, legacy_align, - errp); + memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, NULL, errp); } void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 81a187f126..d7d4b188ee 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3700,7 +3700,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, return; } - pc_dimm_pre_plug(dimm, MACHINE(hotplug_dev), NULL, errp); + pc_dimm_pre_plug(dimm, MACHINE(hotplug_dev), errp); } struct SpaprDimmState {