5636aff5b1
- target/i386: csv: Support inject secret for CSV3 guest only if the extension is enabled
- target/i386: csv: Support load kernel hashes for CSV3 guest only if the extension is enabled
- target/i386: csv: Request to set private memory of CSV3 guest if the extension is enabled
- target/i386: kvm: Support to get and enable extensions for Hygon CoCo guest
- qapi/qom,target/i386: csv-guest: Introduce secret-header-file=str and secret-file=str options
- bakcend: VirtCCA:resolve hugepage memory waste issue in vhost-user scenario
- parallels: fix ext_off assertion failure due to overflow
- backends/cryptodev-vhost-user: Fix local_error leaks
- hw/usb/hcd-ehci: Fix debug printf format string
- target/riscv/vector_helper.c: fix 'vmvr_v' memcpy endianess
- target/riscv/vector_helper.c: optimize loops in ldst helpers
- target/riscv/vector_helper.c: set vstart = 0 in GEN_VEXT_VSLIDEUP_VX()
- target/hexagon: don't look for static glib
- virtio-net: Fix network stall at the host side waiting for kick
- Add if condition to avoid assertion failed error in blockdev_init
- target/arm: Use float_status copy in sme_fmopa_s
- target/arm: take HSTR traps of cp15 accesses to EL2, not EL1
- target/arm: Reinstate "vfp" property on AArch32 CPUs
- target/i386/cpu: Fix notes for CPU models
- target/arm: LDAPR should honour SCTLR_ELx.nAA
- target/riscv: Avoid bad shift in riscv_cpu_do_interrupt()
- hvf: remove unused but set variable
- hw/misc/nrf51_rng: Don't use BIT_MASK() when we mean BIT()
- Avoid taking address of out-of-bounds array index
- target/arm: Fix VCMLA Dd, Dn, Dm[idx]
- target/arm: Fix UMOPA/UMOPS of 16-bit values
- target/arm: Fix SVE/SME gross MTE suppression checks
- target/arm: Fix nregs computation in do_{ld,st}_zpa
- crypto: fix error check on gcry_md_open
- Change vmstate_cpuhp_sts vmstateDescription version_id
- hw/pci: Remove unused pci_irq_pulse() method
- hw/intc: Don't clear pending bits on IRQ lowering
- target/arm: Drop user-only special case in sve_stN_r
- migration: Ensure vmstate_save() sets errp
- target/i386: fix hang when using slow path for ptw_setl
- contrib/plugins: add compat for g_memdup2
- hw/audio/hda: fix memory leak on audio setup
- crypto: perform runtime check for hash/hmac support in gcrypt
- target/arm: Fix incorrect aa64_tidcp1 feature check
- target/arm: fix exception syndrome for AArch32 bkpt insn
- target/arm: Don't get MDCR_EL2 in pmu_counter_enabled() before checking ARM_FEATURE_PMU
- linux-user: Print tid not pid with strace
- target/arm: Fix A64 scalar SQSHRN and SQRSHRN
- target/arm: Don't assert for 128-bit tile accesses when SVL is 128
- hw/timer/exynos4210_mct: fix possible int overflow
- target/arm: Avoid shifts by -1 in tszimm_shr() and tszimm_shl()
- hw/audio/virtio-snd: Always use little endian audio format
- target/riscv: Fix vcompress with rvv_ta_all_1s
- usb-hub: Fix handling port power control messages
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit d4a20b24ff377fd07fcbf2b72eecaf07a3ac4cc0)
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
From 84321dcfb4ec3d08984e7680c8efad80907bde84 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>
|
|
Date: Mon, 29 Jul 2024 15:44:13 +0100
|
|
Subject: [PATCH] contrib/plugins: add compat for g_memdup2
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We were premature if bumping this because some of our builds are still
|
|
on older glibs. Just copy the compat handler for now and we can remove
|
|
it later.
|
|
|
|
Fixes: ee293103b0 (plugins: update lockstep to use g_memdup2)
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2161
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
|
|
Message-Id: <20240729144414.830369-14-alex.bennee@linaro.org>
|
|
(cherry picked from commit 44e794896759236885f6d30d1f6b9b8b76355d52)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
contrib/plugins/lockstep.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c
|
|
index 237543b43a..0c6f060183 100644
|
|
--- a/contrib/plugins/lockstep.c
|
|
+++ b/contrib/plugins/lockstep.c
|
|
@@ -100,6 +100,31 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
|
|
plugin_cleanup(id);
|
|
}
|
|
|
|
+/*
|
|
+ * g_memdup has been deprecated in Glib since 2.68 and
|
|
+ * will complain about it if you try to use it. However until
|
|
+ * glib_req_ver for QEMU is bumped we make a copy of the glib-compat
|
|
+ * handler.
|
|
+ */
|
|
+static inline gpointer g_memdup2_qemu(gconstpointer mem, gsize byte_size)
|
|
+{
|
|
+#if GLIB_CHECK_VERSION(2, 68, 0)
|
|
+ return g_memdup2(mem, byte_size);
|
|
+#else
|
|
+ gpointer new_mem;
|
|
+
|
|
+ if (mem && byte_size != 0) {
|
|
+ new_mem = g_malloc(byte_size);
|
|
+ memcpy(new_mem, mem, byte_size);
|
|
+ } else {
|
|
+ new_mem = NULL;
|
|
+ }
|
|
+
|
|
+ return new_mem;
|
|
+#endif
|
|
+}
|
|
+#define g_memdup2(m, s) g_memdup2_qemu(m, s)
|
|
+
|
|
static void report_divergance(ExecState *us, ExecState *them)
|
|
{
|
|
DivergeState divrec = { log, 0 };
|
|
--
|
|
2.41.0.windows.1
|
|
|