mirror of
https://github.com/qemu/qemu.git
synced 2024-11-28 14:24:02 +08:00
Clean up includes
Clean up includes so that osdep.h is included first and headers which it implies are not included manually. This commit was created with scripts/clean-includes, with the changes to the following files manually reverted: contrib/libvhost-user/libvhost-user-glib.h contrib/libvhost-user/libvhost-user.c contrib/libvhost-user/libvhost-user.h linux-user/mips64/cpu_loop.c linux-user/mips64/signal.c linux-user/sparc64/cpu_loop.c linux-user/sparc64/signal.c linux-user/x86_64/cpu_loop.c linux-user/x86_64/signal.c target/s390x/gen-features.c tests/migration/s390x/a-b-bios.c tests/test-rcu-simpleq.c tests/test-rcu-tailq.c Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20181204172535.2799-1-armbru@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Halil Pasic <pasic@linux.ibm.com> Acked-by: Yuval Shaia <yuval.shaia@oracle.com> Acked-by: Viktor Prutyanov <viktor.prutyanov@phystech.edu>
This commit is contained in:
parent
b72566a4ff
commit
b7d89466dd
@ -8,8 +8,6 @@
|
|||||||
#ifndef PDB_H
|
#ifndef PDB_H
|
||||||
#define PDB_H
|
#define PDB_H
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
typedef struct GUID {
|
typedef struct GUID {
|
||||||
unsigned int Data1;
|
unsigned int Data1;
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
#ifndef PE_H
|
#ifndef PE_H
|
||||||
#define PE_H
|
#define PE_H
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
|
|
||||||
typedef struct IMAGE_DOS_HEADER {
|
typedef struct IMAGE_DOS_HEADER {
|
||||||
uint16_t e_magic; /* 0x00: MZ Header signature */
|
uint16_t e_magic; /* 0x00: MZ Header signature */
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
#ifndef QEMU_ELF_H
|
#ifndef QEMU_ELF_H
|
||||||
#define QEMU_ELF_H
|
#define QEMU_ELF_H
|
||||||
|
|
||||||
#include <stdint.h>
|
|
||||||
#include <elf.h>
|
#include <elf.h>
|
||||||
|
|
||||||
typedef struct QEMUCPUSegment {
|
typedef struct QEMUCPUSegment {
|
||||||
|
@ -20,7 +20,6 @@
|
|||||||
#include "contrib/libvhost-user/libvhost-user-glib.h"
|
#include "contrib/libvhost-user/libvhost-user-glib.h"
|
||||||
#include "contrib/libvhost-user/libvhost-user.h"
|
#include "contrib/libvhost-user/libvhost-user.h"
|
||||||
|
|
||||||
#include <glib.h>
|
|
||||||
|
|
||||||
struct virtio_blk_inhdr {
|
struct virtio_blk_inhdr {
|
||||||
unsigned char status;
|
unsigned char status;
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#include "contrib/libvhost-user/libvhost-user-glib.h"
|
#include "contrib/libvhost-user/libvhost-user-glib.h"
|
||||||
#include "standard-headers/linux/virtio_scsi.h"
|
#include "standard-headers/linux/virtio_scsi.h"
|
||||||
|
|
||||||
#include <glib.h>
|
|
||||||
|
|
||||||
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
|
#define VUS_ISCSI_INITIATOR "iqn.2016-11.com.nutanix:vhost-user-scsi"
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
#include "rdma_utils.h"
|
#include "rdma_utils.h"
|
||||||
|
|
||||||
#ifdef PVRDMA_DEBUG
|
#ifdef PVRDMA_DEBUG
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#ifndef RDMA_UTILS_H
|
#ifndef RDMA_UTILS_H
|
||||||
#define RDMA_UTILS_H
|
#define RDMA_UTILS_H
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
#include "sysemu/dma.h"
|
#include "sysemu/dma.h"
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#ifndef PVRDMA_DEV_RING_H
|
#ifndef PVRDMA_DEV_RING_H
|
||||||
#define PVRDMA_DEV_RING_H
|
#define PVRDMA_DEV_RING_H
|
||||||
|
|
||||||
#include "qemu/typedefs.h"
|
|
||||||
|
|
||||||
#define MAX_RING_NAME_SZ 32
|
#define MAX_RING_NAME_SZ 32
|
||||||
|
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
* directory.
|
* directory.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
#include <linux/vfio.h>
|
#include <linux/vfio.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "hw/sysbus.h"
|
#include "hw/sysbus.h"
|
||||||
#include "hw/vfio/vfio.h"
|
#include "hw/vfio/vfio.h"
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
|
|
||||||
#ifndef QEMU_VFIO_HELPERS_H
|
#ifndef QEMU_VFIO_HELPERS_H
|
||||||
#define QEMU_VFIO_HELPERS_H
|
#define QEMU_VFIO_HELPERS_H
|
||||||
#include "qemu/typedefs.h"
|
|
||||||
|
|
||||||
typedef struct QEMUVFIOState QEMUVFIOState;
|
typedef struct QEMUVFIOState QEMUVFIOState;
|
||||||
|
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
#ifndef QEMU_WHPX_H
|
#ifndef QEMU_WHPX_H
|
||||||
#define QEMU_WHPX_H
|
#define QEMU_WHPX_H
|
||||||
|
|
||||||
#include "config-host.h"
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
|
|
||||||
int whpx_init_vcpu(CPUState *cpu);
|
int whpx_init_vcpu(CPUState *cpu);
|
||||||
|
@ -11,12 +11,13 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "qemu/osdep.h"
|
||||||
|
|
||||||
#include <linux/kvm.h>
|
#include <linux/kvm.h>
|
||||||
#include <linux/psp-sev.h>
|
#include <linux/psp-sev.h>
|
||||||
|
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qom/object_interfaces.h"
|
#include "qom/object_interfaces.h"
|
||||||
#include "qemu/base64.h"
|
#include "qemu/base64.h"
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#include <stdbool.h>
|
|
||||||
|
|
||||||
#include <WinHvPlatform.h>
|
#include <WinHvPlatform.h>
|
||||||
#include <WinHvEmulation.h>
|
#include <WinHvEmulation.h>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include <stdlib.h>
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
#include "exec/exec-all.h"
|
#include "exec/exec-all.h"
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
#include "config-host.h"
|
|
||||||
|
|
||||||
#ifndef HOST_WORDS_BIGENDIAN
|
#ifndef HOST_WORDS_BIGENDIAN
|
||||||
#define LITTLEENDIAN 1
|
#define LITTLEENDIAN 1
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
#ifndef TESTS_TPM_UTIL_H
|
#ifndef TESTS_TPM_UTIL_H
|
||||||
#define TESTS_TPM_UTIL_H
|
#define TESTS_TPM_UTIL_H
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
|
||||||
#include "io/channel-socket.h"
|
#include "io/channel-socket.h"
|
||||||
|
|
||||||
typedef void (tx_func)(QTestState *s,
|
typedef void (tx_func)(QTestState *s,
|
||||||
|
@ -29,8 +29,8 @@
|
|||||||
|
|
||||||
#define _FILE_OFFSET_BITS 64
|
#define _FILE_OFFSET_BITS 64
|
||||||
|
|
||||||
#include "qemu/atomic.h"
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
|
#include "qemu/atomic.h"
|
||||||
#include "qemu/iov.h"
|
#include "qemu/iov.h"
|
||||||
#include "standard-headers/linux/virtio_net.h"
|
#include "standard-headers/linux/virtio_net.h"
|
||||||
#include "contrib/libvhost-user/libvhost-user.h"
|
#include "contrib/libvhost-user/libvhost-user.h"
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
#ifndef QEMU_THREAD_COMMON_H
|
#ifndef QEMU_THREAD_COMMON_H
|
||||||
#define QEMU_THREAD_COMMON_H
|
#define QEMU_THREAD_COMMON_H
|
||||||
|
|
||||||
#include "qemu/typedefs.h"
|
|
||||||
#include "qemu/thread.h"
|
#include "qemu/thread.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user