]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28b9d47 594278d)
Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Mon, 30 Sep 2013 22:14:10 +0000 (17:14 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Mon, 30 Sep 2013 22:14:10 +0000 (17:14 -0500)
commit3469a60d9f6f7ba6fca3fe0788391f7285ead631
tree460bb059eb31a09f6610e7ea3db8685a36953d44tree
parent28b9d47db61a96d2630c7ffa6cbfdcdd1536f7cbcommit | diff
parent594278d9f251222675f1c24f5fbb1b05560b8711commit | diff
Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging

# By Anthony PERARD (2) and Liu, Jinsong (2)
# Via Stefano Stabellini
* sstabellini/xen-2013-09-25:
  xen: Enable cpu-hotplug on xenfv machine.
  xen: Fix vcpu initialization.
  qemu: Add qemu xen logic for Xen HVM S3 resume
  qemu: Adjust qemu wakeup

Message-id: alpine.DEB.2.02.1309251749180.5498@kaball.uk.xensource.com
Qemu copy for testing