From patchwork Tue Jan 29 20:50:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 216659 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 CF25C2C0093 for ; Wed, 30 Jan 2013 08:47:32 +1100 (EST) Received: from localhost ([::1]:46473 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0IA6-0005yP-JR for incoming@patchwork.ozlabs.org; Tue, 29 Jan 2013 15:52:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0I9E-0004WA-HM for qemu-devel@nongnu.org; Tue, 29 Jan 2013 15:51:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0I9C-0005QJ-CW for qemu-devel@nongnu.org; Tue, 29 Jan 2013 15:51:16 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45297 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0I9C-0005Pq-2X for qemu-devel@nongnu.org; Tue, 29 Jan 2013 15:51:14 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 7CA20A5271; Tue, 29 Jan 2013 21:51:13 +0100 (CET) From: Alexander Graf To: qemu-devel Date: Tue, 29 Jan 2013 21:50:53 +0100 Message-Id: <1359492659-16362-14-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1359492659-16362-1-git-send-email-agraf@suse.de> References: <1359492659-16362-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Blue Swirl , =?utf-8?q?Aur=C3=A9lien=20Jarno?= Subject: [Qemu-devel] [PATCH 13/19] s390: Move hw files to hw/s390x 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 This moves all files only used by s390 system emulation to hw/s390x. Signed-off-by: Alexander Graf Acked-by: Christian Borntraeger --- hw/s390x/Makefile.objs | 2 -- hw/{ => s390x}/s390-virtio-bus.c | 8 ++++---- hw/{ => s390x}/s390-virtio-bus.h | 12 ++++++------ hw/s390x/s390-virtio-hcall.c | 2 +- hw/{ => s390x}/s390-virtio.c | 10 +++++----- hw/{ => s390x}/s390-virtio.h | 0 6 files changed, 16 insertions(+), 18 deletions(-) rename hw/{ => s390x}/s390-virtio-bus.c (99%) rename hw/{ => s390x}/s390-virtio-bus.h (95%) rename hw/{ => s390x}/s390-virtio.c (98%) rename hw/{ => s390x}/s390-virtio.h (100%) diff --git a/hw/s390-virtio.h b/hw/s390x/s390-virtio.h similarity index 100% rename from hw/s390-virtio.h rename to hw/s390x/s390-virtio.h diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index f6b461b..e4ee456 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -1,6 +1,4 @@ obj-y = s390-virtio-bus.o s390-virtio.o - -obj-y := $(addprefix ../,$(obj-y)) obj-y += s390-virtio-hcall.o obj-y += sclp.o obj-y += event-facility.o diff --git a/hw/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c similarity index 99% rename from hw/s390-virtio-bus.c rename to hw/s390x/s390-virtio-bus.c index 6858db0..32f63b0 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -17,12 +17,12 @@ * License along with this library; if not, see . */ -#include "hw.h" +#include "hw/hw.h" #include "block/block.h" #include "sysemu/sysemu.h" -#include "boards.h" +#include "hw/boards.h" #include "monitor/monitor.h" -#include "loader.h" +#include "hw/loader.h" #include "elf.h" #include "hw/virtio.h" #include "hw/virtio-rng.h" @@ -31,7 +31,7 @@ #include "hw/sysbus.h" #include "sysemu/kvm.h" -#include "hw/s390-virtio-bus.h" +#include "hw/s390x/s390-virtio-bus.h" #include "hw/virtio-bus.h" /* #define DEBUG_S390 */ diff --git a/hw/s390-virtio-bus.h b/hw/s390x/s390-virtio-bus.h similarity index 95% rename from hw/s390-virtio-bus.h rename to hw/s390x/s390-virtio-bus.h index 438b37f..4aacf83 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390x/s390-virtio-bus.h @@ -19,12 +19,12 @@ #ifndef HW_S390_VIRTIO_BUS_H #define HW_S390_VIRTIO_BUS_H 1 -#include "virtio-blk.h" -#include "virtio-net.h" -#include "virtio-rng.h" -#include "virtio-serial.h" -#include "virtio-scsi.h" -#include "virtio-bus.h" +#include "hw/virtio-blk.h" +#include "hw/virtio-net.h" +#include "hw/virtio-rng.h" +#include "hw/virtio-serial.h" +#include "hw/virtio-scsi.h" +#include "hw/virtio-bus.h" #define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */ #define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */ diff --git a/hw/s390x/s390-virtio-hcall.c b/hw/s390x/s390-virtio-hcall.c index d7938c0..ee62649 100644 --- a/hw/s390x/s390-virtio-hcall.c +++ b/hw/s390x/s390-virtio-hcall.c @@ -10,7 +10,7 @@ */ #include "cpu.h" -#include "hw/s390-virtio.h" +#include "hw/s390x/s390-virtio.h" #define MAX_DIAG_SUBCODES 255 diff --git a/hw/s390-virtio.c b/hw/s390x/s390-virtio.c similarity index 98% rename from hw/s390-virtio.c rename to hw/s390x/s390-virtio.c index 6e0f53b..a8a489d 100644 --- a/hw/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -21,22 +21,22 @@ * License along with this library; if not, see . */ -#include "hw.h" +#include "hw/hw.h" #include "block/block.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "net/net.h" -#include "boards.h" +#include "hw/boards.h" #include "monitor/monitor.h" -#include "loader.h" +#include "hw/loader.h" #include "hw/virtio.h" #include "hw/sysbus.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" -#include "hw/s390-virtio-bus.h" +#include "hw/s390x/s390-virtio-bus.h" #include "hw/s390x/sclp.h" -#include "hw/s390-virtio.h" +#include "hw/s390x/s390-virtio.h" //#define DEBUG_S390