ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockdev: Factor drive_index_to_{bus,unit}_id out of drive_init() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2011-01-28 11:21:43 +01:00 committed by Kevin Wolf
parent 2292ddaeab
commit 505a7fb1b1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
blockdev.c
View File

@ -75,6 +75,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) QemuOpts *drive_def(const char *optstr)
{ {
return qemu_opts_parse(qemu_find_opts("drive"), optstr, 0); return qemu_opts_parse(qemu_find_opts("drive"), optstr, 0);
@ -382,14 +394,8 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error)
error_report("index cannot be used with bus and unit"); error_report("index cannot be used with bus and unit");
return NULL; return NULL;
} }
if (max_devs == 0) bus_id = drive_index_to_bus_id(type, index);
{ unit_id = drive_index_to_unit_id(type, index);
unit_id = index;
bus_id = 0;
} else {
unit_id = index % max_devs;
bus_id = index / max_devs;
}
} }
/* if user doesn't specify a unit_id, /* if user doesn't specify a unit_id,