Skip to content
Snippets Groups Projects

community/qemu: upgrade to 8.2.0

Merged Milan P. Stanić requested to merge mps/aports:qemu-8.2.0 into master
All threads resolved!
Files
2
From e7ca95cfc4b42ec381807fc82536a57158d610a7 Mon Sep 17 00:00:00 2001
From 3b30d72d41a4aa91738a110debaa439bee8f9b6c Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 18 Dec 2023 16:56:17 +0100
Subject: [PATCH] target/riscv/kvm: do not use non-portable strerrorname_np()
@@ -13,14 +13,14 @@ Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2041
Buglink: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15541
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
target/riscv/kvm.c | 18 ++++++++----------
target/riscv/kvm/kvm-cpu.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/target/riscv/kvm.c b/target/riscv/kvm.c
index 3fb29299d9..25c200a02a 100644
--- a/target/riscv/kvm.c
+++ b/target/riscv/kvm.c
@@ -727,9 +727,8 @@ static void kvm_riscv_read_multiext_legacy(RISCVCPU *cpu,
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 45b6cf1cfa..117e33cf90 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -832,9 +832,8 @@ static void kvm_riscv_read_multiext_legacy(RISCVCPU *cpu,
multi_ext_cfg->supported = false;
val = false;
} else {
@@ -32,7 +32,7 @@ index 3fb29299d9..25c200a02a 100644
exit(EXIT_FAILURE);
}
} else {
@@ -790,8 +789,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
@@ -895,8 +894,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
*
* Error out if we get any other errno.
*/
@@ -43,7 +43,7 @@ index 3fb29299d9..25c200a02a 100644
exit(EXIT_FAILURE);
}
@@ -800,8 +799,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
@@ -905,8 +904,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
reglist->n = rl_struct.n;
ret = ioctl(kvmcpu->cpufd, KVM_GET_REG_LIST, reglist);
if (ret) {
@@ -54,7 +54,7 @@ index 3fb29299d9..25c200a02a 100644
exit(EXIT_FAILURE);
}
@@ -822,9 +821,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
@@ -927,9 +926,8 @@ static void kvm_riscv_init_multiext_cfg(RISCVCPU *cpu, KVMScratchCPU *kvmcpu)
reg.addr = (uint64_t)&val;
ret = ioctl(kvmcpu->cpufd, KVM_GET_ONE_REG, &reg);
if (ret != 0) {
Loading