haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up #include "..." vs <...> and header guards 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXhP1vAAoJEDhwtADrkYZTSnsP/050pn1Zeo8tF7+C9Sj/8mu1
 Peuaz7f+QkGzvkteoVu8W2dDNebUnjZI1InsBFcpJab8TCjnk+A2UipalTyWlX2U
 QQbgqgLKTJgewVPMje+7B96D2Eyr4IhnhiaJDP7zBtx5tW+mO9NDqly7j9VJajbO
 cBC9SBFLNEk3wQqiQMv4Ig6qi3a4jfU56Zhazt6ci7lJRKJwPnbhZjEWCKliRjzT
 TjZsV8mlKm5Sp3wmahxGiWuUI+JnbneEnjLLvRBot5mUGZsA9oU4mgmzFBn+/uvp
 rzvae41tfw1Td/S7nRBwTxZqRo8qiRSC5vNc90piBKkj7H1TaKnZUVBskkexZl4x
 ibFOAVPx3yJredtCgjJZun2gc/EBpIQtcV9WNqY9qjwldczjim93ua/lM7BcTrbN
 4rdNP63a81KYOkgL3rSd9zVarGybHIrhd96KUhX8j6SKbc7z4gVn90uMnAPsapk/
 I39HR3smMvgNK3x6gZ4pU3Ghr2hmmWMah+gQ2ErczmoYArAixR8lDqFO+c2eoqfe
 bHfZM6gsZickrJSL1t3/FXB0oXfcNifUzF5g2hDQY9WKDjFee4tb2+UGHcrb7PW8
 Uq3eYqigNitj1COMksjijG0iBAfCqtJNPJDA4M0SLhuYVnH+cSGWYg3UWgETwu8q
 nYZHU/nNqI9p3BNFkILR
 =Zct/
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-include-2016-07-12' into staging

Clean up #include "..." vs <...> and header guards

# gpg: Signature made Tue 12 Jul 2016 15:23:43 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-include-2016-07-12:
  cris: Fix broken header guard in hw/cris/boot.h
  Clean up decorations and whitespace around header guards
  Clean up ill-advised or unusual header guards
  libdecnumber: Don't error out on decNumberLocal.h re-inclusion
  libdecnumber: Don't fool around with guards to avoid #include
  Clean up header guards that don't match their file name
  Drop Emacs local variables lists redundant with .dir-locals.el
  spapr_pci: Include spapr.h instead of playing games with #error
  tcg: Clean up tcg-target.h header guards
  linux-user: Fix broken header guard in syscall_defs.h
  linux-user: Clean up hostdep.h header guards
  linux-user: Clean up target_structs.h header guards
  linux-user: Clean up target_signal.h header guards
  linux-user: Clean up target_cpu.h header guards
  linux-user: Clean up target_syscall.h header guards
  target-*: Clean up cpu.h header guards
  scripts: New clean-header-guards.pl
  Use #include "..." for our own headers, <...> for others

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
stable-2.7
Peter Maydell 2016-07-12 16:04:35 +01:00
parent 7d820b766a 82751a32be
commit ca3d87d4c8
524 changed files with 1420 additions and 1228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/audio.h
View File

@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef QEMU_AUDIO_H
#define QEMU_AUDIO_H
@ -162,4 +163,4 @@ static inline void *advance (void *p, int incr)
int wav_start_capture (CaptureState *s, const char *path, int freq,
int bits, int nchannels);
#endif /* audio.h */
#endif /* QEMU_AUDIO_H */

3
audio/audio_int.h
View File

@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef QEMU_AUDIO_INT_H
#define QEMU_AUDIO_INT_H
@ -257,4 +258,4 @@ static inline int audio_ring_dist (int dst, int src, int len)
#define AUDIO_FUNC __FILE__ ":" AUDIO_STRINGIFY (__LINE__)
#endif
#endif /* audio_int.h */
#endif /* QEMU_AUDIO_INT_H */

2
audio/audio_pt_int.h
View File

@ -19,4 +19,4 @@ int audio_pt_wait (struct audio_pt *, const char *);
int audio_pt_unlock_and_signal (struct audio_pt *, const char *);
int audio_pt_join (struct audio_pt *, void **, const char *);
#endif /* audio_pt_int.h */
#endif /* QEMU_AUDIO_PT_INT_H */

