Commit 585fcd4b authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents dc278c58 0544edd8

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -498,12 +498,12 @@ test speed: all 


.PHONY: ctags

ctags:

	rm -f $@

	rm -f tags

	find "$(SRC_PATH)" -name '*.[hc]' -exec ctags --append {} +



.PHONY: TAGS

TAGS:

	rm -f $@

	rm -f TAGS

	find "$(SRC_PATH)" -name '*.[hc]' -exec etags --append {} +



cscope:

audio/ossaudio.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include <sys/mman.h>

#include <sys/ioctl.h>

#include <sys/soundcard.h>

#include "qemu-common.h"

block/qcow2-cache.c

+0 −5
Original line number Diff line number Diff line
@@ -24,11 +24,6 @@ 


/* Needed for CONFIG_MADVISE */

#include "qemu/osdep.h"



#if defined(CONFIG_MADVISE) || defined(CONFIG_POSIX_MADVISE)

#include <sys/mman.h>

#endif



#include "block/block_int.h"

#include "qemu-common.h"

#include "qcow2.h"

bsd-user/elfload.c

+0 −1
Original line number Diff line number Diff line 
/* This is the Linux kernel elf-loading code, ported into user space */



#include "qemu/osdep.h"

#include <sys/mman.h>



#include "qemu.h"

#include "disas/disas.h"

bsd-user/main.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
 */

#include "qemu/osdep.h"

#include <machine/trap.h>

#include <sys/mman.h>



#include "qemu.h"

#include "qemu/path.h"