adam
parent
57bec34ff9
commit
d77c7d76c2
6 changed files with 27 additions and 39 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.331 2023/12/07 17:41:55 gdt Exp $
|
||||
# $NetBSD: Makefile,v 1.332 2023/12/28 17:15:39 adam Exp $
|
||||
|
||||
DISTNAME= qemu-8.1.3
|
||||
DISTNAME= qemu-8.2.0
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= https://download.qemu.org/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.87 2023/12/07 17:41:55 gdt Exp $
|
||||
@comment $NetBSD: PLIST,v 1.88 2023/12/28 17:15:39 adam Exp $
|
||||
bin/elf2dmp
|
||||
${PLIST.aarch64}bin/qemu-aarch64
|
||||
${PLIST.aarch64_be}bin/qemu-aarch64_be
|
||||
|
|
@ -127,6 +127,7 @@ share/doc/qemu/devel/migration.html
|
|||
share/doc/qemu/devel/modules.html
|
||||
share/doc/qemu/devel/multi-process.html
|
||||
share/doc/qemu/devel/multi-thread-tcg.html
|
||||
share/doc/qemu/devel/pci.html
|
||||
share/doc/qemu/devel/qapi-code-gen.html
|
||||
share/doc/qemu/devel/qdev-api.html
|
||||
share/doc/qemu/devel/qgraph.html
|
||||
|
|
@ -135,6 +136,7 @@ share/doc/qemu/devel/qom.html
|
|||
share/doc/qemu/devel/qtest.html
|
||||
share/doc/qemu/devel/replay.html
|
||||
share/doc/qemu/devel/reset.html
|
||||
share/doc/qemu/devel/s390-cpu-topology.html
|
||||
share/doc/qemu/devel/s390-dasd-ipl.html
|
||||
share/doc/qemu/devel/secure-coding-practices.html
|
||||
share/doc/qemu/devel/stable-process.html
|
||||
|
|
@ -183,8 +185,10 @@ share/doc/qemu/specs/acpi_hw_reduced_hotplug.html
|
|||
share/doc/qemu/specs/acpi_mem_hotplug.html
|
||||
share/doc/qemu/specs/acpi_nvdimm.html
|
||||
share/doc/qemu/specs/acpi_pci_hotplug.html
|
||||
share/doc/qemu/specs/edu.html
|
||||
share/doc/qemu/specs/fw_cfg.html
|
||||
share/doc/qemu/specs/index.html
|
||||
share/doc/qemu/specs/ivshmem-spec.html
|
||||
share/doc/qemu/specs/pci-ids.html
|
||||
share/doc/qemu/specs/pci-serial.html
|
||||
share/doc/qemu/specs/pci-testdev.html
|
||||
|
|
@ -194,8 +198,14 @@ share/doc/qemu/specs/ppc-spapr-numa.html
|
|||
share/doc/qemu/specs/ppc-spapr-uv-hcalls.html
|
||||
share/doc/qemu/specs/ppc-spapr-xive.html
|
||||
share/doc/qemu/specs/ppc-xive.html
|
||||
share/doc/qemu/specs/pvpanic.html
|
||||
share/doc/qemu/specs/sev-guest-firmware.html
|
||||
share/doc/qemu/specs/standard-vga.html
|
||||
share/doc/qemu/specs/tpm.html
|
||||
share/doc/qemu/specs/virt-ctlr.html
|
||||
share/doc/qemu/specs/vmcoreinfo.html
|
||||
share/doc/qemu/specs/vmgenid.html
|
||||
share/doc/qemu/specs/vmw_pvscsi-spec.html
|
||||
share/doc/qemu/system/arm/aspeed.html
|
||||
share/doc/qemu/system/arm/bananapi_m2u.html
|
||||
share/doc/qemu/system/arm/collie.html
|
||||
|
|
@ -250,7 +260,9 @@ share/doc/qemu/system/devices/usb-u2f.html
|
|||
share/doc/qemu/system/devices/usb.html
|
||||
share/doc/qemu/system/devices/vhost-user-rng.html
|
||||
share/doc/qemu/system/devices/vhost-user.html
|
||||
share/doc/qemu/system/devices/virtio-gpu.html
|
||||
share/doc/qemu/system/devices/virtio-pmem.html
|
||||
share/doc/qemu/system/devices/virtio-snd.html
|
||||
share/doc/qemu/system/gdb.html
|
||||
share/doc/qemu/system/generic-loader.html
|
||||
share/doc/qemu/system/guest-loader.html
|
||||
|
|
@ -294,6 +306,7 @@ share/doc/qemu/system/riscv/sifive_u.html
|
|||
share/doc/qemu/system/riscv/virt.html
|
||||
share/doc/qemu/system/s390x/3270.html
|
||||
share/doc/qemu/system/s390x/bootdevices.html
|
||||
share/doc/qemu/system/s390x/cpu-topology.html
|
||||
share/doc/qemu/system/s390x/css.html
|
||||
share/doc/qemu/system/s390x/pcidevices.html
|
||||
share/doc/qemu/system/s390x/protvirt.html
|
||||
|
|
@ -317,6 +330,7 @@ share/doc/qemu/system/target-xtensa.html
|
|||
share/doc/qemu/system/targets.html
|
||||
share/doc/qemu/system/tls.html
|
||||
share/doc/qemu/system/virtio-net-failover.html
|
||||
share/doc/qemu/system/vm-templating.html
|
||||
share/doc/qemu/system/vnc-security.html
|
||||
share/doc/qemu/tools/index.html
|
||||
share/doc/qemu/tools/qemu-img.html
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
$NetBSD: distinfo,v 1.212 2023/11/26 10:34:23 adam Exp $
|
||||
$NetBSD: distinfo,v 1.213 2023/12/28 17:15:39 adam Exp $
|
||||
|
||||
BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
|
||||
SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
|
||||
Size (palcode-clipper-qemu-5.2.0nb8) = 159808 bytes
|
||||
BLAKE2s (qemu-8.1.3.tar.xz) = 3192d12642eb11bd317a13b7526d5ff168a1622444177b84fc17dae465c016de
|
||||
SHA512 (qemu-8.1.3.tar.xz) = d3847f1c0c0099937d08bba604713ac288b6151867a8da230297ee1d93b7e741fa406a2f7bf6645ce3293c0a98458dc9c79454746e7c2920e9a73e0574753e5a
|
||||
Size (qemu-8.1.3.tar.xz) = 124040288 bytes
|
||||
BLAKE2s (qemu-8.2.0.tar.xz) = 981f6034991b4f264f5733b00a56b3a0e5a42737aead00896f6c3a565efcd83b
|
||||
SHA512 (qemu-8.2.0.tar.xz) = 92ec41196ff145cdbb98948f6b6e43214fa4b4419554a8a1927fb4527080c8212ccb703e184baf8ee0bdfa50ad7a84689e8f5a69eba1bd7bbbdfd69e3b91256c
|
||||
Size (qemu-8.2.0.tar.xz) = 130008888 bytes
|
||||
SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
|
||||
SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
|
||||
SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
|
||||
|
|
@ -19,8 +19,7 @@ SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
|
|||
SHA1 (patch-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca
|
||||
SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
|
||||
SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
|
||||
SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4
|
||||
SHA1 (patch-target_i386_cpu.c) = 696b1137a7aac18f70933025cab5318b965aee66
|
||||
SHA1 (patch-target_i386_meson.build) = b8f413866ac1079d3ddeb21aacf226509e25ae9c
|
||||
SHA1 (patch-target_sparc_translate.c) = f633b3953847c1a7e93f1d09a67964431979b197
|
||||
SHA1 (patch-util_coroutine-ucontext.c) = 890767e1f034b34f4aad6c791745fc0b151b8e3c
|
||||
SHA1 (patch-util_osdep.c) = 1e5bcde7be23792f487334d35797869bff686d25
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
#include "qapi/error.h"
|
||||
#include "cpu.h"
|
||||
#include "hw/mips/mips.h"
|
||||
#include "hw/mips/cpudevs.h"
|
||||
#include "hw/char/serial.h"
|
||||
#include "hw/isa/isa.h"
|
||||
#include "net/net.h"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
$NetBSD: patch-target_i386_cpu.c,v 1.2 2022/09/17 09:54:56 tnn Exp $
|
||||
$NetBSD: patch-target_i386_cpu.c,v 1.3 2023/12/28 17:15:39 adam Exp $
|
||||
|
||||
Permit to use `-cpu host' with NVMM.
|
||||
|
||||
--- target/i386/cpu.c.orig 2022-08-30 16:41:57.000000000 +0000
|
||||
--- target/i386/cpu.c.orig 2023-12-19 21:24:34.000000000 +0000
|
||||
+++ target/i386/cpu.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "tcg/helper-tcg.h"
|
||||
#include "sysemu/reset.h"
|
||||
#include "sysemu/hvf.h"
|
||||
+#include "sysemu/nvmm.h"
|
||||
#include "hvf/hvf-i386.h"
|
||||
#include "kvm/kvm_i386.h"
|
||||
#include "sev.h"
|
||||
#include "qapi/error.h"
|
||||
@@ -1486,7 +1487,7 @@ static uint32_t xsave_area_size(uint64_t
|
||||
@@ -1643,7 +1644,7 @@ uint32_t xsave_area_size(uint64_t mask,
|
||||
|
||||
static inline bool accel_uses_host_cpuid(void)
|
||||
{
|
||||
|
|
@ -21,7 +21,7 @@ Permit to use `-cpu host' with NVMM.
|
|||
}
|
||||
|
||||
static inline uint64_t x86_cpu_xsave_xcr0_components(X86CPU *cpu)
|
||||
@@ -6476,7 +6477,8 @@ static void x86_cpu_realizefn(DeviceStat
|
||||
@@ -7314,7 +7315,8 @@ static void x86_cpu_realizefn(DeviceStat
|
||||
|
||||
if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) {
|
||||
g_autofree char *name = x86_cpu_class_get_model_name(xcc);
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
$NetBSD: patch-target_sparc_translate.c,v 1.2 2023/05/06 19:22:37 ryoon Exp $
|
||||
|
||||
Patch from upstream (not integrated there yet) to work around %pc/%npc
|
||||
being set to invalid values via ptrace, triggered by the NetBSD ptrace
|
||||
ATF tests. Real hardware seems to hardcode the lower bits to zero too.
|
||||
|
||||
--- target/sparc/translate.c.orig 2023-03-28 20:31:55.000000000 +0000
|
||||
+++ target/sparc/translate.c
|
||||
@@ -4324,6 +4324,7 @@ static void disas_sparc_insn(DisasContex
|
||||
|
||||
r_tsptr = tcg_temp_new_ptr();
|
||||
gen_load_trap_state_at_tl(r_tsptr, cpu_env);
|
||||
+ tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
|
||||
tcg_gen_st_tl(cpu_tmp0, r_tsptr,
|
||||
offsetof(trap_state, tpc));
|
||||
}
|
||||
@@ -4334,6 +4335,7 @@ static void disas_sparc_insn(DisasContex
|
||||
|
||||
r_tsptr = tcg_temp_new_ptr();
|
||||
gen_load_trap_state_at_tl(r_tsptr, cpu_env);
|
||||
+ tcg_gen_andi_tl(cpu_tmp0, cpu_tmp0, ~3);
|
||||
tcg_gen_st_tl(cpu_tmp0, r_tsptr,
|
||||
offsetof(trap_state, tnpc));
|
||||
}
|
||||
Loading…
Reference in a new issue