- update update_git.sh for 1.0.1

- add fixes for reserved_va mmap(NULL) case, fixes git build on arm

OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=59

0001-Handle-CPU-interrupts-by-inline-checking-of-a-flag.patch

@@ -1,4 +1,4 @@
-From 4cc09e9530fb08123594be6c72dfc381df5dcddc Mon Sep 17 00:00:00 2001
+From 46def18ae5e55d5d5287ff2c4fc3b8aed446f564 Mon Sep 17 00:00:00 2001
 From: Peter Maydell <peter.maydell@linaro.org>
 Date: Wed, 5 Oct 2011 10:04:02 +0100
 Subject: [PATCH] Handle CPU interrupts by inline checking of a flag
@@ -52,7 +52,7 @@ index a9fa608..5f7982f 100644
                          int insns_left;
                          tb = (TranslationBlock *)(long)(next_tb & ~3);
 diff --git a/exec.c b/exec.c
-index 6b92198..6c923f2 100644
+index 6c206ff..bb221cf 100644
 --- a/exec.c
 +++ b/exec.c
 @@ -125,6 +125,8 @@ DEFINE_TLS(CPUState *,cpu_single_env);
@@ -207,6 +207,3 @@ index a50842b..7fdd80f 100644
              case QEMU_OPTION_acpitable:
                  do_acpitable_option(optarg);
                  break;
--- 
-1.6.0.2
-

0002-linux-user-fix-QEMU_STRACE-1-segfault.patch

@@ -1,4 +1,4 @@
-From 0588bc446fd48bdb1965a6773d008c05a4ba16c1 Mon Sep 17 00:00:00 2001
+From 7c38fac0f55fad6c8506796bbbee3ab036c6350f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sun, 20 Nov 2011 13:02:54 +0100
 Subject: [PATCH] linux-user: fix QEMU_STRACE=1 segfault
@@ -83,6 +83,3 @@ index f227097..f170724 100644
      return strerror(target_to_host_errno(err));
  }
  
--- 
-1.6.0.2
-

0003-linux-user-save-auxv-length.patch

@@ -1,4 +1,4 @@
-From 67c12998086c44ebef7f92a394154d6aba446178 Mon Sep 17 00:00:00 2001
+From e968f21cebfd85c10405e5d4c8cc8f70361590ad Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 2 Nov 2011 09:23:22 +0000
 Subject: [PATCH] linux-user: save auxv length
@@ -83,6 +83,3 @@ index 55ad9d8..ef08d39 100644
          abi_ulong       arg_start;
          abi_ulong       arg_end;
  	int		personality;
--- 
-1.6.0.2
-

0004-linux-user-add-open-hijack-infrastructure.patch

@@ -1,4 +1,4 @@
-From 99590488e94b6b7f10ecf9a99398fd24a69a7039 Mon Sep 17 00:00:00 2001
+From a1508f441692e958ee11ac10648ed7941c242be8 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 2 Nov 2011 09:23:23 +0000
 Subject: [PATCH] linux-user: add open() hijack infrastructure
@@ -83,6 +83,3 @@ index f170724..1ecc0e1 100644
          unlock_user(p, arg1, 0);
          break;
  #if defined(TARGET_NR_openat) && defined(__NR_openat)
--- 
-1.6.0.2
-

0005-linux-user-fake-proc-self-maps.patch

@@ -1,4 +1,4 @@
-From 059e727a9a4be00de949769105e9e0ea876fc64b Mon Sep 17 00:00:00 2001
+From a28f243a16b5e2e13645fba6d26c8ce26e9b399b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 2 Nov 2011 09:23:24 +0000
 Subject: [PATCH] linux-user: fake /proc/self/maps
@@ -48,6 +48,3 @@ index 1ecc0e1..8727249 100644
          { NULL, NULL }
      };
  
--- 
-1.6.0.2
-

0006-linux-user-fake-proc-self-stat.patch

@@ -1,4 +1,4 @@
-From 7ee3fd47eed19e4dfa26a8d0176ed3550b8d0ccf Mon Sep 17 00:00:00 2001
+From ddbcc8e3bf832386832322146235e251bc7bc0d7 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 2 Nov 2011 09:23:25 +0000
 Subject: [PATCH] linux-user: fake /proc/self/stat
@@ -59,6 +59,3 @@ index 8727249..5eefd01 100644
          { NULL, NULL }
      };
  
--- 
-1.6.0.2
-

0007-linux-user-fake-proc-self-auxv.patch

@@ -1,4 +1,4 @@
-From ddf0d4037b10c07d9e5b168f9f96e60a1601c75b Mon Sep 17 00:00:00 2001
+From 53bd82c12dac42df6c602aee6a93b3ea39e134da Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 2 Nov 2011 09:23:26 +0000
 Subject: [PATCH] linux-user: fake /proc/self/auxv
@@ -63,6 +63,3 @@ index 5eefd01..3e6f3bd 100644
          { NULL, NULL }
      };
  
--- 
-1.6.0.2
-

0008-XXX-dont-dump-core-on-sigabort.patch

@@ -1,4 +1,4 @@
-From 4bc96d88f91417aa2bb029da2e8343456fe86631 Mon Sep 17 00:00:00 2001
+From f48d5facfbfa643ff2d89fa215d7982877468f02 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
 Subject: [PATCH] XXX dont dump core on sigabort
