|
 |
1bdc94 |
From 695c0b884eb5e6f35023b0e32928741c044b0498 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Date: Thu, 19 Oct 2017 15:28:13 +0200
|
|
|
1bdc94 |
Subject: spapr: disable cpu hot-remove
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
Message-id: <1508426893-172020-1-git-send-email-imammedo@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 77378
|
|
|
1bdc94 |
O-Subject: [RHV7.5 qemu-kvm-ma PATCH v2] spapr: disable cpu hot-remove
|
|
|
1bdc94 |
Bugzilla: 1499320
|
|
|
1bdc94 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1499320
|
|
|
1bdc94 |
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=14301295
|
|
|
1bdc94 |
Upstream: RHEL-only
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Rebase to 2.10 brought in cpu hot-remove with it, disable it
|
|
|
1bdc94 |
for qemu-kvm-ma variant of QEMU where it hasn't been supported.
|
|
|
1bdc94 |
Use CONFIG_RHV to switch unplug off only for qemu-kvm-ma and
|
|
|
1bdc94 |
not to affect RHEV variant built from the same source code.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Conflicts:
|
|
|
1bdc94 |
hw/ppc/spapr.c
|
|
|
1bdc94 |
|
|
|
1bdc94 |
(cherry picked from commit 56c058f25caa085fb22a92d89976afb529a391d8)
|
|
|
1bdc94 |
(cherry picked from commit c5448e8e407c2275d5b74e93fbf67eafb93b5a56)
|
|
|
1bdc94 |
(cherry picked from commit 7556463d8bfe3f357960962c6da2f6dc692b289f)
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/ppc/spapr.c | 4 ++++
|
|
|
1bdc94 |
1 file changed, 4 insertions(+)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
1bdc94 |
index 3ea94de..f71a62e 100644
|
|
|
1bdc94 |
--- a/hw/ppc/spapr.c
|
|
|
1bdc94 |
+++ b/hw/ppc/spapr.c
|
|
|
1bdc94 |
@@ -3315,6 +3315,7 @@ static
|
|
|
1bdc94 |
void spapr_core_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
1bdc94 |
Error **errp)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
+#if defined(CONFIG_RHV)
|
|
|
1bdc94 |
sPAPRMachineState *spapr = SPAPR_MACHINE(OBJECT(hotplug_dev));
|
|
|
1bdc94 |
int index;
|
|
|
1bdc94 |
sPAPRDRConnector *drc;
|
|
|
1bdc94 |
@@ -3337,6 +3338,9 @@ void spapr_core_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
1bdc94 |
spapr_drc_detach(drc);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
spapr_hotplug_req_remove_by_index(drc);
|
|
|
1bdc94 |
+#else
|
|
|
1bdc94 |
+ error_setg(errp, "this feature or command is not currently supported");
|
|
|
1bdc94 |
+#endif /* CONFIG_RHV */
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|