From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td3qh-0004ya-3A for qemu-devel@nongnu.org; Mon, 26 Nov 2012 13:56:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Td3qb-0003eR-Fl for qemu-devel@nongnu.org; Mon, 26 Nov 2012 13:56:07 -0500 From: Alexander Graf Date: Mon, 26 Nov 2012 19:55:52 +0100 Message-Id: <1353956157-26879-2-git-send-email-agraf@suse.de> In-Reply-To: <1353956157-26879-1-git-send-email-agraf@suse.de> References: <1353956157-26879-1-git-send-email-agraf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/6] hw/ide/macio: Fix segfault caused by NULL DMAContext* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "qemu-devel@nongnu.org qemu-devel" Cc: Blue Swirl , Peter Maydell , "qemu-ppc@nongnu.org List" , Aurelien Jarno From: Peter Maydell Pass qemu_sglist_init the global dma_context_memory rather than a NULL pointer; this fixes a segfault in dma_memory_map() when the guest starts using DMA. Reported-by: Amadeusz S=C5=82awi=C5=84ski Signed-off-by: Peter Maydell Signed-off-by: Alexander Graf --- hw/ide/macio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 720af6e..d2edcc0 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -76,7 +76,8 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, in= t ret) =20 s->io_buffer_size =3D io->len; =20 - qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL); + qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, + &dma_context_memory); qemu_sglist_add(&s->sg, io->addr, io->len); io->addr +=3D io->len; io->len =3D 0; @@ -132,7 +133,8 @@ static void pmac_ide_transfer_cb(void *opaque, int re= t) s->io_buffer_index =3D 0; s->io_buffer_size =3D io->len; =20 - qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, NULL); + qemu_sglist_init(&s->sg, io->len / MACIO_PAGE_SIZE + 1, + &dma_context_memory); qemu_sglist_add(&s->sg, io->addr, io->len); io->addr +=3D io->len; io->len =3D 0; --=20 1.6.0.2