| commit | 72086da44c928b24220e30b7be60181015f13291 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 11:46:56 +0000 (26 14:46 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 26 May 2010 11:46:56 +0000 (26 14:46 +0300) | ||
| tree | 5a5acd998b477fe74959c141ba28b1c30ac08397 | treesnapshot (tar.gz zip) |
| parent | 030e7ee312548f465d9906488ea482cecba7e2d0 | commitdiff |
| parent | fe270d044d512a308fb1fdf02cb11db46df29cdb | commitdiff |
Merge commit 'fe270d044d512a308fb1fdf02cb11db46df29cdb' into upstream-merge
* commit 'fe270d044d512a308fb1fdf02cb11db46df29cdb':
target-s390: add firmware code
PPC/KVM: make iothread work
fix chardev_init for win32
qemu-sockets: avoid strlen of NULL pointer
linux-user: rlimit conversion between host and target.
Conflicts:
Makefile
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'fe270d044d512a308fb1fdf02cb11db46df29cdb':
target-s390: add firmware code
PPC/KVM: make iothread work
fix chardev_init for win32
qemu-sockets: avoid strlen of NULL pointer
linux-user: rlimit conversion between host and target.
Conflicts:
Makefile
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |