Merge commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551' into upstream-merge

* commit '0392a017ae9b44dd5c29bf7769a96fd6806a3551': (23 commits)
  pci: s/PCI_ADDRESS_SPACE_/PCI_BASE_ADDRESS_SPACE_/ to match pci_regs.h
  pci: clean up pci_init_wmask()
  pci/bridge: clean up of pci_bridge_initfn()
  pci: use helper functions to access pci config space.
  pci: helper functions to access PCIDevice::config
  pci: define a constant to represent a unmapped bar and use it.
  pci: use PCI_SLOT() and PCI_FUNC().
  pci: introduce constant PCI_NUM_PINS for the number of interrupt pins, 4.
  pci: fix PCI_DPRINTF() wrt variadic macro.
  Makefile: make qemu-io dependent on config-host.h
  scsi: move scsi-disk.h -> scsi.h
  scsi: move scsi.h -> esp.h
  Makefile: make qemu-img dependant on config-host.h
  whitelist host virtio networking features
  qemu-img: Allow creating zero sized images
  tap: drain queue in tap_send()
  virtio-net: split the has_buffers() logic from can_receive()
  net/queue: queue packets even if sender doesn't supply a callback
  net: disable receiving if client returns zero
  tap: disable draining queue in one go
  ...

Conflicts:
	hw/pci.h

Manual fixup for hw/device-assignment.c.

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/configure b/configure
index 5b08367ba..1948ae958 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@ cc="gcc"
 audio_drv_list=""
 audio_card_list="ac97 es1370 sb16"
 audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
+block_drv_whitelist=""
 host_cc="gcc"
 ar="ar"
 make="make"
@@ -452,6 +453,8 @@ for opt do
   ;;
   --audio-drv-list=*) audio_drv_list="$optarg"
   ;;
+  --block-drv-whitelist=*) block_drv_whitelist=`echo "$optarg" | sed -e 's/,/ /g'`
+  ;;
   --enable-debug-tcg) debug_tcg="yes"
   ;;
   --disable-debug-tcg) debug_tcg="no"
@@ -695,6 +698,8 @@ echo "  --audio-drv-list=LIST    set audio drivers list:"
 echo "                           Available drivers: $audio_possible_drivers"
 echo "  --audio-card-list=LIST   set list of emulated audio cards [$audio_card_list]"
 echo "                           Available cards: $audio_possible_cards"
+echo "  --block-drv-whitelist=L  set block driver whitelist"
+echo "                           (affects only QEMU, not qemu-img)"
 echo "  --enable-mixemu          enable mixer emulation"
 echo "  --disable-xen            disable xen backend driver support"
 echo "  --enable-xen             enable xen backend driver support"
@@ -1978,6 +1983,7 @@ echo "check support     $check_utests"
 echo "mingw32 support   $mingw32"
 echo "Audio drivers     $audio_drv_list"
 echo "Extra audio cards $audio_card_list"
+echo "Block whitelist   $block_drv_whitelist"
 echo "Mixer emulation   $mixemu"
 echo "VNC TLS support   $vnc_tls"
 echo "VNC SASL support  $vnc_sasl"
@@ -2104,6 +2110,7 @@ fi
 if test "$audio_win_int" = "yes" ; then
   echo "CONFIG_AUDIO_WIN_INT=y" >> $config_host_mak
 fi
+echo "CONFIG_BDRV_WHITELIST=$block_drv_whitelist" >> $config_host_mak
 if test "$mixemu" = "yes" ; then
   echo "CONFIG_MIXEMU=y" >> $config_host_mak
 fi