aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-06-26 07:22:57 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2017-07-04 14:39:27 +0200
commit5ddc64822b84b34f0ae68e9ed6e497ec35b51587 (patch)
tree76a061e8f97b1da0a6145ae6ce62c8b665a3ea98
parent47507383c663b48af28e1428f782df5caad39441 (diff)
Makefile: Move bootdevice.o to common-obj-y
There does not seem to be any target specific code in this file, so we can put it into "common-obj" instead of "obj" to compile it only once for all targets. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <1498454578-18709-7-git-send-email-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--Makefile.objs2
-rw-r--r--Makefile.target2
-rw-r--r--bootdevice.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.objs b/Makefile.objs
index b2e6322ef0..756644c77b 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -40,7 +40,7 @@ io-obj-y = io/
ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = blockdev.o blockdev-nbd.o block/
-common-obj-y += iothread.o
+common-obj-y += bootdevice.o iothread.o
common-obj-y += net/
common-obj-y += qdev-monitor.o device-hotplug.o
common-obj-$(CONFIG_WIN32) += os-win32.o
diff --git a/Makefile.target b/Makefile.target
index 0066579090..ffa7a8f9a3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -137,7 +137,7 @@ endif #CONFIG_BSD_USER
# System emulator target
ifdef CONFIG_SOFTMMU
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
-obj-y += qtest.o bootdevice.o
+obj-y += qtest.o
obj-y += hw/
obj-y += memory.o
obj-y += memory_mapping.o
diff --git a/bootdevice.c b/bootdevice.c
index 33e3029e40..1141009114 100644
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -27,7 +27,7 @@
#include "sysemu/sysemu.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
-#include "hw/hw.h"
+#include "sysemu/reset.h"
#include "hw/qdev-core.h"
typedef struct FWBootEntry FWBootEntry;