mirror of
https://gitlab.com/qemu-project/qemu.git
synced 2024-11-05 05:52:15 +03:00
aio / timers: Untangle include files
include/qemu/timer.h has no need to include main-loop.h and doing so causes an issue for the next patch. Unfortunately various files assume including timers.h will pull in main-loop.h. Untangle this mess. Signed-off-by: Alex Bligh <alex@alex.org.uk> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
ff83c66ecc
commit
6a1751b7aa
@ -11,6 +11,7 @@
|
||||
#include "trace.h"
|
||||
#include "qemu/range.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
/* #define DEBUG_IOMMU */
|
||||
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#include "hw/stream.h"
|
||||
|
||||
|
@ -12,6 +12,7 @@
|
||||
#include "qemu-common.h"
|
||||
#include "hw/qdev.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
/* Common timer implementation. */
|
||||
|
||||
|
@ -54,6 +54,7 @@
|
||||
|
||||
#include "hw/sysbus.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu-common.h"
|
||||
#include "hw/ptimer.h"
|
||||
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "hw/sysbus.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "hw/ptimer.h"
|
||||
|
||||
#include "hw/arm/exynos4210.h"
|
||||
|
@ -25,6 +25,8 @@
|
||||
#include "hw/sysbus.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#include "trace.h"
|
||||
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "hw/ptimer.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "hw/arm/imx.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define TYPE_IMX_EPIT "imx.epit"
|
||||
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "hw/ptimer.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "hw/arm/imx.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define TYPE_IMX_GPT "imx.gpt"
|
||||
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define DEFAULT_FREQUENCY (50*1000000)
|
||||
|
||||
|
@ -10,6 +10,7 @@
|
||||
*/
|
||||
#include "hw/sysbus.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#undef DEBUG_PUV3
|
||||
#include "hw/unicore32/puv3.h"
|
||||
|
@ -11,6 +11,7 @@
|
||||
#include "hw/hw.h"
|
||||
#include "hw/sh4/sh.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "hw/ptimer.h"
|
||||
|
||||
|
@ -27,6 +27,7 @@
|
||||
#include "hw/ptimer.h"
|
||||
#include "hw/sysbus.h"
|
||||
#include "trace.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
/*
|
||||
* Registers of hardware timer in sun4m.
|
||||
|
@ -25,6 +25,7 @@
|
||||
#include "hw/sysbus.h"
|
||||
#include "hw/ptimer.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define D(x)
|
||||
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include "hw/pci/pci_ids.h"
|
||||
#include "tpm_tis.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
/*#define DEBUG_TIS */
|
||||
|
||||
|
@ -32,6 +32,7 @@
|
||||
#include "qemu/iov.h"
|
||||
#include "sysemu/dma.h"
|
||||
#include "trace.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
//#define DEBUG
|
||||
//#define DEBUG_DUMP_DATA
|
||||
|
@ -14,6 +14,7 @@
|
||||
#ifndef QEMU_AIO_H
|
||||
#define QEMU_AIO_H
|
||||
|
||||
#include "qemu/typedefs.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/event_notifier.h"
|
||||
@ -42,7 +43,7 @@ typedef struct AioHandler AioHandler;
|
||||
typedef void QEMUBHFunc(void *opaque);
|
||||
typedef void IOHandler(void *opaque);
|
||||
|
||||
typedef struct AioContext {
|
||||
struct AioContext {
|
||||
GSource source;
|
||||
|
||||
/* The list of registered AIO handlers */
|
||||
@ -72,7 +73,7 @@ typedef struct AioContext {
|
||||
|
||||
/* Thread pool for performing work and receiving completion callbacks */
|
||||
struct ThreadPool *thread_pool;
|
||||
} AioContext;
|
||||
};
|
||||
|
||||
/**
|
||||
* aio_context_new: Allocate a new AioContext.
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "monitor/monitor.h"
|
||||
#include "qemu/hbitmap.h"
|
||||
#include "block/snapshot.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define BLOCK_FLAG_ENCRYPT 1
|
||||
#define BLOCK_FLAG_COMPAT6 4
|
||||
|
@ -16,6 +16,7 @@
|
||||
#define QEMU_COROUTINE_H
|
||||
|
||||
#include <stdbool.h>
|
||||
#include "qemu/typedefs.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/timer.h"
|
||||
|
||||
|
@ -3,7 +3,6 @@
|
||||
|
||||
#include "qemu/typedefs.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/notify.h"
|
||||
|
||||
/* timers */
|
||||
|
@ -7,6 +7,8 @@ typedef struct QEMUTimer QEMUTimer;
|
||||
typedef struct QEMUFile QEMUFile;
|
||||
typedef struct QEMUBH QEMUBH;
|
||||
|
||||
typedef struct AioContext AioContext;
|
||||
|
||||
struct Monitor;
|
||||
typedef struct Monitor Monitor;
|
||||
typedef struct MigrationParams MigrationParams;
|
||||
|
@ -17,6 +17,7 @@
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "migration/migration.h"
|
||||
#include "migration/qemu-file.h"
|
||||
#include "block/block.h"
|
||||
|
@ -14,6 +14,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "migration/migration.h"
|
||||
#include "monitor/monitor.h"
|
||||
|
@ -18,6 +18,7 @@
|
||||
#include "migration/migration.h"
|
||||
#include "migration/qemu-file.h"
|
||||
#include "block/block.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
//#define DEBUG_MIGRATION_TCP
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "migration/migration.h"
|
||||
#include "migration/qemu-file.h"
|
||||
#include "block/block.h"
|
||||
|
@ -14,6 +14,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "migration/migration.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "migration/qemu-file.h"
|
||||
|
1
nbd.c
1
nbd.c
@ -38,6 +38,7 @@
|
||||
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
//#define DEBUG_NBD
|
||||
|
||||
|
@ -36,6 +36,7 @@
|
||||
#include "qmp-commands.h"
|
||||
#include "hw/qdev.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qapi-visit.h"
|
||||
#include "qapi/opts-visitor.h"
|
||||
#include "qapi/dealloc-visitor.h"
|
||||
|
@ -31,6 +31,7 @@
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
typedef struct NetSocketState {
|
||||
NetClientState nc;
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "qemu/sockets.h"
|
||||
#include "block/coroutine.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
ssize_t coroutine_fn
|
||||
qemu_co_sendv_recvv(int sockfd, struct iovec *iov, unsigned iov_cnt,
|
||||
|
@ -10,6 +10,7 @@
|
||||
|
||||
#include "qemu-io.h"
|
||||
#include "block/block_int.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#define CMD_NOFILE_OK 0x01
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
#include "qemu-common.h"
|
||||
#include "block/block.h"
|
||||
#include "block/nbd.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
|
@ -9,6 +9,7 @@
|
||||
#include <libslirp.h>
|
||||
|
||||
#include "monitor/monitor.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "block/block_int.h"
|
||||
#include "qemu/event_notifier.h"
|
||||
#include "block/thread-pool.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
static void do_spawn_thread(ThreadPool *pool);
|
||||
|
||||
|
@ -33,6 +33,7 @@ typedef struct VncStateSASL VncStateSASL;
|
||||
typedef struct VncDisplaySASL VncDisplaySASL;
|
||||
|
||||
#include "qemu/acl.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
struct VncStateSASL {
|
||||
sasl_conn_t *conn;
|
||||
|
@ -25,7 +25,7 @@
|
||||
*/
|
||||
|
||||
#include "vnc.h"
|
||||
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
static void start_auth_vencrypt_subauth(VncState *vs)
|
||||
{
|
||||
|
@ -19,6 +19,7 @@
|
||||
*/
|
||||
|
||||
#include "vnc.h"
|
||||
#include "qemu/main-loop.h"
|
||||
|
||||
#ifdef CONFIG_VNC_TLS
|
||||
#include "qemu/sockets.h"
|
||||
|
Loading…
Reference in New Issue
Block a user