From: Greg Kurz <groug@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP
Date: Mon, 19 Oct 2020 10:48:27 +0200 [thread overview]
Message-ID: <160309730758.2739814.15821922745424652642.stgit@bahia.lan> (raw)
In-Reply-To: <160309727218.2739814.14722724927730985344.stgit@bahia.lan>
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 >= 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 <groug@kaod.org>
---
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 = NULL;
SpaprMachineState *ms = SPAPR_MACHINE(hotplug_dev);
PCDIMMDevice *dimm = PC_DIMM(dev);
- uint64_t size, addr, slot;
+ uint64_t size, addr;
+ int64_t slot;
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);
@@ -3450,11 +3451,13 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT),
&local_err);
} else {
- slot = object_property_get_uint(OBJECT(dimm),
- PC_DIMM_SLOT_PROP, &local_err);
+ slot = 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 >= 0);
spapr_add_nvdimm(dev, slot, &local_err);
}
next prev parent reply other threads:[~2020-10-19 8:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 8:47 [PATCH 0/5] spapr: Error handling fixes and cleanups (round 3) Greg Kurz
2020-10-19 8:48 ` [PATCH 1/5] pc-dimm: Drop @errp argument of pc_dimm_plug() Greg Kurz
2020-10-21 14:29 ` Vladimir Sementsov-Ogievskiy
2020-10-22 4:06 ` David Gibson
2020-10-23 19:19 ` Igor Mammedov
2020-10-25 21:31 ` Greg Kurz
2020-10-19 8:48 ` [PATCH 2/5] spapr: Use appropriate getter for PC_DIMM_ADDR_PROP Greg Kurz
2020-10-19 9:05 ` Philippe Mathieu-Daudé
2020-10-22 4:07 ` David Gibson
2020-10-19 8:48 ` Greg Kurz [this message]
2020-10-19 9:08 ` [PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP Philippe Mathieu-Daudé
2020-10-22 4:08 ` David Gibson
2020-10-19 8:48 ` [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties Greg Kurz
2020-10-23 19:15 ` Igor Mammedov
2020-10-25 15:24 ` Greg Kurz
2020-10-27 11:54 ` Igor Mammedov
2020-10-27 15:18 ` Greg Kurz
2020-10-28 15:22 ` Igor Mammedov
2020-10-30 13:25 ` Greg Kurz
2020-11-02 0:57 ` David Gibson
2020-10-19 8:49 ` [PATCH 5/5] spapr: Simplify error handling in spapr_memory_plug() Greg Kurz
2020-10-19 9:10 ` Philippe Mathieu-Daudé
2020-10-23 19:17 ` Igor Mammedov
2020-10-22 4:11 ` [PATCH 0/5] spapr: Error handling fixes and cleanups (round 3) David Gibson
2020-10-25 10:13 ` Greg Kurz
2020-10-25 21:33 ` Greg Kurz
2020-10-26 5:44 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160309730758.2739814.15821922745424652642.stgit@bahia.lan \
--to=groug@kaod.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=rth@twiddle.net \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).