b36d41c519
- cvm : bug fix for undefined reference to 'virtcca_cvm_allowed' while compiling - cvm : bug-fix for incorrect device name check for vhost-user-fs - target/i386: add control bits support for LAM - target/i386: add support for LAM in CPUID enumeration - Add support for the virtcca cvm feature. - target/sparc: use signed denominator in sdiv helper - crypto: Introduce SM4 symmetric cipher algorithm - ppc/vof: Fix unaligned FDT property access - vl: fix "type is NULL" in -vga help - hw/display/bcm2835_fb: fix fb_use_offsets condition - aspeed/smc: Fix possible integer overflow - hw/nvme: fix number of PIDs for FDP RUH update - hw/nvme: fix memory leak in nvme_dsm - hvf: arm: Do not advance PC when raising an exception - physmem: Bail out qemu_ram_block_from_host() for invalid ram addrs Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 282d63f9b5915f0529e9d0ae54b47c0ceacc58c3 Mon Sep 17 00:00:00 2001
|
|
From: liupingwei <liupingwei0317@outlook.com>
|
|
Date: Mon, 19 Aug 2024 15:38:23 +0800
|
|
Subject: [PATCH] cvm : bug-fix for incorrect device name check for
|
|
vhost-user-fs
|
|
|
|
The 'vhost-user-fs' was being parsed as 'virtio-user-fs' during the
|
|
compilation and this caused the device to erroneously trigger the error
|
|
branch.
|
|
|
|
Fixes: 5db954cb188d3775aec053fad8a39bf4c26a2b92("Add support for the
|
|
virtcca cvm feature.)
|
|
|
|
Signed-off-by: liupingwei <liupingwei0317@outlook.com>
|
|
---
|
|
hw/virtio/virtio-bus.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
|
|
index 7e750d073d..4f16e7ef77 100644
|
|
--- a/hw/virtio/virtio-bus.c
|
|
+++ b/hw/virtio/virtio-bus.c
|
|
@@ -83,7 +83,7 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
|
|
if (has_iommu) {
|
|
vdev_has_iommu = virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM);
|
|
|
|
- if (virtcca_cvm_enabled() && (strcmp(vdev->name, "vhost-user-fs") == 0)) {
|
|
+ if (virtcca_cvm_enabled() && (strcmp(vdev->name, "virtio-user-fs") == 0)) {
|
|
vdev_has_iommu = true;
|
|
}
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|