mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-27 05:43:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use #include "..." for our own headers, <...> for others

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2016-06-22 19:11:19 +02:00
parent b35399bb4e
commit a9c94277f0
91 changed files with 169 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/iscsi.c
View File

@ -46,7 +46,6 @@
#ifdef __linux__
#include <scsi/sg.h>
#include <block/scsi.h>
#endif
typedef struct IscsiLun {

2
crypto/hash-gcrypt.c
View File

@ -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] = {

2
crypto/pbkdf-gcrypt.c
View File

@ -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)
{

2
crypto/pbkdf-nettle.c
View File

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

2
exec.c
View File

@ -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"

8
hw/block/nvme.c
View File

@ -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"

2
hw/char/sclpconsole.c
View File

@ -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"

2
hw/display/vga_int.h
View File

@ -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

2
hw/display/virtio-gpu-3d.c
View File

@ -21,7 +21,7 @@
#ifdef CONFIG_VIRGL
#include "virglrenderer.h"
#include <virglrenderer.h>
static struct virgl_renderer_callbacks virtio_gpu_3d_cbs;

2
hw/display/virtio-gpu.c
View File

@ -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) { \

3
hw/i386/kvm/i8254.c
View File

@ -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

3
hw/i386/kvm/pci-assign.c
View File

@ -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"

14
hw/ide/ahci.c
View File

@ -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

10
hw/ide/cmd646.c
View File

@ -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

10
hw/ide/core.c
View File

@ -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 */

14
hw/ide/ich.c
View File

@ -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

8
hw/ide/isa.c
View File

@ -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 */

2
hw/ide/macio.c
View File

@ -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

8
hw/ide/microdrive.c
View File

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

2
hw/ide/mmio.c
View File

@ -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

10
hw/ide/pci.c
View File

@ -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

10
hw/ide/piix.c
View File

@ -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)
{

4
hw/ide/qdev.c
View File

@ -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"

10
hw/ide/via.c
View File

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

2
hw/misc/hyperv_testdev.c
View File

@ -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"

4
hw/ppc/spapr_cpu_core.c
View File

@ -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)
{

2
hw/ppc/spapr_pci_vfio.c
View File

@ -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"

2
hw/s390x/css.c
View File

@ -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"

6
hw/s390x/s390-pci-bus.c
View File

@ -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

4
hw/s390x/s390-pci-bus.h
View File

@ -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"

4
hw/s390x/s390-pci-inst.c
View File

@ -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

2
hw/s390x/s390-pci-inst.h
View File

@ -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

2
hw/s390x/sclpquiesce.c
View File

@ -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"

20
hw/s390x/virtio-ccw.h
View File

@ -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"

4
hw/scsi/vhost-scsi.c
View File

@ -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. */

6
hw/scsi/virtio-scsi-dataplane.c
View File

@ -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 */

6
hw/scsi/virtio-scsi.c
View File

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

2
hw/scsi/vmw_pvscsi.c
View File

@ -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"

2
hw/usb/xen-usb.c
View File

@ -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>

6
hw/vfio/common.c
View File

@ -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 =

5
hw/virtio/vhost-backend.c
View File

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

2
include/exec/helper-gen.h
View File

@ -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)) \

2
include/exec/helper-proto.h
View File

@ -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);

2
include/exec/helper-tcg.h
View File

@ -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, \

2
include/exec/tb-hash-xx.h
View File

@ -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

2
include/hw/gpio/imx_gpio.h
View File

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

2
include/hw/i2c/imx_i2c.h
View File

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

2
include/hw/ide/ahci.h
View File

@ -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

4
include/hw/ide/internal.h
View File

@ -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"

2
include/hw/ide/pci.h
View File

@ -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

2
include/hw/ppc/spapr_drc.h
View File

@ -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) \

2
include/hw/s390x/event-facility.h
View File

@ -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"

4
include/hw/s390x/sclp.h
View File

@ -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

2
include/hw/s390x/storage-keys.h
View File

@ -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"

2
include/migration/vmstate.h
View File

@ -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"

4
include/qemu/seqlock.h
View File

@ -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;

3
include/qemu/thread-posix.h
View File

@ -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 {

3
include/qemu/thread-win32.h
View File

@ -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;

3
linux-user/arm/nwfpe/fpa11.h
View File

@ -21,8 +21,7 @@
#ifndef __FPA11_H__
#define __FPA11_H__
#include <cpu.h>
#include "cpu.h"
#define GET_FPA11() (qemufpa)

2
linux-user/flatload.c
View File

@ -37,7 +37,7 @@
#include "qemu.h"
#include "flat.h"
#include <target_flat.h>
#include "target_flat.h"
//#define DEBUG

2
monitor.c
View File

@ -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"

3
qga/vss-win32/install.cpp
View File

@ -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>

4
qga/vss-win32/provider.cpp
View File

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

4
qga/vss-win32/requester.cpp
View File

@ -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

2
qga/vss-win32/vss-common.h
View File

@ -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

2
slirp/bootp.c
View File

@ -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.

2
slirp/cksum.c
View File

@ -31,7 +31,7 @@
*/
#include "qemu/osdep.h"
#include <slirp.h>
#include "slirp.h"
/*
* Checksum routine for Internet Protocol family headers (Portable Version).

2
slirp/if.c
View File

@ -6,7 +6,7 @@
*/
#include "qemu/osdep.h"
#include <slirp.h>
#include "slirp.h"
#include "qemu/timer.h"
static void

2
slirp/ip_input.c
View File

@ -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);

2
slirp/ip_output.c
View File

@ -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) */

2
slirp/mbuf.c
View File

@ -16,7 +16,7 @@
*/
#include "qemu/osdep.h"
#include <slirp.h>
#include "slirp.h"
#define MBUF_THRESH 30

5
slirp/misc.c
View File

@ -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"

4
slirp/sbuf.c
View File

@ -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);

2
slirp/socket.c
View File

@ -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>

2
slirp/tcp_input.c
View File

@ -39,7 +39,7 @@
*/
#include "qemu/osdep.h"
#include <slirp.h>
#include "slirp.h"
#include "ip_icmp.h"
#define TCPREXMTTHRESH 3

2
slirp/tcp_output.c
View File

@ -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,

2
slirp/tcp_subr.c
View File

@ -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 */

2
slirp/tcp_timer.c
View File

@ -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);

2
slirp/tftp.c
View File

@ -23,7 +23,7 @@
*/
#include "qemu/osdep.h"
#include <slirp.h>
#include "slirp.h"
#include "qemu-common.h"
#include "qemu/cutils.h"

2
slirp/udp.c
View File

@ -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);

4
target-arm/arm-powerctl.c
View File

@ -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"

8
target-arm/psci.c
View File

@ -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"

2
target-ppc/translate_init.c
View File

@ -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"

2
target-s390x/cpu.h
View File

@ -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

2
target-unicore32/softmmu.c
View File

@ -13,7 +13,7 @@
#endif
#include "qemu/osdep.h"
#include <cpu.h>
#include "cpu.h"
#include "exec/exec-all.h"
#undef DEBUG_UC32

3
tests/postcopy-test.c
View File

@ -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;

2
tests/tcg/xtensa/linker.ld.S
View File

@ -1,4 +1,4 @@
#include <core-isa.h>
#include "core-isa.h"
#if XTENSA_HAVE_BE
OUTPUT_FORMAT("elf32-xtensa-be")

2
tests/vhost-user-bridge.c
View File

@ -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"

2
tests/vhost-user-test.c
View File

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

3
util/mmap-alloc.c
View File

@ -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

2
util/oslib-posix.c
View File

@ -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)
{