[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] Makefile: Move bootdevice.o to common-obj-y
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PATCH 7/7] Makefile: Move bootdevice.o to common-obj-y |
Date: |
Fri, 16 Jun 2017 16:59:13 +0200 |
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 <address@hidden>
---
Makefile.objs | 2 +-
Makefile.target | 2 +-
bootdevice.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 0575802..e5bdae9 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 ce8dfe4..0759176 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -140,7 +140,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-$(CONFIG_KVM) += kvm-all.o
obj-y += memory.o cputlb.o
diff --git a/bootdevice.c b/bootdevice.c
index 33e3029..1141009 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;
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/7] Poison some more target-specific defines, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 1/7] include/exec/poison: Add missing TARGET defines, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 2/7] include/exec/poison: Mark some CONFIG defines as poisoned, too, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 3/7] Move CONFIG_KVM related definitions to kvm_i386.h, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 4/7] include/exec/poison: Mark CONFIG_KVM as poisoned, too, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 5/7] cpu: Introduce a wrapper for tlb_flush() that can be used in common code, Thomas Huth, 2017/06/16
- [Qemu-devel] [PATCH 7/7] Makefile: Move bootdevice.o to common-obj-y,
Thomas Huth <=
- [Qemu-devel] [PATCH 6/7] include/exec/poison: Mark CONFIG_SOFTMMU as poisoned, Thomas Huth, 2017/06/16
- Re: [Qemu-devel] [PATCH v2 0/7] Poison some more target-specific defines, Paolo Bonzini, 2017/06/16