From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52907 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiQyZ-0006tY-DS for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiQyX-0007fl-77 for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:23 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:58238) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiQyX-0007f1-0e for qemu-devel@nongnu.org; Thu, 27 Jan 2011 07:29:21 -0500 From: Markus Armbruster Date: Thu, 27 Jan 2011 13:29:14 +0100 Message-Id: <1296131356-27257-8-git-send-email-armbru@redhat.com> In-Reply-To: <1296131356-27257-1-git-send-email-armbru@redhat.com> References: <1296131356-27257-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 07/10] blockdev: Factor drive_index_to_{bus, unit}_id out of drive_init() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com Signed-off-by: Markus Armbruster --- blockdev.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/blockdev.c b/blockdev.c index e67f93c..4d8bb3d 100644 --- a/blockdev.c +++ b/blockdev.c @@ -61,6 +61,18 @@ void blockdev_auto_del(BlockDriverState *bs) } } +static int drive_index_to_bus_id(BlockInterfaceType type, int index) +{ + int max_devs = if_max_devs[type]; + return max_devs ? index / max_devs : 0; +} + +static int drive_index_to_unit_id(BlockInterfaceType type, int index) +{ + int max_devs = if_max_devs[type]; + return max_devs ? index % max_devs : index; +} + QemuOpts *drive_def(const char *optstr) { return qemu_opts_parse(qemu_find_opts("drive"), optstr, 0); @@ -364,14 +376,8 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) error_report("index cannot be used with bus and unit"); return NULL; } - if (max_devs == 0) - { - unit_id = index; - bus_id = 0; - } else { - unit_id = index % max_devs; - bus_id = index / max_devs; - } + bus_id = drive_index_to_bus_id(type, index); + unit_id = drive_index_to_unit_id(type, index); } /* if user doesn't specify a unit_id, -- 1.7.2.3