merge upstream

diff --cc Makefile
index 0d6d440,8649938..6eb73c5
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -61,10 -63,10 +63,10 @@@ recurse-all: $(SUBDIR_RULES
  #######################################################################
  # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
  
- BLOCK_OBJS=cutils.o qemu-malloc.o
+ BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o
  BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
  BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
 -BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
 +BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o block-vmstate.o
  BLOCK_OBJS+=nbd.o block.o aio.o
  
  ifdef CONFIG_WIN32

diff --cc Makefile.target
Simple merge

diff --cc block.c
Simple merge

diff --cc block.h
Simple merge

diff --cc configure
index 08df436,82fb60a..bc89227
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1306,9 -1335,9 +1340,10 @@@ echo "Documentation     $build_docs
  [ ! -z "$uname_release" ] && \
  echo "uname -r          $uname_release"
  echo "NPTL support      $nptl"
 +echo "GUEST_BASE        $guest_base"
  echo "vde support       $vde"
  echo "AIO support       $aio"
+ echo "IO thread         $io_thread"
  echo "Install blobs     $blobs"
  echo "KVM support       $kvm"
  echo "fdt support       $fdt"

diff --cc cpu-all.h
Simple merge

diff --cc exec.c
Simple merge

diff --cc hw/boards.h
Simple merge

diff --cc hw/sd.c
index 5f496cd,284cd08..2e2a0f5
--- 1/hw/sd.c
--- 2/hw/sd.c
+++ b/hw/sd.c
@@@ -365,9 -365,13 +365,13 @@@ static void sd_reset(SDState *sd, Block
      uint32_t size;
      uint64_t sect;
  
-     bdrv_get_geometry(bdrv, &sect);
+     if (bdrv) {
+         bdrv_get_geometry(bdrv, &sect);
+     } else {
+         sect = 0;
+     }
      sect <<= 9;
 -
 +    
      if (sect > 0x40000000)
          size = 0x40000000;    /* 1 gig */
      else
@@@ -511,9 -425,9 +515,11 @@@ SDState *sd_init(BlockDriverState *bs, 
      sd->spi = is_spi;
      sd->enable = 1;
      sd_reset(sd, bs);
-     bdrv_set_change_cb(sd->bdrv, sd_cardchange, sd);
+     if (sd->bdrv) {
+         bdrv_set_change_cb(sd->bdrv, sd_cardchange, sd);
+     }
 +    register_savevm("sd", instance_number++, 0,
 +                    sd_save_state, sd_load_state, sd);
      return sd;
  }
  

diff --cc linux-user/main.c
Simple merge

diff --cc linux-user/signal.c
Simple merge

diff --cc linux-user/syscall_defs.h
Simple merge

diff --cc target-arm/helper.c
Simple merge