From 3f9e4859640c69618446eb95176c31ae6a77c06f Mon Sep 17 00:00:00 2001 From: Sascha Silbe Date: Mon, 4 Jul 2016 15:46:20 +0200 Subject: [PATCH] s390x/css: use define for "virtual-css-bridge" literal Introduce a TYPE_* define (like we already use for a couple of other QOM types) for the name of the virtual CSS bridge QOM type instead of sprinkling the same string literal over several source files. Signed-off-by: Sascha Silbe Signed-off-by: Cornelia Huck --- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/virtio-ccw.c | 4 ++-- hw/s390x/virtio-ccw.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 52f079a884..3b79e96b09 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -29,7 +29,7 @@ #include "hw/s390x/s390-virtio-ccw.h" static const char *const reset_dev_types[] = { - "virtual-css-bridge", + TYPE_VIRTUAL_CSS_BRIDGE, "s390-sclp-event-facility", "s390-flic", "diag288", diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 67d7867c56..0afc0d36a6 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -130,7 +130,7 @@ VirtualCssBus *virtual_css_bus_init(void) DeviceState *dev; /* Create bridge device */ - dev = qdev_create(NULL, "virtual-css-bridge"); + dev = qdev_create(NULL, TYPE_VIRTUAL_CSS_BRIDGE); qdev_init_nofail(dev); /* Create bus on bridge device */ @@ -1626,7 +1626,7 @@ static void virtual_css_bridge_class_init(ObjectClass *klass, void *data) } static const TypeInfo virtual_css_bridge_info = { - .name = "virtual-css-bridge", + .name = TYPE_VIRTUAL_CSS_BRIDGE, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(SysBusDevice), .class_init = virtual_css_bridge_class_init, diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 7243fb08be..6144625416 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -101,6 +101,9 @@ static inline int virtio_ccw_rev_max(VirtioCcwDevice *dev) return dev->max_rev; } +/* virtual css bridge type */ +#define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge" + /* virtual css bus type */ typedef struct VirtualCssBus { BusState parent_obj;