From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gs-0005py-Gj for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2gq-0001Rz-Jt for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:02 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:64104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gq-0001Rq-Eb for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:00 -0400 Received: by mail-ee0-f42.google.com with SMTP id b47so271966eek.15 for ; Tue, 02 Apr 2013 07:59:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 2 Apr 2013 16:58:54 +0200 Message-Id: <1364914749-11141-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 20/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/i386-softmmu.mak | 4 ++++ default-configs/x86_64-softmmu.mak | 4 ++++ hw/i386/Makefile.objs | 7 ++----- hw/isa/Makefile.objs | 6 ++++++ hw/{ => isa}/debugexit.c | 0 hw/{ => isa}/lpc_ich9.c | 0 hw/{ => isa}/pc-testdev.c | 0 hw/{ => isa}/sga.c | 0 hw/{ => isa}/vmport.c | 0 hw/{ => isa}/vt82c686.c | 0 hw/mips/Makefile.objs | 2 +- 11 files changed, 17 insertions(+), 6 deletions(-) rename hw/{ => isa}/debugexit.c (100%) rename hw/{ => isa}/lpc_ich9.c (100%) rename hw/{ => isa}/pc-testdev.c (100%) rename hw/{ => isa}/sga.c (100%) rename hw/{ => isa}/vmport.c (100%) rename hw/{ => isa}/vt82c686.c (100%) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 60010b1..594921c 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -35,3 +35,7 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_ISA_TESTDEV=y +CONFIG_VMPORT=y +CONFIG_SGA=y +CONFIG_LPC_ICH9=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index c2a3d4e..c0d152f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -35,3 +35,7 @@ CONFIG_WDT_IB700=y CONFIG_PC_SYSFW=y CONFIG_XEN_I386=$(CONFIG_XEN) CONFIG_ISA_DEBUG=y +CONFIG_ISA_TESTDEV=y +CONFIG_VMPORT=y +CONFIG_SGA=y +CONFIG_LPC_ICH9=y diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 5e91d1e..1dc9575 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,10 +1,7 @@ obj-y += apic_common.o apic.o -obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o -obj-y += vmport.o -obj-y += debugexit.o -obj-y += lpc_ich9.o q35.o +obj-y += ioapic_common.o ioapic.o piix_pci.o +obj-y += q35.o obj-y += kvm/ -obj-y += pc-testdev.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index cbee381..18e2256 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -3,7 +3,13 @@ common-obj-$(CONFIG_APM) += apm.o common-obj-$(CONFIG_APPLESMC) += applesmc.o common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_I82374) += i82374.o +common-obj-$(CONFIG_ISA_DEBUG) += debugexit.o common-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o common-obj-$(CONFIG_PC87312) += pc87312.o common-obj-$(CONFIG_PIIX4) += piix4.o +common-obj-$(CONFIG_FULONG) += vt82c686.o +common-obj-$(CONFIG_SGA) += sga.o +common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o +obj-$(CONFIG_VMPORT) += vmport.o +obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o diff --git a/hw/debugexit.c b/hw/isa/debugexit.c similarity index 100% rename from hw/debugexit.c rename to hw/isa/debugexit.c diff --git a/hw/lpc_ich9.c b/hw/isa/lpc_ich9.c similarity index 100% rename from hw/lpc_ich9.c rename to hw/isa/lpc_ich9.c diff --git a/hw/pc-testdev.c b/hw/isa/pc-testdev.c similarity index 100% rename from hw/pc-testdev.c rename to hw/isa/pc-testdev.c diff --git a/hw/sga.c b/hw/isa/sga.c similarity index 100% rename from hw/sga.c rename to hw/isa/sga.c diff --git a/hw/vmport.c b/hw/isa/vmport.c similarity index 100% rename from hw/vmport.c rename to hw/isa/vmport.c diff --git a/hw/vt82c686.c b/hw/isa/vt82c686.c similarity index 100% rename from hw/vt82c686.c rename to hw/isa/vt82c686.c diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index e173a2d..af4d1f9 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,5 +1,5 @@ obj-y += gt64xxx.o -obj-$(CONFIG_FULONG) += bonito.o vt82c686.o +obj-$(CONFIG_FULONG) += bonito.o obj-y := $(addprefix ../,$(obj-y)) -- 1.8.1.4