Revision 428c149b hw/ide/core.c
| b/hw/ide/core.c | ||
|---|---|---|
| 2594 | 2594 |
ide_clear_hob(bus); |
| 2595 | 2595 |
} |
| 2596 | 2596 |
|
| 2597 |
void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version) |
|
| 2597 |
void ide_init_drive(IDEState *s, DriveInfo *dinfo, BlockConf *conf, |
|
| 2598 |
const char *version) |
|
| 2598 | 2599 |
{
|
| 2599 | 2600 |
int cylinders, heads, secs; |
| 2600 | 2601 |
uint64_t nb_sectors; |
| ... | ... | |
| 2619 | 2620 |
} |
| 2620 | 2621 |
strncpy(s->drive_serial_str, drive_get_serial(s->bs), |
| 2621 | 2622 |
sizeof(s->drive_serial_str)); |
| 2623 |
if (conf) {
|
|
| 2624 |
s->conf = conf; |
|
| 2625 |
} |
|
| 2622 | 2626 |
} |
| 2623 | 2627 |
if (strlen(s->drive_serial_str) == 0) |
| 2624 | 2628 |
snprintf(s->drive_serial_str, sizeof(s->drive_serial_str), |
| ... | ... | |
| 2648 | 2652 |
s->sector_write_timer = qemu_new_timer(vm_clock, |
| 2649 | 2653 |
ide_sector_write_timer_cb, s); |
| 2650 | 2654 |
if (i == 0) |
| 2651 |
ide_init_drive(s, hd0, NULL); |
|
| 2655 |
ide_init_drive(s, hd0, NULL, NULL);
|
|
| 2652 | 2656 |
if (i == 1) |
| 2653 |
ide_init_drive(s, hd1, NULL); |
|
| 2657 |
ide_init_drive(s, hd1, NULL, NULL);
|
|
| 2654 | 2658 |
} |
| 2655 | 2659 |
bus->irq = irq; |
| 2656 | 2660 |
} |
Also available in: Unified diff