From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dul0G-0004Af-Tc for qemu-devel@nongnu.org; Wed, 20 Sep 2017 15:49:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dul0F-0007r4-PF for qemu-devel@nongnu.org; Wed, 20 Sep 2017 15:49:48 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:35744) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dul0F-0007qp-KV for qemu-devel@nongnu.org; Wed, 20 Sep 2017 15:49:47 -0400 Received: by mail-qt0-x241.google.com with SMTP id l25so2417593qtf.2 for ; Wed, 20 Sep 2017 12:49:47 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Wed, 20 Sep 2017 16:49:29 -0300 Message-Id: <20170920194934.23071-2-f4bug@amsat.org> In-Reply-To: <20170920194934.23071-1-f4bug@amsat.org> References: <20170920194934.23071-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 1/6] mips: move hw/mips/cputimer.c to target/mips/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , Eduardo Habkost , Aurelien Jarno , Yongbok Kim , Marcel Apfelbaum Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , James Hogan , Thomas Huth This timer is a required part of the MIPS32/MIPS64 System Control coprocessor (CP0). Moving it with the other architecture related files will allow an opaque use of CPUMIPSState* in the next commit (introduce "internal.h"). also remove it from 'user' targets, remove an unnecessary include. Signed-off-by: Philippe Mathieu-Daudé Tested-by: Igor Mammedov Tested-by: James Hogan Acked-by: Eduardo Habkost --- hw/mips/cputimer.c => target/mips/cp0_timer.c | 1 - hw/mips/Makefile.objs | 2 +- target/mips/Makefile.objs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename hw/mips/cputimer.c => target/mips/cp0_timer.c (99%) diff --git a/hw/mips/cputimer.c b/target/mips/cp0_timer.c similarity index 99% rename from hw/mips/cputimer.c rename to target/mips/cp0_timer.c index 8a166b3ea7..a9a58c5604 100644 --- a/hw/mips/cputimer.c +++ b/target/mips/cp0_timer.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" #include "sysemu/kvm.h" diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 48cd2ef50e..17a311aaba 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,5 +1,5 @@ obj-y += mips_r4k.o mips_malta.o mips_mipssim.o -obj-y += addr.o cputimer.o mips_int.o +obj-y += addr.o mips_int.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-y += gt64xxx_pci.o diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs index bc5ed8511f..651f36f517 100644 --- a/target/mips/Makefile.objs +++ b/target/mips/Makefile.objs @@ -1,4 +1,4 @@ obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o obj-y += gdbstub.o msa_helper.o mips-semi.o -obj-$(CONFIG_SOFTMMU) += machine.o +obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o obj-$(CONFIG_KVM) += kvm.o -- 2.14.1