diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-10-25 15:31:08 +0200 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-10-25 15:31:08 +0200 |
| commit | b00d54d3d54adfb9fab309301e0019e703feb0a2 (patch) | |
| tree | 642f8180bd5e55e24aa75f23aaba2ae2657547fa | |
| parent | 43ae74cf38cdfe477a9ca2d915d5255026162af6 (diff) | |
| download | xen-b00d54d3d54adfb9fab309301e0019e703feb0a2.tar.gz xen-b00d54d3d54adfb9fab309301e0019e703feb0a2.tar.bz2 xen-b00d54d3d54adfb9fab309301e0019e703feb0a2.zip | |
hvm: handle PoD and grant pages in HVMOP_get_mem_type
During kexec in a ballooned PVonHVM guest the new kernel needs to check
each pfn if its backed by a mfn to find ballooned pages. Currently all
PoD and grant pages will appear as HVMMEM_mmio_dm, so the new kernel has
to assume they are ballooned. This is wrong: PoD pages may turn into
real RAM at runtime, grant pages are also RAM.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Tim Deegan <tim@xen.org>
xen-unstable changeset: 26093:4ae08ca5500f
xen-unstable date: Fri Oct 19 16:09:05 2012 +0200
| -rw-r--r-- | xen/arch/x86/hvm/hvm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8b269aca06..0e9e520f61 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4071,6 +4071,10 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE(void) arg) a.mem_type = HVMMEM_ram_ro; else if ( p2m_is_ram(t) ) a.mem_type = HVMMEM_ram_rw; + else if ( p2m_is_magic(t) ) + a.mem_type = HVMMEM_ram_rw; + else if ( p2m_is_grant(t) ) + a.mem_type = HVMMEM_ram_rw; else a.mem_type = HVMMEM_mmio_dm; rc = copy_to_guest(arg, &a, 1) ? -EFAULT : 0; |