[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 35/58] virtio-serial-bus: Move QOM macros to header
From: |
Eduardo Habkost |
Subject: |
[PATCH v2 35/58] virtio-serial-bus: Move QOM macros to header |
Date: |
Wed, 19 Aug 2020 20:12:13 -0400 |
This will make future conversion to OBJECT_DECLARE* easier.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes series v1 -> v2: new patch in series v2
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Amit Shah <amit@kernel.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
---
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
- [PATCH v2 30/58] ahci: Move QOM macros to header, (continued)
- [PATCH v2 30/58] ahci: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 31/58] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 32/58] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 33/58] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 34/58] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/19
- [PATCH v2 35/58] virtio-serial-bus: Move QOM macros to header,
Eduardo Habkost <=
- [PATCH v2 36/58] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 37/58] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 38/58] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/19
- [PATCH v2 39/58] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/19