From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPMUS-0004XU-HA for qemu-devel@nongnu.org; Mon, 26 Jun 2017 01:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPMUR-00064Y-LP for qemu-devel@nongnu.org; Mon, 26 Jun 2017 01:23:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41544) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dPMUR-00064N-FP for qemu-devel@nongnu.org; Mon, 26 Jun 2017 01:23:11 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7CF0780F6C for ; Mon, 26 Jun 2017 05:23:10 +0000 (UTC) From: Thomas Huth Date: Mon, 26 Jun 2017 07:22:57 +0200 Message-Id: <1498454578-18709-7-git-send-email-thuth@redhat.com> In-Reply-To: <1498454578-18709-1-git-send-email-thuth@redhat.com> References: <1498454578-18709-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH v4 6/7] Makefile: Move bootdevice.o to common-obj-y List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Paolo Bonzini 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 --- 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 b2e6322..756644c 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 0066579..ffa7a8f 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 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