diff options
| -rw-r--r-- | hw/ide/core.c | 71 | ||||
| -rw-r--r-- | hw/ide/internal.h | 1 |
2 files changed, 40 insertions, 32 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 5f6e2cb5de..0b6de6caae 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2518,51 +2518,58 @@ void ide_reset(IDEState *s) s->media_changed = 0; } +void ide_init_drive(IDEState *s, DriveInfo *dinfo) +{ + int cylinders, heads, secs; + uint64_t nb_sectors; + + if (dinfo && dinfo->bdrv) { + s->bs = dinfo->bdrv; + bdrv_get_geometry(s->bs, &nb_sectors); + bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); + s->cylinders = cylinders; + s->heads = heads; + s->sectors = secs; + s->nb_sectors = nb_sectors; + /* The SMART values should be preserved across power cycles + but they aren't. */ + s->smart_enabled = 1; + s->smart_autosave = 1; + s->smart_errors = 0; + s->smart_selftest_count = 0; + if (bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM) { + s->is_cdrom = 1; + bdrv_set_change_cb(s->bs, cdrom_change_cb, s); + } + strncpy(s->drive_serial_str, drive_get_serial(s->bs), + sizeof(s->drive_serial_str)); + } + if (strlen(s->drive_serial_str) == 0) + snprintf(s->drive_serial_str, sizeof(s->drive_serial_str), + "QM%05d", s->drive_serial); + ide_reset(s); +} + void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq) { IDEState *s; static int drive_serial = 1; - int i, cylinders, heads, secs; - uint64_t nb_sectors; + int i; for(i = 0; i < 2; i++) { s = bus->ifs + i; s->bus = bus; s->unit = i; - if (i == 0 && hd0) - s->bs = hd0->bdrv; - if (i == 1 && hd1) - s->bs = hd1->bdrv; - s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4); - if (s->bs) { - bdrv_get_geometry(s->bs, &nb_sectors); - bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs); - s->cylinders = cylinders; - s->heads = heads; - s->sectors = secs; - s->nb_sectors = nb_sectors; - /* The SMART values should be preserved across power cycles - but they aren't. */ - s->smart_enabled = 1; - s->smart_autosave = 1; - s->smart_errors = 0; - s->smart_selftest_count = 0; - s->smart_selftest_data = qemu_blockalign(s->bs, 512); - if (bdrv_get_type_hint(s->bs) == BDRV_TYPE_CDROM) { - s->is_cdrom = 1; - bdrv_set_change_cb(s->bs, cdrom_change_cb, s); - } - } s->drive_serial = drive_serial++; - strncpy(s->drive_serial_str, drive_get_serial(s->bs), - sizeof(s->drive_serial_str)); - if (strlen(s->drive_serial_str) == 0) - snprintf(s->drive_serial_str, sizeof(s->drive_serial_str), - "QM%05d", s->drive_serial); + s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4); + s->smart_selftest_data = qemu_blockalign(s->bs, 512); s->sector_write_timer = qemu_new_timer(vm_clock, ide_sector_write_timer_cb, s); - ide_reset(s); + if (i == 0) + ide_init_drive(s, hd0); + if (i == 1) + ide_init_drive(s, hd1); } bus->irq = irq; } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index b9a7c721a6..62aef1c3b0 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -527,6 +527,7 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr); void ide_data_writel(void *opaque, uint32_t addr, uint32_t val); uint32_t ide_data_readl(void *opaque, uint32_t addr); +void ide_init_drive(IDEState *s, DriveInfo *dinfo); void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); |