From: Anthony Liguori <aliguori@amazon.com>
Date: Thu, 10 Oct 2013 20:16:25 +0000 (-0700)
Subject: Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~426
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=39c153b80f890dc5f02465dc59992e195abd5f40;p=qemu-xen.git

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging

QOM CPUState refactorings / X86CPU

* Fix for X86CPU model field of qemu32/qemu64 CPU models
* Bug fix for longjmp on FreeBSD
* Removal of unused function
* Confinement of clone syscall infrastructure to linux-user

# gpg: Signature made Wed 09 Oct 2013 03:40:51 AM PDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber (2) and others
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  cpu: Drop cpu_model_str from CPU_COMMON
  cpu: Move cpu_copy() into linux-user
  cputlb: Remove dead function tlb_update_dirty()
  cpu-exec: Also reload CPUClass *cc after longjmp return in cpu_exec()
  target-i386: Set model=6 on qemu64 & qemu32 CPU models
---

39c153b80f890dc5f02465dc59992e195abd5f40