From patchwork Thu Apr 4 19:22:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E60232C0082 for ; Fri, 5 Apr 2013 06:31:01 +1100 (EST) Received: from localhost ([::1]:56566 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpsB-0002cm-Q4 for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:30:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplL-0001Ky-2l for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplI-0001pn-QC for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:54 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:56522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplI-0001pY-EV for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:23:52 -0400 Received: by mail-wg0-f42.google.com with SMTP id k13so1078020wgh.1 for ; Thu, 04 Apr 2013 12:23:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=/V4LcMwuhYPFVJAc4g3YDYwhedqrhWCONVQXWOZwfvA=; b=ZbxjppwGny7ju6/LrlISbewL6wSwOCiN0dxBYUvXJvuv6MgmYzyfP8wVpyFq0JLON4 STmKVbGwSuCUhcO37+ctvLuTn25+YHjtj5kY/3HB8bksY0+yYj4PmmFcuSYZCam+3x4y w2lzRC8bz/tcLMnQEdb0yF+re75/wY3O5t+0j7JI4z92HcQFplwV53SPy3l2wltVm98M Y4EIfM/ubn5ybo3+Ibgdf7VULvQZTaIcX8QTrJdFeG7kEIMfTsJgmQiTWtDgLhfRbU3z G3EW+y8nerRJyVJ/SNjRHfx8dTGTLAdpSCpOhbaYn8pwUXhyxZlRvvRYHOb4DU6mehYN Z+7w== X-Received: by 10.194.82.104 with SMTP id h8mr11731298wjy.3.1365103431831; Thu, 04 Apr 2013 12:23:51 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.23.50 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:23:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:22:53 +0200 Message-Id: <1365103395-11547-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22a Subject: [Qemu-devel] [PATCH 13/35] hw: move block devices to hw/block/, configure via default-configs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 1 + default-configs/sh4-softmmu.mak | 1 + default-configs/sh4eb-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/block/Makefile.objs | 4 ++++ hw/{ => block}/onenand.c | 0 hw/{ => block}/pc_sysfw.c | 0 hw/{ => block}/tc58128.c | 0 hw/i386/Makefile.objs | 1 - hw/sh4/Makefile.objs | 1 - 12 files changed, 10 insertions(+), 3 deletions(-) rename hw/{ => block}/onenand.c (100%) rename hw/{ => block}/pc_sysfw.c (100%) rename hw/{ => block}/tc58128.c (100%) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index cd353bd..7717ea6 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -48,6 +48,7 @@ CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y +CONFIG_ONENAND=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 2ddf670..4f0b3f3 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -31,3 +31,4 @@ CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_WDT_IB700=y +CONFIG_PC_SYSFW=y diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index bcafc27..20a05f9 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -6,4 +6,5 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_SH4=y CONFIG_IDE_MMIO=y diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak index 8372b0d..875e7e6 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -6,4 +6,5 @@ CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y CONFIG_ISA_MMIO=y +CONFIG_SH4=y CONFIG_IDE_MMIO=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 72f9bc7..6fba70f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -31,3 +31,4 @@ CONFIG_TPM_PASSTHROUGH=y CONFIG_PCI_HOTPLUG=y CONFIG_MC146818RTC=y CONFIG_WDT_IB700=y +CONFIG_PC_SYSFW=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index b14beb8..ede019d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o obj-y += tsc210x.o -obj-y += blizzard.o onenand.o cbus.o tusb6010.o +obj-y += blizzard.o cbus.o tusb6010.o obj-y += mst_fpga.o obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index 856915e..e4329a0 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -6,6 +6,10 @@ common-obj-$(CONFIG_PFLASH_CFI01) += pflash_cfi01.o common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o common-obj-$(CONFIG_XEN_BACKEND) += xen_disk.o common-obj-$(CONFIG_ECC) += ecc.o +common-obj-$(CONFIG_ONENAND) += onenand.o +common-obj-$(CONFIG_PC_SYSFW) += pc_sysfw.o + +obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO) += virtio-blk.o obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/ diff --git a/hw/onenand.c b/hw/block/onenand.c similarity index 100% rename from hw/onenand.c rename to hw/block/onenand.c diff --git a/hw/pc_sysfw.c b/hw/block/pc_sysfw.c similarity index 100% rename from hw/pc_sysfw.c rename to hw/block/pc_sysfw.c diff --git a/hw/tc58128.c b/hw/block/tc58128.c similarity index 100% rename from hw/tc58128.c rename to hw/block/tc58128.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 80132d8..6df5fd9 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,6 @@ 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 += debugcon.o debugexit.o -obj-y += pc_sysfw.o obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 4f2ac2a..efbb9eb 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,4 +1,3 @@ -obj-y = tc58128.o obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o obj-y := $(addprefix ../,$(obj-y))