qdev: Move declaration of qdev_init_bdrv() into qdev.h

Signed-off-by: Markus Armbruster <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>

diff --git a/hw/pl181.c b/hw/pl181.c
index 19240533303b82d481ae2aeb6d8b085b0e999a94..85cadc4fe1e6f74327a4edf08d519014cf8a4cb9 100644 (file)
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -9,7 +9,6 @@
 
 #include "sysbus.h"
 #include "sd.h"
-#include "sysemu.h"
 
 //#define DEBUG_PL181 1
 

diff --git a/hw/qdev.h b/hw/qdev.h
index 51a24e271c6a11f78da9334dbd0ca13f6dc97d81..0ad6c9567d69d559fea2a7dd67952d66260b1bba 100644 (file)
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -125,6 +125,8 @@ void qdev_machine_creation_done(void);
 qemu_irq qdev_get_gpio_in(DeviceState *dev, int n);
 void qdev_connect_gpio_out(DeviceState *dev, int n, qemu_irq pin);
 
+BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type);
+
 BusState *qdev_get_child_bus(DeviceState *dev, const char *name);
 
 /*** Device API.  ***/

diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c
index 5e74e5d7ce943a9f9bf3af32a4dbf3ad6802a8db..96b33edcbd8f87fd586b0473ec2bc4f9e6d0a534 100644 (file)
--- a/hw/ssi-sd.c
+++ b/hw/ssi-sd.c
@@ -9,7 +9,6 @@
 
 #include "ssi.h"
 #include "sd.h"
-#include "sysemu.h"
 
 //#define DEBUG_SSI_SD 1
 

diff --git a/sysemu.h b/sysemu.h
index 46a1b2f87fa90d591b6283b724647387e1046117..dce13c1a059088d3aca448c507ae47c36ec5d9fe 100644 (file)
--- a/sysemu.h
+++ b/sysemu.h
@@ -188,8 +188,6 @@ extern const char *drive_get_serial(BlockDriverState *bdrv);
 extern BlockInterfaceErrorAction drive_get_on_error(
     BlockDriverState *bdrv, int is_read);
 
-BlockDriverState *qdev_init_bdrv(DeviceState *dev, BlockInterfaceType type);
-
 extern QemuOpts *drive_add(const char *file, const char *fmt, ...);
 extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi,
                              int *fatal_error);