9a05aa7fc4
22707-x2apic-preenabled-check.patch - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" 7434-qemu-rlimit-as.patch - Additional or upstream patches from Jan 22693-fam10-mmio-conf-base-protect.patch 22694-x86_64-no-weak.patch 22708-xenctx-misc.patch 21432-4.0-cpu-boot-failure.patch 22645-amd-flush-filter.patch qemu-fix-7433.patch - Maintain compatibility with the extid flag even though it is deprecated for both legacy and sxp config files. hv_extid_compatibility.patch - bnc#649209-improve suspend eventchn lock suspend_evtchn_lock.patch - Removed the hyper-v shim patches in favor of using the upstream version. - bnc#641419 - L3: Xen: qemu-dm reports "xc_map_foreign_batch: mmap failed: Cannot allocate memory" qemu-rlimit-as.patch - Upstream c/s 7433 to replace qemu_altgr_more.patch 7433-qemu-altgr.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=90
57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
Subject: xenpaging: Fix-up xenpaging tool code.
|
|
|
|
This isn't directly related to EPT checking, but does some general fix-ups
|
|
to the xenpaging code (adds some extra frees, etc.)
|
|
|
|
(xen-unstable changeset: 21890:3263d0ff9476)
|
|
|
|
Already-Signed-off-by: Patrick Colp <pjcolp@cs.ubc.ca>
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 22 ++++++++++++++++++----
|
|
1 file changed, 18 insertions(+), 4 deletions(-)
|
|
|
|
--- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
|
|
@@ -100,7 +100,7 @@ xenpaging_t *xenpaging_init(domid_t doma
|
|
paging->mem_event.ring_page = init_page();
|
|
if ( paging->mem_event.ring_page == NULL )
|
|
{
|
|
- ERROR("Error initialising shared page");
|
|
+ ERROR("Error initialising ring page");
|
|
goto err;
|
|
}
|
|
|
|
@@ -198,13 +198,27 @@ xenpaging_t *xenpaging_init(domid_t doma
|
|
return paging;
|
|
|
|
err:
|
|
- if ( paging->bitmap )
|
|
+ if ( paging )
|
|
+ {
|
|
+ if ( paging->mem_event.shared_page )
|
|
+ {
|
|
+ munlock(paging->mem_event.shared_page, PAGE_SIZE);
|
|
+ free(paging->mem_event.shared_page);
|
|
+ }
|
|
+
|
|
+ if ( paging->mem_event.ring_page )
|
|
+ {
|
|
+ munlock(paging->mem_event.ring_page, PAGE_SIZE);
|
|
+ free(paging->mem_event.ring_page);
|
|
+ }
|
|
+
|
|
free(paging->bitmap);
|
|
- if ( paging->platform_info )
|
|
free(paging->platform_info);
|
|
- if ( paging )
|
|
+ free(paging->domain_info);
|
|
free(paging);
|
|
+ }
|
|
|
|
+ err_iface:
|
|
return NULL;
|
|
}
|
|
|