aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-06-02 13:31:55 +0200
committerKevin Wolf <kwolf@redhat.com>2010-06-04 11:43:40 +0200
commita803cb8eb8ada1add74f1b393b8a553a7e7f3acf (patch)
treef2fff551c60a4f49060e2d4d7b8d3edbce8dfb87 /hw
parent7cdb1f6d305e1000b5f882257cbee71b8bb08ef5 (diff)
blockdev: Hide QEMUMachine from drive_init()
To pave the way for moving it out of vl.c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/device-hotplug.c2
-rw-r--r--hw/usb-msd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 9cc8376691..a3fe99ea77 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -38,7 +38,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;
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index c1c2537475..0ba4a64d7c 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -584,7 +584,7 @@ static USBDevice *usb_msd_init(const char *filename)
qemu_opt_set(opts, "if", "none");
/* create host drive */
- dinfo = drive_init(opts, NULL, &fatal_error);
+ dinfo = drive_init(opts, 0, &fatal_error);
if (!dinfo) {
qemu_opts_del(opts);
return NULL;