Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c4c7e54d418f2a61188c85be05320d51ff1244a3 Mon Sep 17 00:00:00 2001
From 7524720962d103fbf7c324b43aa84f26b6cc8835 Mon Sep 17 00:00:00 2001
From: Max Filippov <[email protected]>
Date: Thu, 14 Dec 2023 18:08:26 -0800
Subject: [PATCH 1/5] target/xtensa: add translation for wsr.mpucfg
Subject: [PATCH 01/16] target/xtensa: add translation for wsr.mpucfg

Although MPUCFG is not writable, the opcode wsr.mpucfg is defined and it
just does nothing. Define wsr.mpucfg as nop.
Expand All @@ -12,10 +12,10 @@ Signed-off-by: Max Filippov <[email protected]>
1 file changed, 9 insertions(+)

diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index f4da4a40f9..80efc87c8f 100644
index 4f02cefde3..18ca37f0fe 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -5303,6 +5303,15 @@ static const XtensaOpcodeOps core_ops[] = {
@@ -5304,6 +5304,15 @@ static const XtensaOpcodeOps core_ops[] = {
XTENSA_OPTION_TRACE_PORT,
},
.op_flags = XTENSA_OP_PRIVILEGED,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 73b26889b8e68efee58d3a3bef4e3672c7b166fc Mon Sep 17 00:00:00 2001
From a46011e8eadebc4d8021f6a8522fa0ed52e89428 Mon Sep 17 00:00:00 2001
From: Max Filippov <[email protected]>
Date: Thu, 14 Dec 2023 16:47:09 -0800
Subject: [PATCH 2/5] target/xtensa: import sample_controller32 core
Subject: [PATCH 02/16] target/xtensa: import sample_controller32 core

This is an LX core with MPU and exclusive access options.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7b358c875242cd90ce64b175f9585c0da933b6b6 Mon Sep 17 00:00:00 2001
From ad202784183a635c281749f67ed2411e879facb3 Mon Sep 17 00:00:00 2001
From: Max Filippov <[email protected]>
Date: Thu, 14 Dec 2023 16:46:08 -0800
Subject: [PATCH 3/5] tests/tcg/xtensa: tidy test linker script
Subject: [PATCH 03/16] tests/tcg/xtensa: tidy test linker script

Drop MEMORY clause and related size definitions and output section
region specifications. Drop .rodata output section as the tests don't
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 21f01eb5a8dfa0ca7d4e4f9b2bf51b89ecc1e3b3 Mon Sep 17 00:00:00 2001
From dd5194b56b7a6ca2faedccfd96137c0304abe394 Mon Sep 17 00:00:00 2001
From: Max Filippov <[email protected]>
Date: Thu, 14 Dec 2023 18:14:00 -0800
Subject: [PATCH 4/5] tests/tcg/xtensa: fix SR test for configs with MPU
Subject: [PATCH 04/16] tests/tcg/xtensa: fix SR test for configs with MPU

- atomctl is available not only in the presence of s32c1i, but also with
the exclusive access option
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1b83e396296f32f7fdd4cf430494e813e5573949 Mon Sep 17 00:00:00 2001
From f427b780bb1241b675d7a710d224d233031b709d Mon Sep 17 00:00:00 2001
From: Daniel Leung <[email protected]>
Date: Tue, 14 May 2024 09:52:26 -0700
Subject: [PATCH 5/5] target/xtensa: fix sample_controller32 build for QEMU 7
Subject: [PATCH 05/16] target/xtensa: fix sample_controller32 build for QEMU 7

The original patches for adding sample_controller32 are based on
QEMU 9. The GDB stub header file is not in the same place between
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 1fcd2c937b1b7a2bc748f9828d242f7031d31c28 Mon Sep 17 00:00:00 2001
From ab661500c3afa2ba48d8635089bc9985a149b5a0 Mon Sep 17 00:00:00 2001
From: Anas Nashif <[email protected]>
Date: Fri, 16 May 2025 17:58:04 -0400
Subject: [PATCH] Revert "target/xtensa: Make use of 'segment' in pptlb helper
less confusing"
Subject: [PATCH 06/16] Revert "target/xtensa: Make use of 'segment' in pptlb
helper less confusing"

This reverts commit b42ba4ea4322357fcbfcb0e6e613d79ede84de64.
---
target/xtensa/mmu_helper.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
index 29b84d5dbf..997b21d389 100644
index 63be741a42..d05226c788 100644
--- a/target/xtensa/mmu_helper.c
+++ b/target/xtensa/mmu_helper.c
@@ -991,7 +991,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
@@ -992,7 +992,7 @@ uint32_t HELPER(rptlb1)(CPUXtensaState *env, uint32_t s)
uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
{
unsigned nhits;
Expand All @@ -22,7 +22,7 @@ index 29b84d5dbf..997b21d389 100644
unsigned bg_segment;

nhits = xtensa_mpu_lookup(env->mpu_fg, env->config->n_mpu_fg_segments,
@@ -1005,7 +1005,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
@@ -1006,7 +1006,7 @@ uint32_t HELPER(pptlb)(CPUXtensaState *env, uint32_t v)
xtensa_mpu_lookup(env->config->mpu_bg,
env->config->n_mpu_bg_segments,
v, &bg_segment);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 29dce25c090792e360a1c1ff081af25d63d7df29 Mon Sep 17 00:00:00 2001
From 42a7273b1d4fd681a432d40bc4092c3487b3a556 Mon Sep 17 00:00:00 2001
From: Jason Wessel <[email protected]>
Date: Fri, 28 Mar 2014 17:42:43 +0800
Subject: [PATCH] qemu: Add addition environment space to boot loader
Subject: [PATCH 07/16] qemu: Add addition environment space to boot loader
qemu-system-mips

Upstream-Status: Inappropriate - OE uses deep paths
Expand All @@ -18,10 +18,10 @@ Signed-off-by: Roy Li <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 198da5ba3..736bf0999 100644
index 8e9cea70b1..2268a8b618 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -64,7 +64,7 @@
@@ -65,7 +65,7 @@
#define ENVP_PADDR 0x2000
#define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
#define ENVP_NB_ENTRIES 16
Expand All @@ -30,3 +30,6 @@ index 198da5ba3..736bf0999 100644

/* Hardware addresses */
#define FLASH_ADDRESS 0x1e000000ULL
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e069c66ccf29fb13ef5938b68f5362737b64d638 Mon Sep 17 00:00:00 2001
From d98f52b978273b4ee394f7ee3c00fdf966a0c2ec Mon Sep 17 00:00:00 2001
From: Mark Asselstine <[email protected]>
Date: Tue, 26 Feb 2013 11:43:28 -0500
Subject: [PATCH] apic: fixup fallthrough to PIC
Subject: [PATCH 08/16] apic: fixup fallthrough to PIC

Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
interrupts through the local APIC if the local APIC config says so.]
Expand Down Expand Up @@ -29,10 +29,10 @@ Signed-off-by: He Zhe <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 4186c57b3..43cd805a9 100644
index d18c1dbf2c..45dde1fc51 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev)
@@ -758,7 +758,7 @@ int apic_accept_pic_intr(DeviceState *dev)
APICCommonState *s = APIC(dev);
uint32_t lvt0;

Expand All @@ -41,3 +41,6 @@ index 4186c57b3..43cd805a9 100644
return -1;

lvt0 = s->lvt[APIC_LVT_LINT0];
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 24e16b32dd0a4136ac30f8e2d48e266892814de6 Mon Sep 17 00:00:00 2001
From 19b994a2d608eabfa52e8f327ae6dc0ea3653181 Mon Sep 17 00:00:00 2001
From: Oleksiy Obitotskyy <[email protected]>
Date: Wed, 25 Mar 2020 21:21:35 +0200
Subject: [PATCH] qemu: Do not include file if not exists
Subject: [PATCH 09/16] qemu: Do not include file if not exists

Script configure checks for if_alg.h and check failed but
if_alg.h still included.
Expand All @@ -16,10 +16,10 @@ Signed-off-by: Sakib Sajal <[email protected]>
1 file changed, 2 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 549e39e19..439c7beb0 100644
index 8bfe4912e1..d04984f66b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -116,7 +116,9 @@
@@ -118,7 +118,9 @@
#include <linux/blkpg.h>
#include <netpacket/packet.h>
#include <linux/netlink.h>
Expand All @@ -29,3 +29,6 @@ index 549e39e19..439c7beb0 100644
#include <linux/rtc.h>
#include <sound/asound.h>
#ifdef HAVE_BTRFS_H
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From ef7497674b2d41cffcb90f36bfe145c4951a03ba Mon Sep 17 00:00:00 2001
From 923be76163f1e7a178431ee65c4867cb8e1a2fef Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Fri, 8 Jan 2021 17:27:06 +0000
Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
Subject: [PATCH 10/16] qemu: Add some user space mmap tweaks to address musl
32 bit

When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an
infinite loop of mremap calls of ever decreasing/increasing addresses.
Expand All @@ -22,10 +23,10 @@ Signed-off-by: Richard Purdie <[email protected]
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index e4bf5d5f3..04d920c11 100644
index d1f36e6f16..26ccf8f4dd 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -1105,12 +1105,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
@@ -1108,12 +1108,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
int prot;
void *host_addr;

Expand All @@ -45,3 +46,6 @@ index e4bf5d5f3..04d920c11 100644
return -1;
}

