[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/53] virtio-serial-bus: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PULL 34/53] virtio-serial-bus: Move QOM macros to header |
Date: |
Thu, 27 Aug 2020 15:21:03 -0400 |
This will make future conversion to OBJECT_DECLARE* easier.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-36-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/virtio/virtio-serial.h | 5 +++++
hw/char/virtio-serial-bus.c | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/hw/virtio/virtio-serial.h
b/include/hw/virtio/virtio-serial.h
index ed3e916b68..448615a6b3 100644
--- a/include/hw/virtio/virtio-serial.h
+++ b/include/hw/virtio/virtio-serial.h
@@ -33,7 +33,12 @@ struct virtio_serial_conf {
OBJECT_GET_CLASS(VirtIOSerialPortClass, (obj), TYPE_VIRTIO_SERIAL_PORT)
typedef struct VirtIOSerial VirtIOSerial;
+
+#define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus"
typedef struct VirtIOSerialBus VirtIOSerialBus;
+#define VIRTIO_SERIAL_BUS(obj) \
+ OBJECT_CHECK(VirtIOSerialBus, (obj), TYPE_VIRTIO_SERIAL_BUS)
+
typedef struct VirtIOSerialPort VirtIOSerialPort;
typedef struct VirtIOSerialPortClass {
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index f9a4428bd6..cf08ef9728 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -843,10 +843,6 @@ static Property virtser_props[] = {
DEFINE_PROP_END_OF_LIST()
};
-#define TYPE_VIRTIO_SERIAL_BUS "virtio-serial-bus"
-#define VIRTIO_SERIAL_BUS(obj) \
- OBJECT_CHECK(VirtIOSerialBus, (obj), TYPE_VIRTIO_SERIAL_BUS)
-
static void virtser_bus_class_init(ObjectClass *klass, void *data)
{
BusClass *k = BUS_CLASS(klass);
--
2.26.2
- [PULL 26/53] spapr: Move typedef SpaprMachineState to spapr.h, (continued)
- [PULL 26/53] spapr: Move typedef SpaprMachineState to spapr.h, Eduardo Habkost, 2020/08/27
- [PULL 27/53] s390x: Move typedef SCLPEventFacility to event-facility.h, Eduardo Habkost, 2020/08/27
- [PULL 28/53] vhost-user-gpu: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 29/53] ahci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 24/53] armsse: Rename QOM macros to avoid conflicts, Eduardo Habkost, 2020/08/27
- [PULL 30/53] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 31/53] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 32/53] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/27
- [PULL 33/53] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/27
- [PULL 37/53] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 34/53] virtio-serial-bus: Move QOM macros to header,
Eduardo Habkost <=
- [PULL 36/53] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 35/53] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 38/53] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 39/53] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 41/53] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/27
- [PULL 40/53] kvm: Move QOM macros to kvm.h, Eduardo Habkost, 2020/08/27
- [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro, Eduardo Habkost, 2020/08/27
- [PULL 42/53] nubus: Rename class type checking macros, Eduardo Habkost, 2020/08/27
- [PULL 44/53] swim: Rename struct SWIM to Swim, Eduardo Habkost, 2020/08/27
- [PULL 45/53] migration: Rename class type checking macros, Eduardo Habkost, 2020/08/27