[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 33/53] vmbus: Move QOM macros to vmbus.h
From: |
Eduardo Habkost |
Subject: |
[PULL 33/53] vmbus: Move QOM macros to vmbus.h |
Date: |
Thu, 27 Aug 2020 15:21:02 -0400 |
Move all declarations related to TYPE_VMBUS to the same place in
vmbus.h.
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-35-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/hyperv/vmbus-bridge.h | 3 +--
include/hw/hyperv/vmbus.h | 4 ++++
hw/hyperv/vmbus.c | 3 ---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.h
index 33f93de64d..fe90bda01b 100644
--- a/include/hw/hyperv/vmbus-bridge.h
+++ b/include/hw/hyperv/vmbus-bridge.h
@@ -11,11 +11,10 @@
#define HW_HYPERV_VMBUS_BRIDGE_H
#include "hw/sysbus.h"
+#include "hw/hyperv/vmbus.h"
#define TYPE_VMBUS_BRIDGE "vmbus-bridge"
-typedef struct VMBus VMBus;
-
typedef struct VMBusBridge {
SysBusDevice parent_obj;
diff --git a/include/hw/hyperv/vmbus.h b/include/hw/hyperv/vmbus.h
index 40e8417eec..cd98ec24e7 100644
--- a/include/hw/hyperv/vmbus.h
+++ b/include/hw/hyperv/vmbus.h
@@ -26,6 +26,10 @@
#define VMBUS_DEVICE_GET_CLASS(obj) \
OBJECT_GET_CLASS(VMBusDeviceClass, (obj), TYPE_VMBUS_DEVICE)
+#define TYPE_VMBUS "vmbus"
+typedef struct VMBus VMBus;
+#define VMBUS(obj) OBJECT_CHECK(VMBus, (obj), TYPE_VMBUS)
+
/*
* Object wrapping a GPADL -- GPA Descriptor List -- an array of guest physical
* pages, to be used for various buffers shared between the host and the guest.
diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index 34392e892a..75af6b83dd 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -20,9 +20,6 @@
#include "cpu.h"
#include "trace.h"
-#define TYPE_VMBUS "vmbus"
-#define VMBUS(obj) OBJECT_CHECK(VMBus, (obj), TYPE_VMBUS)
-
enum {
VMGPADL_INIT,
VMGPADL_ALIVE,
--
2.26.2
- [PULL 23/53] platform-bus: Delete macros for non-existing typedef, (continued)
- [PULL 23/53] platform-bus: Delete macros for non-existing typedef, Eduardo Habkost, 2020/08/27
- [PULL 25/53] xen-legacy-backend: Add missing typedef XenLegacyDevice, Eduardo Habkost, 2020/08/27
- [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 <=
- [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, 2020/08/27
- [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