--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b0862cf4fecc11a181bc8c6602c7d09812148249 Mon Sep 17 00:00:00 2001
From a23965528591e86e12c4eccb56ce045067acedf7 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Mon, 1 Mar 2021 13:00:47 +0000
Subject: [PATCH] qemu: Determinism fixes
Subject: [PATCH 11/16] qemu: Determinism fixes

When sources are included within debug information, a couple of areas of the
qemu build are not reproducible due to either full buildpaths or timestamps.
Expand All @@ -16,7 +16,7 @@ RP 2021/3/1
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index e8b72da3a..5cd86b142 100644
index e8b72da3a9..5cd86b1428 100644
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -1558,7 +1558,7 @@ def main():
Expand All @@ -28,3 +28,6 @@ index e8b72da3a..5cd86b142 100644
f = open(filename, 'rt', encoding='utf-8')
parse_file(f, toppat)
f.close()
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 7bce3a9379b09dfa7d24a377a9f7f1c6a2f8bdde Mon Sep 17 00:00:00 2001
From 7362a4c35fcfe52fc63d80456b51a33fc597cc85 Mon Sep 17 00:00:00 2001
From: Changqing Li <[email protected]>
Date: Thu, 14 Jan 2021 06:33:04 +0000
Subject: [PATCH] tests/meson.build: use relative path to refer to files
Subject: [PATCH 12/16] tests/meson.build: use relative path to refer to files