@@ -31,6 +31,3 @@ index 78e3380..cfa92b9 100644
      /* The proper exit code for dying from an uncaught signal is
       * -<signal>.  The kernel doesn't allow exit() or _exit() to pass
       * a negative value.  To get the proper exit code we need to
--- 
-1.6.0.2
-

0009-linux-user-fix-wait-syscall-status-returns.patch

@@ -1,4 +1,4 @@
-From ee5137d38109fdcb55a58be447c2c27be2b16eb0 Mon Sep 17 00:00:00 2001
+From c2c3a707453bc853b73cf2d3f2663ff2277b6563 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 22 Nov 2011 17:53:40 +0100
 Subject: [PATCH] linux-user: fix wait* syscall status returns
@@ -50,6 +50,3 @@ index 3e6f3bd..f86fe4a 100644
              ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr));
              if (!is_error(ret)) {
                  if (status_ptr) {
--- 
-1.6.0.2
-

0010-Revert-linux-user-fix-wait-syscall-status-returns.patch

@@ -1,4 +1,4 @@
-From 5cfce885dd1b3a229cd2ea7a94dfe2445ec29417 Mon Sep 17 00:00:00 2001
+From e300580980d4ac564a7c458717f7415f2528c41f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 24 Nov 2011 00:38:22 +0100
 Subject: [PATCH] Revert "linux-user: fix wait* syscall status returns"
@@ -34,6 +34,3 @@ index f86fe4a..3e6f3bd 100644
              ret = get_errno(wait4(arg1, &status, arg3, rusage_ptr));
              if (!is_error(ret)) {
                  if (status_ptr) {
--- 
-1.6.0.2
-

0011-linux-user-fix-wait-syscall-status-returns.patch

@@ -1,4 +1,4 @@
-From b71ee7a063f7cffdf8a2cf73fcbc1d461fbbb80e Mon Sep 17 00:00:00 2001
+From d9e44fedae2abdc61ea12000719cc74dee54200c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 24 Nov 2011 00:39:35 +0100
 Subject: [PATCH] linux-user: fix wait* syscall status returns
@@ -53,6 +53,3 @@ index 3e6f3bd..5810e2a 100644
                      status = host_to_target_waitstatus(status);
                      if (put_user_s32(status, status_ptr))
                          goto efault;
--- 
-1.6.0.2
-

0012-XXX-linux-user-fake-proc-self-maps-even-more.patch

@@ -1,4 +1,4 @@
-From 146dddbec44c48417f776d54f823093b464e596c Mon Sep 17 00:00:00 2001
+From 1e34dbb17e1ce60d2c2afd7803dd6b9af8043140 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 28 Nov 2011 17:05:24 +0100
 Subject: [PATCH] XXX linux-user: fake /proc/self/maps even more
@@ -64,6 +64,3 @@ index 5810e2a..4af0edb 100644
  
      return 0;
  }
--- 
-1.6.0.2
-

0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch

@@ -1,4 +1,4 @@
-From 79a59902304b66e9270d11901a554e5b22042d6e Mon Sep 17 00:00:00 2001
+From e093a96fb61a17b9b0ee88d35fbe8871ec205797 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Dec 2011 19:00:01 +0100
 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
@@ -242,6 +242,3 @@ index 4af0edb..97c3303 100644
      return ret;
  efault:
      ret = -TARGET_EFAULT;
--- 
-1.6.0.2
-

0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch

@@ -1,4 +1,4 @@
-From e534a77a0e1f880d0f74514ac50de5de3dd4811a Mon Sep 17 00:00:00 2001
+From 4c1134246f3bd0af9b9b512a2094010ed12e7895 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 5 Dec 2011 23:37:52 +0100
 Subject: [PATCH] XXX move qemu binary lower in address space so we have space for guest stuff
@@ -20,6 +20,3 @@ index b7a9f4e..1151d8c 100644
    .interp         : { *(.interp) }
    .hash           : { *(.hash) }
    .dynsym         : { *(.dynsym) }
--- 
-1.6.0.2
-

0015-linux-user-map-lower-in-address-space.patch

@@ -1,4 +1,4 @@
-From edda5e8f49b7857379733d652d6b259488bd7b70 Mon Sep 17 00:00:00 2001
+From b2e723019225ba03cef46b204dbfc51102f83259 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 6 Dec 2011 00:39:50 +0100
 Subject: [PATCH] linux-user: map lower in address space
@@ -29,6 +29,3 @@ index 994c02b..505254f 100644
  #endif
  static abi_ulong mmap_next_start = TASK_UNMAPPED_BASE;
  
--- 
-1.6.0.2
-

0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch

@@ -1,4 +1,4 @@
-From 3580a90d40df10410b7268f89aae58ce05dd2bed Mon Sep 17 00:00:00 2001
+From 8132af006535df8bbf5c4f23c9f37b7d45851950 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 8 Dec 2011 23:19:32 +0100
 Subject: [PATCH] XXX fake /proc/self/maps: also fclose real file
@@ -19,6 +19,3 @@ index 97c3303..9fabcba 100644
  
  #if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32)
      dprintf(fd, "%08llx-%08llx rw-p %08llx 00:00 0          [stack]\n",
--- 
-1.6.0.2
-

0017-XXX-map-qemu-higher-again-so-we-have-space-for-brk.patch

@@ -1,4 +1,4 @@
-From 91f12fe177833e0112cd7f7cf5781b26377667a5 Mon Sep 17 00:00:00 2001
+From 1021c91ed33c597aec0665501c1bfef96386046b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sat, 10 Dec 2011 00:03:56 +0100
 Subject: [PATCH] XXX map qemu higher again so we have space for brk
@@ -34,6 +34,3 @@ index 1151d8c..dc31aba 100644
    .interp         : { *(.interp) }
    .hash           : { *(.hash) }
    .dynsym         : { *(.dynsym) }
--- 
-1.6.0.2
-

0018-qemu-0.9.0.cvs-binfmt.patch

@@ -1,4 +1,4 @@
-From 434801ec78b031170eb0762302b52062e6c27d0e Mon Sep 17 00:00:00 2001
+From 68c582bd8f27e48828c3ea90aceb4bbead37382b Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:18:44 +0200
 Subject: [PATCH] qemu-0.9.0.cvs-binfmt
@@ -80,6 +80,3 @@ index 83a44d8..d0fe4e1 100644
 -    echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register
 +    echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register
  fi
--- 
-1.6.0.2
-

0019-qemu-cvs-alsa_bitfield.patch

@@ -1,4 +1,4 @@
-From b41a72d0c29f97610dfdd5573b8be383823bc88f Mon Sep 17 00:00:00 2001
+From dafb3a450b28740afb77a503af84c4217cf47f49 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:20:50 +0200
 Subject: [PATCH] qemu-cvs-alsa_bitfield
@@ -79,6 +79,3 @@ index 109c541..55890f3 100644
          return 4;
      case TYPE_LONGLONG:
      case TYPE_ULONGLONG:
--- 
-1.6.0.2
-

0020-qemu-cvs-alsa_ioctl.patch

@@ -1,4 +1,4 @@
-From 33f065c217c1921759df12467954eb4638f84a72 Mon Sep 17 00:00:00 2001
+From 5808e2a35680dd98d356f81d1d3e5a5375883c54 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:23:27 +0200
 Subject: [PATCH] qemu-cvs-alsa_ioctl
@@ -13,8 +13,8 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  linux-user/ioctls_alsa_structs.h | 1740 ++++++++++++++++++++++++++++++++++++++
  linux-user/syscall_defs.h        |    2 +
  linux-user/syscall_types.h       |    5 +
- linux-user/syscall_types_alsa.h  | 1337 +++++++++++++++++++++++++++++
+ linux-user/syscall_types_alsa.h  | 1336 +++++++++++++++++++++++++++++
- 6 files changed, 3556 insertions(+), 0 deletions(-)
+ 6 files changed, 3555 insertions(+), 0 deletions(-)
  create mode 100644 linux-user/ioctls_alsa.h
  create mode 100644 linux-user/ioctls_alsa_structs.h
  create mode 100644 linux-user/syscall_types_alsa.h
@@ -2282,10 +2282,10 @@ index c370125..8fde25c 100644
         TYPE_INT,                 /* lo_number */
 diff --git a/linux-user/syscall_types_alsa.h b/linux-user/syscall_types_alsa.h
 new file mode 100644
