[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 41/74] kvm: Move QOM macros to kvm.h
From: |
Eduardo Habkost |
Subject: |
[PATCH v3 41/74] kvm: Move QOM macros to kvm.h |
Date: |
Tue, 25 Aug 2020 15:20:37 -0400 |
Move QOM macros close to the KVMState typedef.
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>
---
Changes v2 -> v3: none
Changes series v1 -> v2: new patch in series v2
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org
Cc: qemu-devel@nongnu.org
---
include/sysemu/kvm.h | 6 ++++++
include/sysemu/kvm_int.h | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index b4174d941c..8445a88db1 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -17,6 +17,7 @@
#include "qemu/queue.h"
#include "hw/core/cpu.h"
#include "exec/memattrs.h"
+#include "sysemu/accel.h"
#ifdef NEED_CPU_H
# ifdef CONFIG_KVM
@@ -199,7 +200,12 @@ typedef struct KVMCapabilityInfo {
#define KVM_CAP_LAST_INFO { NULL, 0 }
struct KVMState;
+
+#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")
typedef struct KVMState KVMState;
+#define KVM_STATE(obj) \
+ OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL)
+
extern KVMState *kvm_state;
typedef struct Notifier Notifier;
diff --git a/include/sysemu/kvm_int.h b/include/sysemu/kvm_int.h
index c660a70c51..65740806da 100644
--- a/include/sysemu/kvm_int.h
+++ b/include/sysemu/kvm_int.h
@@ -33,11 +33,6 @@ typedef struct KVMMemoryListener {
int as_id;
} KVMMemoryListener;
-#define TYPE_KVM_ACCEL ACCEL_CLASS_NAME("kvm")
-
-#define KVM_STATE(obj) \
- OBJECT_CHECK(KVMState, (obj), TYPE_KVM_ACCEL)
-
void kvm_memory_listener_register(KVMState *s, KVMMemoryListener *kml,
AddressSpace *as, int as_id);
--
2.26.2
- [PATCH v3 31/74] i8257: Move QOM macro to header, (continued)
- [PATCH v3 31/74] i8257: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 32/74] ahci: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 33/74] pckbd: Move QOM macro to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 34/74] vmbus: Move QOM macros to vmbus.h, Eduardo Habkost, 2020/08/25
- [PATCH v3 35/74] virtio-serial-bus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 36/74] piix: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 37/74] auxbus: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 38/74] rocker: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 40/74] mptsas: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 39/74] pxa2xx: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 41/74] kvm: Move QOM macros to kvm.h,
Eduardo Habkost <=
- [PATCH v3 42/74] vfio/pci: Move QOM macros to header, Eduardo Habkost, 2020/08/25
- [PATCH v3 43/74] nubus: Rename class type checking macros, Eduardo Habkost, 2020/08/25
- [PATCH v3 44/74] imx_ccm: Rename IMX_GET_CLASS macro, Eduardo Habkost, 2020/08/25
- [PATCH v3 45/74] mos6522: Rename QOM macros, Eduardo Habkost, 2020/08/25
- [PATCH v3 47/74] rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro, Eduardo Habkost, 2020/08/25
- [PATCH v3 46/74] x86-iommu: Rename QOM type macros, Eduardo Habkost, 2020/08/25