[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/54] qemu/queue.h: typedef QTAILQ heads
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 28/54] qemu/queue.h: typedef QTAILQ heads |
Date: |
Wed, 12 Dec 2018 16:22:49 +0100 |
This will be needed when we change the QTAILQ head and elem structs
to unions. However, it is also consistent with the usage elsewhere
in QEMU for other list head structs (see for example FsMountList).
Note that most QTAILQs only need their name in order to do backwards
walks. Those do not break with the struct->union change, and anyway
the change will also remove the need to name heads when doing backwards
walks, so those are not touched here.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 3 ++-
hw/vfio/common.c | 2 +-
include/hw/vfio/vfio-common.h | 3 ++-
include/qom/cpu.h | 5 +++--
ui/input.c | 14 ++++++++------
5 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/exec.c b/exec.c
index b6b2007..a629c98 100644
--- a/exec.c
+++ b/exec.c
@@ -94,7 +94,8 @@ int target_page_bits;
bool target_page_bits_decided;
#endif
-struct CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);
+CPUTailQ cpus = QTAILQ_HEAD_INITIALIZER(cpus);
+
/* current CPU in the current thread. It is only valid inside
cpu_exec() */
__thread CPUState *current_cpu;
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 7aa804e..4262b80 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -37,7 +37,7 @@
#include "trace.h"
#include "qapi/error.h"
-struct vfio_group_head vfio_group_list =
+VFIOGroupList vfio_group_list =
QLIST_HEAD_INITIALIZER(vfio_group_list);
static QLIST_HEAD(, VFIOAddressSpace) vfio_address_spaces =
QLIST_HEAD_INITIALIZER(vfio_address_spaces);
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 127ca47..7624c9f 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -180,7 +180,8 @@ int vfio_get_device(VFIOGroup *group, const char *name,
VFIODevice *vbasedev, Error **errp);
extern const MemoryRegionOps vfio_region_ops;
-extern QLIST_HEAD(vfio_group_head, VFIOGroup) vfio_group_list;
+typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
+extern VFIOGroupList vfio_group_list;
#ifdef CONFIG_LINUX
int vfio_get_region_info(VFIODevice *vbasedev, int index,
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 62aef77..4662a20 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -435,8 +435,9 @@ struct CPUState {
GArray *iommu_notifiers;
};
-QTAILQ_HEAD(CPUTailQ, CPUState);
-extern struct CPUTailQ cpus;
+typedef QTAILQ_HEAD(CPUTailQ, CPUState) CPUTailQ;
+extern CPUTailQ cpus;
+
#define first_cpu QTAILQ_FIRST_RCU(&cpus)
#define CPU_NEXT(cpu) QTAILQ_NEXT_RCU(cpu, node)
#define CPU_FOREACH(cpu) QTAILQ_FOREACH_RCU(cpu, &cpus, node)
diff --git a/ui/input.c b/ui/input.c
index 7c9a410..35c7964 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -19,6 +19,9 @@ struct QemuInputHandlerState {
};
typedef struct QemuInputEventQueue QemuInputEventQueue;
+typedef QTAILQ_HEAD(QemuInputEventQueueHead, QemuInputEventQueue)
+ QemuInputEventQueueHead;
+
struct QemuInputEventQueue {
enum {
QEMU_INPUT_QUEUE_DELAY = 1,
@@ -37,8 +40,7 @@ static QTAILQ_HEAD(, QemuInputHandlerState) handlers =
static NotifierList mouse_mode_notifiers =
NOTIFIER_LIST_INITIALIZER(mouse_mode_notifiers);
-static QTAILQ_HEAD(QemuInputEventQueueHead, QemuInputEventQueue) kbd_queue =
- QTAILQ_HEAD_INITIALIZER(kbd_queue);
+static QemuInputEventQueueHead kbd_queue = QTAILQ_HEAD_INITIALIZER(kbd_queue);
static QEMUTimer *kbd_timer;
static uint32_t kbd_default_delay_ms = 10;
static uint32_t queue_count;
@@ -257,7 +259,7 @@ static void qemu_input_event_trace(QemuConsole *src,
InputEvent *evt)
static void qemu_input_queue_process(void *opaque)
{
- struct QemuInputEventQueueHead *queue = opaque;
+ QemuInputEventQueueHead *queue = opaque;
QemuInputEventQueue *item;
g_assert(!QTAILQ_EMPTY(queue));
@@ -288,7 +290,7 @@ static void qemu_input_queue_process(void *opaque)
}
}
-static void qemu_input_queue_delay(struct QemuInputEventQueueHead *queue,
+static void qemu_input_queue_delay(QemuInputEventQueueHead *queue,
QEMUTimer *timer, uint32_t delay_ms)
{
QemuInputEventQueue *item = g_new0(QemuInputEventQueue, 1);
@@ -306,7 +308,7 @@ static void qemu_input_queue_delay(struct
QemuInputEventQueueHead *queue,
}
}
-static void qemu_input_queue_event(struct QemuInputEventQueueHead *queue,
+static void qemu_input_queue_event(QemuInputEventQueueHead *queue,
QemuConsole *src, InputEvent *evt)
{
QemuInputEventQueue *item = g_new0(QemuInputEventQueue, 1);
@@ -318,7 +320,7 @@ static void qemu_input_queue_event(struct
QemuInputEventQueueHead *queue,
queue_count++;
}
-static void qemu_input_queue_sync(struct QemuInputEventQueueHead *queue)
+static void qemu_input_queue_sync(QemuInputEventQueueHead *queue)
{
QemuInputEventQueue *item = g_new0(QemuInputEventQueue, 1);
--
1.8.3.1
- [Qemu-devel] [PULL 13/54] block/iscsi: take iscsilun->mutex in iscsi_timed_check_events(), (continued)
- [Qemu-devel] [PULL 13/54] block/iscsi: take iscsilun->mutex in iscsi_timed_check_events(), Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 16/54] esp-pci: Fix status register write erase control, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 15/54] block/iscsi: cancel libiscsi task when ABORT TASK TMF completes, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 02/54] vhost-user-bridge: fix "unknown type name" compilation error, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 26/54] vfio: make vfio_address_spaces static, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 22/54] test: execute g_test_run when tests are skipped, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 17/54] scsi: esp: Defer command completion until previous interrupts have been handled, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 21/54] RFC: qga: drop < Vista compatibility, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 19/54] build-sys: move windows defines in osdep.h header, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 10/54] memory: update coalesced_range on transaction_commit, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 28/54] qemu/queue.h: typedef QTAILQ heads,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/54] block/iscsi: drop unused IscsiAIOCB->buf field, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 32/54] checkpatch: warn about qemu/queue.h head structs that are not typedef-ed, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 34/54] configure: Remove obsolete check for Clang < 3.2, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 23/54] test: replace gtester with a TAP driver, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 31/54] qemu/queue.h: simplify reverse access to QTAILQ, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 35/54] configure: Remove old -fno-gcse workaround for GCC 4.6.x and 4.7.[012], Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 29/54] qemu/queue.h: remove Q_TAILQ_{HEAD, ENTRY}, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 36/54] tcg/tcg.h: Remove GCC check for tcg_debug_assert() macro, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 33/54] configure: Add a test for the minimum compiler version, Paolo Bonzini, 2018/12/12
- [Qemu-devel] [PULL 18/54] build-sys: don't include windows.h, osdep.h does it, Paolo Bonzini, 2018/12/12