-index 0000000..a0ae752
+index 0000000..72622ae
 --- /dev/null
 +++ b/linux-user/syscall_types_alsa.h
-@@ -0,0 +1,1337 @@
+@@ -0,0 +1,1336 @@
 +/*
 + *  Advanced Linux Sound Architecture
 + *
@@ -3622,7 +3622,3 @@ index 0000000..a0ae752
 +STRUCT( sscape_microcode,
 +  TYPE_PTRVOID
 +)
-+
--- 
-1.6.0.2
-

0021-qemu-cvs-alsa_mmap.patch

@@ -1,4 +1,4 @@
-From 8b67814c8ab4645ddd43664b1092e78ea6a743d8 Mon Sep 17 00:00:00 2001
+From 361d8917165009c3897a5116a5b6e87c2db2dd68 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:24:15 +0200
 Subject: [PATCH] qemu-cvs-alsa_mmap
@@ -43,6 +43,3 @@ index 46e8bf8..e4db455 100644
      if (offset & ~TARGET_PAGE_MASK) {
          errno = EINVAL;
          goto fail;
--- 
-1.6.0.2
-

0022-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From c0ce4deb6c2ac843e337b7252fbefc190d625ca5 Mon Sep 17 00:00:00 2001
+From 58ab3b92c4406b87b2ef2dbd230b397e2bec9f18 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday
@@ -21,6 +21,3 @@ index 9fabcba..cd120a4 100644
              ret = get_errno(gettimeofday(&tv, NULL));
              if (!is_error(ret)) {
                  if (copy_to_user_timeval(arg1, &tv))
--- 
-1.6.0.2
-

0023-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From 6232258009a4735d7f4f53b5589e7ebd90a9885d Mon Sep 17 00:00:00 2001
+From c73ada0bb889ac958c21dafd410ff8210ca92850 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug
@@ -29,6 +29,3 @@ index cd120a4..4f1a5b4 100644
              return -TARGET_ENOSYS;
          }
          if (ie->target_cmd == cmd)
--- 
-1.6.0.2
-

0024-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 926d75fa4b4b5d95d4b0111e3e0af4d983a9d46b Mon Sep 17 00:00:00 2001
+From a2ccdcc82fc7b094d8e23d9beb2dd3351bb43e23 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection
@@ -38,6 +38,3 @@ index 4f1a5b4..eabeee6 100644
          default:
          case IOC_RW:
              argptr = lock_user(VERIFY_READ, arg, target_size, 1);
--- 
-1.6.0.2
-

0025-qemu-img-vmdk-scsi.patch

@@ -1,4 +1,4 @@
-From 90b3180677c5615bafc9a1f8252fbc4af1dc1ae4 Mon Sep 17 00:00:00 2001
+From dca5711f3a271a3a0f41207e03f7bf5c7c24d08f Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:37:42 +0200
 Subject: [PATCH] qemu-img-vmdk-scsi
@@ -98,7 +98,7 @@ index 77c0187..b79ab4b 100644
  #define BLOCK_OPT_BACKING_FMT   "backing_fmt"
  #define BLOCK_OPT_CLUSTER_SIZE  "cluster_size"
 diff --git a/qemu-img.c b/qemu-img.c
-index 8bdae66..012a9e4 100644
+index 01cc0d3..21f3544 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
 @@ -661,7 +661,7 @@ static int img_convert(int argc, char **argv)
@@ -123,6 +123,3 @@ index 8bdae66..012a9e4 100644
      /* Create the new image */
      ret = bdrv_create(drv, out_filename, param);
      if (ret < 0) {
--- 
-1.6.0.2
-

0026-qemu-nonvoid_return.patch

@@ -1,4 +1,4 @@
-From 7e6479e0d45e45e888cb79759fd44d6c14be19f4 Mon Sep 17 00:00:00 2001
+From 04b073cd49c1e86a663978d5bca1610456afc80c Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:38:20 +0200
 Subject: [PATCH] qemu-nonvoid_return
@@ -35,6 +35,3 @@ index 0e7f1fe..bfaf116 100644
  }
  
  /* Assign value to a register.  If the width is less than the register width
--- 
-1.6.0.2
-

0027-fix-mipsn32-linux-user-builds.patch

@@ -1,4 +1,4 @@
-From 164cf539481164978d9fa6ad69eb20cda7dc0e12 Mon Sep 17 00:00:00 2001
+From c376a21e31202c85164b247ba6332efddfcb9c3b Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Wed, 25 Aug 2010 14:23:43 +0200
 Subject: [PATCH] fix mipsn32*-linux-user builds
@@ -14,7 +14,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  create mode 100644 default-configs/mipsn32el-linux-user.mak
 
 diff --git a/configure b/configure
-index ac4840d..e9cad7f 100755
+index b113f60..a21b1e6 100755
 --- a/configure
 +++ b/configure
 @@ -915,6 +915,8 @@ microblaze-linux-user \
@@ -53,6 +53,3 @@ index 4ec506c..beeeb3c 100644
 +#define TARGET_QEMU_ESIGRETURN 255
  
  #define UNAME_MACHINE "mips64"
--- 
-1.6.0.2
-

0028-Integrating-Dynamips-and-GNS3-UDP-tunnels-Patches.patch

@@ -1,4 +1,4 @@
-From 15d6a32b38abc6c2f8143ebccfcdd05d204f0fcd Mon Sep 17 00:00:00 2001
+From dbaddb35cf05035c5efe05a7272c3a4e8f29033b Mon Sep 17 00:00:00 2001
 From: Benjamin <mlspirat42@gmail.com>
 Date: Sat, 8 Oct 2011 07:31:33 +0000
 Subject: [PATCH] Integrating Dynamips and GNS3 UDP tunnels (Patches)
@@ -43,7 +43,7 @@ Signed-off-by: Benjamin MARSILI <marsil_b@epitech.eu>
  create mode 100644 net/udp.h
 
 diff --git a/Makefile.objs b/Makefile.objs
-index d7a6539..1a28830 100644
+index 3a699ee..97c2b75 100644
 --- a/Makefile.objs
 +++ b/Makefile.objs
 @@ -46,6 +46,7 @@ net-obj-y = net.o
@@ -77,10 +77,10 @@ index e4b0b75..09528ac 100644
      if (s->hfile == INVALID_HANDLE_VALUE) {
          int err = GetLastError();
 diff --git a/hw/e1000.c b/hw/e1000.c
-index 986ed9c..19ca5bf 100644
+index e164d79..22a601a 100644
 --- a/hw/e1000.c
 +++ b/hw/e1000.c
-@@ -577,7 +577,7 @@ receive_filter(E1000State *s, const uint8_t *buf, int size)
+@@ -580,7 +580,7 @@ receive_filter(E1000State *s, const uint8_t *buf, int size)
      if (rctl & E1000_RCTL_UPE)			// promiscuous
          return 1;
  
@@ -153,7 +153,7 @@ index 9f633f8..ac6118c 100644
      NET_CLIENT_TYPE_MAX
 diff --git a/net/udp.c b/net/udp.c
 new file mode 100644
-index 0000000..6080919
+index 0000000..d2a67e7
 --- /dev/null
 +++ b/net/udp.c
 @@ -0,0 +1,138 @@
@@ -346,6 +346,3 @@ index 83b1f38..94f946e 100644
  #ifdef CONFIG_VDE
      "-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
      "                connect the vlan 'n' to port 'n' of a vde switch running\n"
--- 
-1.6.0.2
-

0029-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch

@@ -1,4 +1,4 @@
-From 47ff084e9af71b217e6f842f720d12fe9e12f2fd Mon Sep 17 00:00:00 2001
+From e8b8530dd87efb4bbbb9819af1d2019c49a4b58a Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
@@ -169,6 +169,3 @@ index d0fe4e1..c20fb61 100644
 -    echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x:' > /proc/sys/fs/binfmt_misc/register
 +    echo   ':s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-binfmt:P' > /proc/sys/fs/binfmt_misc/register
  fi
--- 
-1.6.0.2
-

0030-linux-user-Ignore-timer_create-syscall.patch

@@ -1,4 +1,4 @@
-From 269d801698bf7640dd325cfb4b195c4a207a07ee Mon Sep 17 00:00:00 2001
+From a4f0bf51a11607d4ab025719b1c13fc402aac9b7 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sun, 11 Dec 2011 01:19:24 +0100
 Subject: [PATCH] linux-user: Ignore timer_create syscall
@@ -27,6 +27,3 @@ index eabeee6..fd6ff1f 100644
  #if defined(TARGET_NR_tkill) && defined(__NR_tkill)
      case TARGET_NR_tkill:
          ret = get_errno(sys_tkill((int)arg1, target_to_host_signal(arg2)));
--- 
-1.6.0.2
-

0031-linux-user-be-silent-about-capget-failures.patch

@@ -1,4 +1,4 @@
-From 36f403e159ecb5fcaeda5346c2df762cc904a91b Mon Sep 17 00:00:00 2001
+From 853112747ffa9a9747c670d36508b8f51fbaf798 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Sun, 11 Dec 2011 01:21:51 +0100
 Subject: [PATCH] linux-user: be silent about capget failures
@@ -25,6 +25,3 @@ index fd6ff1f..9ba51bf 100644
      case TARGET_NR_capset:
          goto unimplemented;
      case TARGET_NR_sigaltstack:
--- 
-1.6.0.2
-

0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch

@@ -1,4 +1,4 @@
-From ac233b323ad7e498c665e8c74df7e44de4a542c0 Mon Sep 17 00:00:00 2001
+From 8954d20f70430ddd4f6add000fd8bf82d5ddcb27 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 14 Dec 2011 00:33:28 +0100
 Subject: [PATCH] linux-user: reserve 4GB of vmem for 32-on-64
@@ -39,6 +39,3 @@ index 788ff98..3ffee40 100644
  
  static void usage(void);
  extern int use_stopflag;
--- 
-1.6.0.2
-

0033-PPC-KVM-Disable-mmu-notifier-check.patch

@@ -1,4 +1,4 @@
-From 96ac7aa8753cb2d79121c5a579a6e93160428a40 Mon Sep 17 00:00:00 2001
+From c81d26928073f06432c701a28d745dffacc69c98 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
 Subject: [PATCH] PPC: KVM: Disable mmu notifier check
@@ -13,7 +13,7 @@ KVM guests work there, even if possibly racy in some odd circumstances.
  1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/exec.c b/exec.c
-index 6c923f2..9f10868 100644
+index bb221cf..e71a82d 100644
 --- a/exec.c
 +++ b/exec.c
 @@ -2831,10 +2831,12 @@ static void *file_ram_alloc(RAMBlock *block,
@@ -29,6 +29,3 @@ index 6c923f2..9f10868 100644
  
      if (asprintf(&filename, "%s/qemu_back_mem.XXXXXX", path) == -1) {
          return NULL;
--- 
-1.6.0.2
-

0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch

@@ -1,4 +1,4 @@
-From 872ebeaa24ed1c4b0c1596a7ad37f2bf2275efb0 Mon Sep 17 00:00:00 2001
+From 9a72708a58d7bcbc1ba036a44cea920a238b0312 Mon Sep 17 00:00:00 2001
 From: Fabio Erculiani <lxnay@sabayon.org>
 Date: Tue, 3 Jan 2012 09:38:34 +0000
 Subject: [PATCH] linux-user: improve fake /proc/self/stat making `ps` not segfault.
@@ -49,6 +49,3 @@ index 9ba51bf..3e8e3dd 100644
        len = strlen(buf);
        if (write(fd, buf, len) != len) {
            return -1;
--- 
-1.6.0.2
-

0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch

@@ -1,4 +1,4 @@
-From 7dc45b21c5ef8a9445463f8d3754e502621192a7 Mon Sep 17 00:00:00 2001
+From e8171f6d129e129fe632721ab603f800385b0609 Mon Sep 17 00:00:00 2001
 From: Fabio Erculiani <lxnay@sabayon.org>
 Date: Tue, 3 Jan 2012 09:38:35 +0000
 Subject: [PATCH] linux-user: target_argv is placed on ts->bprm->argv and can't be freed()
@@ -32,6 +32,3 @@ index 3ffee40..6a5dfde 100644
      for (wrk = target_environ; *wrk; wrk++) {
          free(*wrk);
      }
--- 
-1.6.0.2
-

0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch

@@ -1,4 +1,4 @@
-From 0d04677df6aabf7404c7bbe454d7be973a773bb0 Mon Sep 17 00:00:00 2001
+From f0fd80de8f15efc091751f2e9bf4c2276ba058b3 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jan 2012 16:25:27 +0100
 Subject: [PATCH] PPC: KVM: Ignore SET_ONE_REG failures
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
-index 429349f..a03e99c 100644
+index 0410901..6c6278a 100644
 --- a/target-ppc/kvm.c
 +++ b/target-ppc/kvm.c
 @@ -759,7 +759,10 @@ void kvmppc_set_papr(CPUState *env)
@@ -28,6 +28,3 @@ index 429349f..a03e99c 100644
      }
  
      /* Set SDR1 so kernel space finds the HTAB */
