diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-06-25 18:32:51 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-06-25 18:32:56 +0300 |
| commit | 58a494082013aa2a4c41e486ed17e0be93a90e03 (patch) | |
| tree | e6c2d99bb4fa061c692db70cad54f502d4a13e7b /target-ppc | |
| parent | Merge commit '6243375f9bba12d8871ac611ca8ce947c3e16c67' into upstream-merge (diff) | |
| parent | add sparc64-softmmu to default configure targets list (diff) | |
| download | qemu-kvm-58a494082013aa2a4c41e486ed17e0be93a90e03.tar.gz qemu-kvm-58a494082013aa2a4c41e486ed17e0be93a90e03.tar.bz2 qemu-kvm-58a494082013aa2a4c41e486ed17e0be93a90e03.zip | |
Merge branch 'master' of git://git.sv.gnu.org/qemu into upstream-merge
* 'master' of git://git.sv.gnu.org/qemu:
add sparc64-softmmu to default configure targets list
sparc64 follow pci_nic_init change
microblaze: Support the latest mmu-kernel stat64 ABI.
target-ppc: permit linux-user to read PVR
cris: Remove unused internal flag.
Win32: Reduce section alignment for Windows.
Win: Install keymaps for Windows, too (needed for VNC).
Win32: Fix compilation with SDL.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-ppc')
| -rw-r--r-- | target-ppc/translate_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 87083644f..04225e557 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8903,7 +8903,13 @@ static void init_ppc_proc (CPUPPCState *env, const ppc_def_t *def) /* Register SPR common to all PowerPC implementations */ gen_spr_generic(env); spr_register(env, SPR_PVR, "PVR", - SPR_NOACCESS, SPR_NOACCESS, + /* Linux permits userspace to read PVR */ +#if defined(CONFIG_LINUX_USER) + &spr_read_generic, +#else + SPR_NOACCESS, +#endif + SPR_NOACCESS, &spr_read_generic, SPR_NOACCESS, def->pvr); /* Register SVR if it's defined to anything else than POWERPC_SVR_NONE */ |