|
 |
218e99 |
From 4cdc106eb2e23157acc594b8318a96803df408d0 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Date: Wed, 18 Sep 2013 09:31:02 +0200
|
|
|
218e99 |
Subject: [PATCH 18/29] exec: Fix Xen RAM allocation with unusual options
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Message-id: <1379496669-22778-2-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54420
|
|
|
218e99 |
O-Subject: [PATCH 7.0 qemu-kvm 1/8] exec: Fix Xen RAM allocation with unusual options
|
|
|
218e99 |
Bugzilla: 1009328
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Issues:
|
|
|
218e99 |
|
|
|
218e99 |
* We try to obey -mem-path even though it can't work with Xen.
|
|
|
218e99 |
|
|
|
218e99 |
* To implement -machine mem-merge, we call
|
|
|
218e99 |
memory_try_enable_merging(new_block->host, size). But with Xen,
|
|
|
218e99 |
new_block->host remains null. Oops.
|
|
|
218e99 |
|
|
|
218e99 |
Fix by separating Xen allocation from normal allocation.
|
|
|
218e99 |
|
|
|
218e99 |
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Message-id: 1375276272-15988-2-git-send-email-armbru@redhat.com
|
|
|
218e99 |
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
|
|
|
218e99 |
(cherry picked from commit dfeaf2abc73429171ecc5b0b26ac4e5a24c047fc)
|
|
|
218e99 |
---
|
|
|
218e99 |
exec.c | 20 ++++++++++++--------
|
|
|
218e99 |
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
exec.c | 20 ++++++++++++--------
|
|
|
218e99 |
1 files changed, 12 insertions(+), 8 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/exec.c b/exec.c
|
|
|
218e99 |
index ee22b9b..914d066 100644
|
|
|
218e99 |
--- a/exec.c
|
|
|
218e99 |
+++ b/exec.c
|
|
|
218e99 |
@@ -1053,6 +1053,12 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
|
|
|
218e99 |
if (host) {
|
|
|
218e99 |
new_block->host = host;
|
|
|
218e99 |
new_block->flags |= RAM_PREALLOC_MASK;
|
|
|
218e99 |
+ } else if (xen_enabled()) {
|
|
|
218e99 |
+ if (mem_path) {
|
|
|
218e99 |
+ fprintf(stderr, "-mem-path not supported with Xen\n");
|
|
|
218e99 |
+ exit(1);
|
|
|
218e99 |
+ }
|
|
|
218e99 |
+ xen_ram_alloc(new_block->offset, size, mr);
|
|
|
218e99 |
} else {
|
|
|
218e99 |
if (mem_path) {
|
|
|
218e99 |
#if defined (__linux__) && !defined(TARGET_S390X)
|
|
|
218e99 |
@@ -1066,9 +1072,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
|
|
|
218e99 |
exit(1);
|
|
|
218e99 |
#endif
|
|
|
218e99 |
} else {
|
|
|
218e99 |
- if (xen_enabled()) {
|
|
|
218e99 |
- xen_ram_alloc(new_block->offset, size, mr);
|
|
|
218e99 |
- } else if (kvm_enabled()) {
|
|
|
218e99 |
+ if (kvm_enabled()) {
|
|
|
218e99 |
/* some s390/kvm configurations have special constraints */
|
|
|
218e99 |
new_block->host = kvm_ram_alloc(size);
|
|
|
218e99 |
} else {
|
|
|
218e99 |
@@ -1146,6 +1150,8 @@ void qemu_ram_free(ram_addr_t addr)
|
|
|
218e99 |
ram_list.version++;
|
|
|
218e99 |
if (block->flags & RAM_PREALLOC_MASK) {
|
|
|
218e99 |
;
|
|
|
218e99 |
+ } else if (xen_enabled()) {
|
|
|
218e99 |
+ xen_invalidate_map_cache_entry(block->host);
|
|
|
218e99 |
} else if (mem_path) {
|
|
|
218e99 |
#if defined (__linux__) && !defined(TARGET_S390X)
|
|
|
218e99 |
if (block->fd) {
|
|
|
218e99 |
@@ -1158,11 +1164,7 @@ void qemu_ram_free(ram_addr_t addr)
|
|
|
218e99 |
abort();
|
|
|
218e99 |
#endif
|
|
|
218e99 |
} else {
|
|
|
218e99 |
- if (xen_enabled()) {
|
|
|
218e99 |
- xen_invalidate_map_cache_entry(block->host);
|
|
|
218e99 |
- } else {
|
|
|
218e99 |
- qemu_anon_ram_free(block->host, block->length);
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ qemu_anon_ram_free(block->host, block->length);
|
|
|
218e99 |
}
|
|
|
218e99 |
g_free(block);
|
|
|
218e99 |
break;
|
|
|
218e99 |
@@ -1186,6 +1188,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
|
|
|
218e99 |
vaddr = block->host + offset;
|
|
|
218e99 |
if (block->flags & RAM_PREALLOC_MASK) {
|
|
|
218e99 |
;
|
|
|
218e99 |
+ } else if (xen_enabled()) {
|
|
|
218e99 |
+ abort();
|
|
|
218e99 |
} else {
|
|
|
218e99 |
flags = MAP_FIXED;
|
|
|
218e99 |
munmap(vaddr, length);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|