3
audio/mixeng.h
View File

@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef QEMU_MIXENG_H
#define QEMU_MIXENG_H
@ -48,4 +49,4 @@ void st_rate_stop (void *opaque);
void mixeng_clear (struct st_sample *buf, int len);
void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol);
#endif /* mixeng.h */
#endif /* QEMU_MIXENG_H */

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
bsd-user/i386/target_syscall.h
View File

@ -162,4 +162,4 @@ struct target_vm86plus_struct {
#define UNAME_MACHINE "i386"
#endif /* TARGET_SYSCALL_H */
#endif /* TARGET_SYSCALL_H */

2
bsd-user/sparc/target_syscall.h
View File

@ -11,4 +11,4 @@ struct target_pt_regs {
#define UNAME_MACHINE "sun4"
#endif /* TARGET_SYSCALL_H */
#endif /* TARGET_SYSCALL_H */

2
bsd-user/sparc64/target_syscall.h
View File

@ -12,4 +12,4 @@ struct target_pt_regs {
#define UNAME_MACHINE "sun4u"
#endif /* TARGET_SYSCALL_H */
#endif /* TARGET_SYSCALL_H */

2
bsd-user/x86_64/target_syscall.h
View File

@ -118,4 +118,4 @@ struct target_msqid64_ds {
#define TARGET_ARCH_GET_FS 0x1003
#define TARGET_ARCH_GET_GS 0x1004
#endif /* TARGET_SYSCALL_H */
#endif /* TARGET_SYSCALL_H */

6
contrib/ivshmem-client/ivshmem-client.h
View File

@ -6,8 +6,8 @@
* top-level directory.
*/
#ifndef _IVSHMEM_CLIENT_H_
#define _IVSHMEM_CLIENT_H_
#ifndef IVSHMEM_CLIENT_H
#define IVSHMEM_CLIENT_H
/**
* This file provides helper to implement an ivshmem client. It is used
@ -209,4 +209,4 @@ ivshmem_client_search_peer(IvshmemClient *client, int64_t peer_id);
*/
void ivshmem_client_dump(const IvshmemClient *client);
#endif /* _IVSHMEM_CLIENT_H_ */
#endif /* IVSHMEM_CLIENT_H */

6
contrib/ivshmem-server/ivshmem-server.h
View File

@ -6,8 +6,8 @@
* top-level directory.
*/
#ifndef _IVSHMEM_SERVER_H_
#define _IVSHMEM_SERVER_H_
#ifndef IVSHMEM_SERVER_H
#define IVSHMEM_SERVER_H
/**
* The ivshmem server is a daemon that creates a unix socket in listen
@ -163,4 +163,4 @@ ivshmem_server_search_peer(IvshmemServer *server, int64_t peer_id);
*/
void ivshmem_server_dump(const IvshmemServer *server);
#endif /* _IVSHMEM_SERVER_H_ */
#endif /* IVSHMEM_SERVER_H */

6
crypto/block-luks.h
View File

@ -18,11 +18,11 @@
*
*/
#ifndef QCRYPTO_BLOCK_LUKS_H__
#define QCRYPTO_BLOCK_LUKS_H__
#ifndef QCRYPTO_BLOCK_LUKS_H
#define QCRYPTO_BLOCK_LUKS_H
#include "crypto/blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_luks;
#endif /* QCRYPTO_BLOCK_LUKS_H__ */
#endif /* QCRYPTO_BLOCK_LUKS_H */

6
crypto/block-qcow.h
View File

@ -18,11 +18,11 @@
*
*/
#ifndef QCRYPTO_BLOCK_QCOW_H__
#define QCRYPTO_BLOCK_QCOW_H__
#ifndef QCRYPTO_BLOCK_QCOW_H
#define QCRYPTO_BLOCK_QCOW_H
#include "crypto/blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
#endif /* QCRYPTO_BLOCK_QCOW_H__ */
#endif /* QCRYPTO_BLOCK_QCOW_H */

6
crypto/blockpriv.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QCRYPTO_BLOCK_PRIV_H__
#define QCRYPTO_BLOCK_PRIV_H__
#ifndef QCRYPTO_BLOCKPRIV_H
#define QCRYPTO_BLOCKPRIV_H
#include "crypto/block.h"
@ -89,4 +89,4 @@ int qcrypto_block_encrypt_helper(QCryptoCipher *cipher,
size_t len,
Error **errp);
#endif /* QCRYPTO_BLOCK_PRIV_H__ */
#endif /* QCRYPTO_BLOCKPRIV_H */

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

6
crypto/ivgenpriv.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QCRYPTO_IVGEN_PRIV_H__
#define QCRYPTO_IVGEN_PRIV_H__
#ifndef QCRYPTO_IVGENPRIV_H
#define QCRYPTO_IVGENPRIV_H
#include "crypto/ivgen.h"
@ -46,4 +46,4 @@ struct QCryptoIVGen {
};
#endif /* QCRYPTO_IVGEN_PRIV_H__ */
#endif /* QCRYPTO_IVGENPRIV_H */

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)

7
crypto/tlscredspriv.h
View File

@ -18,8 +18,8 @@
*
*/
#ifndef QCRYPTO_TLSCRED_PRIV_H__
#define QCRYPTO_TLSCRED_PRIV_H__
#ifndef QCRYPTO_TLSCREDSPRIV_H
#define QCRYPTO_TLSCREDSPRIV_H
#include "crypto/tlscreds.h"
@ -38,5 +38,4 @@ int qcrypto_tls_creds_get_dh_params_file(QCryptoTLSCreds *creds,
#endif
#endif /* QCRYPTO_TLSCRED_PRIV_H__ */
#endif /* QCRYPTO_TLSCREDSPRIV_H */

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"

4
fsdev/9p-iov-marshal.h
View File

@ -1,5 +1,5 @@
#ifndef _QEMU_9P_IOV_MARSHAL_H
#define _QEMU_9P_IOV_MARSHAL_H
#ifndef QEMU_9P_IOV_MARSHAL_H
#define QEMU_9P_IOV_MARSHAL_H
#include "9p-marshal.h"

4
fsdev/9p-marshal.h
View File

@ -1,5 +1,5 @@
#ifndef _QEMU_9P_MARSHAL_H
#define _QEMU_9P_MARSHAL_H
#ifndef QEMU_9P_MARSHAL_H
#define QEMU_9P_MARSHAL_H
typedef struct V9fsString
{

6
fsdev/file-op-9p.h
View File

@ -10,8 +10,10 @@
* the COPYING file in the top-level directory.
*
*/
#ifndef _FILEOP_H
#define _FILEOP_H
#ifndef FILE_OP_9P_H
#define FILE_OP_9P_H
#include <dirent.h>
#include <utime.h>
#include <sys/vfs.h>

5
hw/9pfs/9p-proxy.h
View File

@ -9,8 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*/
#ifndef _QEMU_9P_PROXY_H
#define _QEMU_9P_PROXY_H
#ifndef QEMU_9P_PROXY_H
#define QEMU_9P_PROXY_H
#define PROXY_MAX_IO_SZ (64 * 1024)
#define V9FS_FD_VALID INT_MAX

4
hw/9pfs/9p-synth.h
View File

@ -10,9 +10,9 @@
* the COPYING file in the top-level directory.
*
*/
#ifndef HW_9PFS_SYNTH_H
#define HW_9PFS_SYNTH_H 1
#ifndef QEMU_9P_SYNTH_H
#define QEMU_9P_SYNTH_H
typedef struct V9fsSynthNode V9fsSynthNode;
typedef ssize_t (*v9fs_synth_read)(void *buf, int len, off_t offset,

5
hw/9pfs/9p-xattr.h
View File

@ -10,8 +10,9 @@
* the COPYING file in the top-level directory.
*
*/
#ifndef _QEMU_9P_XATTR_H
#define _QEMU_9P_XATTR_H
#ifndef QEMU_9P_XATTR_H
#define QEMU_9P_XATTR_H
#include "qemu/xattr.h"

4
hw/9pfs/9p.h
View File

@ -1,5 +1,5 @@
#ifndef _QEMU_9P_H
#define _QEMU_9P_H
#ifndef QEMU_9P_H
#define QEMU_9P_H
#include <dirent.h>
#include <utime.h>

4
hw/9pfs/coth.h
View File

@ -12,8 +12,8 @@
*
*/
#ifndef _QEMU_9P_COTH_H
#define _QEMU_9P_COTH_H
#ifndef QEMU_9P_COTH_H
#define QEMU_9P_COTH_H
#include "qemu/thread.h"
#include "qemu/coroutine.h"

4
hw/9pfs/virtio-9p.h
View File

@ -1,5 +1,5 @@
#ifndef _QEMU_VIRTIO_9P_H
#define _QEMU_VIRTIO_9P_H
#ifndef QEMU_VIRTIO_9P_H
#define QEMU_VIRTIO_9P_H
#include "standard-headers/linux/virtio_9p.h"
#include "hw/virtio/virtio.h"

4
hw/alpha/alpha_sys.h
View File

@ -1,7 +1,7 @@
/* Alpha cores and system support chips. */
#ifndef HW_ALPHA_H
#define HW_ALPHA_H 1
#ifndef HW_ALPHA_SYS_H
#define HW_ALPHA_SYS_H
#include "target-alpha/cpu-qom.h"
#include "hw/pci/pci.h"

4
hw/arm/strongarm.h
View File

@ -1,5 +1,5 @@
#ifndef _STRONGARM_H
#define _STRONGARM_H
#ifndef STRONGARM_H
#define STRONGARM_H
#include "exec/memory.h"
#include "target-arm/cpu-qom.h"

4
hw/audio/fmopl.h
View File

@ -1,5 +1,5 @@
#ifndef __FMOPL_H_
#define __FMOPL_H_
#ifndef FMOPL_H
#define FMOPL_H
/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)

2
hw/audio/gusemu.h
View File

@ -101,4 +101,4 @@ void gus_irqgen(GUSEmuState *state, unsigned int elapsed_time);
/* lower values won´t provide any benefit at all, higher values can cause audible timing delays */
/* note: masked timers are also calculated by this function, thus it might be needed even without any IRQs in use! */
#endif /* gusemu.h */
#endif /* GUSEMU_H */

2
hw/audio/gustate.h
View File

@ -129,4 +129,4 @@
#define gusdataend (VSRegsEnd+4)
#endif /* gustate.h */
#endif /* GUSTATE_H */

2
hw/audio/lm4549.h
View File

@ -40,4 +40,4 @@ uint32_t lm4549_read(lm4549_state *s, hwaddr offset);
void lm4549_write(lm4549_state *s, hwaddr offset, uint32_t value);
uint32_t lm4549_write_samples(lm4549_state *s, uint32_t left, uint32_t right);
#endif /* #ifndef HW_LM4549_H */
#endif /* HW_LM4549_H */

2
hw/audio/pl041.h
View File

@ -132,4 +132,4 @@ enum {
#define RXTOFEC3 (1 << 11)
#define RXTOFEC4 (1 << 12)
#endif /* #ifndef HW_PL041_H */
#endif /* HW_PL041_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"

6
hw/block/xen_blkif.h
View File

@ -1,5 +1,5 @@
#ifndef __XEN_BLKIF_H__
#define __XEN_BLKIF_H__
#ifndef XEN_BLKIF_H
#define XEN_BLKIF_H
#include <xen/io/ring.h>
#include <xen/io/blkif.h>
@ -143,4 +143,4 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst,
}
}
#endif /* __XEN_BLKIF_H__ */
#endif /* XEN_BLKIF_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"

6
hw/core/uboot_image.h
View File

@ -26,8 +26,8 @@
********************************************************************
*/
#ifndef __UBOOT_IMAGE_H__
#define __UBOOT_IMAGE_H__
#ifndef UBOOT_IMAGE_H
#define UBOOT_IMAGE_H
/*
* Operating System Codes
@ -155,4 +155,4 @@ typedef struct uboot_image_header {
} uboot_image_header_t;
#endif /* __IMAGE_H__ */
#endif /* UBOOT_IMAGE_H */

4
hw/cris/boot.h
View File

@ -1,5 +1,5 @@
#ifndef _CRIS_BOOT_H
#define HW_CRIS_BOOT_H 1
#ifndef HW_CRIS_BOOT_H
#define HW_CRIS_BOOT_H
struct cris_load_info
{

2
hw/display/qxl.h
View File

@ -1,5 +1,5 @@
#ifndef HW_QXL_H
#define HW_QXL_H 1
#define HW_QXL_H
#include "qemu-common.h"

6
hw/display/vga.h
View File

@ -14,8 +14,8 @@
*
*/
#ifndef __linux_video_vga_h__
#define __linux_video_vga_h__
#ifndef LINUX_VIDEO_VGA_H
#define LINUX_VIDEO_VGA_H
/* Some of the code below is taken from SVGAlib. The original,
unmodified copyright notice for that code is below. */
@ -156,4 +156,4 @@
/* VGA graphics controller bit masks */
#define VGA_GR06_GRAPHICS_MODE 0x01
#endif /* __linux_video_vga_h__ */
#endif /* LINUX_VIDEO_VGA_H */

7
hw/display/vga_int.h
View File

@ -21,10 +21,11 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef HW_VGA_INT_H
#define HW_VGA_INT_H 1
#include <hw/hw.h>
#ifndef HW_VGA_INT_H
#define HW_VGA_INT_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/intc/gic_internal.h
View File

@ -100,4 +100,4 @@ static inline bool gic_test_pending(GICState *s, int irq, int cm)
}
}
#endif /* !QEMU_ARM_GIC_INTERNAL_H */
#endif /* QEMU_ARM_GIC_INTERNAL_H */

2
hw/intc/gicv3_internal.h
View File

@ -328,4 +328,4 @@ static inline void gicv3_cache_all_target_cpustates(GICv3State *s)
}
}
#endif /* !QEMU_ARM_GIC_INTERNAL_H */
#endif /* QEMU_ARM_GICV3_INTERNAL_H */

2
hw/lm32/lm32.h
View File

@ -1,5 +1,5 @@
#ifndef HW_LM32_H
#define HW_LM32_H 1
#define HW_LM32_H
#include "hw/char/lm32_juart.h"

6
hw/lm32/milkymist-hw.h
View File

@ -1,5 +1,5 @@
#ifndef QEMU_HW_MILKYMIST_H
#define QEMU_HW_MILKYMIST_H
#ifndef QEMU_HW_MILKYMIST_HW_H
#define QEMU_HW_MILKYMIST_HW_H
#include "hw/qdev.h"
#include "net/net.h"
@ -203,4 +203,4 @@ static inline DeviceState *milkymist_softusb_create(hwaddr base,
return dev;
}
#endif /* QEMU_HW_MILKYMIST_H */
#endif /* QEMU_HW_MILKYMIST_HW_H */

6
hw/microblaze/boot.h
View File

@ -1,5 +1,5 @@
#ifndef __MICROBLAZE_BOOT__
#define __MICROBLAZE_BOOT__
#ifndef MICROBLAZE_BOOT_H
#define MICROBLAZE_BOOT_H
#include "hw/hw.h"
@ -9,4 +9,4 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
const char *dtb_filename,
void (*machine_cpu_reset)(MicroBlazeCPU *));
#endif /* __MICROBLAZE_BOOT __ */
#endif /* MICROBLAZE_BOOT_H */

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"

