From d9fbc5bf6db77141cc4196f49d9f59521ff087ad Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 26 Jan 2011 14:57:59 -0200 Subject: [RHEL6 qemu-kvm PATCH 04/14] ide: Split non-qdev code off ide_init2() RH-Author: Anthony Liguori Message-id: <1296053886-2905-5-git-send-email-aliguori@redhat.com> Patchwork-id: 17090 O-Subject: [PATCH RHEL6.1 qemu-kvm 04/11] ide: Split non-qdev code off ide_init2() Bugzilla: 654682 RH-Acked-by: Kevin Wolf RH-Acked-by: Marcelo Tosatti RH-Acked-by: Markus Armbruster RH-Acked-by: Jes Sorensen From: Markus Armbruster BZ: 654682 Upstream-status: accepted Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf (cherry picked from commit 57234ee40d314f91cf5bd16a926f30a6985e06e2) Signed-off-by: Eduardo Habkost --- hw/ide/cmd646.c | 4 ++-- hw/ide/core.c | 30 ++++++++++++++++++++++-------- hw/ide/internal.h | 5 +++-- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/microdrive.c | 3 ++- hw/ide/mmio.c | 2 +- hw/ide/piix.c | 4 ++-- 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index bb4efd0..9ff92fd 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -232,8 +232,8 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) irq = qemu_allocate_irqs(cmd646_set_irq, d, 2); ide_bus_new(&d->bus[0], &d->dev.qdev, 0); ide_bus_new(&d->bus[1], &d->dev.qdev, 1); - ide_init2(&d->bus[0], NULL, NULL, irq[0]); - ide_init2(&d->bus[1], NULL, NULL, irq[1]); + ide_init2(&d->bus[0], irq[0]); + ide_init2(&d->bus[1], irq[1]); vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d); qemu_register_reset(cmd646_reset, d); diff --git a/hw/ide/core.c b/hw/ide/core.c index fb733b7..e797c42 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2661,7 +2661,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]; @@ -2675,20 +2675,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, qemu_irq irq) +{ + int i; + + for(i = 0; i < 2; i++) { + ide_init1(bus, i); + ide_reset(&bus->ifs[i]); } + bus->irq = irq; } -void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, - qemu_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++) { - ide_init1(bus, i, i == 0 ? hd0 : hd1); + 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; } diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 05be651..94ee01b 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -559,8 +559,9 @@ 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, const char *version); -void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, - qemu_irq irq); +void ide_init2(IDEBus *bus, qemu_irq irq); +void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, + DriveInfo *hd1, qemu_irq irq); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); /* hw/ide/qdev.c */ diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 208afd9..8e965a9 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -72,7 +72,7 @@ static int isa_ide_initfn(ISADevice *dev) isa_init_irq(dev, &s->irq, s->isairq); isa_init_ioport_range(dev, s->iobase, 8); isa_init_ioport(dev, s->iobase2); - ide_init2(&s->bus, NULL, NULL, s->irq); + ide_init2(&s->bus, s->irq); vmstate_register(&dev->qdev, 0, &vmstate_ide_isa, s); return 0; }; diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 683e592..af69602 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -320,7 +320,7 @@ int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq, int pmac_ide_memory; d = qemu_mallocz(sizeof(MACIOIDEState)); - ide_init2(&d->bus, hd_table[0], hd_table[1], irq); + ide_init2_with_non_qdev_drives(&d->bus, hd_table[0], hd_table[1], irq); if (dbdma) DBDMA_register_channel(dbdma, channel, dma_irq, pmac_ide_transfer, pmac_ide_flush, d); diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 30c8aa4..8e20e74 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -539,7 +539,8 @@ PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv) md->card.cis = dscm1xxxx_cis; md->card.cis_len = sizeof(dscm1xxxx_cis); - ide_init2(&md->bus, bdrv, NULL, qemu_allocate_irqs(md_set_irq, md, 1)[0]); + ide_init2_with_non_qdev_drives(&md->bus, bdrv, NULL, + qemu_allocate_irqs(md_set_irq, md, 1)[0]); md->bus.ifs[0].is_cf = 1; md->bus.ifs[0].mdata_size = METADATA_SIZE; md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 5909f21..9f20e8b 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -125,7 +125,7 @@ void mmio_ide_init (target_phys_addr_t membase, target_phys_addr_t membase2, MMIOState *s = qemu_mallocz(sizeof(MMIOState)); int mem1, mem2; - ide_init2(&s->bus, hd0, hd1, irq); + ide_init2_with_non_qdev_drives(&s->bus, hd0, hd1, irq); s->shift = shift; diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 95f8f14..9ef6fa2 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -132,8 +132,8 @@ static int pci_piix_ide_initfn(PCIIDEState *d) ide_init_ioport(&d->bus[0], 0x1f0, 0x3f6); ide_init_ioport(&d->bus[1], 0x170, 0x376); - ide_init2(&d->bus[0], NULL, NULL, isa_reserve_irq(14)); - ide_init2(&d->bus[1], NULL, NULL, isa_reserve_irq(15)); + ide_init2(&d->bus[0], isa_reserve_irq(14)); + ide_init2(&d->bus[1], isa_reserve_irq(15)); return 0; } -- 1.7.3.2