|
 |
4a2fec |
From 3ad6366bd5d0bea256b37b0e8cdef6ff5ac2e4e2 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Date: Mon, 9 Oct 2017 12:32:46 +0200
|
|
|
4a2fec |
Subject: [PATCH 27/34] s390x/sclp: mark sclp-cpu-hotplug as non-usercreatable
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Message-id: <1507552368-9245-11-git-send-email-thuth@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77028
|
|
|
4a2fec |
O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 10/12] s390x/sclp: mark sclp-cpu-hotplug as non-usercreatable
|
|
|
4a2fec |
Bugzilla: 1492033
|
|
|
4a2fec |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
A TYPE_SCLP_CPU_HOTPLUG device for handling cpu hotplug events
|
|
|
4a2fec |
is already created by the sclp event facility. Adding a second
|
|
|
4a2fec |
TYPE_SCLP_CPU_HOTPLUG device via -device sclp-cpu-hotplug creates
|
|
|
4a2fec |
an ambiguity in raise_irq_cpu_hotplug(), leading to a crash once
|
|
|
4a2fec |
a cpu is hotplugged.
|
|
|
4a2fec |
|
|
|
4a2fec |
To fix this, disallow creating a sclp-cpu-hotplug device manually.
|
|
|
4a2fec |
|
|
|
4a2fec |
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
|
|
4a2fec |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 7aa4d85d2962a072931657bee964113727ebf0c8)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/s390x/sclpcpu.c | 6 ++++++
|
|
|
4a2fec |
1 file changed, 6 insertions(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
|
|
|
4a2fec |
index b1f3ef8..fa17cc5 100644
|
|
|
4a2fec |
--- a/hw/s390x/sclpcpu.c
|
|
|
4a2fec |
+++ b/hw/s390x/sclpcpu.c
|
|
|
4a2fec |
@@ -83,6 +83,12 @@ static void cpu_class_init(ObjectClass *oc, void *data)
|
|
|
4a2fec |
k->get_receive_mask = receive_mask;
|
|
|
4a2fec |
k->read_event_data = read_event_data;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
4a2fec |
+ /*
|
|
|
4a2fec |
+ * Reason: raise_irq_cpu_hotplug() depends on an unique
|
|
|
4a2fec |
+ * TYPE_SCLP_CPU_HOTPLUG device, which is already created
|
|
|
4a2fec |
+ * by the sclp event facility
|
|
|
4a2fec |
+ */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo sclp_cpu_info = {
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|