aboutsummaryrefslogtreecommitdiff
path: root/hw/ide
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-09-06 18:58:54 +0200
committerKevin Wolf <kwolf@redhat.com>2011-09-12 15:17:21 +0200
commitd1a0739de59501809ad5382030a0d0eba98b69b0 (patch)
tree64881cbcde20aaa04ea3b548a6c38380fbe3b890 /hw/ide
parente4def80b36231e161b91fa984cd0d73b45668f00 (diff)
block: Move BlockConf & friends from block_int.h to block.h
It's convenience stuff for block device models, so block.h isn't the ideal home either, but better than block_int.h. Permits moving some #include "block_int.h" from device model .h into .c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide')
-rw-r--r--hw/ide/core.c1
-rw-r--r--hw/ide/internal.h1
2 files changed, 1 insertions, 1 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"