--- 
-1.6.0.2
-

0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch

@@ -1,4 +1,4 @@
-From 9ef61f2a197f9dbae104fc1d18634c29d91b4a4e Mon Sep 17 00:00:00 2001
+From 351142c287c874f959828c6360cda977306dfa47 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jan 2012 17:03:02 +0100
 Subject: [PATCH] PPC: KVM: Ignore ENABLE_PAPR to support very old HV KVM kernels
@@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
-index a03e99c..923677c 100644
+index 6c6278a..2f39e77 100644
 --- a/target-ppc/kvm.c
 +++ b/target-ppc/kvm.c
 @@ -745,7 +745,7 @@ void kvmppc_set_papr(CPUState *env)
@@ -24,6 +24,3 @@ index a03e99c..923677c 100644
      }
  
      /*
--- 
-1.6.0.2
-

0038-linux-user-fix-segfault-deadlock.patch

@@ -1,4 +1,4 @@
-From 8be1f86952a0239c1d9e89e47bc25831b1804570 Mon Sep 17 00:00:00 2001
+From 1e747ef08ad5f5901e183cfd2151ae2988fb06ea Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 13 Jan 2012 17:05:41 +0100
 Subject: [PATCH] linux-user: fix segfault deadlock
@@ -62,6 +62,3 @@ index abf6885..2826bd1 100644
      /* XXX: locking issue */
      if (is_write && page_unprotect(h2g(address), pc, puc)) {
          return 1;
--- 
-1.6.0.2
-

0039-linux-user-implement-device-mapper-ioctls.patch

@@ -1,4 +1,4 @@
-From df8bec1f09754015f3b43591e1b8e9de70910c9a Mon Sep 17 00:00:00 2001
+From 0f7996403949df0249e833d7e0f250042eed3384 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 31 Jan 2012 18:42:06 +0100
 Subject: [PATCH] linux-user: implement device mapper ioctls
@@ -8,17 +8,17 @@ enabling us to run dmsetup and kpartx inside of linux-user.
 
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
- linux-user/ioctls.h        |   33 +++++++
+ linux-user/ioctls.h        |   32 ++++++
  linux-user/syscall.c       |  226 ++++++++++++++++++++++++++++++++++++++++++++
  linux-user/syscall_defs.h  |   18 ++++
  linux-user/syscall_types.h |   36 +++++++
- 4 files changed, 313 insertions(+), 0 deletions(-)
+ 4 files changed, 312 insertions(+), 0 deletions(-)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 224dbc6..05b7290 100644
+index 224dbc6..8647d64 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
-@@ -350,3 +350,36 @@
+@@ -350,3 +350,35 @@
    IOCTL(VT_SETMODE, IOC_RW, MK_PTR(MK_STRUCT(STRUCT_vt_mode)))
    IOCTL(VT_RELDISP, 0, TYPE_INT)
    IOCTL(VT_DISALLOCATE, 0, TYPE_INT)
@@ -54,7 +54,6 @@ index 224dbc6..05b7290 100644
 +                MK_PTR(MK_STRUCT(STRUCT_dm_ioctl)))
 +  IOCTL_SPECIAL(DM_DEV_SET_GEOMETRY, IOC_RW, do_ioctl_dm,
 +                MK_PTR(MK_STRUCT(STRUCT_dm_ioctl)))
