pool/qemu
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=95
This commit is contained in:
Alexander Graf 2012-07-11 22:13:33 +00:00 committed by Git OBS Bridge
parent d7b4ab59b0
commit dfedebd666
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0028-XXX-merge-with-segmentation-fault-p.patch
View File

@ -1,25 +1,17 @@
From 62ae064e6bb8028b2d3f91b8c2e9b44a84d5f3cd Mon Sep 17 00:00:00 2001 From a81c9410cc3538dfeb22484d1daa95e6a5bb1e79 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de> From: Alexander Graf <agraf@suse.de>
Date: Wed, 11 Jul 2012 23:15:47 +0200 Date: Wed, 11 Jul 2012 23:15:47 +0200
Subject: [PATCH] XXX merge with segmentation fault passing patch Subject: [PATCH] XXX merge with segmentation fault passing patch
--- ---
user-exec.c | 30 +++++++++++++++++------------- user-exec.c | 32 +++++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-) 1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/user-exec.c b/user-exec.c diff --git a/user-exec.c b/user-exec.c
index 83d2d44..3710c08 100644 index 83d2d44..cc57bde 100644
--- a/user-exec.c --- a/user-exec.c
+++ b/user-exec.c +++ b/user-exec.c
@@ -97,24 +97,28 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address, @@ -100,21 +100,27 @@ static inline int handle_cpu_signal(uintptr_t pc, unsigned long address,
pc, address, is_write, *(unsigned long *)old_set);
#endif
+ if (RESERVED_VA) {
+ /* Convert to guest address space */
+ address = address - GUEST_BASE;
+ }
+
/* Maybe we're still holding the TB fiddling lock? */ /* Maybe we're still holding the TB fiddling lock? */
spin_unlock_safe(&tb_lock); spin_unlock_safe(&tb_lock);
@ -29,7 +21,8 @@ index 83d2d44..3710c08 100644
- return 1; - return 1;
- } - }
+ /* XXX: locking issue */ + /* XXX: locking issue */
+ if (is_write && page_unprotect(address, pc, puc)) { + if (h2g_valid(address) && is_write &&
+ page_unprotect(h2g(address), pc, puc)) {
+ return 1; + return 1;
+ } + }
@ -41,11 +34,17 @@ index 83d2d44..3710c08 100644
- if (ret == 0) { - if (ret == 0) {
- return 1; /* the MMU fault was handled without causing real CPU fault */ - return 1; /* the MMU fault was handled without causing real CPU fault */
- } - }
+ if (RESERVED_VA) {
+ /* Convert forcefully to guest address space, invalid addresses
+ are still valid segv ones */
+ address = address - GUEST_BASE;
}
+
+ /* see if it is an MMU fault */ + /* see if it is an MMU fault */
+ ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX); + ret = cpu_handle_mmu_fault(env, address, is_write, MMU_USER_IDX);
+ if (ret < 0) { + if (ret < 0) {
+ return 0; /* not an MMU fault */ + return 0; /* not an MMU fault */
} + }
+ if (ret == 0) { + if (ret == 0) {
+ return 1; /* the MMU fault was handled without causing real CPU fault */ + return 1; /* the MMU fault was handled without causing real CPU fault */
+ } + }