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
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
Subject: xenpaging: Open paging file only if xenpaging_init() succeeds
|
|
|
|
Open paging file only if xenpaging_init() succeeds. It can fail if the host
|
|
does not support the required virtualization features such as EPT or if
|
|
xenpaging was already started for this domain_id.
|
|
|
|
(xen-unstable changeset: 22435:7818ea9045fd)
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
|
Already-Acked-by: Patrick Colp <pjcolp@cs.ubc.ca>
|
|
Already-Acked-by: Keir Fraser <keir.fraser@citrix.com>
|
|
|
|
---
|
|
tools/xenpaging/xenpaging.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
|
|
@@ -495,15 +495,6 @@ int main(int argc, char *argv[])
|
|
|
|
victims = calloc(num_pages, sizeof(xenpaging_victim_t));
|
|
|
|
- /* Open file */
|
|
- sprintf(filename, "page_cache_%d", domain_id);
|
|
- fd = open(filename, open_flags, open_mode);
|
|
- if ( fd < 0 )
|
|
- {
|
|
- perror("failed to open file");
|
|
- return -1;
|
|
- }
|
|
-
|
|
/* Seed random-number generator */
|
|
srand(time(NULL));
|
|
|
|
@@ -515,6 +506,15 @@ int main(int argc, char *argv[])
|
|
goto out;
|
|
}
|
|
|
|
+ /* Open file */
|
|
+ sprintf(filename, "page_cache_%d", domain_id);
|
|
+ fd = open(filename, open_flags, open_mode);
|
|
+ if ( fd < 0 )
|
|
+ {
|
|
+ perror("failed to open file");
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
/* Evict pages */
|
|
memset(victims, 0, sizeof(xenpaging_victim_t) * num_pages);
|
|
for ( i = 0; i < num_pages; i++ )
|