diff options
| author | Markus Armbruster <armbru@redhat.com> | 2016-06-22 19:11:19 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-07-12 16:19:16 +0200 |
| commit | a9c94277f07d19d3eb14f199c3e93491aa3eae0e (patch) | |
| tree | fbacb9207afd71c3ad206a4099099d95b7824c16 | |
| parent | b35399bb4e9968296a12303b00f9f2066470e987 (diff) | |
Use #include "..." for our own headers, <...> for others
Tracked down with an ugly, brittle and probably buggy Perl script.
Also move includes converted to <...> up so they get included before
ours where that's obviously okay.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
91 files changed, 169 insertions, 172 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 24f78a7755..434cb37107 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -46,7 +46,6 @@ #ifdef __linux__ #include <scsi/sg.h> -#include <block/scsi.h> #endif typedef struct IscsiLun { diff --git a/crypto/hash-gcrypt.c b/crypto/hash-gcrypt.c index 8ea5aff4ee..ed6f842461 100644 --- a/crypto/hash-gcrypt.c +++ b/crypto/hash-gcrypt.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <gcrypt.h> #include "qapi/error.h" #include "crypto/hash.h" -#include "gcrypt.h" static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = { diff --git a/crypto/pbkdf-gcrypt.c b/crypto/pbkdf-gcrypt.c index 997b311d84..34af3a97e9 100644 --- a/crypto/pbkdf-gcrypt.c +++ b/crypto/pbkdf-gcrypt.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <gcrypt.h> #include "qapi/error.h" #include "crypto/pbkdf.h" -#include "gcrypt.h" bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) { diff --git a/crypto/pbkdf-nettle.c b/crypto/pbkdf-nettle.c index db9fc15780..d681a606f9 100644 --- a/crypto/pbkdf-nettle.c +++ b/crypto/pbkdf-nettle.c @@ -19,9 +19,9 @@ */ #include "qemu/osdep.h" +#include <nettle/pbkdf2.h> #include "qapi/error.h" #include "crypto/pbkdf.h" -#include "nettle/pbkdf2.h" bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) @@ -36,7 +36,7 @@ #include "qemu/config-file.h" #include "qemu/error-report.h" #if defined(CONFIG_USER_ONLY) -#include <qemu.h> +#include "qemu.h" #else /* !CONFIG_USER_ONLY */ #include "hw/hw.h" #include "exec/memory.h" diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 9faad29fad..280d54d8eb 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -21,10 +21,10 @@ */ #include "qemu/osdep.h" -#include <hw/block/block.h> -#include <hw/hw.h> -#include <hw/pci/msix.h> -#include <hw/pci/pci.h> +#include "hw/block/block.h" +#include "hw/hw.h" +#include "hw/pci/msix.h" +#include "hw/pci/pci.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c index 15a5b2b2b5..d22464826b 100644 --- a/hw/char/sclpconsole.c +++ b/hw/char/sclpconsole.c @@ -13,7 +13,7 @@ */ #include "qemu/osdep.h" -#include <hw/qdev.h> +#include "hw/qdev.h" #include "qemu/thread.h" #include "qemu/error-report.h" diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 3ce5544efd..29a5c03826 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -24,7 +24,7 @@ #ifndef HW_VGA_INT_H #define HW_VGA_INT_H 1 -#include <hw/hw.h> +#include "hw/hw.h" #include "exec/memory.h" #define ST01_V_RETRACE 0x08 diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index d6c8c6e2dc..758d33a09d 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -21,7 +21,7 @@ #ifdef CONFIG_VIRGL -#include "virglrenderer.h" +#include <virglrenderer.h> static struct virgl_renderer_callbacks virtio_gpu_3d_cbs; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index f8b0274752..929c3c8b8a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -28,7 +28,7 @@ static struct virtio_gpu_simple_resource* virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); #ifdef CONFIG_VIRGL -#include "virglrenderer.h" +#include <virglrenderer.h> #define VIRGL(_g, _virgl, _simple, ...) \ do { \ if (_g->use_virgl_renderer) { \ diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index 734992ead0..521a58498a 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -22,14 +22,15 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + #include "qemu/osdep.h" +#include <linux/kvm.h> #include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" #include "sysemu/kvm.h" -#include "linux/kvm.h" #define KVM_PIT_REINJECT_BIT 0 diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 3623aa1965..1a429e5402 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -20,7 +20,9 @@ * Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com) * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com) */ + #include "qemu/osdep.h" +#include <linux/kvm.h> #include "qapi/error.h" #include "hw/hw.h" #include "hw/i386/pc.h" @@ -32,7 +34,6 @@ #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" -#include "linux/kvm.h" #include "kvm_i386.h" #include "hw/pci/pci-assign.h" diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index b1a7b65a7b..bcb9ff9e1b 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -22,17 +22,17 @@ */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/pci/msi.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> +#include "hw/hw.h" +#include "hw/pci/msi.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" #include "qemu/error-report.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/internal.h> -#include <hw/ide/pci.h> -#include <hw/ide/ahci.h> +#include "hw/ide/internal.h" +#include "hw/ide/pci.h" +#include "hw/ide/ahci.h" #define DEBUG_AHCI 0 diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 49294a5314..9ebb8d4fb2 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -23,15 +23,15 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" -#include <hw/ide/pci.h> +#include "hw/ide/pci.h" /* CMD646 specific */ #define CFR 0x50 diff --git a/hw/ide/core.c b/hw/ide/core.c index 029f6b9b12..f2d131b0d3 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -23,10 +23,10 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" @@ -35,7 +35,7 @@ #include "sysemu/block-backend.h" #include "qemu/cutils.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" /* These values were based on a Seagate ST3500418AS but have been modified to make more sense in QEMU */ diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 920ec276ed..459916977e 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -61,15 +61,15 @@ */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/pci/msi.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/pci/msi.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/pci.h> -#include <hw/ide/ahci.h> +#include "hw/ide/pci.h" +#include "hw/ide/ahci.h" #define ICH9_MSI_CAP_OFFSET 0x80 #define ICH9_SATA_CAP_OFFSET 0xA8 diff --git a/hw/ide/isa.c b/hw/ide/isa.c index eba567c877..40213d662c 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -23,13 +23,13 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" /***********************************************************/ /* ISA IDE definitions */ diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 56cc50661f..5a326afd96 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -29,7 +29,7 @@ #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" /* debug MACIO */ // #define DEBUG_MACIO diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 5c9db8047d..e3fd30e457 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -23,13 +23,13 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pcmcia.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pcmcia.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" #define TYPE_MICRODRIVE "microdrive" #define MICRODRIVE(obj) OBJECT_CHECK(MicroDriveState, (obj), TYPE_MICRODRIVE) diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 493f65a1d0..6f12f456ed 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -28,7 +28,7 @@ #include "sysemu/block-backend.h" #include "sysemu/dma.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" /***********************************************************/ /* MMIO based ide port diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 8d56a00b1b..3cfb510afe 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -23,14 +23,14 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "qemu/error-report.h" -#include <hw/ide/pci.h> +#include "hw/ide/pci.h" #define BMDMA_PAGE_SIZE 4096 diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 6d76ce980b..c190fcaa3c 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -24,15 +24,15 @@ */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" -#include <hw/ide/pci.h> +#include "hw/ide/pci.h" static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) { diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 6842a5596a..d07b44eed5 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -17,11 +17,11 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include <hw/hw.h> +#include "hw/hw.h" #include "sysemu/dma.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/block.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index d3f72267a1..5b32ecb386 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -24,15 +24,15 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <hw/hw.h> -#include <hw/i386/pc.h> -#include <hw/pci/pci.h> -#include <hw/isa/isa.h> +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "hw/pci/pci.h" +#include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "sysemu/dma.h" -#include <hw/ide/pci.h> +#include "hw/ide/pci.h" static uint64_t bmdma_read(void *opaque, hwaddr addr, unsigned size) diff --git a/hw/misc/hyperv_testdev.c b/hw/misc/hyperv_testdev.c index 1883fd7f20..6cae9e9010 100644 --- a/hw/misc/hyperv_testdev.c +++ b/hw/misc/hyperv_testdev.c @@ -12,11 +12,11 @@ */ #include "qemu/osdep.h" +#include <linux/kvm.h> #include "hw/hw.h" #include "hw/qdev.h" #include "hw/isa/isa.h" #include "sysemu/kvm.h" -#include "linux/kvm.h" #include "target-i386/hyperv.h" #include "kvm_i386.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 70b6b0b5ee..9347f0741e 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -12,11 +12,11 @@ #include "hw/ppc/spapr.h" #include "hw/boards.h" #include "qapi/error.h" -#include <sysemu/cpus.h> +#include "sysemu/cpus.h" #include "target-ppc/kvm_ppc.h" #include "hw/ppc/ppc.h" #include "target-ppc/mmu-hash64.h" -#include <sysemu/numa.h> +#include "sysemu/numa.h" static void spapr_cpu_reset(void *opaque) { diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c index f3cb141763..8448e0b024 100644 --- a/hw/ppc/spapr_pci_vfio.c +++ b/hw/ppc/spapr_pci_vfio.c @@ -18,13 +18,13 @@ */ #include "qemu/osdep.h" +#include <linux/vfio.h> #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/ppc/spapr.h" #include "hw/pci-host/spapr.h" #include "hw/pci/msix.h" -#include "linux/vfio.h" #include "hw/vfio/vfio.h" #include "qemu/error-report.h" #include "sysemu/qtest.h" diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 54991f5d6f..aa61773885 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include <hw/qdev.h> +#include "hw/qdev.h" #include "qemu/bitops.h" #include "exec/address-spaces.h" #include "cpu.h" diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 640a4eaa61..47ca853bd2 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -18,9 +18,9 @@ #include "cpu.h" #include "s390-pci-bus.h" #include "s390-pci-inst.h" -#include <hw/pci/pci_bus.h> -#include <hw/pci/msi.h> -#include <qemu/error-report.h> +#include "hw/pci/pci_bus.h" +#include "hw/pci/msi.h" +#include "qemu/error-report.h" /* #define DEBUG_S390PCI_BUS */ #ifdef DEBUG_S390PCI_BUS diff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h index f1fbd3c1b6..4f564e02f2 100644 --- a/hw/s390x/s390-pci-bus.h +++ b/hw/s390x/s390-pci-bus.h @@ -14,8 +14,8 @@ #ifndef HW_S390_PCI_BUS_H #define HW_S390_PCI_BUS_H -#include <hw/pci/pci.h> -#include <hw/pci/pci_host.h> +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" #include "hw/s390x/sclp.h" #include "hw/s390x/s390_flic.h" #include "hw/s390x/css.h" diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 331bc4cfde..f069b110b4 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -16,8 +16,8 @@ #include "cpu.h" #include "s390-pci-inst.h" #include "s390-pci-bus.h" -#include <exec/memory-internal.h> -#include <qemu/error-report.h> +#include "exec/memory-internal.h" +#include "qemu/error-report.h" /* #define DEBUG_S390PCI_INST */ #ifdef DEBUG_S390PCI_INST diff --git a/hw/s390x/s390-pci-inst.h b/hw/s390x/s390-pci-inst.h index e1c2ee1529..23f4bfa0ed 100644 --- a/hw/s390x/s390-pci-inst.h +++ b/hw/s390x/s390-pci-inst.h @@ -15,7 +15,7 @@ #define HW_S390_PCI_INST_H #include "s390-pci-bus.h" -#include <sysemu/dma.h> +#include "sysemu/dma.h" /* CLP common request & response block size */ #define CLP_BLK_SIZE 4096 diff --git a/hw/s390x/sclpquiesce.c b/hw/s390x/sclpquiesce.c index c0ecab9c3b..762cb184ac 100644 --- a/hw/s390x/sclpquiesce.c +++ b/hw/s390x/sclpquiesce.c @@ -12,7 +12,7 @@ * */ #include "qemu/osdep.h" -#include <hw/qdev.h> +#include "hw/qdev.h" #include "sysemu/sysemu.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 3f76443fba..1c6bc86316 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -13,19 +13,19 @@ #ifndef HW_S390X_VIRTIO_CCW_H #define HW_S390X_VIRTIO_CCW_H -#include <hw/virtio/virtio-blk.h> -#include <hw/virtio/virtio-net.h> -#include <hw/virtio/virtio-serial.h> -#include <hw/virtio/virtio-scsi.h> +#include "hw/virtio/virtio-blk.h" +#include "hw/virtio/virtio-net.h" +#include "hw/virtio/virtio-serial.h" +#include "hw/virtio/virtio-scsi.h" #ifdef CONFIG_VHOST_SCSI -#include <hw/virtio/vhost-scsi.h> +#include "hw/virtio/vhost-scsi.h" #endif -#include <hw/virtio/virtio-balloon.h> -#include <hw/virtio/virtio-rng.h> -#include <hw/virtio/virtio-bus.h> +#include "hw/virtio/virtio-balloon.h" +#include "hw/virtio/virtio-rng.h" +#include "hw/virtio/virtio-bus.h" -#include <hw/s390x/s390_flic.h> -#include <hw/s390x/css.h> +#include "hw/s390x/s390_flic.h" +#include "hw/s390x/css.h" #include "ccw-device.h" #include "hw/s390x/css-bridge.h" diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 2a00f2f3c8..5b2694615f 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -15,8 +15,9 @@ */ #include "qemu/osdep.h" -#include "qapi/error.h" +#include <linux/vhost.h> #include <sys/ioctl.h> +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/queue.h" #include "monitor/monitor.h" @@ -27,7 +28,6 @@ #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" #include "hw/fw-path-provider.h" -#include "linux/vhost.h" #include "qemu/cutils.h" /* Features supported by host kernel. */ diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index 18ced31493..b173b94949 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -15,9 +15,9 @@ #include "hw/virtio/virtio-scsi.h" #include "qemu/error-report.h" #include "sysemu/block-backend.h" -#include <hw/scsi/scsi.h> -#include <block/scsi.h> -#include <hw/virtio/virtio-bus.h> +#include "hw/scsi/scsi.h" +#include "block/scsi.h" +#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" /* Context: QEMU global mutex held */ diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index e8179d6616..722c93e5fc 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -20,9 +20,9 @@ #include "qemu/error-report.h" #include "qemu/iov.h" #include "sysemu/block-backend.h" -#include <hw/scsi/scsi.h> -#include <block/scsi.h> -#include <hw/virtio/virtio-bus.h> +#include "hw/scsi/scsi.h" +#include "block/scsi.h" +#include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" static inline int virtio_scsi_get_lun(uint8_t *lun) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index da71c8c8a5..5116f4ad68 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -28,7 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/scsi/scsi.h" -#include <block/scsi.h> +#include "block/scsi.h" #include "hw/pci/msi.h" #include "vmw_pvscsi.h" #include "trace.h" diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c index 7bed0cebe3..799245654a 100644 --- a/hw/usb/xen-usb.c +++ b/hw/usb/xen-usb.c @@ -21,6 +21,7 @@ #include "qemu/osdep.h" #include <libusb.h> +#include <sys/user.h> #include "qemu-common.h" #include "qemu/config-file.h" @@ -31,7 +32,6 @@ #include "qapi/qmp/qbool.h" #include "qapi/qmp/qint.h" #include "qapi/qmp/qstring.h" -#include "sys/user.h" #include <xen/io/ring.h> #include <xen/io/usbif.h> diff --git a/hw/vfio/common.c b/hw/vfio/common.c index f3c0522e7e..b313e7c2c6 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -20,6 +20,9 @@ #include "qemu/osdep.h" #include <sys/ioctl.h> +#ifdef CONFIG_KVM +#include <linux/kvm.h> +#endif #include <linux/vfio.h> #include "hw/vfio/vfio-common.h" @@ -30,9 +33,6 @@ #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/kvm.h" -#ifdef CONFIG_KVM -#include "linux/kvm.h" -#endif #include "trace.h" struct vfio_group_head vfio_group_list = diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index d62372e597..7681f152f3 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -9,12 +9,11 @@ */ #include "qemu/osdep.h" +#include <linux/vhost.h> +#include <sys/ioctl.h> #include "hw/virtio/vhost.h" #include "hw/virtio/vhost-backend.h" #include "qemu/error-report.h" -#include "linux/vhost.h" - -#include <sys/ioctl.h> static int vhost_kernel_call(struct vhost_dev *dev, unsigned long int request, void *arg) diff --git a/include/exec/helper-gen.h b/include/exec/helper-gen.h index 0d0da3aeb3..be96254e5a 100644 --- a/include/exec/helper-gen.h +++ b/include/exec/helper-gen.h @@ -4,7 +4,7 @@ #ifndef HELPER_GEN_H #define HELPER_GEN_H 1 -#include <exec/helper-head.h> +#include "exec/helper-head.h" #define DEF_HELPER_FLAGS_0(name, flags, ret) \ static inline void glue(gen_helper_, name)(dh_retvar_decl0(ret)) \ diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h index effdd4383a..00901370ed 100644 --- a/include/exec/helper-proto.h +++ b/include/exec/helper-proto.h @@ -4,7 +4,7 @@ #ifndef HELPER_PROTO_H #define HELPER_PROTO_H 1 -#include <exec/helper-head.h> +#include "exec/helper-head.h" #define DEF_HELPER_FLAGS_0(name, flags, ret) \ dh_ctype(ret) HELPER(name) (void); diff --git a/include/exec/helper-tcg.h b/include/exec/helper-tcg.h index 79fa3c8c81..62d87a32d6 100644 --- a/include/exec/helper-tcg.h +++ b/include/exec/helper-tcg.h @@ -4,7 +4,7 @@ #ifndef HELPER_TCG_H #define HELPER_TCG_H 1 -#include <exec/helper-head.h> +#include "exec/helper-head.h" #define DEF_HELPER_FLAGS_0(NAME, FLAGS, ret) \ { .func = HELPER(NAME), .name = #NAME, .flags = FLAGS, \ diff --git a/include/exec/tb-hash-xx.h b/include/exec/tb-hash-xx.h index 9f3fc05636..85b741d02a 100644 --- a/include/exec/tb-hash-xx.h +++ b/include/exec/tb-hash-xx.h @@ -33,7 +33,7 @@ #ifndef EXEC_TB_HASH_XX #define EXEC_TB_HASH_XX -#include <qemu/bitops.h> +#include "qemu/bitops.h" #define PRIME32_1 2654435761U #define PRIME32_2 2246822519U diff --git a/include/hw/gpio/imx_gpio.h b/include/hw/gpio/imx_gpio.h index b15a09fbca..4573570384 100644 --- a/include/hw/gpio/imx_gpio.h +++ b/include/hw/gpio/imx_gpio.h @@ -20,7 +20,7 @@ #ifndef __IMX_GPIO_H_ #define __IMX_GPIO_H_ -#include <hw/sysbus.h> +#include "hw/sysbus.h" #define TYPE_IMX_GPIO "imx.gpio" #define IMX_GPIO(obj) OBJECT_CHECK(IMXGPIOState, (obj), TYPE_IMX_GPIO) diff --git a/include/hw/i2c/imx_i2c.h b/include/hw/i2c/imx_i2c.h index e2ee8eaee8..fb95df5a52 100644 --- a/include/hw/i2c/imx_i2c.h +++ b/include/hw/i2c/imx_i2c.h @@ -21,7 +21,7 @@ #ifndef __IMX_I2C_H_ #define __IMX_I2C_H_ -#include <hw/sysbus.h> +#include "hw/sysbus.h" #define TYPE_IMX_I2C "imx.i2c" #define IMX_I2C(obj) OBJECT_CHECK(IMXI2CState, (obj), TYPE_IMX_I2C) diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h index bc777ed5c2..0ca7c65820 100644 --- a/include/hw/ide/ahci.h +++ b/include/hw/ide/ahci.h @@ -24,7 +24,7 @@ #ifndef HW_IDE_AHCI_H #define HW_IDE_AHCI_H -#include <hw/sysbus.h> +#include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000 #define AHCI_MAX_PORTS 32 diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index 773928af77..7824bc34ce 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -6,8 +6,8 @@ * only files in hw/ide/ are supposed to include this file. * non-internal declarations are in hw/ide.h */ -#include <hw/ide.h> -#include <hw/isa/isa.h> +#include "hw/ide.h" +#include "hw/isa/isa.h" #include "sysemu/dma.h" #include "sysemu/sysemu.h" #include "hw/block/block.h" diff --git a/include/hw/ide/pci.h b/include/hw/ide/pci.h index 0f2d4b91a7..dbc6a0383d 100644 --- a/include/hw/ide/pci.h +++ b/include/hw/ide/pci.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_PCI_H #define HW_IDE_PCI_H -#include <hw/ide/internal.h> +#include "hw/ide/internal.h" #define BM_STATUS_DMAING 0x01 #define BM_STATUS_ERROR 0x02 diff --git a/include/hw/ppc/spapr_drc.h b/include/hw/ppc/spapr_drc.h index 08e8411463..6aa506fbc3 100644 --- a/include/hw/ppc/spapr_drc.h +++ b/include/hw/ppc/spapr_drc.h @@ -12,9 +12,9 @@ #if !defined(__HW_SPAPR_DRC_H__) #define __HW_SPAPR_DRC_H__ +#include <libfdt.h> #include "qom/object.h" #include "hw/qdev.h" -#include "libfdt.h" #define TYPE_SPAPR_DR_CONNECTOR "spapr-dr-connector" #define SPAPR_DR_CONNECTOR_GET_CLASS(obj) \ diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-facility.h index dd8881838c..def1bb0c03 100644 --- a/include/hw/s390x/event-facility.h +++ b/include/hw/s390x/event-facility.h @@ -15,7 +15,7 @@ #ifndef HW_S390_SCLP_EVENT_FACILITY_H #define HW_S390_SCLP_EVENT_FACILITY_H -#include <hw/qdev.h> +#include "hw/qdev.h" #include "qemu/thread.h" #include "hw/s390x/sclp.h" diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index fbf357d2ed..ba28d1dd0e 100644 --- a/include/hw/s390x/sclp.h +++ b/include/hw/s390x/sclp.h @@ -14,8 +14,8 @@ #ifndef HW_S390_SCLP_H #define HW_S390_SCLP_H -#include <hw/sysbus.h> -#include <hw/qdev.h> +#include "hw/sysbus.h" +#include "hw/qdev.h" #define SCLP_CMD_CODE_MASK 0xffff00ff diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h index 72b850cb17..5ed7a0ebb0 100644 --- a/include/hw/s390x/storage-keys.h +++ b/include/hw/s390x/storage-keys.h @@ -12,7 +12,7 @@ #ifndef __S390_STORAGE_KEYS_H #define __S390_STORAGE_KEYS_H -#include <hw/qdev.h> +#include "hw/qdev.h" #include "monitor/monitor.h" #define TYPE_S390_SKEYS "s390-skeys" diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 15ea7679bd..8e31b9b6ec 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -27,7 +27,7 @@ #define QEMU_VMSTATE_H 1 #ifndef CONFIG_USER_ONLY -#include <migration/qemu-file.h> +#include "migration/qemu-file.h" #endif #include "migration/qjson.h" diff --git a/include/qemu/seqlock.h b/include/qemu/seqlock.h index 4dfc055353..18eb3fda9d 100644 --- a/include/qemu/seqlock.h +++ b/include/qemu/seqlock.h @@ -13,8 +13,8 @@ #ifndef QEMU_SEQLOCK_H #define QEMU_SEQLOCK_H 1 -#include <qemu/atomic.h> -#include <qemu/thread.h> +#include "qemu/atomic.h" +#include "qemu/thread.h" typedef struct QemuSeqLock QemuSeqLock; diff --git a/include/qemu/thread-posix.h b/include/qemu/thread-posix.h index eb5c7a1da1..24f84908b0 100644 --- a/include/qemu/thread-posix.h +++ b/include/qemu/thread-posix.h @@ -1,6 +1,7 @@ #ifndef __QEMU_THREAD_POSIX_H #define __QEMU_THREAD_POSIX_H 1 -#include "pthread.h" + +#include <pthread.h> #include <semaphore.h> struct QemuMutex { diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h index 385ff5f76a..1417d38b47 100644 --- a/include/qemu/thread-win32.h +++ b/include/qemu/thread-win32.h @@ -1,6 +1,7 @@ #ifndef __QEMU_THREAD_WIN32_H #define __QEMU_THREAD_WIN32_H 1 -#include "windows.h" + +#include <windows.h> struct QemuMutex { CRITICAL_SECTION lock; diff --git a/linux-user/arm/nwfpe/fpa11.h b/linux-user/arm/nwfpe/fpa11.h index 0b072843da..7f6f6549d6 100644 --- a/linux-user/arm/nwfpe/fpa11.h +++ b/linux-user/arm/nwfpe/fpa11.h @@ -21,8 +21,7 @@ #ifndef __FPA11_H__ #define __FPA11_H__ - -#include <cpu.h> +#include "cpu.h" #define GET_FPA11() (qemufpa) diff --git a/linux-user/flatload.c b/linux-user/flatload.c index 48ad1c5e9e..42d1079a24 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -37,7 +37,7 @@ #include "qemu.h" #include "flat.h" -#include <target_flat.h> +#include "target_flat.h" //#define DEBUG @@ -58,7 +58,7 @@ #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" -#include <qom/object_interfaces.h> +#include "qom/object_interfaces.h" #include "cpu.h" #include "trace.h" #include "trace/control.h" diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index cd9cdb4a24..f4160a3a86 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -13,8 +13,7 @@ #include "qemu/osdep.h" #include "vss-common.h" -#include "inc/win2003/vscoordint.h" - +#include <inc/win2003/vscoordint.h> #include <comadmin.h> #include <wbemidl.h> #include <comdef.h> diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp index d977393e33..ef9466909a 100644 --- a/qga/vss-win32/provider.cpp +++ b/qga/vss-win32/provider.cpp @@ -12,8 +12,8 @@ #include "qemu/osdep.h" #include "vss-common.h" -#include "inc/win2003/vscoordint.h" -#include "inc/win2003/vsprov.h" +#include <inc/win2003/vscoordint.h> +#include <inc/win2003/vsprov.h> #define VSS_TIMEOUT_MSEC (60*1000) diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 889052dedd..0cd2f0ee7f 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -13,8 +13,8 @@ #include "qemu/osdep.h" #include "vss-common.h" #include "requester.h" -#include "inc/win2003/vswriter.h" -#include "inc/win2003/vsbackup.h" +#include <inc/win2003/vswriter.h> +#include <inc/win2003/vsbackup.h> /* Max wait time for frozen event (VSS can only hold writes for 10 seconds) */ #define VSS_TIMEOUT_FREEZE_MSEC 10000 diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h index 91dae0c38d..1ffde0ff94 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -50,7 +50,7 @@ * VSS headers must be installed from Microsoft VSS SDK 7.2 available at: * http://www.microsoft.com/en-us/download/details.aspx?id=23490 */ -#include "inc/win2003/vss.h" +#include <inc/win2003/vss.h> /* Macros to convert char definitions to wchar */ #define _L(a) L##a diff --git a/slirp/bootp.c b/slirp/bootp.c index 7b3232bdc4..5a4646c182 100644 --- a/slirp/bootp.c +++ b/slirp/bootp.c @@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #if defined(_WIN32) /* Windows ntohl() returns an u_long value. diff --git a/slirp/cksum.c b/slirp/cksum.c index 2ad0e6540d..6d73abf4a0 100644 --- a/slirp/cksum.c +++ b/slirp/cksum.c @@ -31,7 +31,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" /* * Checksum routine for Internet Protocol family headers (Portable Version). diff --git a/slirp/if.c b/slirp/if.c index 9b02180db0..51ae0d0e9a 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -6,7 +6,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #include "qemu/timer.h" static void diff --git a/slirp/ip_input.c b/slirp/ip_input.c index 34fba2b7dd..348e1dca5a 100644 --- a/slirp/ip_input.c +++ b/slirp/ip_input.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #include "ip_icmp.h" static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp); diff --git a/slirp/ip_output.c b/slirp/ip_output.c index 0d6b3b8312..db403f04c1 100644 --- a/slirp/ip_output.c +++ b/slirp/ip_output.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" /* Number of packets queued before we start sending * (to prevent allocing too many mbufs) */ diff --git a/slirp/mbuf.c b/slirp/mbuf.c index d136988397..7eddc217e4 100644 --- a/slirp/mbuf.c +++ b/slirp/mbuf.c @@ -16,7 +16,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #define MBUF_THRESH 30 diff --git a/slirp/misc.c b/slirp/misc.c index 1a0ea1be4e..88e9d94197 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -6,9 +6,8 @@ */ #include "qemu/osdep.h" -#include <slirp.h> -#include <libslirp.h> - +#include "slirp.h" +#include "libslirp.h" #include "monitor/monitor.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" diff --git a/slirp/sbuf.c b/slirp/sbuf.c index dd4cb8c139..10119d3ad5 100644 --- a/slirp/sbuf.c +++ b/slirp/sbuf.c @@ -6,8 +6,8 @@ */ #include "qemu/osdep.h" -#include <slirp.h> -#include <qemu/main-loop.h> +#include "slirp.h" +#include "qemu/main-loop.h" static void sbappendsb(struct sbuf *sb, struct mbuf *m); diff --git a/slirp/socket.c b/slirp/socket.c index 02e89ce1f2..280050a21f 100644 --- a/slirp/socket.c +++ b/slirp/socket.c @@ -7,7 +7,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" -#include <slirp.h> +#include "slirp.h" #include "ip_icmp.h" #ifdef __sun__ #include <sys/filio.h> diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index e2b5d4ebbb..c5063a918d 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #include "ip_icmp.h" #define TCPREXMTTHRESH 3 diff --git a/slirp/tcp_output.c b/slirp/tcp_output.c index 99b0a9b1cb..819db27348 100644 --- a/slirp/tcp_output.c +++ b/slirp/tcp_output.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" static const u_char tcp_outflags[TCP_NSTATES] = { TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK, diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 6b9fef2008..ed16e1807f 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" /* patchable/settable parameters for tcp */ /* Don't do rfc1323 performance enhancements */ diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c index 8f5dd772ad..f9060c7bf8 100644 --- a/slirp/tcp_timer.c +++ b/slirp/tcp_timer.c @@ -31,7 +31,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer); diff --git a/slirp/tftp.c b/slirp/tftp.c index 367340222d..c1859066cc 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #include "qemu-common.h" #include "qemu/cutils.h" diff --git a/slirp/udp.c b/slirp/udp.c index 247024fd86..93d7224792 100644 --- a/slirp/udp.c +++ b/slirp/udp.c @@ -39,7 +39,7 @@ */ #include "qemu/osdep.h" -#include <slirp.h> +#include "slirp.h" #include "ip_icmp.h" static uint8_t udp_tos(struct socket *so); diff --git a/target-arm/arm-powerctl.c b/target-arm/arm-powerctl.c index d452230515..6519d52cae 100644 --- a/target-arm/arm-powerctl.c +++ b/target-arm/arm-powerctl.c @@ -9,8 +9,8 @@ */ #include "qemu/osdep.h" -#include <cpu.h> -#include <cpu-qom.h> +#include "cpu.h" +#include "cpu-qom.h" #include "internals.h" #include "arm-powerctl.h" #include "qemu/log.h" diff --git a/target-arm/psci.c b/target-arm/psci.c index 4db9b8ce24..14316eb0ae 100644 --- a/target-arm/psci.c +++ b/target-arm/psci.c @@ -16,10 +16,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include <cpu.h> -#include <exec/helper-proto.h> -#include <kvm-consts.h> -#include <sysemu/sysemu.h> +#include "cpu.h" +#include "exec/helper-proto.h" +#include "kvm-consts.h" +#include "sysemu/sysemu.h" #include "internals.h" #include "arm-powerctl.h" #include "exec/exec-all.h" diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 8f257fb74a..7cb784262c 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "disas/bfd.h" #include "exec/gdbstub.h" -#include <sysemu/kvm.h> +#include "sysemu/kvm.h" #include "kvm_ppc.h" #include "sysemu/arch_init.h" #include "sysemu/cpus.h" diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 8bcb0f75f3..0c8dba3602 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -219,7 +219,7 @@ int s390_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void s390_cpu_gdb_init(CPUState *cs); void s390x_cpu_debug_excp_handler(CPUState *cs); -#include <sysemu/kvm.h> +#include "sysemu/kvm.h" /* distinguish between 24 bit and 31 bit addressing */ #define HIGH_ORDER_BIT 0x80000000 diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c index a34026a524..e7152e72e0 100644 --- a/target-unicore32/softmmu.c +++ b/target-unicore32/softmmu.c @@ -13,7 +13,7 @@ #endif #include "qemu/osdep.h" -#include <cpu.h> +#include "cpu.h" #include "exec/exec-all.h" #undef DEBUG_UC32 diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c index 35d5180173..16465ab57e 100644 --- a/tests/postcopy-test.c +++ b/tests/postcopy-test.c @@ -15,11 +15,10 @@ #include "libqtest.h" #include "qemu/option.h" #include "qemu/range.h" +#include "qemu/sockets.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" -#include <qemu/sockets.h> - const unsigned start_address = 1024 * 1024; const unsigned end_address = 100 * 1024 * 1024; bool got_stop; diff --git a/tests/tcg/xtensa/linker.ld.S b/tests/tcg/xtensa/linker.ld.S index f1e7fa9f8d..5902302cf8 100644 --- a/tests/tcg/xtensa/linker.ld.S +++ b/tests/tcg/xtensa/linker.ld.S @@ -1,4 +1,4 @@ -#include <core-isa.h> +#include "core-isa.h" #if XTENSA_HAVE_BE OUTPUT_FORMAT("elf32-xtensa-be") diff --git a/tests/vhost-user-bridge.c b/tests/vhost-user-bridge.c index 45fa2b6148..775e031069 100644 --- a/tests/vhost-user-bridge.c +++ b/tests/vhost-user-bridge.c @@ -36,8 +36,6 @@ #include <sys/eventfd.h> #include <arpa/inet.h> #include <netdb.h> -#include <qemu/osdep.h> - #include <linux/vhost.h> #include "qemu/atomic.h" diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 421d432f44..46d05881b6 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -13,12 +13,12 @@ #include "libqtest.h" #include "qemu/option.h" #include "qemu/range.h" +#include "qemu/sockets.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" #include <linux/vhost.h> #include <sys/vfs.h> -#include <qemu/sockets.h> /* GLIB version compatibility flags */ #if !GLIB_CHECK_VERSION(2, 26, 0) diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 629d97a362..5a85aa3c89 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -9,8 +9,9 @@ * This work is licensed under the terms of the GNU GPL, version 2 or * later. See the COPYING file in the top-level directory. */ + #include "qemu/osdep.h" -#include <qemu/mmap-alloc.h> +#include "qemu/mmap-alloc.h" #define HUGETLBFS_MAGIC 0x958458f6 diff --git a/util/oslib-posix.c b/util/oslib-posix.c index e2e1d4d39f..d8e5dcfede 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -48,7 +48,7 @@ #include <sys/sysctl.h> #endif -#include <qemu/mmap-alloc.h> +#include "qemu/mmap-alloc.h" int qemu_get_thread_id(void) { |