[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/6] mips: move hw/mips/cputimer.c to target/mips
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v3 1/6] mips: move hw/mips/cputimer.c to target/mips/ |
Date: |
Sun, 17 Sep 2017 20:20:05 -0300 |
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é <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
---
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
- [Qemu-devel] [PATCH v3 0/6] QOMify MIPS cpu, Philippe Mathieu-Daudé, 2017/09/17
- [Qemu-devel] [PATCH v3 1/6] mips: move hw/mips/cputimer.c to target/mips/,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 3/6] mips: split cpu_mips_realize_env() out of cpu_mips_init(), Philippe Mathieu-Daudé, 2017/09/17
- [Qemu-devel] [PATCH v3 2/6] mips: introduce internal.h and cleanup cpu.h, Philippe Mathieu-Daudé, 2017/09/17
- [Qemu-devel] [PATCH v3 4/6] mips: call cpu_mips_realize_env() from mips_cpu_realizefn(), Philippe Mathieu-Daudé, 2017/09/17
- [Qemu-devel] [PATCH v3 5/6] mips: MIPSCPU model subclasses, Philippe Mathieu-Daudé, 2017/09/17
- [Qemu-devel] [PATCH v3 6/6] mips: replace cpu_mips_init() with cpu_generic_init(), Philippe Mathieu-Daudé, 2017/09/17
- Re: [Qemu-devel] [PATCH v3 0/6] QOMify MIPS cpu, no-reply, 2017/09/17