From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41666) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8un4-00084q-Dg for qemu-devel@nongnu.org; Sat, 17 Mar 2012 10:39:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8un2-0003nw-HE for qemu-devel@nongnu.org; Sat, 17 Mar 2012 10:39:29 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 17 Mar 2012 15:39:41 +0100 Message-Id: <1331995186-18507-2-git-send-email-hpoussin@reactos.org> In-Reply-To: <1331995186-18507-1-git-send-email-hpoussin@reactos.org> References: <1331995186-18507-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/6] i82378/i82374: do not create DMA controller twice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= This fixes a crash in PReP emulation when using DMA controller to access = floppy drive. Signed-off-by: Herv=C3=A9 Poussineau --- hw/i82374.c | 5 ++++- hw/i82378.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/i82374.c b/hw/i82374.c index 67298a3..4a922c3 100644 --- a/hw/i82374.c +++ b/hw/i82374.c @@ -38,6 +38,7 @@ do { fprintf(stderr, "i82374 ERROR: " fmt , ## __VA_ARG= S__); } while (0) =20 typedef struct I82374State { uint8_t commands[8]; + qemu_irq out; } I82374State; =20 static const VMStateDescription vmstate_i82374 =3D { @@ -99,7 +100,7 @@ static uint32_t i82374_read_descriptor(void *opaque, u= int32_t nport) =20 static void i82374_init(I82374State *s) { - DMA_init(1, NULL); + DMA_init(1, &s->out); memset(s->commands, 0, sizeof(s->commands)); } =20 @@ -132,6 +133,8 @@ static int i82374_isa_init(ISADevice *dev) =20 i82374_init(s); =20 + qdev_init_gpio_out(&dev->qdev, &s->out, 1); + return 0; } =20 diff --git a/hw/i82378.c b/hw/i82378.c index faad1a3..9b11d90 100644 --- a/hw/i82378.c +++ b/hw/i82378.c @@ -170,6 +170,7 @@ static void i82378_init(DeviceState *dev, I82378State= *s) { ISABus *isabus =3D DO_UPCAST(ISABus, qbus, qdev_get_child_bus(dev, "= isa.0")); ISADevice *pit; + ISADevice *isa; qemu_irq *out0_irq; =20 /* This device has: @@ -199,8 +200,8 @@ static void i82378_init(DeviceState *dev, I82378State= *s) pcspk_init(isabus, pit); =20 /* 2 82C37 (dma) */ - DMA_init(1, &s->out[1]); - isa_create_simple(isabus, "i82374"); + isa =3D isa_create_simple(isabus, "i82374"); + qdev_connect_gpio_out(&isa->qdev, 0, s->out[1]); =20 /* timer */ isa_create_simple(isabus, "mc146818rtc"); --=20 1.7.9.1