From 642d0586c0916ec4cf9fbdc5db23ee4bd1d95207 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Wed, 26 Jan 2011 14:57:57 -0200 Subject: [RHEL6 qemu-kvm PATCH 02/14] ide: Split ide_init1() off ide_init2() (v2) RH-Author: Anthony Liguori Message-id: <1296053886-2905-3-git-send-email-aliguori@redhat.com> Patchwork-id: 17087 O-Subject: [PATCH RHEL6.1 qemu-kvm 02/11] ide: Split ide_init1() off ide_init2() (v2) Bugzilla: 654682 RH-Acked-by: Kevin Wolf RH-Acked-by: Marcelo Tosatti RH-Acked-by: Markus Armbruster From: Markus Armbruster BZ: 654682 Upstream-status: accepted Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf (cherry picked from commit d459da0ed4bcdc38d5aaaa78f0c83fdeac6dd190) Signed-off-by: Anthony Liguori -- v1 -> v2 - remove duplicate initialization of io_buffer Signed-off-by: Eduardo Habkost --- hw/ide/core.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index da8b7d7..43d4d19 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2661,28 +2661,30 @@ 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 int drive_serial = 1; + IDEState *s = &bus->ifs[unit]; + + s->bus = bus; + s->unit = unit; + s->drive_serial = drive_serial++; + /* we need at least 2k alignment for accessing CDROMs using O_DIRECT */ + s->io_buffer = qemu_memalign(2048, IDE_DMA_BUF_SECTORS*512 + 4); + s->io_buffer_total_len = 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_init_drive(s, dinfo, NULL); +} + void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq) { - IDEState *s; - static int drive_serial = 1; int i; for(i = 0; i < 2; i++) { - s = bus->ifs + i; - s->bus = bus; - s->unit = i; - s->drive_serial = drive_serial++; - /* we need at least 2k alignment for accessing CDROMs using O_DIRECT */ - s->io_buffer = qemu_memalign(2048, IDE_DMA_BUF_SECTORS*512 + 4); - s->io_buffer_total_len = 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); - if (i == 0) - ide_init_drive(s, hd0, NULL); - if (i == 1) - ide_init_drive(s, hd1, NULL); + ide_init1(bus, i, i == 0 ? hd0 : hd1); } bus->irq = irq; } -- 1.7.3.2