[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 40/53] kvm: Move QOM macros to kvm.h
From: |
Eduardo Habkost |
Subject: |
[PULL 40/53] kvm: Move QOM macros to kvm.h |
Date: |
Thu, 27 Aug 2020 15:21:09 -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>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-42-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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
- [PULL 31/53] ahci: Move QOM macro to header, (continued)
- [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, 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 <=
- [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
- [PULL 47/53] nios2_iic: Use TYPE_ALTERA_IIC constant, Eduardo Habkost, 2020/08/27
- [PULL 46/53] etsec: Use TYPE_ETSEC_COMMON constant, Eduardo Habkost, 2020/08/27
- [PULL 49/53] sclpconsole: Use TYPE_* constants, Eduardo Habkost, 2020/08/27
- [PULL 48/53] amd_iommu: Use TYPE_AMD_IOMMU_PCI constant, Eduardo Habkost, 2020/08/27
- [PULL 51/53] tosa: Use TYPE_TOSA_MISC_GPIO constant, Eduardo Habkost, 2020/08/27
- [PULL 50/53] xlnx-zcu102: Use TYPE_ZCU102_MACHINE constant, Eduardo Habkost, 2020/08/27