-+
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index 3e8e3dd..7a20af4 100644
 --- a/linux-user/syscall.c
@@ -375,6 +374,3 @@ index 8fde25c..dea520e 100644
  STRUCT(fiemap_extent,
         TYPE_ULONGLONG, /* fe_logical */
         TYPE_ULONGLONG, /* fe_physical */
--- 
-1.6.0.2
-

0040-linux-user-add-struct-old_dev_t-compat.patch

@@ -1,4 +1,4 @@
-From 79df307311156580da72aff94e73ad54c73bc4e7 Mon Sep 17 00:00:00 2001
+From 1c1448c93345613871dac849cfd6786cf4a394ae Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 31 Jan 2012 19:44:41 +0100
 Subject: [PATCH] linux-user: add struct old_dev_t compat
@@ -131,6 +131,3 @@ index 55890f3..ed65121 100644
      case TYPE_ARRAY:
          return thunk_type_align_array(type_ptr + 2, is_host);
      case TYPE_STRUCT:
--- 
-1.6.0.2
-

0041-linux-user-fix-BLK-ioctl-arguments.patch

@@ -1,4 +1,4 @@
-From 8563ceced36263dbc91af9d6941e18626bd9f488 Mon Sep 17 00:00:00 2001
+From e9c0b65bbf4f8df8dcddf619d8473afecac8166c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 31 Jan 2012 20:10:20 +0100
 Subject: [PATCH] linux-user: fix BLK ioctl arguments
@@ -31,6 +31,3 @@ index c8b57c9..21b054c 100644
  #define TARGET_FIBMAP     TARGET_IO(0x00,1)  /* bmap access */
  #define TARGET_FIGETBSZ   TARGET_IO(0x00,2)  /* get the block size used for bmap */
  #define TARGET_FS_IOC_FIEMAP TARGET_IOWR('f',11,struct fiemap)
--- 
-1.6.0.2
-

0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch

@@ -1,4 +1,4 @@
-From 3977eaddfd8aad7fcab30dab3c9bab52bd79bdeb Mon Sep 17 00:00:00 2001
+From 62783a25efd8a6c5e6272950e8fc7f2dd0fd28e5 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 31 Jan 2012 20:11:37 +0100
 Subject: [PATCH] linux-user: add BLKSSZGET ioctl wrapper
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index 05b7290..f938050 100644
+index 8647d64..07463d3 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
 @@ -74,6 +74,7 @@
@@ -22,6 +22,3 @@ index 05b7290..f938050 100644
  #ifdef FIBMAP
       IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
  #endif
--- 
-1.6.0.2
-

0043-linux-user-Add-ioctl-for-BLKBSZGET.patch

@@ -1,4 +1,4 @@
-From 3f2fdae967bb91a2c02020369c0af53c9cafd8b5 Mon Sep 17 00:00:00 2001
+From cd606a848069e4adfbf65f33468ab1471b26d85e Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 02:22:34 +0100
 Subject: [PATCH] linux-user: Add ioctl for BLKBSZGET
@@ -11,7 +11,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
-index f938050..c261063 100644
+index 07463d3..e8c1c69 100644
 --- a/linux-user/ioctls.h
 +++ b/linux-user/ioctls.h
 @@ -75,6 +75,7 @@
@@ -22,6 +22,3 @@ index f938050..c261063 100644
  #ifdef FIBMAP
       IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
  #endif
--- 
-1.6.0.2
-

0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch

@@ -1,4 +1,4 @@
-From 63ad8e6ca106981bc18f2d49cf0bed79a7b2cbfe Mon Sep 17 00:00:00 2001
+From e142d9e8baf58cd6f3ae688db188721d9207f8ca Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 03:14:18 +0100
 Subject: [PATCH] linux-user: take RESERVED_VA into account for g2h_valid()
@@ -29,6 +29,3 @@ index 5f47ab8..ce3e78f 100644
  })
  #endif
  
