Commit 737e150e authored by Paolo Bonzini's avatar Paolo Bonzini

block: move include files to include/block/

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7b1b5d19
......@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "qemu-common.h"
#include "aes.h"
#include "block/aes.h"
#ifndef NDEBUG
#define NDEBUG
......
......@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
#include "block.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
......
......@@ -16,7 +16,7 @@
*/
#include "qemu-common.h"
#include "block.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "main-loop.h"
/***********************************************************/
......
......@@ -14,7 +14,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "hw/hw.h"
#include "qemu-queue.h"
#include "qemu-timer.h"
......
......@@ -25,13 +25,13 @@
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
#include "block_int.h"
#include "blockjob.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "module.h"
#include "qapi/qmp/qjson.h"
#include "sysemu.h"
#include "notify.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
......
......@@ -24,7 +24,7 @@
#include "qemu-common.h"
#include "qemu-config.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
typedef struct BDRVBlkdebugState {
......
......@@ -9,7 +9,7 @@
#include <stdarg.h>
#include "qemu_socket.h" /* for EINPROGRESS on Windows */
#include "block_int.h"
#include "block/block_int.h"
typedef struct {
BlockDriverState *test_file;
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
/**************************************************************/
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
......
......@@ -13,8 +13,8 @@
*/
#include "trace.h"
#include "block_int.h"
#include "blockjob.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "qemu/ratelimit.h"
enum {
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
/**************************************************************/
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include <curl/curl.h>
// #define DEBUG
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "bswap.h"
#include "module.h"
#include <zlib.h>
......
......@@ -16,7 +16,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include <glusterfs/api/glfs.h>
#include "block_int.h"
#include "block/block_int.h"
#include "qemu_socket.h"
#include "uri.h"
......
......@@ -29,7 +29,7 @@
#include "qemu-common.h"
#include "qemu-config.h"
#include "qemu-error.h"
#include "block_int.h"
#include "block/block_int.h"
#include "trace.h"
#include "hw/scsi-defs.h"
......
......@@ -8,7 +8,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu-common.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "qemu-queue.h"
#include "block/raw-aio.h"
#include "event_notifier.h"
......
......@@ -12,8 +12,8 @@
*/
#include "trace.h"
#include "blockjob.h"
#include "block_int.h"
#include "block/blockjob.h"
#include "block/block_int.h"
#include "qemu/ratelimit.h"
enum {
......
......@@ -27,9 +27,9 @@
*/
#include "qemu-common.h"
#include "nbd.h"
#include "block/nbd.h"
#include "uri.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu_socket.h"
......
......@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
/**************************************************************/
......
......@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
#include "aes.h"
#include "block/aes.h"
#include "migration.h"
/**************************************************************/
......
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "block_int.h"
#include "block/block_int.h"
#include "qemu-common.h"
#include "qcow2.h"
#include "trace.h"
......
......@@ -25,7 +25,7 @@
#include <zlib.h>
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "block/qcow2.h"
#include "trace.h"
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "block/qcow2.h"
static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "block/qcow2.h"
typedef struct QEMU_PACKED QCowSnapshotHeader {
......
......@@ -22,10 +22,10 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include <zlib.h>
#include "aes.h"
#include "block/aes.h"
#include "block/qcow2.h"
#include "qemu-error.h"
#include "qapi/qmp/qerror.h"
......
......@@ -25,8 +25,8 @@
#ifndef BLOCK_QCOW2_H
#define BLOCK_QCOW2_H
#include "aes.h"
#include "qemu-coroutine.h"
#include "block/aes.h"
#include "block/coroutine.h"
//#define DEBUG_ALLOC
//#define DEBUG_ALLOC2
......
......@@ -15,7 +15,7 @@
#ifndef BLOCK_QED_H
#define BLOCK_QED_H
#include "block_int.h"
#include "block/block_int.h"
/* The layout of a QED file is as follows:
*
......
......@@ -24,10 +24,10 @@
#include "qemu-common.h"
#include "qemu-timer.h"
#include "qemu-log.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "trace.h"
#include "thread-pool.h"
#include "block/thread-pool.h"
#include "iov.h"
#include "raw-aio.h"
......
......@@ -23,11 +23,11 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "raw-aio.h"
#include "trace.h"
#include "thread-pool.h"
#include "block/thread-pool.h"
#include "iov.h"
#include <windows.h>
#include <winioctl.h>
......
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
static int raw_open(BlockDriverState *bs, int flags)
......
......@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "block_int.h"
#include "block/block_int.h"
#include <rbd/librbd.h>
......
......@@ -15,7 +15,7 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu_socket.h"
#include "block_int.h"
#include "block/block_int.h"
#include "bitops.h"
#define SD_PROTO_VER 0x01
......
......@@ -12,8 +12,8 @@
*/
#include "trace.h"
#include "block_int.h"
#include "blockjob.h"
#include "block/block_int.h"
#include "block/blockjob.h"
#include "qemu/ratelimit.h"
enum {
......
......@@ -50,7 +50,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "migration.h"
......
......@@ -24,7 +24,7 @@
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "migration.h"
#include <zlib.h>
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "migration.h"
#if defined(CONFIG_UUID)
......
......@@ -25,7 +25,7 @@
#include <sys/stat.h>
#include <dirent.h>
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "migration.h"
......
......@@ -23,10 +23,10 @@
*/
#include "qemu-common.h"
#include "qemu-timer.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "qemu-common.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "raw-aio.h"
#include "event_notifier.h"
#include <windows.h>
......
......@@ -16,7 +16,7 @@
#include "sysemu.h"
#include "qmp-commands.h"
#include "trace.h"
#include "nbd.h"
#include "block/nbd.h"
#include "qemu_socket.h"
static int server_fd = -1;
......
......@@ -9,14 +9,14 @@
#include "blockdev.h"
#include "hw/block-common.h"
#include "blockjob.h"
#include "block/blockjob.h"
#include "monitor.h"
#include "qapi/qmp/qerror.h"
#include "qemu-option.h"
#include "qemu-config.h"
#include "qapi/qmp/types.h"
#include "sysemu.h"
#include "block_int.h"
#include "block/block_int.h"
#include "qmp-commands.h"
#include "trace.h"
#include "arch_init.h"
......
......@@ -10,7 +10,7 @@
#ifndef BLOCKDEV_H
#define BLOCKDEV_H
#include "block.h"
#include "block/block.h"
#include "qapi/error.h"
#include "qemu-queue.h"
......
......@@ -27,11 +27,11 @@
#include "qemu-common.h"
#include "trace.h"
#include "monitor.h"
#include "block.h"
#include "blockjob.h"
#include "block_int.h"
#include "block/block.h"
#include "block/blockjob.h"
#include "block/block_int.h"
#include "qapi/qmp/qjson.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "qmp-commands.h"
#include "qemu-timer.h"
......
......@@ -24,7 +24,7 @@
#include <getopt.h>
#include "cmd.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "main-loop.h"
#define _(x) x /* not gettext support yet */
......
......@@ -20,7 +20,7 @@
#include <glib.h>
#include "qemu-common.h"
#include "qemu-coroutine-int.h"
#include "block/coroutine_int.h"
typedef struct {
Coroutine base;
......
......@@ -31,7 +31,7 @@
#include <pthread.h>
#include <signal.h>
#include "qemu-common.h"
#include "qemu-coroutine-int.h"
#include "block/coroutine_int.h"
enum {
/* Maximum free pool size prevents holding too many freed coroutines */
......
......@@ -28,7 +28,7 @@
#include <pthread.h>
#include <ucontext.h>
#include "qemu-common.h"
#include "qemu-coroutine-int.h"
#include "block/coroutine_int.h"
#ifdef CONFIG_VALGRIND_H
#include <valgrind/valgrind.h>
......
......@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu-coroutine-int.h"
#include "block/coroutine_int.h"
typedef struct
{
......
......@@ -13,7 +13,7 @@
#include <stdio.h>
#include "memory.h"
#include "hw/hw.h"
#include "block.h"
#include "block/block.h"
#include "kvm.h"
typedef struct DMAContext DMAContext;
......
......@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_readdir_r(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent *dent,
......
......@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,
......
......@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)
......
......@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
int v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, size_t size)
......
......@@ -14,7 +14,7 @@
#include "fsdev/qemu-fsdev.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p-coth.h"
/* v9fs glib thread pool */
......
......@@ -16,7 +16,7 @@
#define _QEMU_VIRTIO_9P_COTH_H
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
#include "virtio-9p.h"
#include <glib.h>
......
......@@ -10,7 +10,7 @@
#include "fsdev/file-op-9p.h"
#include "fsdev/virtio-9p-marshal.h"
#include "qemu-thread.h"
#include "qemu-coroutine.h"
#include "block/coroutine.h"
/* The feature bitmap for virtio 9P */
......
......@@ -30,7 +30,7 @@
* THE SOFTWARE.
*/
#include "block.h"
#include "block/block.h"
#include "hw/block-common.h"
#include "trace.h"
......
......@@ -10,7 +10,7 @@
#include "ioport.h"
#include "irq.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "qemu-file.h"
#include "vmstate.h"
#include "qemu-log.h"
......
......@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block.h"
#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
......
......@@ -65,7 +65,7 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/pci.h>
......
......@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/pc.h>
#include <hw/isa.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
......
......@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/ppc_mac.h>
#include <hw/mac_dbdma.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
......
......@@ -25,7 +25,7 @@
#include <hw/hw.h>
#include <hw/pc.h>
#include <hw/pcmcia.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
......
......@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include <hw/hw.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/internal.h>
......
......@@ -26,7 +26,7 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block.h"
#include "block/block.h"
#include "dma.h"
#include <hw/ide/pci.h>
......
......@@ -27,7 +27,7 @@
#include <hw/pc.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "block.h"
#include "block/block.h"
#include "sysemu.h"
#include "dma.h"
......
......@@ -25,7 +25,7 @@
#include "net/net.h"
#include "boards.h"
#include "smbus.h"
#include "block.h"
#include "block/block.h"
#include "flash.h"
#include "mips.h"
#include "mips_cpudevs.h"
......
......@@ -29,7 +29,7 @@
#include "net/net.h"
#include "boards.h"
#include "smbus.h"
#include "block.h"
#include "block/block.h"
#include "flash.h"
#include "mips.h"
#include "mips_cpudevs.h"
......
......@@ -18,7 +18,7 @@
#include "serial.h"
#include "qemu-timer.h"
#include "ptimer.h"
#include "block.h"
#include "block/block.h"
#include "flash.h"
#include "ui/console.h"
#include "i2c.h"
......
......@@ -38,7 +38,7 @@
#include "hw.h"
#include "flash.h"
#include "block.h"
#include "block/block.h"
#include "qemu-timer.h"
#include "exec-memory.h"
#include "host-utils.h"
......
......@@ -38,7 +38,7 @@
#include "hw.h"
#include "flash.h"
#include "qemu-timer.h"
#include "block.h"
#include "block/block.h"
#include "exec-memory.h"
#include "host-utils.h"
#include "sysbus.h"
......
......@@ -27,7 +27,7 @@
#include "nvram.h"
#include "flash.h"
#include "sysemu.h"
#include "block.h"
#include "block/block.h"
#include "boards.h"