motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: Split non-qdev code off ide_init2()

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2010-06-01 20:32:29 +02:00 • committed by Kevin Wolf
parent 870111c8ed
commit 57234ee40d
8 changed files with 35 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

32
hw/ide/core.c
View file

@ -2632,7 +2632,7 @@ void ide_init_drive(IDEState *s, DriveInfo *dinfo, const char *version)
ide_reset(s);
}
static void ide_init1(IDEBus *bus, int unit, DriveInfo *dinfo)
static void ide_init1(IDEBus *bus, int unit)
{
static int drive_serial = 1;
IDEState *s = &bus->ifs[unit];
@ -2645,20 +2645,34 @@ static void ide_init1(IDEBus *bus, int unit, DriveInfo *dinfo)
s->smart_selftest_data = qemu_blockalign(s->bs, 512);
s->sector_write_timer = qemu_new_timer(vm_clock,
ide_sector_write_timer_cb, s);
if (dinfo) {
ide_init_drive(s, dinfo, NULL);
} else {
ide_reset(s);
}
}
void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
qemu_irq irq)
void ide_init2(IDEBus *bus, qemu_irq irq)
{
int i;
for(i = 0; i < 2; i++) {
ide_init1(bus, i, i == 0 ? hd0 : hd1);
ide_init1(bus, i);
ide_reset(&bus->ifs[i]);
}
bus->irq = irq;
}
/* TODO convert users to qdev and remove */
void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0,
DriveInfo *hd1, qemu_irq irq)
{
int i;
DriveInfo *dinfo;
for(i = 0; i < 2; i++) {
dinfo = i == 0 ? hd0 : hd1;
ide_init1(bus, i);
if (dinfo) {
ide_init_drive(&bus->ifs[i], dinfo, NULL);
} else {
ide_reset(&bus->ifs[i]);
}
}
bus->irq = irq;
}