summaryrefslogtreecommitdiff
path: root/include/hw
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2014-07-11 03:24:39 +0200
committerAlexander Graf <agraf@suse.de>2014-09-08 12:50:47 +0200
commit261265cc912b375649fcdf7aded0f87359dba544 (patch)
tree3b92fe4e08e7984bcc566c4c6cde696b67484904 /include/hw
parentef9514431d33e52eb611f799670ca86618c1b7d9 (diff)
downloadqemu-261265cc912b375649fcdf7aded0f87359dba544.tar.gz
qemu-261265cc912b375649fcdf7aded0f87359dba544.tar.bz2
qemu-261265cc912b375649fcdf7aded0f87359dba544.zip
PPC: mac99: Move NVRAM to page boundary when necessary
When running KVM we have to adhere to host page boundaries for memory slots. Unfortunately the NVRAM on mac99 is a 4k RAM hole inside of an MMIO flash area. So if our host is configured with 64k page size, we can't use the mac99 target with KVM. This is a real shame, as this limitation is not really an issue - we can easily map NVRAM somewhere else and at least Linux and Mac OS X use it at their new location. So in that emergency case when it's about failing to run at all and moving NVRAM to a place it shouldn't be at, choose the latter. This patch enables -M mac99 with KVM on 64k page size hosts. Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'include/hw')
-rw-r--r--include/hw/ppc/ppc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h
index 7e16e2e06c..14efd0ca31 100644
--- a/include/hw/ppc/ppc.h
+++ b/include/hw/ppc/ppc.h
@@ -92,7 +92,7 @@ enum {
#define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05)
#define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06)
#define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)
-/* OpenBIOS has FW_CFG_PPC_NVRAM_ADDR as +0x08 */
+#define FW_CFG_PPC_NVRAM_ADDR (FW_CFG_ARCH_LOCAL + 0x08)
#define FW_CFG_PPC_BUSFREQ (FW_CFG_ARCH_LOCAL + 0x09)
#define PPC_SERIAL_MM_BAUDBASE 399193