diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-06-02 13:31:56 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-06-04 11:43:40 +0200 |
| commit | 7b370f513002b340a383fac961dc8c6fdf39eddc (patch) | |
| tree | dc2b10005b19613242f57eb96092b470b51af504 | |
| parent | a803cb8eb8ada1add74f1b393b8a553a7e7f3acf (diff) | |
| download | focaccia-qemu-7b370f513002b340a383fac961dc8c6fdf39eddc.tar.gz focaccia-qemu-7b370f513002b340a383fac961dc8c6fdf39eddc.zip | |
qdev: Move declaration of qdev_init_bdrv() into qdev.h
Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/pl181.c | 1 | ||||
| -rw-r--r-- | hw/qdev.h | 2 | ||||
| -rw-r--r-- | hw/ssi-sd.c | 1 | ||||
| -rw-r--r-- | sysemu.h | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/hw/pl181.c b/hw/pl181.c index 1924053330..85cadc4fe1 100644 --- 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 51a24e271c..0ad6c9567d 100644 --- 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 5e74e5d7ce..96b33edcbd 100644 --- 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 46a1b2f87f..dce13c1a05 100644 --- 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); |