| commit | f7bc58c14fa07bcadc555629a431d34b8ab7802d | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:16:35 +0000 (30 13:16 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 10:16:35 +0000 (30 13:16 +0300) | ||
| tree | 65e70d9d8f5e48d8e84cc5a6d3fb7cf66dd8d3d9 | treesnapshot (tar.gz zip) |
| parent | 6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb | commitdiff |
| parent | 253d0942fac33c5c15c9a7f8657f55f125dc5816 | commitdiff |
Merge commit '253d0942fac33c5c15c9a7f8657f55f125dc5816' into upstream-merge
* commit '253d0942fac33c5c15c9a7f8657f55f125dc5816':
Multiboot build system v4
Multiboot support v5
Expose fw_cfg v2
Change bochs bios init order
preserve the hypervisor bit while KVM trims the CPUID bits
Conflicts:
Makefile
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '253d0942fac33c5c15c9a7f8657f55f125dc5816':
Multiboot build system v4
Multiboot support v5
Expose fw_cfg v2
Change bochs bios init order
preserve the hypervisor bit while KVM trims the CPUID bits
Conflicts:
Makefile
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| target-i386/kvm.c | diff1 | diff2 | blobhistory |