DM: cleanup for header inclusions

used https://gitlab.com/esr/deheader to detect and remove unnecessary
header file inclusions

Signed-off-by: Zide Chen <zide.chen@intel.com>
This commit is contained in:
Zide Chen 2018-05-31 08:57:51 -07:00 committed by lijinxia
parent a9ee6da0d9
commit df4ab92e81
48 changed files with 2 additions and 225 deletions

View File

@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h>
#include <errno.h>
#include <pthread.h>
@ -34,7 +32,6 @@
#include <stdbool.h>
#include "vmmapi.h"
#include "vmm.h"
#include "acpi.h"
#include "inout.h"
#include "mevent.h"

View File

@ -24,10 +24,8 @@
* SUCH DAMAGE.
*/
#include <stdio.h>
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
#include "gc.h"
#include "console.h"

View File

@ -26,16 +26,11 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/select.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <termios.h>
#include <unistd.h>
#include <stdbool.h>
#include <sysexits.h>
#include "inout.h"
#include "lpc.h"

View File

@ -1,5 +1,3 @@
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

View File

@ -34,13 +34,9 @@
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <ctype.h>
#include <fcntl.h>
#include <errno.h>
#include <assert.h>
#include "vmm.h"
#include "vhm_ioctl_defs.h"
#include "vmmapi.h"
#define HUGETLB_LV1 0

View File

@ -26,18 +26,10 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/mman.h>
#include <linux/uio.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <assert.h>
#include "vmm.h"
#include "vmmapi.h"
#include "dm.h"
#include "inout.h"
SET_DECLARE(inout_port_set, struct inout_port);

View File

@ -26,10 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -43,8 +39,6 @@
#include <stdbool.h>
#include <getopt.h>
#include "types.h"
#include "vmm.h"
#include "vmmapi.h"
#include "sw_load.h"
#include "cpuset.h"

View File

@ -32,16 +32,13 @@
* so it can be searched within the range.
*/
#include <sys/cdefs.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <assert.h>
#include <pthread.h>
#include "vmm.h"
#include "types.h"
#include "mem.h"
#include "tree.h"

View File

@ -31,24 +31,17 @@
* using EPOLL, and having events be persistent by default.
*/
#include <sys/cdefs.h>
#include <assert.h>
#include <err.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <sysexits.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
#include <sys/epoll.h>
#include <sys/queue.h>
#include <pthread.h>
#include "mevent.h"
#include "vmm.h"
#include "vmmapi.h"
#define MEVENT_MAX 64

View File

@ -26,8 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
@ -35,7 +33,6 @@
#include "mptable.h"
#include "acpi.h"
#include "dm.h"
#include "mptbl.h"
#include "pci_core.h"
#define MPTABLE_BASE 0xF0000

View File

@ -26,9 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdbool.h>
#include <assert.h>
#include "inout.h"

View File

@ -24,20 +24,15 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
#include <openssl/md5.h>
#include <stdio.h>
#include <stdbool.h>
#include <string.h>
#include <unistd.h>
#include <uuid/uuid.h>
#include "vmm.h"
#include "vmmapi.h"
#include "dm.h"
#include "smbiostbl.h"
#define SMBIOS_BASE 0xF1000

View File

@ -28,11 +28,8 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <stdbool.h>
#include <stdint.h>
#include "acrn_common.h"
#include "vmmapi.h"
#include "sw_load.h"

View File

@ -28,9 +28,7 @@
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <stdbool.h>
#include <stdint.h>
#include "vmmapi.h"
#include "sw_load.h"

View File

@ -30,10 +30,8 @@
#include <stdlib.h>
#include <assert.h>
#include <stdbool.h>
#include <stdint.h>
#include "dm.h"
#include "acrn_common.h"
#include "vmmapi.h"
#include "sw_load.h"
#include "acpi.h"

View File

