[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/23] s390/sclp: replace sclp event types with prope
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 12/23] s390/sclp: replace sclp event types with proper defines |
Date: |
Mon, 7 Sep 2015 16:48:26 +0200 |
From: David Hildenbrand <address@hidden>
Introduce TYPE_SCLP_QUIESCE and make use of it. Also use
TYPE_SCLP_CPU_HOTPLUG where applicable.
Reviewed-by: Matthew Rosato <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/event-facility.c | 2 +-
hw/s390x/sclpcpu.c | 2 +-
hw/s390x/sclpquiesce.c | 4 ++--
include/hw/s390x/event-facility.h | 1 +
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 7b64e78..ef2a051 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -353,7 +353,7 @@ static void init_event_facility(Object *obj)
TYPE_SCLP_EVENTS_BUS, sdev, NULL);
object_initialize(&event_facility->quiesce_event, sizeof(SCLPEvent),
- "sclpquiesce");
+ TYPE_SCLP_QUIESCE);
qdev_set_parent_bus(DEVICE(&event_facility->quiesce_event),
&event_facility->sbus.qbus);
object_initialize(&event_facility->cpu_hotplug_event, sizeof(SCLPEvent),
diff --git a/hw/s390x/sclpcpu.c b/hw/s390x/sclpcpu.c
index 615ac06..322eb31 100644
--- a/hw/s390x/sclpcpu.c
+++ b/hw/s390x/sclpcpu.c
@@ -85,7 +85,7 @@ static void cpu_class_init(ObjectClass *oc, void *data)
}
static const TypeInfo sclp_cpu_info = {
- .name = "sclp-cpu-hotplug",
+ .name = TYPE_SCLP_CPU_HOTPLUG,
.parent = TYPE_SCLP_EVENT,
.instance_size = sizeof(SCLPEvent),
.class_init = cpu_class_init,
diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c
index ffa5553..15b06e1 100644
--- a/hw/s390x/sclpquiesce.c
+++ b/hw/s390x/sclpquiesce.c
@@ -66,7 +66,7 @@ static int read_event_data(SCLPEvent *event,
EventBufferHeader *evt_buf_hdr,
}
static const VMStateDescription vmstate_sclpquiesce = {
- .name = "sclpquiesce",
+ .name = TYPE_SCLP_QUIESCE,
.version_id = 0,
.minimum_version_id = 0,
.fields = (VMStateField[]) {
@@ -127,7 +127,7 @@ static void quiesce_class_init(ObjectClass *klass, void
*data)
}
static const TypeInfo sclp_quiesce_info = {
- .name = "sclpquiesce",
+ .name = TYPE_SCLP_QUIESCE,
.parent = TYPE_SCLP_EVENT,
.instance_size = sizeof(SCLPEvent),
.class_init = quiesce_class_init,
diff --git a/include/hw/s390x/event-facility.h
b/include/hw/s390x/event-facility.h
index eae3b3b..3c1ee35 100644
--- a/include/hw/s390x/event-facility.h
+++ b/include/hw/s390x/event-facility.h
@@ -47,6 +47,7 @@
OBJECT_GET_CLASS(SCLPEventClass, (obj), TYPE_SCLP_EVENT)
#define TYPE_SCLP_CPU_HOTPLUG "sclp-cpu-hotplug"
+#define TYPE_SCLP_QUIESCE "sclpquiesce"
typedef struct WriteEventMask {
SCCBHeader h;
--
2.5.1
- [Qemu-devel] [PULL 00/23] s390x: further patches, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 01/23] s390x/css: handle ccw-0 TIC correctly, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 10/23] sclp/s390: rework sclp cpu hotplug device notification, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 02/23] s390x/css: ccw-0 enforces count > 0, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 03/23] s390x/event-facility: fix receive mask check, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 05/23] s390x/event-facility: fix location of receive mask, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 06/23] pc-bios/s390-ccw: Device detection in higher subchannel sets, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 07/23] pc-bios/s390-ccw: rebuild image, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 11/23] s390/sclp: rework sclp event facility initialization + device realization, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 12/23] s390/sclp: replace sclp event types with proper defines,
Cornelia Huck <=
- [Qemu-devel] [PULL 04/23] s390x/css: start with cleared cstat/dstat, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 18/23] s390: disallow memory hotplug for the s390-virtio machine, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 08/23] s390x/kvm: make setting of in-kernel irq routes more efficient, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 16/23] s390/sclp: move sclp_service_interrupt into the sclp device, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 14/23] s390/sclp: introduce a root sclp device, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 21/23] s390: unify allocation of initial memory, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 19/23] s390/sclp: ignore memory hotplug operations if it is disabled, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 15/23] s390/sclp: move sclp_execute related functions into the SCLP class, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 20/23] s390: move memory calculation into the sclp device, Cornelia Huck, 2015/09/07
- [Qemu-devel] [PULL 09/23] s390x/gdb: support reading/writing of control registers, Cornelia Huck, 2015/09/07