6c5e9f07c4
- i386/cpuid: Move leaf 7 to correct group - i386/cpuid: Decrease cpuid_i when skipping CPUID leaf 1F - i386/cpu: Mask with XCR0/XSS mask for FEAT_XSAVE_XCR0_HI and FEAT_XSAVE_XSS_HI leafs - i386/cpu: Clear FEAT_XSAVE_XSS_LO/HI leafs when CPUID_EXT_XSAVE is not available - target/i386: Change wrong XFRM value in SGX CPUID leaf - target/i386: Enable support for XSAVES based features - target/i386: Add kvm_get_one_msr helper - hw/block/hd-geometry: Do not override specified bios-chs-trans mainline inclusion commit fd8a68ad6823d33bedeba20a22857867a1c3890e category: bugfix - linux-user/riscv: Align signal frame to 16 bytes mainline inclusion commit 1eaa63429a9944265c92efdb94c02fabb231f564 category: bugfix - ipmi:smbus: Add a check around a memcpy mainline inclusion commit 3fde641e7286f9b968bdb3b4b922c6465f2a9abc category: bugfix - tests/tcg/linux-test: Fix random hangs in test_socket mainline inclusion commit b9e6074fc5b429b1e956e9c60db7e284a91e0f3d category: bugfix - qemu-options.hx: Don't claim "-serial" has limit of 4 serial ports Before v2.12, the implementation of serial ports was limited to a value of MAX_SERIAL_PORTS = 4. We now dynamically allocate the data structures for serial ports, so this limit is no longer present, but the documentation for the -serial options still reads: - target/ppc: Modify the uncorrect value irq to n_IRQ - block-migration: Ensure we don't crash during migration cleanup - target/s390x: fix handling of zeroes in vfmin/vfmax mainline inclusion commit 13c59eb09bd6d1fbc13f08b708226421f14a232b category: bugfix - hw/virtio/virtio-iommu: Enforce power-of-two notify for both MAP and UNMAP mainline inclusion commit 0522be9a0c0094088ccef7aab352c57f483ca250 category: bugfix - configure: Add missing POSIX-required space mainline inclusion commit 35a7a6fc5624b1df828d82f2dfa74d0e4188b3b2 category: bugfix - vga: fix incorrect line height in 640x200x2 mode mainline inclusion commit 37e7b86766244b62a406747bb78e049390d0b528 category: bugfix - hw/ide/core: set ERR_STAT in unsupported command completion - linux-user/flatload.c: Fix setting of image_info::end_code mainline inclusion commit 734a659ad264ac080457167e845ffabbaaa66d0e category: bugfix - load_elf: fix iterator's type for elf file processing - hw/misc/mps2-scc: Free MPS2SCC::oscclk[] array on finalize() - hw/nvram/xlnx-efuse: Free XlnxEFuse::ro_bits[] array on finalize() - hw/nvram/xlnx-efuse-ctrl: Free XlnxVersalEFuseCtrl[] "pg0-lock" array - chardev/char.c: fix "abstract device type" error message - block/rbd: fix handling of holes in .bdrv_co_block_status - qga: treat get-guest-fsinfo as "best effort" mainline inclusion commit bbb0151cf2e82489120a15df5e2eb9653312b0ec category: bugfix - usb/hcd-xhci: check slotid in xhci_wakeup_endpoint() mainline inclusion commit 84218892f05515d20347fde4506e1944eb11cb25 category: bugfix - hw/display/bcm2835_fb: Fix framebuffer allocation address mainline inclusion commit 5865d99fe88d8c8fa437c18c6b63fb2a8165634f category: bugfix - block/parallels: Fix buffer-based write call mainline inclusion commit eba088f91d21d9e42a81bef847173da30c5da961 category: bugfix - vl: Improve error message for conflicting -incoming and -loadvm - hw/smbios: Fix OEM strings table option validation Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 5d1a5160936dce1757c09050d97d12f42642794b)
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From 8ae86aa13df2128b46b421df14f6000f81312795 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 4 Mar 2024 01:19:55 -0800
|
|
Subject: [PATCH] hw/misc/mps2-scc: Free MPS2SCC::oscclk[] array on finalize()
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Commit 0be6bfac62 ("qdev: Implement variable length array properties")
|
|
added the DEFINE_PROP_ARRAY() macro with the following comment:
|
|
|
|
* It is the responsibility of the device deinit code to free the
|
|
* @_arrayfield memory.
|
|
|
|
Commit 4fb013afcc added:
|
|
|
|
DEFINE_PROP_ARRAY("oscclk", MPS2SCC, num_oscclk, oscclk_reset,
|
|
qdev_prop_uint32, uint32_t),
|
|
|
|
but forgot to free the 'oscclk_reset' array. Do it in the
|
|
instance_finalize() handler.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: 4fb013afcc ("hw/misc/mps2-scc: Support configurable number of OSCCLK values") # v6.0.0+
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-id: 20231121174051.63038-4-philmd@linaro.org
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
(cherry picked from commit 896dd6ff7b9f2575f1a908a07f26a70b58d8b675)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/misc/mps2-scc.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
|
|
index b3b42a792c..fe5034db14 100644
|
|
--- a/hw/misc/mps2-scc.c
|
|
+++ b/hw/misc/mps2-scc.c
|
|
@@ -329,6 +329,13 @@ static void mps2_scc_realize(DeviceState *dev, Error **errp)
|
|
s->oscclk = g_new0(uint32_t, s->num_oscclk);
|
|
}
|
|
|
|
+static void mps2_scc_finalize(Object *obj)
|
|
+{
|
|
+ MPS2SCC *s = MPS2_SCC(obj);
|
|
+
|
|
+ g_free(s->oscclk_reset);
|
|
+}
|
|
+
|
|
static const VMStateDescription mps2_scc_vmstate = {
|
|
.name = "mps2-scc",
|
|
.version_id = 3,
|
|
@@ -385,6 +392,7 @@ static const TypeInfo mps2_scc_info = {
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(MPS2SCC),
|
|
.instance_init = mps2_scc_init,
|
|
+ .instance_finalize = mps2_scc_finalize,
|
|
.class_init = mps2_scc_class_init,
|
|
};
|
|
|
|
--
|
|
2.27.0
|
|
|