From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 25 Jul 2013 20:56:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
X-Git-Tag: v1.6.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=874ec3c5b3821bb964f9f37b2f930f2a9ce51652;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

* riku/linux-user-for-upstream: (21 commits)
  linux-user: Handle compressed ISA encodings when processing MIPS exceptions
  linux-user: Unlock mmap_lock when resuming guest from page_unprotect
  linux-user: Reset copied CPUs in cpu_copy() always
  linux-user: Fix epoll on ARM hosts
  linux-user: fix segmentation fault passing with h2g(x) != x
  linux-user: Fix pipe syscall return for SPARC
  linux-user: Fix target_stat and target_stat64 for OpenRISC
  linux-user: Avoid conditional cpu_reset()
  configure: Make NPTL non-optional
  linux-user: Enable NPTL for x86-64
  linux-user: Add i386 TLS setter
  linux-user: Clean up handling of clone() argument order
  linux-user: Add missing 'break' in i386 get_thread_area syscall
  linux-user: Enable NPTL for m68k
  linux-user: Enable NPTL for SPARC targets
  linux-user: Enable NPTL for OpenRISC
  linux-user: Move includes of target-specific headers to end of qemu.h
  configure: Enable threading for unicore32-linux-user
  configure: Enable threading on all ppc and mips linux-user targets
  configure: Don't say target_nptl="no" if there is no linux-user target
  ...

Conflicts:
	linux-user/main.c

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

874ec3c5b3821bb964f9f37b2f930f2a9ce51652
diff --cc configure
index 877a8213f38,9d9088ebd61..3d83e168bc3
--- a/configure
+++ b/configure
@@@ -1100,11 -1090,7 +1095,9 @@@ echo "  --enable-bluez           enabl
  echo "  --disable-slirp          disable SLIRP userspace network connectivity"
  echo "  --disable-kvm            disable KVM acceleration support"
  echo "  --enable-kvm             enable KVM acceleration support"
 +echo "  --disable-rdma           disable RDMA-based migration support"
 +echo "  --enable-rdma            enable RDMA-based migration support"
  echo "  --enable-tcg-interpreter enable TCG with bytecode interpreter (TCI)"
- echo "  --disable-nptl           disable usermode NPTL support"
- echo "  --enable-nptl            enable usermode NPTL support"
  echo "  --enable-system          enable all system emulation targets"
  echo "  --disable-system         disable all system emulation targets"
  echo "  --enable-user            enable supported user emulation targets"
diff --cc linux-user/main.c
index f6a3aad9e5a,441e31dc011..5dc09471e4f
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@@ -3639,12 -3634,9 +3636,10 @@@ int main(int argc, char **argv, char **
          fprintf(stderr, "Unable to find CPU definition\n");
          exit(1);
      }
 +    cpu = ENV_GET_CPU(env);
- #if defined(TARGET_SPARC) || defined(TARGET_PPC)
-     cpu_reset(cpu);
- #endif
+     cpu_reset(ENV_GET_CPU(env));
  
 -    thread_cpu = ENV_GET_CPU(env);
 +    thread_cpu = cpu;
  
      if (getenv("QEMU_STRACE")) {
          do_strace = 1;