]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'afaerber-or/qom-cpu-4' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 18:56:39 +0000 (13:56 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 3 Aug 2012 18:56:39 +0000 (13:56 -0500)
* afaerber-or/qom-cpu-4:
  cpu: Move thread_kicked to CPUState
  cpu: Move thread field into CPUState
  cpu: Move CPU_COMMON_THREAD into CPUState
  qemu-thread: Let qemu_thread_is_self() return bool


Trivial merge