izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07: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-07-12 16:19:16 +02:00
parent b35399bb4e
commit a9c94277f0
91 changed files with 169 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/iscsi.c
-1
View File
@@ -46,7 +46,6 @@
#ifdef __linux__ #ifdef __linux__
#include <scsi/sg.h> #include <scsi/sg.h>
#include <block/scsi.h>
#endif #endif
typedef struct IscsiLun { typedef struct IscsiLun {
crypto/hash-gcrypt.c
+1 -1
View File
@@ -19,9 +19,9 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <gcrypt.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "crypto/hash.h" #include "crypto/hash.h"
#include "gcrypt.h"
static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = { static int qcrypto_hash_alg_map[QCRYPTO_HASH_ALG__MAX] = {
crypto/pbkdf-gcrypt.c
+1 -1
View File
@@ -19,9 +19,9 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <gcrypt.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "crypto/pbkdf.h" #include "crypto/pbkdf.h"
#include "gcrypt.h"
bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
{ {
crypto/pbkdf-nettle.c
+1 -1
View File
@@ -19,9 +19,9 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <nettle/pbkdf2.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "crypto/pbkdf.h" #include "crypto/pbkdf.h"
#include "nettle/pbkdf2.h"
bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash) bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash)
exec.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#if defined(CONFIG_USER_ONLY) #if defined(CONFIG_USER_ONLY)
#include <qemu.h> #include "qemu.h"
#else /* !CONFIG_USER_ONLY */ #else /* !CONFIG_USER_ONLY */
#include "hw/hw.h" #include "hw/hw.h"
#include "exec/memory.h" #include "exec/memory.h"
hw/block/nvme.c
+4 -4
View File
@@ -21,10 +21,10 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/block/block.h> #include "hw/block/block.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/pci/msix.h> #include "hw/pci/msix.h"
#include <hw/pci/pci.h> #include "hw/pci/pci.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
hw/char/sclpconsole.c
+1 -1
View File
@@ -13,7 +13,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/qdev.h> #include "hw/qdev.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
hw/display/vga_int.h
+1 -1
View File
@@ -24,7 +24,7 @@
#ifndef HW_VGA_INT_H #ifndef HW_VGA_INT_H
#define HW_VGA_INT_H 1 #define HW_VGA_INT_H 1
#include <hw/hw.h> #include "hw/hw.h"
#include "exec/memory.h" #include "exec/memory.h"
#define ST01_V_RETRACE 0x08 #define ST01_V_RETRACE 0x08
hw/display/virtio-gpu-3d.c
+1 -1
View File
@@ -21,7 +21,7 @@
#ifdef CONFIG_VIRGL #ifdef CONFIG_VIRGL
#include "virglrenderer.h" #include <virglrenderer.h>
static struct virgl_renderer_callbacks virtio_gpu_3d_cbs; static struct virgl_renderer_callbacks virtio_gpu_3d_cbs;
hw/display/virtio-gpu.c
+1 -1
View File
@@ -28,7 +28,7 @@ static struct virtio_gpu_simple_resource*
virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id); virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
#ifdef CONFIG_VIRGL #ifdef CONFIG_VIRGL
#include "virglrenderer.h" #include <virglrenderer.h>
#define VIRGL(_g, _virgl, _simple, ...) \ #define VIRGL(_g, _virgl, _simple, ...) \
do { \ do { \
if (_g->use_virgl_renderer) { \ if (_g->use_virgl_renderer) { \
hw/i386/kvm/i8254.c
+2 -1
View File
@@ -22,14 +22,15 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <linux/kvm.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/timer/i8254.h" #include "hw/timer/i8254.h"
#include "hw/timer/i8254_internal.h" #include "hw/timer/i8254_internal.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "linux/kvm.h"
#define KVM_PIT_REINJECT_BIT 0 #define KVM_PIT_REINJECT_BIT 0
hw/i386/kvm/pci-assign.c
+2 -1
View File
@@ -20,7 +20,9 @@
* Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com) * Copyright (C) 2008, Red Hat, Amit Shah (amit.shah@redhat.com)
* Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com) * Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <linux/kvm.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
@@ -32,7 +34,6 @@
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "linux/kvm.h"
#include "kvm_i386.h" #include "kvm_i386.h"
#include "hw/pci/pci-assign.h" #include "hw/pci/pci-assign.h"
hw/ide/ahci.c
+7 -7
View File
@@ -22,17 +22,17 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/pci/msi.h> #include "hw/pci/msi.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/pci/pci.h> #include "hw/pci/pci.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/internal.h> #include "hw/ide/internal.h"
#include <hw/ide/pci.h> #include "hw/ide/pci.h"
#include <hw/ide/ahci.h> #include "hw/ide/ahci.h"
#define DEBUG_AHCI 0 #define DEBUG_AHCI 0
hw/ide/cmd646.c
+5 -5
View File
@@ -23,15 +23,15 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/pci/pci.h> #include "hw/pci/pci.h"
#include <hw/isa/isa.h> #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/pci.h> #include "hw/ide/pci.h"
/* CMD646 specific */ /* CMD646 specific */
#define CFR 0x50 #define CFR 0x50
hw/ide/core.c
+5 -5
View File
@@ -23,10 +23,10 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/pci/pci.h> #include "hw/pci/pci.h"
#include <hw/isa/isa.h> #include "hw/isa/isa.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@@ -35,7 +35,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "qemu/cutils.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 /* These values were based on a Seagate ST3500418AS but have been modified
to make more sense in QEMU */ to make more sense in QEMU */
hw/ide/ich.c
+7 -7
View File
@@ -61,15 +61,15 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/pci/msi.h> #include "hw/pci/msi.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/pci/pci.h> #include "hw/pci/pci.h"
#include <hw/isa/isa.h> #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/pci.h> #include "hw/ide/pci.h"
#include <hw/ide/ahci.h> #include "hw/ide/ahci.h"
#define ICH9_MSI_CAP_OFFSET 0x80 #define ICH9_MSI_CAP_OFFSET 0x80
#define ICH9_SATA_CAP_OFFSET 0xA8 #define ICH9_SATA_CAP_OFFSET 0xA8
hw/ide/isa.c
+4 -4
View File
@@ -23,13 +23,13 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/isa/isa.h> #include "hw/isa/isa.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/internal.h> #include "hw/ide/internal.h"
/***********************************************************/ /***********************************************************/
/* ISA IDE definitions */ /* ISA IDE definitions */
hw/ide/macio.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/internal.h> #include "hw/ide/internal.h"
/* debug MACIO */ /* debug MACIO */
// #define DEBUG_MACIO // #define DEBUG_MACIO
hw/ide/microdrive.c
+4 -4
View File
@@ -23,13 +23,13 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <hw/hw.h> #include "hw/hw.h"
#include <hw/i386/pc.h> #include "hw/i386/pc.h"
#include <hw/pcmcia.h> #include "hw/pcmcia.h"
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/internal.h> #include "hw/ide/internal.h"
#define TYPE_MICRODRIVE "microdrive" #define TYPE_MICRODRIVE "microdrive"
#define MICRODRIVE(obj) OBJECT_CHECK(MicroDriveState, (obj), TYPE_MICRODRIVE) #define MICRODRIVE(obj) OBJECT_CHECK(MicroDriveState, (obj), TYPE_MICRODRIVE)
hw/ide/mmio.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include <hw/ide/internal.h> #include "hw/ide/internal.h"
/***********************************************************/ /***********************************************************/
/* MMIO based ide port /* MMIO based ide port

Some files were not shown because too many files have changed in this diff Show More