From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:60669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeSwC-0007Sd-F9 for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeSwA-0001HB-Co for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeSw9-0001H2-UQ for qemu-devel@nongnu.org; Wed, 06 Jul 2011 10:18:46 -0400 From: Kevin Wolf Date: Wed, 6 Jul 2011 16:21:26 +0200 Message-Id: <1309962089-7328-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1309962089-7328-1-git-send-email-kwolf@redhat.com> References: <1309962089-7328-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 5/8] block: drive_init(): Simplify interface type setting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Luiz Capitulino Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster Signed-off-by: Kevin Wolf --- blockdev.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index 7d579d6..470be71 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) { -- 1.7.6