mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu: dynamic drive/drive_opt index allocation (Marcelo Tosatti)

Browse Source 
Dynamically allocate drive options and drive table index, to reuse
indexes when devices are removed.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6594 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-02-11 15:19:58 +00:00
parent 72da420859
commit 7d5aca9ee6
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sysemu.h
View File

@ -134,6 +134,7 @@ typedef struct DriveInfo {
BlockInterfaceType type; BlockInterfaceType type;
int bus; int bus;
int unit; int unit;
int used;
BlockInterfaceErrorAction onerror; BlockInterfaceErrorAction onerror;
char serial[21]; char serial[21];
} DriveInfo; } DriveInfo;

54
vl.c
View File

@ -246,6 +246,7 @@ static int nb_drives_opt;
static struct drive_opt { static struct drive_opt {
const char *file; const char *file;
char opt[1024]; char opt[1024];
int used;
} drives_opt[MAX_DRIVES]; } drives_opt[MAX_DRIVES];
static CPUState *cur_cpu; static CPUState *cur_cpu;
@ -2135,22 +2136,50 @@ static int bt_parse(const char *opt)
#define MTD_ALIAS "if=mtd" #define MTD_ALIAS "if=mtd"
#define SD_ALIAS "index=0,if=sd" #define SD_ALIAS "index=0,if=sd"
static int drive_opt_get_free_idx(void)
{
int index;
for (index = 0; index < MAX_DRIVES; index++)
if (!drives_opt[index].used) {
drives_opt[index].used = 1;
return index;
}
return -1;
}
static int drive_get_free_idx(void)
{
int index;
for (index = 0; index < MAX_DRIVES; index++)
if (!drives_table[index].used) {
drives_table[index].used = 1;
return index;
}
return -1;
}
static int drive_add(const char *file, const char *fmt, ...) static int drive_add(const char *file, const char *fmt, ...)
{ {
va_list ap; va_list ap;
int index = drive_opt_get_free_idx();
if (nb_drives_opt >= MAX_DRIVES) { if (nb_drives_opt >= MAX_DRIVES || index == -1) {
fprintf(stderr, "qemu: too many drives\n"); fprintf(stderr, "qemu: too many drives\n");
exit(1); exit(1);
} }
drives_opt[nb_drives_opt].file = file; drives_opt[index].file = file;
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf(drives_opt[nb_drives_opt].opt, vsnprintf(drives_opt[index].opt,
sizeof(drives_opt[0].opt), fmt, ap); sizeof(drives_opt[0].opt), fmt, ap);
va_end(ap); va_end(ap);
return nb_drives_opt++; nb_drives_opt++;
return index;
} }
int drive_get_index(BlockInterfaceType type, int bus, int unit) int drive_get_index(BlockInterfaceType type, int bus, int unit)
@ -2159,10 +2188,11 @@ int drive_get_index(BlockInterfaceType type, int bus, int unit)
/* seek interface, bus and unit */ /* seek interface, bus and unit */
for (index = 0; index < nb_drives; index++) for (index = 0; index < MAX_DRIVES; index++)
if (drives_table[index].type == type && if (drives_table[index].type == type &&
drives_table[index].bus == bus && drives_table[index].bus == bus &&
drives_table[index].unit == unit) drives_table[index].unit == unit &&
drives_table[index].used)
return index; return index;
return -1; return -1;
@ -2227,6 +2257,7 @@ static int drive_init(struct drive_opt *arg, int snapshot,
int index; int index;
int cache; int cache;
int bdrv_flags, onerror; int bdrv_flags, onerror;
int drives_table_idx;
char *str = arg->opt; char *str = arg->opt;
static const char * const params[] = { "bus", "unit", "if", "index", static const char * const params[] = { "bus", "unit", "if", "index",
"cyls", "heads", "secs", "trans", "cyls", "heads", "secs", "trans",
@ -2501,11 +2532,12 @@ static int drive_init(struct drive_opt *arg, int snapshot,
snprintf(buf, sizeof(buf), "%s%s%i", snprintf(buf, sizeof(buf), "%s%s%i",
devname, mediastr, unit_id); devname, mediastr, unit_id);
bdrv = bdrv_new(buf); bdrv = bdrv_new(buf);
drives_table[nb_drives].bdrv = bdrv; drives_table_idx = drive_get_free_idx();
drives_table[nb_drives].type = type; drives_table[drives_table_idx].bdrv = bdrv;
drives_table[nb_drives].bus = bus_id; drives_table[drives_table_idx].type = type;
drives_table[nb_drives].unit = unit_id; drives_table[drives_table_idx].bus = bus_id;
drives_table[nb_drives].onerror = onerror; drives_table[drives_table_idx].unit = unit_id;
drives_table[drives_table_idx].onerror = onerror;
strncpy(drives_table[nb_drives].serial, serial, sizeof(serial)); strncpy(drives_table[nb_drives].serial, serial, sizeof(serial));
nb_drives++; nb_drives++;