[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/10] libvhost-user: Change dev->postcopy_ufd assignment to m
From: |
Marcel Holtmann |
Subject: |
[PATCH v3 06/10] libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant |
Date: |
Wed, 21 Dec 2022 14:10:22 +0100 |
The assignment of dev->postcopy_ufd can be moved into an else clause and
then the code becomes C90 compliant.
CC libvhost-user.o
libvhost-user.c: In function ‘vu_set_postcopy_advise’:
libvhost-user.c:1625:5: error: ISO C90 forbids mixed declarations and code
[-Werror=declaration-after-statement]
1625 | struct uffdio_api api_struct;
| ^~~~~~
Understandable, it might be desired to avoid else clauses, but in this
case it seems clear enough and frankly the dev->postcopy_ufd is only
assigned once.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
subprojects/libvhost-user/libvhost-user.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/subprojects/libvhost-user/libvhost-user.c
b/subprojects/libvhost-user/libvhost-user.c
index bf92cc85c086..b28b66cdb159 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -1599,12 +1599,13 @@ vu_set_config(VuDev *dev, VhostUserMsg *vmsg)
static bool
vu_set_postcopy_advise(VuDev *dev, VhostUserMsg *vmsg)
{
- dev->postcopy_ufd = -1;
#ifdef UFFDIO_API
struct uffdio_api api_struct;
dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
vmsg->size = 0;
+#else
+ dev->postcopy_ufd = -1;
#endif
if (dev->postcopy_ufd == -1) {
--
2.38.1
- [PATCH v3 00/10] Compiler warning fixes for libvhost-user,libvduse, Marcel Holtmann, 2022/12/21
- [PATCH v3 01/10] libvhost-user: Provide _GNU_SOURCE when compiling outside of QEMU, Marcel Holtmann, 2022/12/21
- [PATCH v3 05/10] libvhost-user: Declare uffdio_register early to make it C90 compliant, Marcel Holtmann, 2022/12/21
- [PATCH v3 04/10] libvhost-user: Use unsigned int i for some for-loop iterations, Marcel Holtmann, 2022/12/21
- [PATCH v3 07/10] libvhost-user: Switch to unsigned int for inuse field in struct VuVirtq, Marcel Holtmann, 2022/12/21
- [PATCH v3 08/10] libvduse: Provide _GNU_SOURCE when compiling outside of QEMU, Marcel Holtmann, 2022/12/21
- [PATCH v3 03/10] libvhost-user: Cast rc variable to avoid compiler warning, Marcel Holtmann, 2022/12/21
- [PATCH v3 02/10] libvhost-user: Replace typeof with __typeof__, Marcel Holtmann, 2022/12/21
- [PATCH v3 06/10] libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant,
Marcel Holtmann <=
- [PATCH v3 10/10] libvduse: Fix assignment in vring_set_avail_event, Marcel Holtmann, 2022/12/21
- [PATCH v3 09/10] libvduse: Switch to unsigned int for inuse field in struct VduseVirtq, Marcel Holtmann, 2022/12/21