qemu/hw-remote-message.c-Don-t-directly-invoke-DeviceClas.patch
Jiabo Feng ab7fc8ee5b QEMU update to version 6.2.0-99:
- target/i386: Introduce SapphireRapids-v3 to add missing features
- qtest/fuzz-lsi53c895a-test: set guest RAM to 2G
- hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level
- target/arm: Fix alignment for VLD4.32
- hw/microblaze: pass random seed to fdt
- tests/qtest: npcm7xx-emc-test: Skip checking MAC
- tests: mark io-command test as skipped if socat is missing
- tests: unit: add NULL-pointer check
- tests: test-qga: close socket on failure to connect
- vdpa:block device capacity expansion online support vdpa block device update capacity.
- virtio-net: Ensure queue index fits with RSS(CVE-2024-6505)
- nbd/server: CVE-2024-7409: Avoid use-after-free when closing server
- ppc/vof: Fix unaligned FDT property access
- vvfat: Fix reading files with non-continuous clusters
- vvfat: Fix bug in writing to middle of file
- savevm: Fix load_snapshot error path crash
- hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma
- hw/remote/message.c: Don't directly invoke DeviceClass:reset
- crypto/tlscredspsk: Free username on finalize
- hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read()
- virtio: remove virtio_tswap16s() call in vring_packed_event_read()
- char-stdio: Restore blocking mode of stdout on exit
- hw/ppc: spapr: Use qemu_vfree() to free spapr->htab
- smbios: sanitize type from external type before checking have_fields_bitmap
- spapr_pci: fix leak in spapr_phb_vfio_get_loc_code
- KVM: use store-release to mark dirty pages as harvested
- monitor/hmp: print trace as option in help for log command
- tpm_crb: Avoid backend startup just before shutdown under Xen
- crypto/block-luks: make range overlap check more readable
- spapr: Free stdout path
- target/rx: Use target_ulong for address in LI
- virtio-pci: Fix the use of an uninitialized irqfd
- rtl8139: Fix behaviour for old kernels.
- virtio-rng: block max-bytes=0 MIME-Version: 1.0
- hw/audio/es1370: Clean up comment
- vhost-user-server: do not set memory fd non-blocking
- ui: reject extended clipboard message if not activated
- virtio-net: Fix vhost virtqueue notifiers for RSS
- hw/misc/applesmc: Fix memory leak in reset() handler

Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
2024-09-18 15:37:32 +08:00

49 lines
1.6 KiB
Diff

From ea0169b5de433426e863f162f7a299fc29b9ff8d Mon Sep 17 00:00:00 2001
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Aug 2024 17:52:46 +0100
Subject: [PATCH] hw/remote/message.c: Don't directly invoke DeviceClass:reset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Directly invoking the DeviceClass::reset method is a bad idea,
because if the device is using three-phase reset then it relies on
transitional reset machinery which is likely to disappear at some
point.
Reset the device in the standard way, by calling device_cold_reset().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240813165250.2717650-7-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org
(cherry picked from commit 7d3a421feab29c03601813c8a0f98d5b2fd4420a)
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
---
hw/remote/message.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/hw/remote/message.c b/hw/remote/message.c
index 11d729845c..83b91c8762 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -216,13 +216,10 @@ fail:
static void process_device_reset_msg(QIOChannel *ioc, PCIDevice *dev,
Error **errp)
{
- DeviceClass *dc = DEVICE_GET_CLASS(dev);
DeviceState *s = DEVICE(dev);
MPQemuMsg ret = { 0 };
- if (dc->reset) {
- dc->reset(s);
- }
+ device_cold_reset(s);
ret.cmd = MPQEMU_CMD_RET;
--
2.41.0.windows.1