summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/ide/core.c1
-rw-r--r--hw/ide/internal.h1
-rw-r--r--hw/scsi-disk.c1
-rw-r--r--hw/scsi.h1
-rw-r--r--hw/virtio-blk.c1
-rw-r--r--hw/virtio.h2
6 files changed, 4 insertions, 3 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 8f719ee76c..740ffe0b37 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -30,6 +30,7 @@
#include "sysemu.h"
#include "dma.h"
#include "blockdev.h"
+#include "block_int.h"
#include <hw/ide/internal.h>
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 663db39697..233915ce0d 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -7,7 +7,6 @@
* non-internal declarations are in hw/ide.h
*/
#include <hw/ide.h>
-#include "block_int.h"
#include "iorange.h"
#include "dma.h"
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index f48ca8b5d4..d44b3b87bc 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -37,6 +37,7 @@ do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
#include "scsi-defs.h"
#include "sysemu.h"
#include "blockdev.h"
+#include "block_int.h"
#define SCSI_DMA_BUF_SIZE 131072
#define SCSI_MAX_INQUIRY_LEN 256
diff --git a/hw/scsi.h b/hw/scsi.h
index a28cd68d2b..e8dcabfa28 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -3,7 +3,6 @@
#include "qdev.h"
#include "block.h"
-#include "block_int.h"
#define MAX_SCSI_DEVS 255
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 6d1a7cf5ce..7bf684ee77 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -15,6 +15,7 @@
#include "qemu-error.h"
#include "trace.h"
#include "blockdev.h"
+#include "block_int.h"
#include "virtio-blk.h"
#ifdef __linux__
# include <scsi/sg.h>
diff --git a/hw/virtio.h b/hw/virtio.h
index c1292647fe..4d20d9b8f4 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -18,7 +18,7 @@
#include "net.h"
#include "qdev.h"
#include "sysemu.h"
-#include "block_int.h"
+#include "block.h"
#include "event_notifier.h"
#ifdef CONFIG_LINUX
#include "9p.h"