[Qemu-devel] [PATCH] Clean up includes

Markus Armbruster posted 1 patch 23 weeks ago
Test asan passed
Test checkpatch passed
Test docker-quick@centos7 passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20181204172535.2799-1-armbru@redhat.com
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(-)

[Qemu-devel] [PATCH] Clean up includes

Posted by Markus Armbruster 23 weeks ago
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 <armbru@redhat.com>
---
 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 <stdint.h>
-#include <stdlib.h>
 
 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 <stdint.h>
 
 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 <stdint.h>
 #include <elf.h>
 
 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 <glib.h>
 
 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 <glib.h>
 
 #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 65de952f44..32b880213d 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -10,9 +10,9 @@
  * directory.
  */
 
+#include "qemu/osdep.h"
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
-#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 <linux/kvm.h>
 #include <linux/psp-sev.h>
 
 #include <sys/ioctl.h>
 
-#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 <stdbool.h>
 
 #include <WinHvPlatform.h>
 #include <WinHvEmulation.h>
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 <stdlib.h>
 #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"
 
-- 
2.17.2


Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Viktor Prutyanov 23 weeks ago
On Tue,  4 Dec 2018 18:25:35 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> 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 <armbru@redhat.com>
> ---

For the elf2dmp:

>  contrib/elf2dmp/pdb.h                     | 2 --
>  contrib/elf2dmp/pe.h                      | 1 -
>  contrib/elf2dmp/qemu_elf.h                | 1 -

Acked-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu>

-- 
Viktor Prutyanov

Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Yuval Shaia 23 weeks ago
On Tue, Dec 04, 2018 at 06:25:35PM +0100, Markus Armbruster wrote:
> 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 <armbru@redhat.com>
> ---
>  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 -

For the rdma part:

>  hw/rdma/rdma_utils.c                      | 1 +
>  hw/rdma/rdma_utils.h                      | 1 -
>  hw/rdma/vmw/pvrdma_dev_ring.h             | 1 -

Acked-by: Yuval Shaia <yuval.shaia@oracle.com>

Thanks.

>  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 <stdint.h>
> -#include <stdlib.h>
>  
>  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 <stdint.h>
>  
>  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 <stdint.h>
>  #include <elf.h>
>  
>  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 <glib.h>
>  
>  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 <glib.h>
>  
>  #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 65de952f44..32b880213d 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -10,9 +10,9 @@
>   * directory.
>   */
>  
> +#include "qemu/osdep.h"
>  #include <linux/vfio.h>
>  #include <sys/ioctl.h>
> -#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 <linux/kvm.h>
>  #include <linux/psp-sev.h>
>  
>  #include <sys/ioctl.h>
>  
> -#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 <stdbool.h>
>  
>  #include <WinHvPlatform.h>
>  #include <WinHvEmulation.h>
> 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 <stdlib.h>
>  #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"
>  
> -- 
> 2.17.2
> 

Re: [Qemu-devel] [qemu-s390x] [PATCH] Clean up includes

Posted by Halil Pasic 23 weeks ago
On Tue,  4 Dec 2018 18:25:35 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> 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 <armbru@redhat.com>

Acked-by: Halil Pasic <pasic@linux.ibm.com>

Thanks,
Halil


Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Eric Blake 23 weeks ago
On 12/4/18 11:25 AM, Markus Armbruster wrote:
> 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

The script should probably auto-exclude contrib/ if none of those files 
make it into our final binary, and especially if they are meant to be 
compiled as stand-alone examples.

>      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

Should any of these files be renamed *.c.inc to match their usage? 
(Presuming that you excluded them because they are pulled in via another 
.c file?)

> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   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 -

Hmm - my earlier question about auto-excluding contrib/ gets trickier. 
What's the rationale for including some files in here?

>   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(-)

The remainder of these files look reasonable.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Markus Armbruster 23 weeks ago
Eric Blake <eblake@redhat.com> writes:

> On 12/4/18 11:25 AM, Markus Armbruster wrote:
>> 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
>
> The script should probably auto-exclude contrib/ if none of those
> files make it into our final binary, and especially if they are meant
> to be compiled as stand-alone examples.



>>      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
>
> Should any of these files be renamed *.c.inc to match their usage?
> (Presuming that you excluded them because they are pulled in via
> another .c file?)

The linux-user/T64/N.c contain nothing but

    #include "../T/N.c"

plus sometimes a #define T_TARGET_SINGAL_H thrown in to suppress
inclusion of a header.

Perhaps moving the actual meat into a common .inc.c would be cleaner.

Similarly, tests/test-rcu-simpleq.c contains nothing but

    #define TEST_LIST_TYPE 2
    #include "test-rcu-list.c"

and tests/test-rcu-tailq.c is the same with 3 instead of 2.

Again, we could move the actual meat into a common .inc.c.  But I'd
first investigate compiling the test three times with the appropriate
-DTEST_LIST_TYPE, using GNU Make's target-specific variable values.

target/s390x/gen-features.c is a standalone program that is compiled in
a way that breaks when we include osdep.h.  If that's fixable, fixing it
would be nice.  Aside: not sure I'd have written this in C.

tests/migration/s390x/ is a s390x guest firmware program for
migration-test.c.  It's compiled as a freestanding application.  I guess
osdep.h just gets in the way there.

All of the above is well beyond the scope of this simple cleanup patch.

>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>   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 -
>
> Hmm - my earlier question about auto-excluding contrib/ gets
> trickier. What's the rationale for including some files in here?

These are standalone programs that already include osdep.h.  My patch
simply drops superfluous include directives.

>>   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(-)
>
> The remainder of these files look reasonable.

Thanks!

Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Cornelia Huck 23 weeks ago
On Wed, 05 Dec 2018 09:07:13 +0100
Markus Armbruster <armbru@redhat.com> wrote:

> > On 12/4/18 11:25 AM, Markus Armbruster wrote:  
> >> 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:

(...)

> >>      target/s390x/gen-features.c

(..)

> target/s390x/gen-features.c is a standalone program that is compiled in
> a way that breaks when we include osdep.h.  If that's fixable, fixing it
> would be nice.  Aside: not sure I'd have written this in C.

Yes, that file is a bit of an oddball. Might make sense to add a
comment there that it is standalone, so you can find that out without
looking at the Makefile. I don't think rewriting this to something else
is worth the effort.

Re: [Qemu-devel] [PATCH] Clean up includes

Posted by Eduardo Habkost 23 weeks ago
On Tue, Dec 04, 2018 at 06:25:35PM +0100, Markus Armbruster wrote:
> 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 <armbru@redhat.com>

Acked-by: Eduardo Habkost <ehabkost@redhat.com>

-- 
Eduardo