diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-10-19 14:28:49 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2018-10-24 07:27:25 +0100 |
| commit | 3858ff763985fb9e9516cd36ae119562b9d61fea (patch) | |
| tree | d7fbace1c4925d75cd6ad13486b5663a8a168b83 /hw | |
| parent | d254b392cb1006039e3f1ede3375181b878091c5 (diff) | |
hw/core: Move null-machine into the common-obj list
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é <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/Makefile.objs | 3 | ||||
| -rw-r--r-- | 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 b736ce223a..a799c83815 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 cde4d3eb57..76d3f8e39c 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) { |