7
hw/net/e1000_regs.h
View File

@ -29,9 +29,8 @@
* Structures, enums, and macros for the MAC
*/
#ifndef _E1000_HW_H_
#define _E1000_HW_H_
#ifndef HW_E1000_REGS_H
#define HW_E1000_REGS_H
/* PCI Device IDs */
#define E1000_DEV_ID_82542 0x1000
@ -1248,4 +1247,4 @@ struct e1000_data_desc {
#define E1000_IOADDR 0x00
#define E1000_IODATA 0x04
#endif /* _E1000_HW_H_ */
#endif /* HW_E1000_REGS_H */

7
hw/net/fsl_etsec/etsec.h
View File

@ -21,8 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef _ETSEC_H_
#define _ETSEC_H_
#ifndef ETSEC_H
#define ETSEC_H
#include "hw/qdev.h"
#include "hw/sysbus.h"
@ -173,4 +174,4 @@ void etsec_write_miim(eTSEC *etsec,
void etsec_miim_link_status(eTSEC *etsec, NetClientState *nc);
#endif /* ! _ETSEC_H_ */
#endif /* ETSEC_H */

6
hw/net/fsl_etsec/registers.h
View File

@ -21,9 +21,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef _ETSEC_REGISTERS_H_
#define _ETSEC_REGISTERS_H_
#ifndef ETSEC_REGISTERS_H
#define ETSEC_REGISTERS_H
enum eTSEC_Register_Access_Type {
ACC_RW = 1, /* Read/Write */
@ -316,4 +316,4 @@ extern const eTSEC_Register_Definition eTSEC_registers_def[];
#define TMR_ETTS2_H (0xEA8 / 4)
#define TMR_ETTS2_L (0xEAC / 4)
#endif /* ! _ETSEC_REGISTERS_H_ */
#endif /* ETSEC_REGISTERS_H */

2
hw/net/ne2000.h
View File

@ -1,5 +1,5 @@
#ifndef HW_NE2000_H
#define HW_NE2000_H 1
#define HW_NE2000_H
#define NE2000_PMEM_SIZE (32*1024)
#define NE2000_PMEM_START (16*1024)

2
hw/net/pcnet.h
View File

@ -1,5 +1,5 @@
#ifndef HW_PCNET_H
#define HW_PCNET_H 1
#define HW_PCNET_H
#define PCNET_IOPORT_SIZE 0x20
#define PCNET_PNPMMIO_SIZE 0x20

6
hw/net/rocker/rocker.h
View File

@ -16,8 +16,8 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_H_
#define _ROCKER_H_
#ifndef ROCKER_H
#define ROCKER_H
#include "qemu/sockets.h"
@ -81,4 +81,4 @@ int rx_produce(World *world, uint32_t pport,
int rocker_port_eg(Rocker *r, uint32_t pport,
const struct iovec *iov, int iovcnt);
#endif /* _ROCKER_H_ */
#endif /* ROCKER_H */

5
hw/net/rocker/rocker_desc.h
View File

@ -14,9 +14,8 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_DESC_H_
#define _ROCKER_DESC_H_
#ifndef ROCKER_DESC_H
#define ROCKER_DESC_H
#include "rocker_hw.h"

6
hw/net/rocker/rocker_fp.h
View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_FP_H_
#define _ROCKER_FP_H_
#ifndef ROCKER_FP_H
#define ROCKER_FP_H
#include "net/net.h"
#include "qemu/iov.h"
@ -51,4 +51,4 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name,
void fp_port_free(FpPort *port);
void fp_port_reset(FpPort *port);
#endif /* _ROCKER_FP_H_ */
#endif /* ROCKER_FP_H */

6
hw/net/rocker/rocker_hw.h
View File

@ -6,8 +6,8 @@
*
*/
#ifndef _ROCKER_HW_
#define _ROCKER_HW_
#ifndef ROCKER_HW_H
#define ROCKER_HW_H
#define __le16 uint16_t
#define __le32 uint32_t
@ -490,4 +490,4 @@ enum rocker_of_dpa_overlay_type {
*/
#define ROCKER_CONTROL_RESET (1 << 0)
#endif /* _ROCKER_HW_ */
#endif /* ROCKER_HW_H */

6
hw/net/rocker/rocker_of_dpa.h
View File

@ -14,9 +14,9 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_OF_DPA_H_
#define _ROCKER_OF_DPA_H_
#ifndef ROCKER_OF_DPA_H
#define ROCKER_OF_DPA_H
World *of_dpa_world_alloc(Rocker *r);
#endif /* _ROCKER_OF_DPA_H_ */
#endif /* ROCKER_OF_DPA_H */

4
hw/net/rocker/rocker_tlv.h
View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_TLV_H_
#define _ROCKER_TLV_H_
#ifndef ROCKER_TLV_H
#define ROCKER_TLV_H
#define ROCKER_TLV_ALIGNTO 8U
#define ROCKER_TLV_ALIGN(len) \

6
hw/net/rocker/rocker_world.h
View File

@ -14,8 +14,8 @@
* GNU General Public License for more details.
*/
#ifndef _ROCKER_WORLD_H_
#define _ROCKER_WORLD_H_
#ifndef ROCKER_WORLD_H
#define ROCKER_WORLD_H
#include "rocker_hw.h"
@ -58,4 +58,4 @@ const char *world_name(World *world);
World *rocker_get_world(Rocker *r, enum rocker_world_type type);
#endif /* _ROCKER_WORLD_H_ */
#endif /* ROCKER_WORLD_H */

4
hw/net/vmxnet3.h
View File

@ -15,8 +15,8 @@
*
*/
#ifndef _QEMU_VMXNET3_H
#define _QEMU_VMXNET3_H
#ifndef QEMU_VMXNET3_H
#define QEMU_VMXNET3_H
#define VMXNET3_DEVICE_MAX_TX_QUEUES 8
#define VMXNET3_DEVICE_MAX_RX_QUEUES 8 /* Keep this value as a power of 2 */

6
hw/net/vmxnet_debug.h
View File

@ -15,8 +15,8 @@
*
*/
#ifndef _QEMU_VMXNET_DEBUG_H
#define _QEMU_VMXNET_DEBUG_H
#ifndef QEMU_VMXNET_DEBUG_H
#define QEMU_VMXNET_DEBUG_H
#define VMXNET_DEVICE_NAME "vmxnet3"
@ -142,4 +142,4 @@
} \
} while (0)
#endif /* _QEMU_VMXNET3_DEBUG_H */
#endif /* QEMU_VMXNET_DEBUG_H */

4
hw/pci-bridge/dec.h
View File

@ -1,5 +1,5 @@
#ifndef DEC_PCI_H
#define DEC_PCI_H
#ifndef HW_PCI_BRIDGE_DEC_H
#define HW_PCI_BRIDGE_DEC_H
#include "qemu-common.h"

9
hw/pci-bridge/ioh3420.c
View File

@ -216,12 +216,3 @@ static void ioh3420_register_types(void)
}
type_init(ioh3420_register_types)
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* tab-width: 8
* indent-tab-mode: nil
* End:
*/

9
hw/pci-bridge/xio3130_downstream.c
View File

@ -203,12 +203,3 @@ static void xio3130_downstream_register_types(void)
}
type_init(xio3130_downstream_register_types)
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* tab-width: 8
* indent-tab-mode: nil
* End:
*/

10
hw/pci-bridge/xio3130_upstream.c
View File

@ -174,13 +174,3 @@ static void xio3130_upstream_register_types(void)
}
type_init(xio3130_upstream_register_types)
/*
* Local variables:
* c-indent-level: 4
* c-basic-offset: 4
* tab-width: 8
* indent-tab-mode: nil
* End:
*/

