Skip to content

Commit

Permalink
qemu-usermode: remove extra includes from commpage patch.
Browse files Browse the repository at this point in the history
[qemu-usermode] remove extra includes from commpage patch. JB#51953
  • Loading branch information
krnlyng committed Dec 8, 2020
1 parent 5771c2f commit afdd035
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 30 deletions.
@@ -1,4 +1,4 @@
From 0ac39b60e1b500f54cd46c4cc38e7e70b215c8d8 Mon Sep 17 00:00:00 2001
From a5702421f6f9f205fe6ba4e6ce90cef778356d9a Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:47:20 +0200
Subject: [PATCH 01/15] Revert "linux-user: Use safe_syscall for open and
Expand Down
@@ -1,4 +1,4 @@
From 89a2ff52ab649304b05ec90f27ca0e00390272ec Mon Sep 17 00:00:00 2001
From a79fd5a9d642953db93f33af098ad7c3920915cf Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:48:18 +0200
Subject: [PATCH 02/15] Revert "linux-user: Use safe_syscall for execve
Expand Down
@@ -1,4 +1,4 @@
From c45d32c85a6d98e6fb20025af3ee96abfdccf925 Mon Sep 17 00:00:00 2001
From 34c2acb97023dbe6fdf2e81cbb1e55b2e25bc169 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:57:53 +0200
Subject: [PATCH 03/15] Revert "linux-user: Use safe_syscall wrapper for send*
Expand Down
@@ -1,4 +1,4 @@
From d6f39d396f585b53ef3b1e9214b6d0f55eee5dfa Mon Sep 17 00:00:00 2001
From d7a6f3ca96a4af2f47031ea04cf05e92e36cd8bb Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 10:59:47 +0200
Subject: [PATCH 04/15] Revert "linux-user: Use safe_syscall wrapper for accept
Expand Down
@@ -1,4 +1,4 @@
From d727cbc2df0c396ebe39ecdfb900c564395752c6 Mon Sep 17 00:00:00 2001
From 2d7e33829ff7b9f5f2841d0cc577be45b9f3d3fb Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 22 Jan 2020 11:13:13 +0200
Subject: [PATCH 05/15] Revert "linux-user: Use safe_syscall wrapper for
Expand Down
@@ -1,4 +1,4 @@
From 99dc4c635148193e3edfcfa8fecc62748fdf9148 Mon Sep 17 00:00:00 2001
From 7d64443c41d6249f098da26ff5fa9bc463ebbd45 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 29 Jan 2020 12:49:43 +0200
Subject: [PATCH 06/15] Revert "linux-user: Use direct syscall for utimensat"
Expand Down
@@ -1,4 +1,4 @@
From a66c62b4db0643b10d2471b4b5ab046c7afd3cff Mon Sep 17 00:00:00 2001
From 0c236d048cd3ddfbd02ea96d780a1abe01dc1c0a Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 23 Jan 2020 00:13:32 +0000
Subject: [PATCH 07/15] linux-user: Also ignore attempts to block SIGTERM,
Expand Down
@@ -1,4 +1,4 @@
From 71722b7b0709ae5b2d9ce89b42d55b4907173d3c Mon Sep 17 00:00:00 2001
From e85a856e19919c936c4cd851bcc68c3b974f28d1 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Mon, 27 Jan 2020 20:34:21 +0200
Subject: [PATCH 08/15] crypto: check if getrandom is available properly
Expand Down
@@ -1,4 +1,4 @@
From 3b522254716b6a1647716ebf4cb47d81da4734d4 Mon Sep 17 00:00:00 2001
From d5e5925b5b7fc08d0c476842493183f3bc66389e Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 29 Jan 2020 11:12:24 +0000
Subject: [PATCH 09/15] make sure mode is passed to openat if O_TMPFILE is
Expand Down
2 changes: 1 addition & 1 deletion rpm/0010-Revert-util-drop-old-utimensat-compat-code.patch
@@ -1,4 +1,4 @@
From b9d5ad6e4361ea2b6659deb9350e6f642c95e1fe Mon Sep 17 00:00:00 2001
From b633f9758ed8101ea56a7d3c2303ac1f6b994258 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 29 Jan 2020 11:21:54 +0000
Subject: [PATCH 10/15] Revert "util: drop old utimensat() compat code"
Expand Down
@@ -1,4 +1,4 @@
From 9b30d2368b2fed70268d8e6c95eb63be31546c19 Mon Sep 17 00:00:00 2001
From 3025c3ad424d229f4d52209d7eec058d9fec8816 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Wed, 29 Jan 2020 12:42:08 +0000
Subject: [PATCH 11/15] Revert "linux-user: Use safe_syscall wrapper for fcntl"
Expand Down
@@ -1,4 +1,4 @@
From b2e957746ede5e8e5f8b9d931a309079df6521b8 Mon Sep 17 00:00:00 2001
From 33dd663c75aeceade62a2e5803a9648815acd019 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Thu, 30 Jan 2020 12:17:16 +0000
Subject: [PATCH 12/15] linux-user: Support f_flags in statfs64 when available.
Expand Down
@@ -1,4 +1,4 @@
From df913dba95eb858cfb27b8eba26e5a19006a1f19 Mon Sep 17 00:00:00 2001
From 116a97a22bce7b8a034d2b071b5200cd3f5fedff Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Tue, 8 Dec 2020 10:18:18 +0000
Subject: [PATCH 13/15] linux-user: Force avx1 and avx2 off since they cause
Expand Down
22 changes: 6 additions & 16 deletions rpm/0014-linux-user-disable-commpage.patch
@@ -1,27 +1,17 @@
From e5652fa105dd80dac30ae6f70f7eabe67028280c Mon Sep 17 00:00:00 2001
From 0ae25695228fefca462304c91735fc1736156649 Mon Sep 17 00:00:00 2001
From: Frajo Haider <f_haider@gmx.at>
Date: Tue, 8 Dec 2020 00:19:06 +0200
Subject: [PATCH 14/15] linux-user: disable commpage

---
linux-user/elfload.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
linux-user/elfload.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index fe9dfe795d..d18dca677a 100644
index fe9dfe795d..7119cf531a 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -4,6 +4,9 @@

#include <sys/resource.h>
#include <sys/shm.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/utsname.h>

#include "qemu.h"
#include "disas/disas.h"
@@ -383,8 +386,10 @@ enum {
@@ -383,8 +383,10 @@ enum {

/* The commpage only exists for 32 bit kernels */

Expand All @@ -33,7 +23,7 @@ index fe9dfe795d..d18dca677a 100644
static bool init_guest_commpage(void)
{
void *want = g2h(ARM_COMMPAGE & -qemu_host_page_size);
@@ -408,6 +413,7 @@ static bool init_guest_commpage(void)
@@ -408,6 +410,7 @@ static bool init_guest_commpage(void)
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion rpm/0015-linux-user-fix-guest-address-space-assert.patch
@@ -1,4 +1,4 @@
From f92cf766be64ab48bb4267e3b13619e03131f425 Mon Sep 17 00:00:00 2001
From a26286f2ddc513fa80ec77fbe4ff36fea28d32e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?=
<juho.hamalainen@jolla.com>
Date: Tue, 8 Dec 2020 15:47:10 +0000
Expand Down

0 comments on commit afdd035

Please sign in to comment.