diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2011-08-03 21:02:19 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2011-10-06 09:48:03 +0200 |
| commit | f73a2575a3bce8a3c487331c918d2c0f9b2e489d (patch) | |
| tree | 0c999928e4a3dd0088f5cc2bef0a1d982ad747c3 /hw/spapr.c | |
| parent | 9dfef5aae422d479d8e561889da05cf31d850d5c (diff) | |
pseries: More complete WIMG validation in H_ENTER code
Currently our implementation of the H_ENTER hypercall, which inserts a
mapping in the hash page table assumes that only ordinary memory is ever
mapped, and only permits mapping attribute bits accordingly (WIMG==0010).
However, we intend to start adding emulated IO to the pseries platform
(and real IO with PCI passthrough on kvm) which means this simple test
will no longer suffice.
This patch extends the h_enter validation code to check if the given
address is a RAM address. If it is it enforces WIMG==0010, otherwise
it assumes that it is an IO mapping and instead enforces WIMG=010x.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/spapr.c')
| -rw-r--r-- | hw/spapr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/spapr.c b/hw/spapr.c index 9eefef9015..00aed62272 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -336,7 +336,8 @@ static void ppc_spapr_init(ram_addr_t ram_size, } /* allocate RAM */ - ram_offset = qemu_ram_alloc(NULL, "ppc_spapr.ram", ram_size); + spapr->ram_limit = ram_size; + ram_offset = qemu_ram_alloc(NULL, "ppc_spapr.ram", spapr->ram_limit); cpu_register_physical_memory(0, ram_size, ram_offset); /* allocate hash page table. For now we always make this 16mb, |