Revision 79d21d5b
| b/blockdev.c | ||
|---|---|---|
| 278 | 278 |
{
|
| 279 | 279 |
const char *buf; |
| 280 | 280 |
const char *file = NULL; |
| 281 |
char devname[128]; |
|
| 282 | 281 |
const char *serial; |
| 283 | 282 |
const char *mediastr = ""; |
| 284 | 283 |
BlockInterfaceType type; |
| ... | ... | |
| 318 | 317 |
serial = qemu_opt_get(opts, "serial"); |
| 319 | 318 |
|
| 320 | 319 |
if ((buf = qemu_opt_get(opts, "if")) != NULL) {
|
| 321 |
pstrcpy(devname, sizeof(devname), buf); |
|
| 322 | 320 |
for (type = 0; type < IF_COUNT && strcmp(buf, if_name[type]); type++) |
| 323 | 321 |
; |
| 324 | 322 |
if (type == IF_COUNT) {
|
| ... | ... | |
| 327 | 325 |
} |
| 328 | 326 |
} else {
|
| 329 | 327 |
type = default_to_scsi ? IF_SCSI : IF_IDE; |
| 330 |
pstrcpy(devname, sizeof(devname), if_name[type]); |
|
| 331 | 328 |
} |
| 332 | 329 |
|
| 333 | 330 |
max_devs = if_max_devs[type]; |
| ... | ... | |
| 523 | 520 |
mediastr = (media == MEDIA_CDROM) ? "-cd" : "-hd"; |
| 524 | 521 |
if (max_devs) |
| 525 | 522 |
snprintf(dinfo->id, 32, "%s%i%s%i", |
| 526 |
devname, bus_id, mediastr, unit_id);
|
|
| 523 |
if_name[type], bus_id, mediastr, unit_id);
|
|
| 527 | 524 |
else |
| 528 | 525 |
snprintf(dinfo->id, 32, "%s%s%i", |
| 529 |
devname, mediastr, unit_id);
|
|
| 526 |
if_name[type], mediastr, unit_id);
|
|
| 530 | 527 |
} |
| 531 | 528 |
dinfo->bdrv = bdrv_new(dinfo->id); |
| 532 | 529 |
dinfo->devaddr = devaddr; |
Also available in: Unified diff