Fix error like:
Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
Expand All @@ -17,7 +17,7 @@ Signed-off-by: Changqing Li <[email protected]>
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index d5248ae51..2c581f055 100644
index d5248ae51d..2c581f055d 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -127,17 +127,17 @@ endif
Expand All @@ -41,3 +41,6 @@ index d5248ae51..2c581f055 100644
'test-vmstate': [migration, io],
'test-yank': ['socket-helpers.c', qom, io, chardev]
}
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2c2fde4042578ee29714a6421c33e00c4301d744 Mon Sep 17 00:00:00 2001
From 386c52f870dfb140fda43932a833d50db5d42495 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Mon, 21 Mar 2022 10:09:38 -0700
Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
Subject: [PATCH 13/16] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
systems

linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
Expand All @@ -18,7 +18,7 @@ Cc: Michael S. Tsirkin <[email protected]>
1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index ed14f9c64..038f5b4b5 100644
index ed14f9c64d..038f5b4b55 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -10,14 +10,18 @@
Expand All @@ -43,3 +43,6 @@ index ed14f9c64..038f5b4b5 100644
#include "qemu/mmap-alloc.h"
#include "qemu/host-utils.h"
#include "qemu/cutils.h"
--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From b3435faf13837f487231a01c2dca45a260ae323c Mon Sep 17 00:00:00 2001
From 320d68aae92aa53ec79e99fb2fae6dcb0598e225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <[email protected]>
Date: Wed, 22 May 2024 14:02:55 +0200
Subject: [PATCH] configure: lookup meson exutable from PATH
Subject: [PATCH 14/16] configure: lookup meson exutable from PATH

Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
---
configure | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure b/configure
index 18336376b..2b014b97c 100755
index 02f1dd2311..2c5ecd346c 100755
--- a/configure
+++ b/configure
@@ -1002,12 +1002,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
@@ -983,12 +983,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
${source_path}/pythondeps.toml meson || exit 1

Expand All @@ -26,3 +26,6 @@ index 18336376b..2b014b97c 100755

# Conditionally ensure Sphinx is installed.

--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 81b55a014b2e5f0863a5a3fd584168c9d4ce9eb8 Mon Sep 17 00:00:00 2001
From a80210622f4f4d99ac31ccf9d77389c0a27a1930 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Wed, 22 May 2024 13:58:23 +0200
Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
Subject: [PATCH 15/16] qemu: Ensure pip and the python venv aren't used for
meson

Qemu wants to use a supported python version and a specific meson version
to "help" users and uses pip and creates a venv to do this. This is a nightmare
Expand Down Expand Up @@ -29,10 +30,10 @@ Signed-off-by: Richard Purdie <[email protected]>
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 2b014b97c..45dc8b146 100755
index 2c5ecd346c..5315ede35e 100755
--- a/configure
+++ b/configure
@@ -988,14 +988,14 @@ python="$(command -v "$python")"
@@ -969,14 +969,14 @@ python="$(command -v "$python")"
echo "python determined to be '$python'"
echo "python version: $($python --version)"

Expand All @@ -49,3 +50,6 @@ index 2b014b97c..45dc8b146 100755

# Finish preparing the virtual environment using vendored .whl files

--
2.43.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 6e5a6d44950c48957f3906294b8efd6a76b91576 Mon Sep 17 00:00:00 2001
From 6e1c3ecc759caac8cc1a48e42780e80c09b4ca16 Mon Sep 17 00:00:00 2001
From: Natanael Copa <[email protected]>
Date: Wed, 18 Sep 2024 16:19:37 -0700
Subject: [PATCH] target/riscv/kvm: do not use non-portable strerrorname_np()
Subject: [PATCH 16/16] target/riscv/kvm: do not use non-portable
strerrorname_np()

strerrorname_np is non-portable and breaks building with musl libc.

Expand All @@ -20,10 +21,10 @@ Signed-off-by: Natanael Copa <[email protected]>
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index c53ca1f76..3c67129ef 100644
index 0f4997a918..4559d0fac2 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -1870,8 +1870,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp)
@@ -1885,8 +1885,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp)
if (riscv_has_ext(&cpu->env, RVV)) {
ret = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON);
if (ret) {
Expand All @@ -33,3 +34,6 @@ index c53ca1f76..3c67129ef 100644
return false;
}
}
--
2.43.0

Loading
Loading