--- 
-1.6.0.2
-

0045-linux-user-binfmt-support-host-binaries.patch

@@ -1,4 +1,4 @@
-From 20d9c73417a401a79a3c5ae9aa07d635a06e9519 Mon Sep 17 00:00:00 2001
+From 69a6177e055dcb4978a22e78971ff2d047534afa Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
 Subject: [PATCH] linux-user: binfmt: support host binaries
@@ -54,6 +54,3 @@ index cd1f513..87dc4c6 100644
      new_argv = (char **)malloc((argc + 2) * sizeof(*new_argv));
      if (argc > 3) {
          memcpy(&new_argv[4], &argv[3], (argc - 3) * sizeof(*new_argv));
--- 
-1.6.0.2
-

0046-linux-user-fix-fallocate.patch

@@ -1,4 +1,4 @@
-From 3ed04f86397af1b58f67e449df558370d5125e27 Mon Sep 17 00:00:00 2001
+From 0a9d9af253f5ff946b86fc7e9d95f1a2a30a34d7 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Feb 2012 21:37:07 +0100
 Subject: [PATCH] linux-user: fix fallocate
@@ -34,6 +34,3 @@ index 7a20af4..cbd37f6 100644
          break;
  #endif
  #if defined(CONFIG_SYNC_FILE_RANGE)
--- 
-1.6.0.2
-

0047-linux-user-map-at-TARGET_UNMAPPED_BASE-with-reserved.patch

@@ -0,0 +1,41 @@
+From 76d6efef547a23ba6e4e1ed0f1f198b36ae9c7ff Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Sat, 3 Mar 2012 23:14:31 +0100
+Subject: [PATCH] linux-user: map at TARGET_UNMAPPED_BASE with reserved_va
+
+When mmap()'ing memory somewhere where it's not allowed, we should not
+default to the "next free page" which could be right after brk()'ed memory,
+but rather at TARGET_UNMAPPED_BASE, which ensures that brk() can extend its
+space later on.
+
+Reported-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
+Signed-off-by: Alexander Graf <agraf@suse.de>
+
+---
+
+v1 -> v2:
+
+  - use consistent constant naming
+---
+ linux-user/mmap.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/linux-user/mmap.c b/linux-user/mmap.c
+index e4db455..2245f40 100644
+--- a/linux-user/mmap.c
++++ b/linux-user/mmap.c
+@@ -244,7 +244,13 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size)
+         }
+         prot = page_get_flags(addr);
+         if (prot) {
+-            last_addr = addr + qemu_host_page_size;
++            if (addr < TASK_UNMAPPED_BASE) {
++                /* Someone randomly shot into potential brk space,
++                   better remap higher up when already remapping */
++                last_addr = TASK_UNMAPPED_BASE;
++            } else {
++                last_addr = addr + qemu_host_page_size;
++            }
+         }
+     }
+     mmap_next_start = addr;

