[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/6] hw/core: Move null-machine into the common-obj l
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 2/6] hw/core: Move null-machine into the common-obj list |
Date: |
Wed, 24 Oct 2018 10:52:04 +0100 |
The null-machine code used to be target specific since it used the
target-specific cpu_init() function in the past. But in the recent
commit 2278b93941d42c30e2950 ("Use cpu_create(type) instead of
cpu_init(cpu_model)") this has been change, so that the code now
uses the common cpu_create() function instead. Thus we can put
the null-machine into the common-obj list so that it is compiled
only once for all targets, to save some compilation time.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
hw/core/Makefile.objs | 3 +--
hw/core/null-machine.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index b736ce2..a799c83 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -21,5 +21,4 @@ common-obj-$(CONFIG_SOFTMMU) += or-irq.o
common-obj-$(CONFIG_SOFTMMU) += split-irq.o
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
-
-obj-$(CONFIG_SOFTMMU) += null-machine.o
+common-obj-$(CONFIG_SOFTMMU) += null-machine.o
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index cde4d3e..76d3f8e 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -18,7 +18,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
-#include "cpu.h"
+#include "qom/cpu.h"
static void machine_none_init(MachineState *mch)
{
--
1.8.3.1
- [Qemu-devel] [PULL 0/6] qtest, Makefiles and shell script improvements, Thomas Huth, 2018/10/24
- [Qemu-devel] [PULL 1/6] tests/migration-test: Disable s390x test when running with TCG, Thomas Huth, 2018/10/24
- [Qemu-devel] [PULL 2/6] hw/core: Move null-machine into the common-obj list,
Thomas Huth <=
- [Qemu-devel] [PULL 3/6] configs: Add a CONFIG_SMC37C669 switch for the "smc37c669-superio" device, Thomas Huth, 2018/10/24
- [Qemu-devel] [PULL 4/6] debian-bootstrap.pre: Modern shell scripting (use $() instead of ``), Thomas Huth, 2018/10/24
- [Qemu-devel] [PULL 5/6] po/Makefile: Modern shell scripting (use $() instead of ``), Thomas Huth, 2018/10/24
- [Qemu-devel] [PULL 6/6] configure: Provide option to explicitly disable AVX2, Thomas Huth, 2018/10/24
- Re: [Qemu-devel] [PULL 0/6] qtest, Makefiles and shell script improvements, Peter Maydell, 2018/10/24