2
hw/pci-bridge/xio3130_upstream.h
View File

@ -7,4 +7,4 @@ PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,
const char *bus_name, pci_map_irq_fn map_irq,
uint8_t port);
#endif /* QEMU_XIO3130_H */
#endif /* QEMU_XIO3130_UPSTREAM_H */

7
hw/ppc/mac.h
View File

@ -22,8 +22,9 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#if !defined(__PPC_MAC_H__)
#define __PPC_MAC_H__
#ifndef PPC_MAC_H
#define PPC_MAC_H
#include "exec/memory.h"
#include "hw/sysbus.h"
@ -184,4 +185,4 @@ typedef struct MacIONVRAMState {
} MacIONVRAMState;
void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
#endif /* !defined(__PPC_MAC_H__) */
#endif /* PPC_MAC_H */

6
hw/ppc/ppc405.h
View File

@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
#if !defined(PPC_405_H)
#define PPC_405_H
#ifndef PPC405_H
#define PPC405_H
#include "hw/ppc/ppc4xx.h"
@ -78,4 +78,4 @@ CPUPPCState *ppc_stb025_init (MemoryRegion ram_memories[2],
uint32_t sysclk, qemu_irq **picp,
ram_addr_t *offsetp);
#endif /* !defined(PPC_405_H) */
#endif /* PPC405_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/s390-virtio.h
View File

@ -10,7 +10,7 @@
*/
#ifndef HW_S390_VIRTIO_H
#define HW_S390_VIRTIO_H 1
#define HW_S390_VIRTIO_H
#include "hw/nmi.h"
#include "standard-headers/asm-s390/kvm_virtio.h"

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"

6
hw/scsi/mfi.h
View File

@ -30,8 +30,8 @@
* SUCH DAMAGE.
*/
#ifndef MFI_REG_H
#define MFI_REG_H
#ifndef SCSI_MFI_H
#define SCSI_MFI_H
/*
* MegaRAID SAS MFI firmware definitions
@ -1269,4 +1269,4 @@ struct mfi_config_data {
#define MFI_SCSI_MAX_CMDS 8
#define MFI_SCSI_MAX_CDB_LEN 16
#endif /* MFI_REG_H */
#endif /* SCSI_MFI_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 */

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