diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2011-07-01 10:46:12 -0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-07-05 11:23:30 +0200 |
| commit | 2d3999fe13b5e4663fd8ffc3661b1ffd44130e55 (patch) | |
| tree | ab2fe38b382ecf591cfa2c1018547d3844e781de /blockdev.c | |
| parent | a8686a9b2b347d0619141e950221c4d6d0311d0b (diff) | |
block: drive_init(): Simplify interface type setting
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/blockdev.c b/blockdev.c index 7d579d6124..470be71cbf 100644 --- a/blockdev.c +++ b/blockdev.c @@ -240,14 +240,6 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) int ret; translation = BIOS_ATA_TRANSLATION_AUTO; - - if (default_to_scsi) { - type = IF_SCSI; - pstrcpy(devname, sizeof(devname), "scsi"); - } else { - type = IF_IDE; - pstrcpy(devname, sizeof(devname), "ide"); - } media = MEDIA_DISK; /* extract parameters */ @@ -273,7 +265,11 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) error_report("unsupported bus type '%s'", buf); return NULL; } + } else { + type = default_to_scsi ? IF_SCSI : IF_IDE; + pstrcpy(devname, sizeof(devname), if_name[type]); } + max_devs = if_max_devs[type]; if (cyls || heads || secs) { |