| commit | 5db1fcbb4107e90b0ce9dcd5424b367e8110686c | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 15:26:50 +0000 (21 18:26 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 15:26:50 +0000 (21 18:26 +0300) | ||
| tree | 89ad017d9dbe21df5a29c019adea325dd7fbf02a | treesnapshot (tar.gz zip) |
| parent | 303d1f34a55d36c60f1042a868638b19ae3d89f0 | commitdiff |
| parent | 0e26b7b892e1369d66da63b748acbfb6b3819a59 | commitdiff |
Merge commit '0e26b7b892e1369d66da63b748acbfb6b3819a59' into upstream-merge
* commit '0e26b7b892e1369d66da63b748acbfb6b3819a59':
apic: avoid using CPUState internals
Conflicts:
hw/apic.h
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '0e26b7b892e1369d66da63b748acbfb6b3819a59':
apic: avoid using CPUState internals
Conflicts:
hw/apic.h
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/apic.c | diff1 | diff2 | blobhistory |
| hw/apic.h | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| target-i386/cpu.h | diff1 | diff2 | blobhistory |
| target-i386/cpuid.c | diff1 | diff2 | blobhistory |