| commit | 2d24961d3bba8ac38c38af27816f462d5deb2d51 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 13 Feb 2011 14:48:24 +0000 (13 16:48 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 13 Feb 2011 14:48:24 +0000 (13 16:48 +0200) | ||
| tree | d9e5c7021d032b31d62bd78f5076a5f24ae89848 | treesnapshot (tar.gz zip) |
| parent | 53d6be977096cbeb9f3941437e1c36a6d47b3ed3 | commitdiff |
| parent | 5dce499948e4a4abe62f010baf4a7ed3d49e53cb | commitdiff |
Merge commit '5dce499948e4a4abe62f010baf4a7ed3d49e53cb' into upstream-merge
* commit '5dce499948e4a4abe62f010baf4a7ed3d49e53cb':
ioapic: Add support for qemu-kvm's vmstate v2
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '5dce499948e4a4abe62f010baf4a7ed3d49e53cb':
ioapic: Add support for qemu-kvm's vmstate v2
Conflicts:
hw/ioapic.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/ioapic.c | diff1 | diff2 | blobhistory |