From patchwork Thu Dec 20 09:45:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 1016706 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43L6Ms0BC4z9sBh for ; Thu, 20 Dec 2018 20:46:16 +1100 (AEDT) Received: from localhost ([::1]:36317 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZuuE-0006aC-H5 for incoming@patchwork.ozlabs.org; Thu, 20 Dec 2018 04:46:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZutW-0006Xw-1l for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZutV-00018L-2O for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33954) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZutU-0000wu-NH for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 001E9C0586AB for ; Thu, 20 Dec 2018 09:45:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 98FA46063D for ; Thu, 20 Dec 2018 09:45:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2E09211385A7; Thu, 20 Dec 2018 10:45:14 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 20 Dec 2018 10:45:13 +0100 Message-Id: <20181220094514.3904-2-armbru@redhat.com> In-Reply-To: <20181220094514.3904-1-armbru@redhat.com> References: <20181220094514.3904-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 20 Dec 2018 09:45:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] Clean up includes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/migration/s390x/a-b-bios.c tests/test-rcu-simpleq.c tests/test-rcu-tailq.c Signed-off-by: Markus Armbruster Message-Id: <20181204172535.2799-1-armbru@redhat.com> Acked-by: Eduardo Habkost Acked-by: Halil Pasic Acked-by: Yuval Shaia Acked-by: Viktor Prutyanov --- contrib/elf2dmp/pdb.h | 2 -- contrib/elf2dmp/pe.h | 1 - contrib/elf2dmp/qemu_elf.h | 1 - contrib/vhost-user-blk/vhost-user-blk.c | 1 - contrib/vhost-user-scsi/vhost-user-scsi.c | 1 - hw/rdma/rdma_utils.c | 1 + hw/rdma/rdma_utils.h | 1 - hw/rdma/vmw/pvrdma_dev_ring.h | 1 - hw/vfio/ap.c | 2 +- include/qemu/vfio-helpers.h | 1 - include/sysemu/whpx.h | 1 - target/i386/sev.c | 3 ++- target/i386/whp-dispatch.h | 1 - target/riscv/fpu_helper.c | 1 - tests/fp/platform.h | 1 - tests/tpm-util.h | 1 - tests/vhost-user-bridge.c | 2 +- util/qemu-thread-common.h | 1 - 18 files changed, 5 insertions(+), 18 deletions(-) diff --git a/contrib/elf2dmp/pdb.h b/contrib/elf2dmp/pdb.h index 4351a2dd61..a3a3cac2c1 100644 --- a/contrib/elf2dmp/pdb.h +++ b/contrib/elf2dmp/pdb.h @@ -8,8 +8,6 @@ #ifndef PDB_H #define PDB_H -#include -#include typedef struct GUID { unsigned int Data1; diff --git a/contrib/elf2dmp/pe.h b/contrib/elf2dmp/pe.h index 374e06a9c5..dafb26afbb 100644 --- a/contrib/elf2dmp/pe.h +++ b/contrib/elf2dmp/pe.h @@ -8,7 +8,6 @@ #ifndef PE_H #define PE_H -#include typedef struct IMAGE_DOS_HEADER { uint16_t e_magic; /* 0x00: MZ Header signature */ diff --git a/contrib/elf2dmp/qemu_elf.h b/contrib/elf2dmp/qemu_elf.h index d85d6558fa..86e6e688fb 100644 --- a/contrib/elf2dmp/qemu_elf.h +++ b/contrib/elf2dmp/qemu_elf.h @@ -8,7 +8,6 @@ #ifndef QEMU_ELF_H #define QEMU_ELF_H -#include #include typedef struct QEMUCPUSegment { diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c index 571f114a56..858221ad95 100644 --- a/contrib/vhost-user-blk/vhost-user-blk.c +++ b/contrib/vhost-user-blk/vhost-user-blk.c @@ -20,7 +20,6 @@ #include "contrib/libvhost-user/libvhost-user-glib.h" #include "contrib/libvhost-user/libvhost-user.h" -#include struct virtio_blk_inhdr { unsigned char status; diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c index 02c29019d1..496dd6e693 100644 --- a/contrib/vhost-user-scsi/vhost-user-scsi.c +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c @@ -16,7 +16,6 @@ #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_scsi.h" -#include #define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi" diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index dc23f158f3..4fbea8cde2 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -13,6 +13,7 @@ * */ +#include "qemu/osdep.h" #include "rdma_utils.h" #ifdef PVRDMA_DEBUG diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 04c7c2ef5b..c4f96c4f2a 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -17,7 +17,6 @@ #ifndef RDMA_UTILS_H #define RDMA_UTILS_H -#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" diff --git a/hw/rdma/vmw/pvrdma_dev_ring.h b/hw/rdma/vmw/pvrdma_dev_ring.h index 411d244603..5f2a0cf9b9 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.h +++ b/hw/rdma/vmw/pvrdma_dev_ring.h @@ -16,7 +16,6 @@ #ifndef PVRDMA_DEV_RING_H #define PVRDMA_DEV_RING_H -#include "qemu/typedefs.h" #define MAX_RING_NAME_SZ 32 diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 0a25f5e096..6166ccd47a 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -10,9 +10,9 @@ * directory. */ +#include "qemu/osdep.h" #include #include -#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/vfio/vfio.h" diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h index ce7e7b057f..1f057c2b9e 100644 --- a/include/qemu/vfio-helpers.h +++ b/include/qemu/vfio-helpers.h @@ -12,7 +12,6 @@ #ifndef QEMU_VFIO_HELPERS_H #define QEMU_VFIO_HELPERS_H -#include "qemu/typedefs.h" typedef struct QEMUVFIOState QEMUVFIOState; diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index 89592ae4fa..d200ee01d0 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -13,7 +13,6 @@ #ifndef QEMU_WHPX_H #define QEMU_WHPX_H -#include "config-host.h" #include "qemu-common.h" int whpx_init_vcpu(CPUState *cpu); diff --git a/target/i386/sev.c b/target/i386/sev.c index 2395171acf..20b2d325d8 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -11,12 +11,13 @@ * */ +#include "qemu/osdep.h" + #include #include #include -#include "qemu/osdep.h" #include "qapi/error.h" #include "qom/object_interfaces.h" #include "qemu/base64.h" diff --git a/target/i386/whp-dispatch.h b/target/i386/whp-dispatch.h index d8d3485976..4ae3cc8fa5 100644 --- a/target/i386/whp-dispatch.h +++ b/target/i386/whp-dispatch.h @@ -1,5 +1,4 @@ #include "windows.h" -#include #include #include diff --git a/target/riscv/fpu_helper.c b/target/riscv/fpu_helper.c index fdb87d8d82..01b45ca0ae 100644 --- a/target/riscv/fpu_helper.c +++ b/target/riscv/fpu_helper.c @@ -17,7 +17,6 @@ */ #include "qemu/osdep.h" -#include #include "cpu.h" #include "qemu/host-utils.h" #include "exec/exec-all.h" diff --git a/tests/fp/platform.h b/tests/fp/platform.h index c20ba70baa..f8c423dde3 100644 --- a/tests/fp/platform.h +++ b/tests/fp/platform.h @@ -29,7 +29,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config-host.h" #ifndef HOST_WORDS_BIGENDIAN #define LITTLEENDIAN 1 diff --git a/tests/tpm-util.h b/tests/tpm-util.h index 9e98bc5124..5755698ad2 100644 --- a/tests/tpm-util.h +++ b/tests/tpm-util.h @@ -13,7 +13,6 @@ #ifndef TESTS_TPM_UTIL_H #define TESTS_TPM_UTIL_H -#include "qemu/osdep.h" #include "io/channel-socket.h" typedef void (tx_func)(QTestState *s, diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 0cf8d0baca..0033b61f2e 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -29,8 +29,8 @@ #define _FILE_OFFSET_BITS 64 -#include "qemu/atomic.h" #include "qemu/osdep.h" +#include "qemu/atomic.h" #include "qemu/iov.h" #include "standard-headers/linux/virtio_net.h" #include "contrib/libvhost-user/libvhost-user.h" diff --git a/util/qemu-thread-common.h b/util/qemu-thread-common.h index a0ea7c0d92..2af6b12085 100644 --- a/util/qemu-thread-common.h +++ b/util/qemu-thread-common.h @@ -13,7 +13,6 @@ #ifndef QEMU_THREAD_COMMON_H #define QEMU_THREAD_COMMON_H -#include "qemu/typedefs.h" #include "qemu/thread.h" #include "trace.h" From patchwork Thu Dec 20 09:45:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 1016704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43L6Ml0LGvz9sDr for ; Thu, 20 Dec 2018 20:46:10 +1100 (AEDT) Received: from localhost ([::1]:36316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZuu8-0006Yd-BU for incoming@patchwork.ozlabs.org; Thu, 20 Dec 2018 04:46:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZutU-0006WE-HI for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZutO-00012L-UT for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZutN-0000wq-J2 for qemu-devel@nongnu.org; Thu, 20 Dec 2018 04:45:22 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D35E8796E2 for ; Thu, 20 Dec 2018 09:45:15 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A019868D27 for ; Thu, 20 Dec 2018 09:45:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3175311385CB; Thu, 20 Dec 2018 10:45:14 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 20 Dec 2018 10:45:14 +0100 Message-Id: <20181220094514.3904-3-armbru@redhat.com> In-Reply-To: <20181220094514.3904-1-armbru@redhat.com> References: <20181220094514.3904-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 20 Dec 2018 09:45:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] build: Remake config-host.mak when VERSION changes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" configure gets the version number from VERSION, and writes it to config-host.mak. The make dependency for that is missing. Because of that, a rebuild after a VERSION change may not pick up the change. Fix that. Signed-off-by: Markus Armbruster Message-Id: <20181214084754.23854-1-armbru@redhat.com> Reviewed-by: Eric Blake --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c8b9efdad4..038780c6d0 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ CONFIG_ALL=y -include config-all-devices.mak -include config-all-disas.mak -config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION @echo $@ is out-of-date, running configure @# TODO: The next lines include code which supports a smooth @# transition from old configurations without config.status.