From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LBCan-0005s6-0C
	for qemu-devel@nongnu.org; Fri, 12 Dec 2008 13:18:25 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LBCai-0005ox-Uz
	for qemu-devel@nongnu.org; Fri, 12 Dec 2008 13:18:22 -0500
Received: from [199.232.76.173] (port=48530 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LBCai-0005on-Qh
	for qemu-devel@nongnu.org; Fri, 12 Dec 2008 13:18:20 -0500
Received: from mx2.redhat.com ([66.187.237.31]:47368)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <aarcange@redhat.com>) id 1LBCah-0001OV-V5
	for qemu-devel@nongnu.org; Fri, 12 Dec 2008 13:18:20 -0500
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Message-Id: <f86db80831d28e1ed46d.1229105805@duo.random>
In-Reply-To: <patchbomb.1229105802@duo.random>
Date: Fri, 12 Dec 2008 19:16:45 +0100
From: Andrea Arcangeli <aarcange@redhat.com>
Subject: [Qemu-devel] [PATCH 3 of 5] rename dma.c to isa_dma.c
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <anthony@codemonkey.ws>
Cc: chrisw@redhat.com, avi@redhat.com, Gerd Hoffmann <kraxel@redhat.com>, kvm@vger.kernel.org, qemu-devel@nongnu.org

From: Andrea Arcangeli <aarcange@redhat.com>

Move dma.c to isa_dma.c.

Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
---

diff --git a/Makefile.target b/Makefile.target
--- a/Makefile.target
+++ b/Makefile.target
@@ -629,7 +629,7 @@ OBJS += e1000.o
 
 ifeq ($(TARGET_BASE_ARCH), i386)
 # Hardware support
-OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
+OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) isa_dma.o
 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o
@@ -640,7 +640,7 @@ ifeq ($(TARGET_BASE_ARCH), ppc)
 ifeq ($(TARGET_BASE_ARCH), ppc)
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 # shared objects
-OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o
+OBJS+= ppc.o ide.o vga.o $(SOUND_HW) isa_dma.o openpic.o
 # PREP target
 OBJS+= pckbd.o ps2.o serial.o i8259.o i8254.o fdc.o m48t59.o mc146818rtc.o
 OBJS+= prep_pci.o ppc_prep.o
@@ -657,7 +657,7 @@ endif
 endif
 ifeq ($(TARGET_BASE_ARCH), mips)
 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
-OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
+OBJS+= mips_timer.o mips_int.o isa_dma.o vga.o serial.o i8254.o i8259.o rc4030.o
 OBJS+= g364fb.o jazz_led.o
 OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
diff --git a/hw/dma.c b/hw/isa_dma.c
rename from hw/dma.c
rename to hw/isa_dma.c