From: Daniel Henrique Barboza <danielhb413@gmail.com>
To: qemu-devel@nongnu.org
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>,
qemu-ppc@nongnu.org, groug@kaod.org, david@gibson.dropbear.id.au
Subject: [PATCH v1 6/7] spapr.c: introduce spapr_core_unplug_possible()
Date: Thu, 14 Jan 2021 15:06:27 -0300 [thread overview]
Message-ID: <20210114180628.1675603-7-danielhb413@gmail.com> (raw)
In-Reply-To: <20210114180628.1675603-1-danielhb413@gmail.com>
Next patch is going to add more conditions to allow a CPU core
hotunplug. Let's put it into a separated function to avoid crowding
the body of spapr_core_unplug_request().
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/spapr.c | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 2c403b574e..a2f01c21aa 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3706,22 +3706,35 @@ static void spapr_core_unplug(HotplugHandler *hotplug_dev, DeviceState *dev)
qdev_unrealize(dev);
}
-static
-void spapr_core_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev,
- Error **errp)
+static int spapr_core_unplug_possible(HotplugHandler *hotplug_dev, CPUCore *cc,
+ Error **errp)
{
- SpaprMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
int index;
- SpaprDrc *drc;
- CPUCore *cc = CPU_CORE(dev);
if (!spapr_find_cpu_slot(MACHINE(hotplug_dev), cc->core_id, &index)) {
error_setg(errp, "Unable to find CPU core with core-id: %d",
cc->core_id);
- return;
+ return -1;
}
+
if (index == 0) {
error_setg(errp, "Boot CPU core may not be unplugged");
+ return -1;
+ }
+
+ return 0;
+}
+
+static
+void spapr_core_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev,
+ Error **errp)
+{
+ ERRP_GUARD();
+ SpaprMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
+ SpaprDrc *drc;
+ CPUCore *cc = CPU_CORE(dev);
+
+ if (spapr_core_unplug_possible(hotplug_dev, cc, errp) < 0) {
return;
}
--
2.26.2
next prev parent reply other threads:[~2021-01-14 18:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 18:06 [PATCH v1 0/7] pseries: avoid unplug the last online CPU core + assorted fixes Daniel Henrique Barboza
2021-01-14 18:06 ` [PATCH v1 1/7] spapr.h: fix trailing whitespace in phb_placement Daniel Henrique Barboza
2021-01-15 0:42 ` David Gibson
2021-01-14 18:06 ` [PATCH v1 2/7] spapr_hcall.c: make do_client_architecture_support static Daniel Henrique Barboza
2021-01-15 0:43 ` David Gibson
2021-01-14 18:06 ` [PATCH v1 3/7] spapr_rtas.c: fix identation in rtas_ibm_nmi_interlock() string Daniel Henrique Barboza
2021-01-15 0:44 ` David Gibson
2021-01-14 18:06 ` [PATCH v1 4/7] spapr_rtas.c: fix identation of rtas_ibm_suspend_me() args Daniel Henrique Barboza
2021-01-15 0:45 ` David Gibson
2021-01-14 18:06 ` [PATCH v1 5/7] spapr_cpu_core.c: use g_auto* in spapr_create_vcpu() Daniel Henrique Barboza
2021-01-15 0:49 ` David Gibson
2021-01-14 18:06 ` Daniel Henrique Barboza [this message]
2021-01-15 0:52 ` [PATCH v1 6/7] spapr.c: introduce spapr_core_unplug_possible() David Gibson
2021-01-14 18:06 ` [PATCH v1 7/7] spapr.c: consider CPU core online state before allowing unplug Daniel Henrique Barboza
2021-01-15 1:03 ` David Gibson
2021-01-15 17:22 ` Greg Kurz
2021-01-15 18:52 ` Daniel Henrique Barboza
2021-01-18 1:18 ` David Gibson
2021-01-18 10:28 ` Daniel Henrique Barboza
2021-01-15 21:43 ` Daniel Henrique Barboza
2021-01-15 21:43 ` Daniel Henrique Barboza
2021-01-18 1:12 ` David Gibson
2021-01-18 11:03 ` Greg Kurz
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=20210114180628.1675603-7-danielhb413@gmail.com \
--to=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).