| commit | 71e67052824174902f5d1ee999fb6c7a6896b071 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:42:42 +0000 (15 05:42 -0400) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:42:42 +0000 (15 05:42 -0400) | ||
| tree | cb48390a14f6dd46877dec313e91592793aa80be | treesnapshot (tar.gz zip) |
| parent | b8d62707d2b408983c605d8c5f1b3d27d8d694f5 | commitdiff |
| parent | 64e07be544ee9c5fb5b741175262fd34726ec431 | commitdiff |
Merge commit '64e07be544ee9c5fb5b741175262fd34726ec431' into upstream-merge
* commit '64e07be544ee9c5fb5b741175262fd34726ec431':
kvm: ppc: detect old headers
monitor: add PPC BookE SPRs
kvm: ppc: fixes for KVM_SET_SREGS on init
ppc64: Don't try to build sPAPR RTAS on Darwin
Place pseries vty devices at addresses more similar to existing machines
Make pSeries 'model' property more closely resemble real hardware
pseries: Increase maximum CPUs to 256
usb-linux: Add missing break statement
usb-musb: uninline functions
Conflicts:
configure
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '64e07be544ee9c5fb5b741175262fd34726ec431':
kvm: ppc: detect old headers
monitor: add PPC BookE SPRs
kvm: ppc: fixes for KVM_SET_SREGS on init
ppc64: Don't try to build sPAPR RTAS on Darwin
Place pseries vty devices at addresses more similar to existing machines
Make pSeries 'model' property more closely resemble real hardware
pseries: Increase maximum CPUs to 256
usb-linux: Add missing break statement
usb-musb: uninline functions
Conflicts:
configure
Signed-off-by: Avi Kivity <avi@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |
| target-ppc/cpu.h | diff1 | diff2 | blobhistory |