diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
| commit | a4673e276248ada38f40d39191a197e7e35d3f8b (patch) | |
| tree | 4ecdac95fb7bb86eefc08ee38ca229c4d89e02e0 /hw/device-hotplug.c | |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 (diff) | |
| parent | 653dbec7c97cb51d19636423902719e5850da265 (diff) | |
| download | qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.tar.gz | |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts:
hw/pc.c
Diffstat (limited to 'hw/device-hotplug.c')
| -rw-r--r-- | hw/device-hotplug.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c index 9cc8376691..c1a9a561d7 100644 --- a/hw/device-hotplug.c +++ b/hw/device-hotplug.c @@ -25,8 +25,6 @@ #include "hw.h" #include "boards.h" #include "net.h" -#include "block_int.h" -#include "sysemu.h" DriveInfo *add_init_drive(const char *optstr) { @@ -38,7 +36,7 @@ DriveInfo *add_init_drive(const char *optstr) if (!opts) return NULL; - dinfo = drive_init(opts, current_machine, &fatal_error); + dinfo = drive_init(opts, current_machine->use_scsi, &fatal_error); if (!dinfo) { qemu_opts_del(opts); return NULL; |