[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-8.1.2 55/57] vdpa net: stop probing if cannot set features
From: |
Michael Tokarev |
Subject: |
[Stable-8.1.2 55/57] vdpa net: stop probing if cannot set features |
Date: |
Fri, 6 Oct 2023 21:14:44 +0300 |
From: Eugenio Pérez <eperezma@redhat.com>
Otherwise it continues the CVQ isolation probing.
Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Message-Id: <20230915170836.3078172-3-eperezma@redhat.com>
Tested-by: Lei Yang <leiyang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit f1085882d028e5a1b227443cd6e96bbb63d66f43)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 1c79e33170..cda6099ceb 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -1291,6 +1291,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd,
uint64_t features,
r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
if (unlikely(r)) {
error_setg_errno(errp, errno, "Cannot set features");
+ goto out;
}
r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
--
2.39.2
- [Stable-8.1.2 00/57] Patch Round-up for stable 8.1.2, freeze on 2023-10-14, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 46/57] subprojects/berkeley-testfloat-3: Update to fix a problem with compiler warnings, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 47/57] target/i386: generalize operand size "ph" for use in CVTPS2PD, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 48/57] target/i386: fix memory operand size for CVTPS2PD, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 49/57] win32: avoid discarding the exception handler, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 50/57] hw/display/ramfb: plug slight guest-triggerable leak on mode setting, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 51/57] chardev/char-pty: Avoid losing bytes when the other side just (re-)connected, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 52/57] linux-user/hppa: Fix struct target_sigcontext layout, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 53/57] vdpa net: zero vhost_vdpa iova_tree pointer at cleanup, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 54/57] vdpa net: fix error message setting virtio status, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 55/57] vdpa net: stop probing if cannot set features,
Michael Tokarev <=
- [Stable-8.1.2 56/57] vdpa net: follow VirtIO initialization properly at cvq isolation probing, Michael Tokarev, 2023/10/06
- [Stable-8.1.2 57/57] amd_iommu: Fix APIC address check, Michael Tokarev, 2023/10/06