@ -26,15 +26,9 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <sys/uio.h>
#include <sys/user.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
@ -43,15 +37,8 @@
#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include <uuid/uuid.h>
#include "types.h"
#include "cpuset.h"
#include "segments.h"
#include "specialreg.h"
#include "vmm.h"
#include "vhm_ioctl_defs.h"
#include "vmmapi.h"
#include "mevent.h"

View File

@ -25,17 +25,13 @@
*
*/
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <unistd.h>
#include <openssl/rand.h>
#include "types.h"
#include "vrpmb.h"
#include "acrn_common.h"
struct key_material {
uint8_t key[RPMB_KEY_LEN];

View File

@ -26,7 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/stat.h>
@ -41,11 +40,9 @@
#include <string.h>
#include <pthread.h>
#include <signal.h>
#include <sysexits.h>
#include <unistd.h>
#include "dm.h"
#include "mevent.h"
#include "block_if.h"
#include "ahci.h"

View File

@ -27,18 +27,10 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <inttypes.h>

View File

@ -26,9 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <ctype.h>
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
@ -38,10 +35,8 @@
#include <assert.h>
#include <stdbool.h>
#include "vmm.h"
#include "vmmapi.h"
#include "acpi.h"
#include "dm.h"
#include "inout.h"
#include "ioapic.h"
#include "mem.h"

View File

@ -5,22 +5,13 @@
*
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <openssl/md5.h>
#include "dm.h"
#include "pci_core.h"

View File

@ -26,8 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <pthread.h>
#include "pci_core.h"
static int

View File

@ -26,8 +26,6 @@
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <assert.h>
#include <pthread.h>
#include <stdbool.h>
@ -36,11 +34,8 @@
#include "types.h"
#include "acpi.h"
#include "vmm.h"
#include "vmmapi.h"
#include "inout.h"
#include "pci_core.h"
#include "irq.h"
#include "lpc.h"
/*

View File

@ -27,14 +27,11 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include "vmm.h"
#include "vmmapi.h"
#include "acpi.h"
#include "inout.h"

View File

@ -26,9 +26,6 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/user.h>
@ -38,22 +35,14 @@
#include <string.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <sysexits.h>
#include <unistd.h>
#include <pthread.h>
#include <pciaccess.h>
#include "pcireg.h"
#include "iodev.h"
#include "vmm.h"
#include "vmmapi.h"
#include "vhm_ioctl_defs.h"
#include "pciio.h"
#include "pci_core.h"
#include "mem.h"
#include "acpi.h"
#include "dm.h"
#ifndef _PATH_DEVPCI
#define _PATH_DEVPCI "/dev/pci"

View File

@ -26,11 +26,8 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
#include "dm.h"
#include "pci_core.h"
#include "uart_core.h"

View File

@ -24,11 +24,8 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
#include <pthread.h>

View File

@ -26,19 +26,11 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <openssl/md5.h>

View File

@ -28,13 +28,8 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@ -44,8 +39,6 @@
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <libgen.h>
#include <sysexits.h>
#include <termios.h>
#include "dm.h"

View File

@ -8,8 +8,6 @@
* HECI device virtualization.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <linux/mei.h>
#include <errno.h>

View File

@ -5,10 +5,7 @@
*
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>

View File

@ -26,35 +26,25 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/select.h>
#include <sys/uio.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
#ifndef NETMAP_WITH_LIBS
#define NETMAP_WITH_LIBS
#endif
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <assert.h>
#include <openssl/md5.h>
#include <pthread.h>
#include <sysexits.h>
#include "types.h"
#include "dm.h"
#include "pci_core.h"
#include "mevent.h"
#include "virtio.h"
#include "netmap_user.h"
#include <net/if.h>
#include <linux/if_tun.h>
#define VIRTIO_NET_RINGSZ 1024

View File

@ -31,10 +31,6 @@
* once it has been seeded at bootup.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <err.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@ -42,7 +38,6 @@
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <sysexits.h>
#include "dm.h"
#include "pci_core.h"

View File

@ -35,11 +35,6 @@
*
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
@ -47,7 +42,6 @@
#include <unistd.h>
#include <assert.h>
#include <pthread.h>
#include <sysexits.h>
#include "dm.h"
#include "pci_core.h"
@ -55,7 +49,6 @@
#include "vmmapi.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#include <linux/types.h>
#include "rpmb.h"
#include "rpmb_sim.h"
#include "rpmb_backend.h"

View File

@ -18,7 +18,6 @@
#include <assert.h>
#include <stdbool.h>
#include "vmm.h"
#include "vmmapi.h"
#include "mevent.h"
#include "pci_core.h"

7
devicemodel/hw/pci/xhci.c Executable file → Normal file
View File

@ -76,15 +76,9 @@
* +--------+ +--------+
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/uio.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <pthread.h>
#include <unistd.h>
@ -96,7 +90,6 @@
#include "dm.h"
#include "pci_core.h"
#include "xhci.h"
#include "usb_core.h"
#include "usb_pmapper.h"
#undef LOG_TAG

View File

@ -50,7 +50,6 @@
* DSDT -> 0xf2800 (variable - can go up to 0x100000)
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <errno.h>
@ -63,8 +62,6 @@
#include <stdbool.h>
#include <fcntl.h>
#include "vmm.h"
#include "vmmapi.h"
#include "dm.h"
#include "acpi.h"
#include "pci_core.h"

View File

@ -9,9 +9,7 @@
#include <string.h>
#include <stdbool.h>
#include "vmm.h"
#include "vmmapi.h"
#include "dm.h"
#include "acpi.h"
static inline int get_vcpu_pm_info(struct vmctx *ctx, int vcpu_id,

View File

@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdint.h>
#include <assert.h>
#include <errno.h>
@ -34,18 +32,15 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <pthread.h>
#include "acpi.h"
#include "inout.h"
#include "pci_core.h"
#include "irq.h"
#include "lpc.h"
#include "atkbdc.h"
#include "ps2kbd.h"
#include "ps2mouse.h"
#include "vmm.h"
#include "vmmapi.h"
static void

View File

@ -26,10 +26,6 @@
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
#include <time.h>
#include <assert.h>
#include "inout.h"

View File

@ -25,16 +25,10 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdio.h>
#include "vmm.h"
#include "vmmapi.h"
#include "ioapic.h"
#include "pci_core.h"
#include "lpc.h"
/* 16 IRQs reserved for kdb/mouse, COM1/2, RTC... */
#define LEGACY_IRQ_NUM 16

View File

@ -25,8 +25,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <assert.h>
#include <stdbool.h>
#include <stdio.h>

View File

@ -25,19 +25,10 @@
* SUCH DAMAGE.
*/
#include <ctype.h>
#include <errno.h>
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <assert.h>
#include <fcntl.h>
#include <inttypes.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdint.h>
#include <openssl/hmac.h>
#include "rpmb.h"

View File

@ -24,9 +24,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <pthread.h>
#include <string.h>
#include <assert.h>
@ -38,7 +35,6 @@
#include <time.h>
#include "vmmapi.h"
#include "vmm.h"
#include "inout.h"
#include "mc146818rtc.h"
#include "rtc.h"

View File

@ -24,15 +24,12 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/time.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include "types.h"
#include "usb.h"
#include "usbdi.h"
#include "usb_core.h"

View File

@ -12,7 +12,6 @@
#include <string.h>
#include "usb.h"
#include "usbdi.h"
#include "usb_core.h"
#include "usb_pmapper.h"
#undef LOG_TAG

View File

@ -27,18 +27,15 @@
* $FreeBSD$
*/
#include <sys/cdefs.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <err.h>
#include <fcntl.h>
#include <termios.h>
#include <unistd.h>
#include <stdbool.h>
#include <string.h>
#include <pthread.h>
#include <sysexits.h>
#include "types.h"
#include "mevent.h"

View File

@ -75,14 +75,10 @@
* USB device: usb_mouse.c usb_pmapper.{h,c}
*/
#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <fcntl.h>
#include <unistd.h>
#include "usb_core.h"