diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-16 17:58:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-16 17:58:45 +0100 |
| commit | 585fcd4b11070b3220685fc54ecca1991cdeb161 (patch) | |
| tree | eac78393a02a9a0cda3571ab7bce3000e095c978 /scripts | |
| parent | dc278c58fa02e5fb796dbacf02c8dde32f697015 (diff) | |
| parent | 0544edd88a6acea81aefe22fd0cd9a85d1eef093 (diff) | |
| download | focaccia-qemu-585fcd4b11070b3220685fc54ecca1991cdeb161.tar.gz focaccia-qemu-585fcd4b11070b3220685fc54ecca1991cdeb161.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* KVM startup speedup (Chao Peng) * configure fixes and cleanups (David, Thomas) * ctags fix (Sergey) * NBD cleanups (Peter, Eric) * "-L help" command line option (Richard) * More esp.c bugfixes (me, Prasad) * KVM_CAP_MAX_VCPU_ID support (Greg) # gpg: Signature made Thu 16 Jun 2016 17:39:10 BST # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: (29 commits) vl: smp_parse: cleanups scsi: esp: make cmdbuf big enough for maximum CDB size scsi: esp: clean up handle_ti/esp_do_dma if s->do_cmd scsi: esp: respect FIFO invariant after message phase scsi: esp: check buffer length before reading scsi command nbd: Avoid magic number for NBD max name size nbd: Detect servers that send unexpected error values nbd: Clean up ioctl handling of qemu-nbd -c nbd: Group all Linux-specific ioctl code in one place nbd: Reject unknown request flags nbd: Improve server handling of bogus commands nbd: Quit server after any write error nbd: More debug typo fixes, use correct formats nbd: Use BDRV_REQ_FUA for better FUA where supported vl.c: Add '-L help' which lists data dirs. KVM: use KVM_CAP_MAX_VCPU_ID scsi-disk: Use (unsigned long) typecasts when using "%lu" format string target-i386: kvm: cache KVM_GET_SUPPORTED_CPUID data nbd: simplify the nbd_request and nbd_reply structs nbd: Don't use cpu_to_*w() functions ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/clean-includes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/clean-includes b/scripts/clean-includes index 37b73b5433..4412a5590a 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -105,6 +105,8 @@ for f in "$@"; do *include/qemu/osdep.h | \ *include/qemu/compiler.h | \ *include/glib-compat.h | \ + *include/sysemu/os-posix.h | \ + *include/sysemu/os-win32.h | \ *include/standard-headers/ ) # Removing include lines from osdep.h itself would be counterproductive. echo "SKIPPING $f (special case header)" @@ -145,6 +147,7 @@ for f in "$@"; do <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h> <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h> <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h> + <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h> <sys/mman.h> "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h" "qemu/typedefs.h" ))' "$f" |