Commit 3858ff76 authored by Thomas Huth's avatar Thomas Huth
Browse files

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 2278b939 ("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: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent d254b392

hw/core/Makefile.objs

+1 −2
Original line number Diff line number Diff line
@@ -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

hw/core/null-machine.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{