From patchwork Fri Dec 9 12:17:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9468141 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84B4D60586 for ; Fri, 9 Dec 2016 12:51:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CF5C28633 for ; Fri, 9 Dec 2016 12:51:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6193128638; Fri, 9 Dec 2016 12:51:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5967C28633 for ; Fri, 9 Dec 2016 12:51:38 +0000 (UTC) Received: from localhost ([::1]:46338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFKeH-0003gt-Bk for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Dec 2016 07:51:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48012) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFK8l-0001A4-IO for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:19:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFK8g-0003NY-Jt for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:19:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47614) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cFK8g-0003NA-BH for qemu-devel@nongnu.org; Fri, 09 Dec 2016 07:18:58 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 587CE81F07; Fri, 9 Dec 2016 12:18:57 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-17.ams2.redhat.com [10.36.116.17]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB9CHpb0031224; Fri, 9 Dec 2016 07:18:51 -0500 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Richard Henderson , Aurelien Jarno , Peter Maydell Date: Fri, 9 Dec 2016 13:17:40 +0100 Message-Id: <1481285870-3396-11-git-send-email-thuth@redhat.com> In-Reply-To: <1481285870-3396-1-git-send-email-thuth@redhat.com> References: <1481285870-3396-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 09 Dec 2016 12:18:57 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 10/20] s390x: Move CPU files to target/ folder X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , James Hogan , Jia Liu , Christian Borntraeger , Bastian Koppelmann , Anthony Green , Marcelo Tosatti , Mark Cave-Ayland , Laurent Vivier , Eduardo Habkost , Alexander Graf , Max Filippov , Michael Walle , Yongbok Kim , "Edgar E. Iglesias" , Guan Xuetao , Artyom Tarasenko , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Thomas Huth Acked-by: Cornelia Huck --- MAINTAINERS | 8 ++++---- Makefile.objs | 2 +- {target-s390x => target/s390x}/Makefile.objs | 2 +- {target-s390x => target/s390x}/arch_dump.c | 0 {target-s390x => target/s390x}/cc_helper.c | 0 {target-s390x => target/s390x}/cpu-qom.h | 0 {target-s390x => target/s390x}/cpu.c | 0 {target-s390x => target/s390x}/cpu.h | 0 {target-s390x => target/s390x}/cpu_features.c | 0 {target-s390x => target/s390x}/cpu_features.h | 0 {target-s390x => target/s390x}/cpu_features_def.h | 0 {target-s390x => target/s390x}/cpu_models.c | 0 {target-s390x => target/s390x}/cpu_models.h | 0 {target-s390x => target/s390x}/fpu_helper.c | 0 {target-s390x => target/s390x}/gdbstub.c | 0 {target-s390x => target/s390x}/gen-features.c | 0 {target-s390x => target/s390x}/helper.c | 0 {target-s390x => target/s390x}/helper.h | 0 {target-s390x => target/s390x}/insn-data.def | 0 {target-s390x => target/s390x}/insn-format.def | 0 {target-s390x => target/s390x}/int_helper.c | 0 {target-s390x => target/s390x}/interrupt.c | 0 {target-s390x => target/s390x}/ioinst.c | 0 {target-s390x => target/s390x}/kvm.c | 0 {target-s390x => target/s390x}/machine.c | 0 {target-s390x => target/s390x}/mem_helper.c | 0 {target-s390x => target/s390x}/misc_helper.c | 0 {target-s390x => target/s390x}/mmu_helper.c | 0 {target-s390x => target/s390x}/trace-events | 8 ++++---- {target-s390x => target/s390x}/translate.c | 0 30 files changed, 10 insertions(+), 10 deletions(-) rename {target-s390x => target/s390x}/Makefile.objs (94%) rename {target-s390x => target/s390x}/arch_dump.c (100%) rename {target-s390x => target/s390x}/cc_helper.c (100%) rename {target-s390x => target/s390x}/cpu-qom.h (100%) rename {target-s390x => target/s390x}/cpu.c (100%) rename {target-s390x => target/s390x}/cpu.h (100%) rename {target-s390x => target/s390x}/cpu_features.c (100%) rename {target-s390x => target/s390x}/cpu_features.h (100%) rename {target-s390x => target/s390x}/cpu_features_def.h (100%) rename {target-s390x => target/s390x}/cpu_models.c (100%) rename {target-s390x => target/s390x}/cpu_models.h (100%) rename {target-s390x => target/s390x}/fpu_helper.c (100%) rename {target-s390x => target/s390x}/gdbstub.c (100%) rename {target-s390x => target/s390x}/gen-features.c (100%) rename {target-s390x => target/s390x}/helper.c (100%) rename {target-s390x => target/s390x}/helper.h (100%) rename {target-s390x => target/s390x}/insn-data.def (100%) rename {target-s390x => target/s390x}/insn-format.def (100%) rename {target-s390x => target/s390x}/int_helper.c (100%) rename {target-s390x => target/s390x}/interrupt.c (100%) rename {target-s390x => target/s390x}/ioinst.c (100%) rename {target-s390x => target/s390x}/kvm.c (100%) rename {target-s390x => target/s390x}/machine.c (100%) rename {target-s390x => target/s390x}/mem_helper.c (100%) rename {target-s390x => target/s390x}/misc_helper.c (100%) rename {target-s390x => target/s390x}/mmu_helper.c (100%) rename {target-s390x => target/s390x}/trace-events (91%) rename {target-s390x => target/s390x}/translate.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index fb6c3a6..48b0a7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -202,7 +202,7 @@ S390 M: Richard Henderson M: Alexander Graf S: Maintained -F: target-s390x/ +F: target/s390x/ F: hw/s390x/ F: disas/s390.c @@ -286,9 +286,9 @@ M: Christian Borntraeger M: Cornelia Huck M: Alexander Graf S: Maintained -F: target-s390x/kvm.c -F: target-s390x/ioinst.[ch] -F: target-s390x/machine.c +F: target/s390x/kvm.c +F: target/s390x/ioinst.[ch] +F: target/s390x/machine.c F: hw/intc/s390_flic.c F: hw/intc/s390_flic_kvm.c F: include/hw/s390x/s390_flic.h diff --git a/Makefile.objs b/Makefile.objs index 91a24c5..c5ebb80 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -158,7 +158,7 @@ trace-events-y += net/trace-events trace-events-y += target/arm/trace-events trace-events-y += target/i386/trace-events trace-events-y += target-sparc/trace-events -trace-events-y += target-s390x/trace-events +trace-events-y += target/s390x/trace-events trace-events-y += target/ppc/trace-events trace-events-y += qom/trace-events trace-events-y += linux-user/trace-events diff --git a/target-s390x/Makefile.objs b/target/s390x/Makefile.objs similarity index 94% rename from target-s390x/Makefile.objs rename to target/s390x/Makefile.objs index 6b02b17..c573633 100644 --- a/target-s390x/Makefile.objs +++ b/target/s390x/Makefile.objs @@ -5,7 +5,7 @@ obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o obj-$(CONFIG_KVM) += kvm.o # build and run feature list generator -feat-src = $(SRC_PATH)/target-$(TARGET_BASE_ARCH)/ +feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/ feat-dst = $(BUILD_DIR)/$(TARGET_DIR) ifneq ($(MAKECMDGOALS),clean) GENERATED_HEADERS += $(feat-dst)gen-features.h diff --git a/target-s390x/arch_dump.c b/target/s390x/arch_dump.c similarity index 100% rename from target-s390x/arch_dump.c rename to target/s390x/arch_dump.c diff --git a/target-s390x/cc_helper.c b/target/s390x/cc_helper.c similarity index 100% rename from target-s390x/cc_helper.c rename to target/s390x/cc_helper.c diff --git a/target-s390x/cpu-qom.h b/target/s390x/cpu-qom.h similarity index 100% rename from target-s390x/cpu-qom.h rename to target/s390x/cpu-qom.h diff --git a/target-s390x/cpu.c b/target/s390x/cpu.c similarity index 100% rename from target-s390x/cpu.c rename to target/s390x/cpu.c diff --git a/target-s390x/cpu.h b/target/s390x/cpu.h similarity index 100% rename from target-s390x/cpu.h rename to target/s390x/cpu.h diff --git a/target-s390x/cpu_features.c b/target/s390x/cpu_features.c similarity index 100% rename from target-s390x/cpu_features.c rename to target/s390x/cpu_features.c diff --git a/target-s390x/cpu_features.h b/target/s390x/cpu_features.h similarity index 100% rename from target-s390x/cpu_features.h rename to target/s390x/cpu_features.h diff --git a/target-s390x/cpu_features_def.h b/target/s390x/cpu_features_def.h similarity index 100% rename from target-s390x/cpu_features_def.h rename to target/s390x/cpu_features_def.h diff --git a/target-s390x/cpu_models.c b/target/s390x/cpu_models.c similarity index 100% rename from target-s390x/cpu_models.c rename to target/s390x/cpu_models.c diff --git a/target-s390x/cpu_models.h b/target/s390x/cpu_models.h similarity index 100% rename from target-s390x/cpu_models.h rename to target/s390x/cpu_models.h diff --git a/target-s390x/fpu_helper.c b/target/s390x/fpu_helper.c similarity index 100% rename from target-s390x/fpu_helper.c rename to target/s390x/fpu_helper.c diff --git a/target-s390x/gdbstub.c b/target/s390x/gdbstub.c similarity index 100% rename from target-s390x/gdbstub.c rename to target/s390x/gdbstub.c diff --git a/target-s390x/gen-features.c b/target/s390x/gen-features.c similarity index 100% rename from target-s390x/gen-features.c rename to target/s390x/gen-features.c diff --git a/target-s390x/helper.c b/target/s390x/helper.c similarity index 100% rename from target-s390x/helper.c rename to target/s390x/helper.c diff --git a/target-s390x/helper.h b/target/s390x/helper.h similarity index 100% rename from target-s390x/helper.h rename to target/s390x/helper.h diff --git a/target-s390x/insn-data.def b/target/s390x/insn-data.def similarity index 100% rename from target-s390x/insn-data.def rename to target/s390x/insn-data.def diff --git a/target-s390x/insn-format.def b/target/s390x/insn-format.def similarity index 100% rename from target-s390x/insn-format.def rename to target/s390x/insn-format.def diff --git a/target-s390x/int_helper.c b/target/s390x/int_helper.c similarity index 100% rename from target-s390x/int_helper.c rename to target/s390x/int_helper.c diff --git a/target-s390x/interrupt.c b/target/s390x/interrupt.c similarity index 100% rename from target-s390x/interrupt.c rename to target/s390x/interrupt.c diff --git a/target-s390x/ioinst.c b/target/s390x/ioinst.c similarity index 100% rename from target-s390x/ioinst.c rename to target/s390x/ioinst.c diff --git a/target-s390x/kvm.c b/target/s390x/kvm.c similarity index 100% rename from target-s390x/kvm.c rename to target/s390x/kvm.c diff --git a/target-s390x/machine.c b/target/s390x/machine.c similarity index 100% rename from target-s390x/machine.c rename to target/s390x/machine.c diff --git a/target-s390x/mem_helper.c b/target/s390x/mem_helper.c similarity index 100% rename from target-s390x/mem_helper.c rename to target/s390x/mem_helper.c diff --git a/target-s390x/misc_helper.c b/target/s390x/misc_helper.c similarity index 100% rename from target-s390x/misc_helper.c rename to target/s390x/misc_helper.c diff --git a/target-s390x/mmu_helper.c b/target/s390x/mmu_helper.c similarity index 100% rename from target-s390x/mmu_helper.c rename to target/s390x/mmu_helper.c diff --git a/target-s390x/trace-events b/target/s390x/trace-events similarity index 91% rename from target-s390x/trace-events rename to target/s390x/trace-events index df59f5f..1574033 100644 --- a/target-s390x/trace-events +++ b/target/s390x/trace-events @@ -1,22 +1,22 @@ # See docs/tracing.txt for syntax documentation. -# target-s390x/mmu_helper.c +# target/s390x/mmu_helper.c get_skeys_nonzero(int rc) "SKEY: Call to get_skeys unexpectedly returned %d" set_skeys_nonzero(int rc) "SKEY: Call to set_skeys unexpectedly returned %d" -# target-s390x/ioinst.c +# target/s390x/ioinst.c ioinst(const char *insn) "IOINST: %s" ioinst_sch_id(const char *insn, int cssid, int ssid, int schid) "IOINST: %s (%x.%x.%04x)" ioinst_chp_id(const char *insn, int cssid, int chpid) "IOINST: %s (%x.%02x)" ioinst_chsc_cmd(uint16_t cmd, uint16_t len) "IOINST: chsc command %04x, len %04x" -# target-s390x/kvm.c +# target/s390x/kvm.c kvm_enable_cmma(int rc) "CMMA: enabling with result code %d" kvm_clear_cmma(int rc) "CMMA: clearing with result code %d" kvm_failed_cpu_state_set(int cpu_index, uint8_t state, const char *msg) "Warning: Unable to set cpu %d state %" PRIu8 " to KVM: %s" kvm_sigp_finished(uint8_t order, int cpu_index, int dst_index, int cc) "SIGP: Finished order %u on cpu %d -> cpu %d with cc=%d" -# target-s390x/cpu.c +# target/s390x/cpu.c cpu_set_state(int cpu_index, uint8_t state) "setting cpu %d state to %" PRIu8 cpu_halt(int cpu_index) "halting cpu %d" cpu_unhalt(int cpu_index) "unhalting cpu %d" diff --git a/target-s390x/translate.c b/target/s390x/translate.c similarity index 100% rename from target-s390x/translate.c rename to target/s390x/translate.c