Commit 1de7afc9 authored by Paolo Bonzini's avatar Paolo Bonzini

misc: move include files to include/qemu/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 14cccb61
......@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "acl.h"
#include "qemu/acl.h"
#ifdef CONFIG_FNMATCH
#include <fnmatch.h>
......
......@@ -15,8 +15,8 @@
#include "qemu-common.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
#include "qemu/queue.h"
#include "qemu/sockets.h"
struct AioHandler
{
......
......@@ -17,8 +17,8 @@
#include "qemu-common.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
#include "qemu/queue.h"
#include "qemu/sockets.h"
struct AioHandler {
EventNotifier *e;
......
......@@ -31,8 +31,8 @@
#include "config.h"
#include "monitor/monitor.h"
#include "sysemu.h"
#include "bitops.h"
#include "bitmap.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
#include "arch_init.h"
#include "audio/audio.h"
#include "hw/pc.h"
......@@ -45,7 +45,7 @@
#include "exec/address-spaces.h"
#include "hw/pcspk.h"
#include "migration/page_cache.h"
#include "qemu-config.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
#include "trace.h"
......
......@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "block/aio.h"
#include "main-loop.h"
#include "qemu/main-loop.h"
/***********************************************************/
/* bottom halves (can be seen as timers which expire ASAP) */
......
......@@ -23,7 +23,7 @@
*/
#include <alsa/asoundlib.h>
#include "qemu-common.h"
#include "main-loop.h"
#include "qemu/main-loop.h"
#include "audio.h"
#if QEMU_GNUC_PREREQ(4, 3)
......
......@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "audio.h"
#include "monitor/monitor.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "sysemu.h"
#define AUDIO_CAP "audio"
......
......@@ -25,7 +25,7 @@
#define QEMU_AUDIO_H
#include "config-host.h"
#include "qemu-queue.h"
#include "qemu/queue.h"
typedef void (*audio_callback_fn) (void *opaque, int avail);
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "audio.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#define AUDIO_CAP "noaudio"
#include "audio_int.h"
......
......@@ -31,8 +31,8 @@
#include <sys/soundcard.h>
#endif
#include "qemu-common.h"
#include "main-loop.h"
#include "host-utils.h"
#include "qemu/main-loop.h"
#include "qemu/host-utils.h"
#include "audio.h"
#define AUDIO_CAP "oss"
......
......@@ -18,7 +18,7 @@
*/
#include "hw/hw.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "ui/qemu-spice.h"
#define AUDIO_CAP "spice"
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "audio.h"
#define AUDIO_CAP "wav"
......
......@@ -13,7 +13,7 @@
#include "qemu/rng-random.h"
#include "qemu/rng.h"
#include "qapi/qmp/qerror.h"
#include "main-loop.h"
#include "qemu/main-loop.h"
struct RndRandom
{
......
......@@ -9,8 +9,8 @@
* Version 2.
*/
#include "bitops.h"
#include "bitmap.h"
#include "qemu/bitops.h"
#include "qemu/bitmap.h"
/*
* bitmaps provide an array of bits, implemented using an an
......
......@@ -11,7 +11,7 @@
* 2 of the License, or (at your option) any later version.
*/
#include "bitops.h"
#include "qemu/bitops.h"
#define BITOP_WORD(nr) ((nr) / BITS_PER_LONG)
......
......@@ -16,8 +16,8 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "hw/hw.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
#include "qemu/queue.h"
#include "qemu/timer.h"
#include "migration/block.h"
#include "migration/migration.h"
#include "blockdev.h"
......
......@@ -27,13 +27,13 @@
#include "monitor/monitor.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "module.h"
#include "qemu/module.h"
#include "qapi/qmp/qjson.h"
#include "sysemu.h"
#include "notify.h"
#include "qemu/notify.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#ifdef CONFIG_BSD
#include <sys/types.h>
......
......@@ -23,9 +23,9 @@
*/
#include "qemu-common.h"
#include "qemu-config.h"
#include "qemu/config-file.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
typedef struct BDRVBlkdebugState {
int state;
......
......@@ -8,7 +8,7 @@
*/
#include <stdarg.h>
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block_int.h"
typedef struct {
......
......@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
/**************************************************************/
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include <zlib.h>
typedef struct BDRVCloopState {
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
/**************************************************************/
/* COW block driver using file system holes */
......
......@@ -23,8 +23,8 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "bswap.h"
#include "module.h"
#include "qemu/bswap.h"
#include "qemu/module.h"
#include <zlib.h>
typedef struct BDRVDMGState {
......
......@@ -17,8 +17,8 @@
*/
#include <glusterfs/api/glfs.h>
#include "block/block_int.h"
#include "qemu_socket.h"
#include "uri.h"
#include "qemu/sockets.h"
#include "qemu/uri.h"
typedef struct GlusterAIOCB {
BlockDriverAIOCB common;
......
......@@ -27,8 +27,8 @@
#include <poll.h>
#include <arpa/inet.h>
#include "qemu-common.h"
#include "qemu-config.h"
#include "qemu-error.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
......
......@@ -9,9 +9,9 @@
*/
#include "qemu-common.h"
#include "block/aio.h"
#include "qemu-queue.h"
#include "qemu/queue.h"
#include "block/raw-aio.h"
#include "event_notifier.h"
#include "qemu/event_notifier.h"
#include <libaio.h>
......
......@@ -28,10 +28,10 @@
#include "qemu-common.h"
#include "block/nbd.h"
#include "uri.h"
#include "qemu/uri.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu_socket.h"
#include "qemu/module.h"
#include "qemu/sockets.h"
#include <sys/types.h>
#include <unistd.h>
......
......@@ -25,7 +25,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
/**************************************************************/
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include <zlib.h>
#include "block/aes.h"
#include "migration/migration.h"
......
......@@ -23,11 +23,11 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include <zlib.h>
#include "block/aes.h"
#include "block/qcow2.h"
#include "qemu-error.h"
#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
#include "trace.h"
......
......@@ -13,7 +13,7 @@
*/
#include "trace.h"
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "qed.h"
typedef struct {
......
......@@ -12,7 +12,7 @@
*
*/
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "trace.h"
#include "qed.h"
#include "qapi/qmp/qerror.h"
......
......@@ -22,13 +22,13 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-log.h"
#include "qemu/timer.h"
#include "qemu/log.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "trace.h"
#include "block/thread-pool.h"
#include "iov.h"
#include "qemu/iov.h"
#include "raw-aio.h"
#if defined(__APPLE__) && (__MACH__)
......
......@@ -22,13 +22,13 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "raw-aio.h"
#include "trace.h"
#include "block/thread-pool.h"
#include "iov.h"
#include "qemu/iov.h"
#include <windows.h>
#include <winioctl.h>
......
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
static int raw_open(BlockDriverState *bs, int flags)
{
......
......@@ -14,7 +14,7 @@
#include <inttypes.h>
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu/error-report.h"
#include "block/block_int.h"
#include <rbd/librbd.h>
......
......@@ -13,10 +13,10 @@
*/
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu_socket.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "block/block_int.h"
#include "bitops.h"
#include "qemu/bitops.h"
#define SD_PROTO_VER 0x01
......
......@@ -51,7 +51,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "migration/migration.h"
#if defined(CONFIG_UUID)
......
......@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "migration/migration.h"
#include <zlib.h>
......
......@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "migration/migration.h"
#if defined(CONFIG_UUID)
#include <uuid/uuid.h>
......
......@@ -26,7 +26,7 @@
#include <dirent.h>
#include "qemu-common.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "migration/migration.h"
#ifndef S_IWGRP
......
......@@ -22,13 +22,13 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu/module.h"
#include "qemu-common.h"
#include "block/aio.h"
#include "raw-aio.h"
#include "event_notifier.h"
#include "qemu/event_notifier.h"
#include <windows.h>
#include <winioctl.h>
......
......@@ -17,7 +17,7 @@
#include "qmp-commands.h"
#include "trace.h"
#include "block/nbd.h"
#include "qemu_socket.h"
#include "qemu/sockets.h"
static int server_fd = -1;
......
......@@ -12,8 +12,8 @@
#include "block/blockjob.h"
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "qapi/qmp/types.h"
#include "sysemu.h"
#include "block/block_int.h"
......
......@@ -12,7 +12,7 @@
#include "block/block.h"
#include "qapi/error.h"
#include "qemu-queue.h"
#include "qemu/queue.h"
void blockdev_mark_auto_del(BlockDriverState *bs);
void blockdev_auto_del(BlockDriverState *bs);
......
......@@ -33,7 +33,7 @@
#include "qapi/qmp/qjson.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
#include "qemu/timer.h"
void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,
int64_t speed, BlockDriverCompletionFunc *cb,
......
......@@ -31,8 +31,8 @@
/* For tb_lock */
#include "cpu.h"
#include "tcg.h"
#include "qemu-timer.h"
#include "envlist.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
#define DEBUG_LOGFILE "/tmp/qemu.log"
......
......@@ -146,7 +146,7 @@ int get_osversion(void);
void fork_start(void);
void fork_end(int child);
#include "qemu-log.h"
#include "qemu/log.h"
/* strace.c */
void
......
......@@ -19,7 +19,7 @@
#include "qemu-common.h"
#include "bt-host.h"
#include "main-loop.h"
#include "qemu/main-loop.h"
#ifndef _WIN32
# include <errno.h>
......
......@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "bt-host.h"