From nobody Sat May 18 22:14:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603097426; cv=none; d=zohomail.com; s=zohoarc; b=O0t2Oqv/pBnC2bx1ZkKEnoCCpdbJA8ahAf8hrqo9gRKwQGHCoqVWjnUWyv0WKsUH56a547WrIeaGPYCUD8Yk0pgzER5VNLYm2JEgylxatDeZE7wHPyqN6MXn9QR6P6lkWs/uZS/sbH1e5H9B5ojIIm6k/ZNbPN6NUEEP5WZV5QE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097426; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=K8AQ/j2e2jfhkJorwSNVvqsfsf1qpH4ABUBg2eAmcJE=; b=d22axRFcmCcrKKj0PL6DGPRrU1sF227kYMa1Y/10xdWnJZrdIAljWykqWAD3eWkMEzXIEJM8Ed0/dEXuk61Q6nAitYkHPLQBc9I9zkwChyBCsZpQO9CV6lawEs0ykKSqggawIQRoBcOvxNVdjNEHu5w25Vq2atHPrDWg33LDdgM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603097426393781.2456817061901; Mon, 19 Oct 2020 01:50:26 -0700 (PDT) Received: from localhost ([::1]:51518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQs5-0005Bd-1B for importer@patchew.org; Mon, 19 Oct 2020 04:50:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQq2-0003iq-Jk for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:20 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:39966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQq1-0002ht-3f for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:18 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-127-BUdTnnOoMEe6vAsWEdgxnQ-1; Mon, 19 Oct 2020 04:48:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D508E1084C81; Mon, 19 Oct 2020 08:48:10 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2FE5D9EF; Mon, 19 Oct 2020 08:48:05 +0000 (UTC) X-MC-Unique: BUdTnnOoMEe6vAsWEdgxnQ-1 Subject: [PATCH 1/5] pc-dimm: Drop @errp argument of pc_dimm_plug() From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:48:04 +0200 Message-ID: <160309728447.2739814.12831204841251148202.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" pc_dimm_plug() doesn't use it. It only aborts on error. Drop @errp and adapt the callers accordingly. Signed-off-by: Greg Kurz Acked-by: David Gibson Reviewed-by: David Gibson Reviewed-by: Igor Mammedov Reviewed-by: Vladimir Sementsov-Ogievskiy --- hw/arm/virt.c | 9 +-------- hw/i386/pc.c | 8 +------- hw/mem/pc-dimm.c | 2 +- hw/ppc/spapr.c | 5 +---- include/hw/mem/pc-dimm.h | 2 +- 5 files changed, 5 insertions(+), 21 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e465a988d683..27dbeb549ef1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2261,12 +2261,8 @@ static void virt_memory_plug(HotplugHandler *hotplug= _dev, VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); MachineState *ms =3D MACHINE(hotplug_dev); bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); - Error *local_err =3D NULL; =20 - pc_dimm_plug(PC_DIMM(dev), MACHINE(vms), &local_err); - if (local_err) { - goto out; - } + pc_dimm_plug(PC_DIMM(dev), MACHINE(vms)); =20 if (is_nvdimm) { nvdimm_plug(ms->nvdimms_state); @@ -2274,9 +2270,6 @@ static void virt_memory_plug(HotplugHandler *hotplug_= dev, =20 hotplug_handler_plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &error_abort); - -out: - error_propagate(errp, local_err); } =20 static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e87be5d29a01..38b1be78e707 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1265,24 +1265,18 @@ static void pc_memory_pre_plug(HotplugHandler *hotp= lug_dev, DeviceState *dev, static void pc_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); X86MachineState *x86ms =3D X86_MACHINE(hotplug_dev); MachineState *ms =3D MACHINE(hotplug_dev); bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 - pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms), &local_err); - if (local_err) { - goto out; - } + pc_dimm_plug(PC_DIMM(dev), MACHINE(pcms)); =20 if (is_nvdimm) { nvdimm_plug(ms->nvdimms_state); } =20 hotplug_handler_plug(x86ms->acpi_dev, dev, &error_abort); -out: - error_propagate(errp, local_err); } =20 static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index c30351070bb8..2ffc986734df 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -64,7 +64,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *m= achine, errp); } =20 -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp) +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine) { PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); MemoryRegion *vmstate_mr =3D ddc->get_vmstate_memory_region(dimm, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index ee716a12af73..4edd31b86915 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3438,10 +3438,7 @@ static void spapr_memory_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, =20 size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); =20 - pc_dimm_plug(dimm, MACHINE(ms), &local_err); - if (local_err) { - goto out; - } + pc_dimm_plug(dimm, MACHINE(ms)); =20 if (!is_nvdimm) { addr =3D object_property_get_uint(OBJECT(dimm), diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index aec9527fdd96..3d3db82641f8 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -72,6 +72,6 @@ struct PCDIMMDeviceClass { =20 void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, const uint64_t *legacy_align, Error **errp); -void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp); +void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine); void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine); #endif From nobody Sat May 18 22:14:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603097433; cv=none; d=zohomail.com; s=zohoarc; b=A2Fx24f8Imvdz4Ca7ELawlVBb6SutnsaFJXXSh+4NVO1HCvhZBmxK0ofafG9Xc8I0+7Ek6KOk10eOg4nbgxsSgwyiZP1psqoRaW2QPsgwMyPH1Vk153s7lRU/DskQ07VobNj1jsn4Vw3C0gId2VV5Ljkc7I3RZW4RX4Ki10rCVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097433; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FWkt81vZi+KBxKmQ59pSTZ1lUtsmI3zgwP1+NFavsHI=; b=i5cvWzkXjmSEH3K3rN8GOArm6C31Qnf52z5M3lwD4H7Y+FwOiPFhZNcmhr0phNQ2h0IZeHkxjfIHt2ImworiMuaqMiC9YdZmxHmPXXQqh8cpA/MUE9hC2viRMqo8D29sjzc56WRZP4N4vB/tBopzgH4j/Aa8y2Nz8uklVwyJd58= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160309743387459.03534607478821; Mon, 19 Oct 2020 01:50:33 -0700 (PDT) Received: from localhost ([::1]:52198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQsC-0005SG-O3 for importer@patchew.org; Mon, 19 Oct 2020 04:50:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQqE-0003lk-2v for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:31 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:30153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQqB-0002kr-TV for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:28 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-569-4nzfdw2iOnyqW2WV-o2cbg-1; Mon, 19 Oct 2020 04:48:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 502638030A4; Mon, 19 Oct 2020 08:48:22 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D2B361983; Mon, 19 Oct 2020 08:48:16 +0000 (UTC) X-MC-Unique: 4nzfdw2iOnyqW2WV-o2cbg-1 Subject: [PATCH 2/5] spapr: Use appropriate getter for PC_DIMM_ADDR_PROP From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:48:16 +0200 Message-ID: <160309729609.2739814.4996614957953215591.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The PC_DIMM_ADDR_PROP property is defined as: DEFINE_PROP_UINT64(PC_DIMM_ADDR_PROP, PCDIMMDevice, addr, 0), Use object_property_get_uint() instead of object_property_get_int(). Signed-off-by: Greg Kurz Acked-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4edd31b86915..115fc52e3b06 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3572,8 +3572,8 @@ static SpaprDimmState *spapr_recover_pending_dimm_sta= te(SpaprMachineState *ms, uint64_t addr_start, addr; int i; =20 - addr_start =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, - &error_abort); + addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PRO= P, + &error_abort); =20 addr =3D addr_start; for (i =3D 0; i < nr_lmbs; i++) { From nobody Sat May 18 22:14:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603097569; cv=none; d=zohomail.com; s=zohoarc; b=AtEPABgXrBcVHQmFb6AJyUtGZSx+IhapQM9j0GW2GS5+6DU3PdelamXO1fGiboPU3FxouXWl8lm1Sz8gmLBezedu8SO/vY7Xpo/2lE43v4SttYTsOOf97yxWY5jvrGYyeKb209JBbR+KMIpYNN0dOn3scsFwFny4L/T3t8uU660= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097569; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZAl0WwX5Z2uf9+Gf8b+4avjmEGhwMIMOZSVooTG0Y0U=; b=g4C92SK71IAEIC0kjm0ROlontjrPG3jEwQGfihfIHvhqptpBA4kyxeF0UIubG6Zhj2pqR9WKsmcTjb6QCxNabuVA8Kp4e+ERIJzfwQPbTxWWn2rN8bqBF5ROg3hlkmaEBED/dcAgxCr9Vt9Y32/ZhRE0iHNpHqj0Tn2eJAGIp8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603097569024269.90012500700357; Mon, 19 Oct 2020 01:52:49 -0700 (PDT) Received: from localhost ([::1]:59458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQuN-0008Vr-VZ for importer@patchew.org; Mon, 19 Oct 2020 04:52:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQqV-0004BL-M8 for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:47 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:46608) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQqU-0002pl-5r for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:48:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-429-t-NR6bF1NKaOly_2ZnBqUw-1; Mon, 19 Oct 2020 04:48:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F678805F05; Mon, 19 Oct 2020 08:48:36 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CDDF672C6; Mon, 19 Oct 2020 08:48:28 +0000 (UTC) X-MC-Unique: t-NR6bF1NKaOly_2ZnBqUw-1 Subject: [PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:48:27 +0200 Message-ID: <160309730758.2739814.15821922745424652642.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The PC_DIMM_SLOT_PROP property is defined as: DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot, PC_DIMM_UNASSIGNED_SLOT), Use object_property_get_int() instead of object_property_get_uint(). Since spapr_memory_plug() only gets called if pc_dimm_pre_plug() succeeded, we expect to have a valid >=3D 0 slot number, either because the user passed a valid slot number or because pc_dimm_get_free_slot() picked one up for us. Signed-off-by: Greg Kurz Acked-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 115fc52e3b06..1b173861152f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3433,7 +3433,8 @@ static void spapr_memory_plug(HotplugHandler *hotplug= _dev, DeviceState *dev, Error *local_err =3D NULL; SpaprMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); PCDIMMDevice *dimm =3D PC_DIMM(dev); - uint64_t size, addr, slot; + uint64_t size, addr; + int64_t slot; bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); @@ -3450,11 +3451,13 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), &local_err); } else { - slot =3D object_property_get_uint(OBJECT(dimm), - PC_DIMM_SLOT_PROP, &local_err); + slot =3D object_property_get_int(OBJECT(dimm), + PC_DIMM_SLOT_PROP, &local_err); if (local_err) { goto out_unplug; } + /* We should have valid slot number at this point */ + g_assert(slot >=3D 0); spapr_add_nvdimm(dev, slot, &local_err); } =20 From nobody Sat May 18 22:14:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603097645; cv=none; d=zohomail.com; s=zohoarc; b=jK5e3/QPfjBuAWfeF0naW8upyfWEDCYz14DUiDqlCKuwHe4UXbLR3jpqDnPTWnyTob1OJeGRV5cVox1csU7vbsfJtQoKBeb/g1yJSjhMUTVyAdFGEq2LHw1Djgo1dQTqaFbLd9xd1Bf3jsUm+3dzIph3uFVfG8I7bQTmOTlDn50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097645; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k4klR3tgVqWzk0OHRgNJG+EFv62mc/EvUhE71rAl0sc=; b=Zho1wiKdzcWifNuGl4+FaorZ2I2sUBEeAt3JYGKY1d0x2lUnf6WMj8CvaC7vXr2AYVLjeM97qYKOElq5dYmC4mSpvcwjpoWkrV6KyHpL2eg0tKd/Jc812xG4a001VgG/gOC6awoqOtZs4YszvK0jHQ5WsrwgwOZfyA+RO3ls2nw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603097645715274.85632927014603; Mon, 19 Oct 2020 01:54:05 -0700 (PDT) Received: from localhost ([::1]:34362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQvc-0001Q3-LU for importer@patchew.org; Mon, 19 Oct 2020 04:54:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQqm-0004Js-CZ for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:49:04 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:56423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQqk-0002vX-Qr for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:49:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-464-P7TqVq-NNC2DzU0OemN32g-1; Mon, 19 Oct 2020 04:48:57 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 89C4518A0765; Mon, 19 Oct 2020 08:48:56 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAECB70105; Mon, 19 Oct 2020 08:48:42 +0000 (UTC) X-MC-Unique: P7TqVq-NNC2DzU0OemN32g-1 Subject: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:48:41 +0200 Message-ID: <160309732180.2739814.7243774674998010907.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Both PC_DIMM_SLOT_PROP and PC_DIMM_ADDR_PROP are defined in the default property list of the PC DIMM device class: DEFINE_PROP_UINT64(PC_DIMM_ADDR_PROP, PCDIMMDevice, addr, 0), DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot, PC_DIMM_UNASSIGNED_SLOT), They should thus be always gettable for both PC DIMMs and NVDIMMs. An error in getting them can only be the result of a programming error. It doesn't make much sense to propagate the error in this case. Abort instead. Signed-off-by: Greg Kurz Reviewed-by: Igor Mammedov --- hw/ppc/spapr.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 1b173861152f..62f217a6b914 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3443,19 +3443,13 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, =20 if (!is_nvdimm) { addr =3D object_property_get_uint(OBJECT(dimm), - PC_DIMM_ADDR_PROP, &local_err); - if (local_err) { - goto out_unplug; - } + PC_DIMM_ADDR_PROP, &error_abort); spapr_add_lmbs(dev, addr, size, spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), &local_err); } else { slot =3D object_property_get_int(OBJECT(dimm), - PC_DIMM_SLOT_PROP, &local_err); - if (local_err) { - goto out_unplug; - } + PC_DIMM_SLOT_PROP, &error_abort); /* We should have valid slot number at this point */ g_assert(slot >=3D 0); spapr_add_nvdimm(dev, slot, &local_err); @@ -3634,7 +3628,6 @@ static void spapr_memory_unplug_request(HotplugHandle= r *hotplug_dev, DeviceState *dev, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); - Error *local_err =3D NULL; PCDIMMDevice *dimm =3D PC_DIMM(dev); uint32_t nr_lmbs; uint64_t size, addr_start, addr; @@ -3650,11 +3643,7 @@ static void spapr_memory_unplug_request(HotplugHandl= er *hotplug_dev, nr_lmbs =3D size / SPAPR_MEMORY_BLOCK_SIZE; =20 addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PRO= P, - &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } + &error_abort); =20 /* * An existing pending dimm state for this DIMM means that there is an From nobody Sat May 18 22:14:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603097479; cv=none; d=zohomail.com; s=zohoarc; b=nQWFuCLdMk75SM8Dd8Zw+dtt36J3MMUZqcdpRAeTM2uV3P7CBprLNwgP4SRCbxc5RiuEidLlqqwtFpFCASpBzwEEoWyspZNlkJga2mcy1kmkY90TgmwSUR6T4PVgKLzCVg/DPQrBdqpST9xv0IcfCI1I1t98r9qivDqkd7Nx1jI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603097479; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/O4hiTd7iTa5xzumEBxMOAJ9xDJe6dHzYXuUYGDeaFs=; b=PH71k9jdpoMtJv0Dt5vSpbgzbjVdosT63HX1HtY9Sv1Gq/yp2rSbH0+eoQzjL0mdXcKqPpGEzA8ILHPQr542yHsJtXe4vE2CyNF2BBllDqqharF3p9M5DUnU4HotT0PJrDzB5kbt4CYP3KkDEtNEuKFTLGNq8BtptorVQsxzCHc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603097479172157.43170511647838; Mon, 19 Oct 2020 01:51:19 -0700 (PDT) Received: from localhost ([::1]:55194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUQsv-0006kw-UY for importer@patchew.org; Mon, 19 Oct 2020 04:51:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUQr6-0004zV-34 for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:49:24 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:52764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUQr4-00032L-Hs for qemu-devel@nongnu.org; Mon, 19 Oct 2020 04:49:23 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-NxMkSShpNWKOqL-VLApkkQ-1; Mon, 19 Oct 2020 04:49:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB5451060DD8; Mon, 19 Oct 2020 08:49:11 +0000 (UTC) Received: from bahia.lan (ovpn-112-78.ams2.redhat.com [10.36.112.78]) by smtp.corp.redhat.com (Postfix) with ESMTP id B21177367B; Mon, 19 Oct 2020 08:49:02 +0000 (UTC) X-MC-Unique: NxMkSShpNWKOqL-VLApkkQ-1 Subject: [PATCH 5/5] spapr: Simplify error handling in spapr_memory_plug() From: Greg Kurz To: David Gibson Date: Mon, 19 Oct 2020 10:49:01 +0200 Message-ID: <160309734178.2739814.3488437759887793902.stgit@bahia.lan> In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> References: <160309727218.2739814.14722724927730985344.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 04:48:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Vladimir Sementsov-Ogievskiy , "Daniel P. Berrange" , Eduardo Habkost , "Michael S. Tsirkin" , Markus Armbruster , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" As recommended in "qapi/error.h", add a bool return value to spapr_add_lmbs() and spapr_add_nvdimm(), and use them instead of local_err in spapr_memory_plug(). This allows to get rid of the error propagation overhead. Signed-off-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/spapr.c | 23 ++++++++++------------- hw/ppc/spapr_nvdimm.c | 5 +++-- include/hw/ppc/spapr_nvdimm.h | 2 +- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 62f217a6b914..0cc19b5863a4 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3382,7 +3382,7 @@ int spapr_lmb_dt_populate(SpaprDrc *drc, SpaprMachine= State *spapr, return 0; } =20 -static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t= size, +static bool spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t= size, bool dedicated_hp_event_source, Error **errp) { SpaprDrc *drc; @@ -3403,7 +3403,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t= addr_start, uint64_t size, addr / SPAPR_MEMORY_BLOCK_SIZE); spapr_drc_detach(drc); } - return; + return false; } if (!hotplugged) { spapr_drc_reset(drc); @@ -3425,12 +3425,12 @@ static void spapr_add_lmbs(DeviceState *dev, uint64= _t addr_start, uint64_t size, nr_lmbs); } } + return true; } =20 static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *de= v, Error **errp) { - Error *local_err =3D NULL; SpaprMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); PCDIMMDevice *dimm =3D PC_DIMM(dev); uint64_t size, addr; @@ -3444,27 +3444,24 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, if (!is_nvdimm) { addr =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP, &error_abort); - spapr_add_lmbs(dev, addr, size, - spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), - &local_err); + if (!spapr_add_lmbs(dev, addr, size, + spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), errp= )) { + goto out_unplug; + } } else { slot =3D object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP, &error_abort); /* We should have valid slot number at this point */ g_assert(slot >=3D 0); - spapr_add_nvdimm(dev, slot, &local_err); - } - - if (local_err) { - goto out_unplug; + if (!spapr_add_nvdimm(dev, slot, errp)) { + goto out_unplug; + } } =20 return; =20 out_unplug: pc_dimm_unplug(dimm, MACHINE(ms)); -out: - error_propagate(errp, local_err); } =20 static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState= *dev, diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index 9e3d94071fe1..a833a63b5ed3 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -89,7 +89,7 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, N= VDIMMDevice *nvdimm, } =20 =20 -void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp) +bool spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp) { SpaprDrc *drc; bool hotplugged =3D spapr_drc_hotplugged(dev); @@ -98,12 +98,13 @@ void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, = Error **errp) g_assert(drc); =20 if (!spapr_drc_attach(drc, dev, errp)) { - return; + return false; } =20 if (hotplugged) { spapr_hotplug_req_add_by_index(drc); } + return true; } =20 static int spapr_dt_nvdimm(SpaprMachineState *spapr, void *fdt, diff --git a/include/hw/ppc/spapr_nvdimm.h b/include/hw/ppc/spapr_nvdimm.h index 490b19a009f4..344582d2f5f7 100644 --- a/include/hw/ppc/spapr_nvdimm.h +++ b/include/hw/ppc/spapr_nvdimm.h @@ -30,6 +30,6 @@ int spapr_pmem_dt_populate(SpaprDrc *drc, SpaprMachineSta= te *spapr, void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt); bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdi= mm, uint64_t size, Error **errp); -void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp); +bool spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp); =20 #endif