[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 27/28] sysemu: Move the VMChangeStateEntry typedef t
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 27/28] sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h |
Date: |
Fri, 26 Jul 2019 14:05:41 +0200 |
The previous commit deleted superfluous inclusions of sysemu/sysemu.h,
but that didn't really help.
Several headers include sysemu/sysemu.h just to get typedef
VMChangeStateEntry. Move it from sysemu/sysemu.h to qemu/typedefs.h.
Spell its structure tag the same while there.
All these headers still include sysemu/sysemu.h indirectly, so this
doesn't by itself reduce its use. It will together with the the next
commit.
Signed-off-by: Markus Armbruster <address@hidden>
---
include/hw/ide/internal.h | 3 ++-
include/hw/ppc/spapr_xive.h | 1 -
include/hw/scsi/scsi.h | 1 -
include/hw/virtio/virtio.h | 1 -
include/qemu/typedefs.h | 1 +
include/sysemu/sysemu.h | 1 -
vl.c | 6 +++---
7 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index c6954c1d56..52ec197da0 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -6,11 +6,12 @@
* only files in hw/ide/ are supposed to include this file.
* non-internal declarations are in hw/ide.h
*/
+
+#include "qapi/qapi-types-run-state.h"
#include "hw/ide.h"
#include "hw/irq.h"
#include "hw/isa/isa.h"
#include "sysemu/dma.h"
-#include "sysemu/sysemu.h"
#include "hw/block/block.h"
#include "scsi/constants.h"
diff --git a/include/hw/ppc/spapr_xive.h b/include/hw/ppc/spapr_xive.h
index a39e672f27..bfd40f01d8 100644
--- a/include/hw/ppc/spapr_xive.h
+++ b/include/hw/ppc/spapr_xive.h
@@ -12,7 +12,6 @@
#include "hw/ppc/spapr_irq.h"
#include "hw/ppc/xive.h"
-#include "sysemu/sysemu.h"
#define TYPE_SPAPR_XIVE "spapr-xive"
#define SPAPR_XIVE(obj) OBJECT_CHECK(SpaprXive, (obj), TYPE_SPAPR_XIVE)
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 2bfaad0fe9..d77a92361b 100644
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -4,7 +4,6 @@
#include "block/aio.h"
#include "hw/block/block.h"
#include "hw/qdev-core.h"
-#include "sysemu/sysemu.h"
#include "scsi/utils.h"
#include "qemu/notify.h"
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index df40a46d60..48e8d04ff6 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -17,7 +17,6 @@
#include "exec/memory.h"
#include "hw/qdev-core.h"
#include "net/net.h"
-#include "sysemu/sysemu.h"
#include "migration/vmstate.h"
#include "qemu/event_notifier.h"
#include "standard-headers/linux/virtio_config.h"
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index f569f5f270..3fcdde8bfc 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -102,6 +102,7 @@ typedef struct SHPCDevice SHPCDevice;
typedef struct SSIBus SSIBus;
typedef struct VirtIODevice VirtIODevice;
typedef struct Visitor Visitor;
+typedef struct VMChangeStateEntry VMChangeStateEntry;
typedef struct VMStateDescription VMStateDescription;
/*
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 227202999d..7e445e0683 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -22,7 +22,6 @@ void runstate_set(RunState new_state);
int runstate_is_running(void);
bool runstate_needs_reset(void);
bool runstate_store(char *str, size_t size);
-typedef struct vm_change_state_entry VMChangeStateEntry;
typedef void VMChangeStateHandler(void *opaque, int running, RunState state);
VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
diff --git a/vl.c b/vl.c
index df23dd6913..91255acf71 100644
--- a/vl.c
+++ b/vl.c
@@ -1362,14 +1362,14 @@ static int machine_help_func(QemuOpts *opts,
MachineState *machine)
return 1;
}
-struct vm_change_state_entry {
+struct VMChangeStateEntry {
VMChangeStateHandler *cb;
void *opaque;
- QTAILQ_ENTRY(vm_change_state_entry) entries;
+ QTAILQ_ENTRY(VMChangeStateEntry) entries;
int priority;
};
-static QTAILQ_HEAD(, vm_change_state_entry) vm_change_state_head;
+static QTAILQ_HEAD(, VMChangeStateEntry) vm_change_state_head;
/**
* qemu_add_vm_change_state_handler_prio:
--
2.21.0
- [Qemu-devel] [PATCH 00/28] Tame a few "touch this, recompile the world" headers, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 10/28] ide: Include hw/ide/internal a bit less outside hw/ide/, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 17/28] Include qom/object.h slightly less, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 03/28] qapi: Split error.json off common.json, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 09/28] Include migration/qemu-file-types.h a lot less, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 27/28] sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h,
Markus Armbruster <=
- [Qemu-devel] [PATCH 05/28] queue: Drop superfluous #include qemu/atomic.h, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 02/28] Include generated QAPI headers less, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 06/28] trace: Eliminate use of TARGET_FMT_plx, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 24/28] Include sysemu/hostmem.h less, Markus Armbruster, 2019/07/26
- [Qemu-devel] [PATCH 11/28] typedefs: Separate incomplete types and function types, Markus Armbruster, 2019/07/26