0048-linux-user-guard-mmap_next_start-from-specific-maps.patch

@@ -0,0 +1,32 @@
+From 48bc21facc19b458cef7e6936da6a012150f0bec Mon Sep 17 00:00:00 2001
+From: Alexander Graf <agraf@suse.de>
+Date: Sun, 4 Mar 2012 00:18:05 +0100
+Subject: [PATCH] linux-user: guard mmap_next_start from specific maps
+
+If the guest process tells us to map at a specific address, we shouldn't
+increase the "last automatic mapping ended here" variable.
+
+This patch brings the reserved_va code in line with the default case.
+
+Signed-off-by: Alexander Graf <agraf@suse.de>
+---
+ linux-user/mmap.c |    6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/linux-user/mmap.c b/linux-user/mmap.c
+index 2245f40..a0c1347 100644
+--- a/linux-user/mmap.c
++++ b/linux-user/mmap.c
+@@ -253,7 +253,11 @@ static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size)
+             }
+         }
+     }
+-    mmap_next_start = addr;
++
++    if (start == mmap_next_start && addr >= TASK_UNMAPPED_BASE) {
++        mmap_next_start = addr;
++    }
++
+     return last_addr;
+ }
+ #endif

qemu.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Mar  3 23:27:14 UTC 2012 - agraf@suse.com
+
+- update update_git.sh for 1.0.1
+- add fixes for reserved_va mmap(NULL) case, fixes git build on arm
+
 -------------------------------------------------------------------
 Tue Feb 28 11:49:55 UTC 2012 - idonmez@suse.com
 

qemu.spec

@@ -16,6 +16,7 @@
 #
 
 
+
 Name:           qemu
 Url:            http://fabrice.bellard.free.fr/qemu/
 Summary:        Universal CPU emulator
@@ -36,7 +37,7 @@ Patch0009:      0009-linux-user-fix-wait-syscall-status-returns.patch
 Patch0010:      0010-Revert-linux-user-fix-wait-syscall-status-returns.patch
 Patch0011:      0011-linux-user-fix-wait-syscall-status-returns.patch
 Patch0012:      0012-XXX-linux-user-fake-proc-self-maps-even-more.patch
-Patch0013:      0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-o.patch
+Patch0013:      0013-XXX-work-around-SA_RESTART-race-with-boehm-gc-ARM-on.patch
 Patch0014:      0014-XXX-move-qemu-binary-lower-in-address-space-so-we-ha.patch
 Patch0015:      0015-linux-user-map-lower-in-address-space.patch
 Patch0016:      0016-XXX-fake-proc-self-maps-also-fclose-real-file.patch
@@ -57,19 +58,21 @@ Patch0030:      0030-linux-user-Ignore-timer_create-syscall.patch
 Patch0031:      0031-linux-user-be-silent-about-capget-failures.patch
 Patch0032:      0032-linux-user-reserve-4GB-of-vmem-for-32-on-64.patch
 Patch0033:      0033-PPC-KVM-Disable-mmu-notifier-check.patch
-Patch0034:      0034-linux-user-improve-fake-proc-self-stat-making-ps.patch
+Patch0034:      0034-linux-user-improve-fake-proc-self-stat-making-ps-not.patch
-Patch0035:      0035-linux-user-target_argv-is-placed-on-ts-bprm-argv.patch
+Patch0035:      0035-linux-user-target_argv-is-placed-on-ts-bprm-argv-and.patch
 Patch0036:      0036-PPC-KVM-Ignore-SET_ONE_REG-failures.patch
-Patch0037:      0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV.patch
+Patch0037:      0037-PPC-KVM-Ignore-ENABLE_PAPR-to-support-very-old-HV-KV.patch
 Patch0038:      0038-linux-user-fix-segfault-deadlock.patch
 Patch0039:      0039-linux-user-implement-device-mapper-ioctls.patch
 Patch0040:      0040-linux-user-add-struct-old_dev_t-compat.patch
 Patch0041:      0041-linux-user-fix-BLK-ioctl-arguments.patch
 Patch0042:      0042-linux-user-add-BLKSSZGET-ioctl-wrapper.patch
 Patch0043:      0043-linux-user-Add-ioctl-for-BLKBSZGET.patch
