Skip to content

Commit

Permalink
block: move include files to include/block/
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Bonzini <[email protected]>
  • Loading branch information
@bonzini
bonzini committed Dec 19, 2012
1 parent 7b1b5d1 commit 737e150
Show file tree
Hide file tree
Showing 109 changed files with 134 additions and 134 deletions.
2 changes: 1 addition & 1 deletion aes.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion aio-posix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

#include "qemu-common.h"
#include "block.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"

Expand Down
2 changes: 1 addition & 1 deletion aio-win32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include "qemu-common.h"
#include "block.h"
#include "block/block.h"
#include "qemu-queue.h"
#include "qemu_socket.h"

Expand Down
2 changes: 1 addition & 1 deletion async.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/

#include "qemu-common.h"
#include "qemu-aio.h"
#include "block/aio.h"
#include "main-loop.h"

/***********************************************************/
Expand Down
2 changes: 1 addition & 1 deletion block-migration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions block.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion block/blkdebug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion block/blkverify.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion block/bochs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"

/**************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion block/cloop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions block/commit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion block/cow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"

/**************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion block/curl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion block/dmg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion block/gluster.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion block/iscsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion block/linux-aio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions block/mirror.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions block/nbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion block/parallels.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"

/**************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions block/qcow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/**************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion block/qcow2-cache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion block/qcow2-cluster.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion block/qcow2-refcount.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion block/qcow2-snapshot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions block/qcow2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions block/qcow2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion block/qed.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
*
Expand Down
4 changes: 2 additions & 2 deletions block/raw-posix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions block/raw-win32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion block/raw.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"

static int raw_open(BlockDriverState *bs, int flags)
Expand Down
2 changes: 1 addition & 1 deletion block/rbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion block/sheepdog.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions block/stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion block/vdi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
*/

#include "qemu-common.h"
#include "block_int.h"
#include "block/block_int.h"
#include "module.h"
#include "migration.h"

Expand Down
2 changes: 1 addition & 1 deletion block/vmdk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion block/vpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion block/vvfat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions block/win32-aio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion blockdev-nbd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 737e150

Please sign in to comment.