-Patch0044:      0044-linux-user-take-RESERVED_VA-into-account-for-g2h_va.patch
+Patch0044:      0044-linux-user-take-RESERVED_VA-into-account-for-g2h_val.patch
 Patch0045:      0045-linux-user-binfmt-support-host-binaries.patch
 Patch0046:      0046-linux-user-fix-fallocate.patch
+Patch0047:      0047-linux-user-map-at-TARGET_UNMAPPED_BASE-with-reserved.patch
+Patch0048:      0048-linux-user-guard-mmap_next_start-from-specific-maps.patch
 # this is to make lint happy
 Source300:      rpmlintrc
 Source400:      update_git.sh
@@ -183,24 +186,26 @@ run cross architectures builds
 %patch0044 -p1
 %patch0045 -p1
 %patch0046 -p1
+%patch0047 -p1
+%patch0048 -p1
 
 %build
 # build QEMU
 mkdir -p dynamic
 # build qemu-system
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
---interp-prefix=%_datadir/%name/qemu-i386 \
+	--interp-prefix=%_datadir/%name/qemu-i386 \
---audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
+	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
---audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
+	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
---extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
+	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
---enable-spice
+	--enable-spice
 %else
---disable-spice
+	--disable-spice
 %endif
 %else
---disable-spice
+	--disable-spice
 %endif
 # curl test fails for no reason in build system
 echo "CONFIG_CURL=y" >> config-host.mak
@@ -212,11 +217,11 @@ mv */qemu */qemu-* qemu-io dynamic || true
 make clean
 # build userland emus
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
---interp-prefix=%_datadir/%name/qemu-i386 \
+	--interp-prefix=%_datadir/%name/qemu-i386 \
---enable-linux-user \
+	--enable-linux-user \
---disable-system \
+	--disable-system \
---static --disable-linux-aio \
+	--static --disable-linux-aio \
---extra-cflags="$QEMU_OPT_FLAGS"
+	--extra-cflags="$QEMU_OPT_FLAGS"
 make %{?jobs:-j%jobs} V=1
 
 %install

qemu.spec.in

@@ -47,8 +47,8 @@ BuildRequires:  zlib-devel-static
 BuildRequires:  zlib-devel
 %endif
 %if 0%{?suse_version} >= 1210
-BuildRequires:  libattr-devel-static
 BuildRequires:  glibc-devel-static
+BuildRequires:  libattr-devel-static
 BuildRequires:  libfdt1-devel
 %endif
 %if 0%{?suse_version} >= 1140
@@ -60,10 +60,10 @@ BuildRequires:  libspice-server-devel
 BuildRequires:  spice-protocol-devel
 %endif
 %endif
-BuildRequires:  libvdeplug3-devel
-BuildRequires:  glib2-devel
-BuildRequires:  python
 BuildRequires:  fdupes
+BuildRequires:  glib2-devel
+BuildRequires:  libvdeplug3-devel
+BuildRequires:  python
 Requires:       timezone
 Requires:       virt-utils
 
@@ -75,8 +75,8 @@ system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
 as PC and PowerMac systems.
 
 %package linux-user
-Group:          System/Emulators/PC
 Summary:        Universal CPU emulator -- Linux User binaries
+Group:          System/Emulators/PC
 Provides:       qemu:%_bindir/qemu-arm
 
 %description linux-user
@@ -98,19 +98,19 @@ PATCH_EXEC
 # build QEMU
 mkdir -p dynamic
 # build qemu-system
-./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\
+./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
-	--interp-prefix=%_datadir/%name/qemu-i386 \\
+	--interp-prefix=%_datadir/%name/qemu-i386 \
-	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \\
+	--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus" \
-        --audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \\
+	--audio-drv-list="alsa sdl" --enable-mixemu --enable-vde \
-	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \\
+	--extra-cflags="$QEMU_OPT_FLAGS" --enable-system --disable-linux-user \
 %if 0%{?suse_version} >= 1130
 %ifarch %ix86 x86_64
-        --enable-spice
+	--enable-spice
 %else
-        --disable-spice
+	--disable-spice
 %endif
 %else
-        --disable-spice
+	--disable-spice
 %endif
 # curl test fails for no reason in build system
 echo "CONFIG_CURL=y" >> config-host.mak
@@ -121,11 +121,11 @@ make qemu-img V=1
 mv */qemu */qemu-* qemu-io dynamic || true
 make clean
 # build userland emus
-./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \\
+./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \
-	--interp-prefix=%_datadir/%name/qemu-i386 \\
+	--interp-prefix=%_datadir/%name/qemu-i386 \
-	--enable-linux-user \\
+	--enable-linux-user \
-	--disable-system \\
+	--disable-system \
-	--static --disable-linux-aio \\
+	--static --disable-linux-aio \
 	--extra-cflags="$QEMU_OPT_FLAGS"
 make %{?jobs:-j%jobs} V=1
 

update_git.sh

@@ -13,7 +13,7 @@
 GIT_TREE=git://repo.or.cz/qemu/agraf.git
 GIT_LOCAL_TREE=/suse/agraf/git/qemu
 GIT_BRANCH=suse-1.0
-GIT_UPSTREAM_TAG=v1.0
+GIT_UPSTREAM_TAG=v1.0.1
 
 # clean up
 if [ -e 0001-* ]; then
@@ -29,16 +29,16 @@ else
 fi
 cd qemu-tmp
 git checkout $GIT_BRANCH 
-git format-patch $GIT_UPSTREAM_TAG -o ..
+git format-patch -N --no-signature $GIT_UPSTREAM_TAG -o ..
 cd ..
 rm -rf qemu-tmp
 
 # we have all patches as files now - generate the spec file!
-while read line; do
+while IFS= read -r line; do
     if [ "$line" = "PATCH_FILES" ]; then
         for i in 0*; do
             NUM=${i%%-*}
-            echo -e "Patch$NUM:\t$i"
+            echo -e "Patch$NUM:      $i"
         done
     elif [ "$line" = "PATCH_EXEC" ]; then
         for i in 0*; do