[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/10] libvhost-user: Declare uffdio_register early to make it
From: |
Marcel Holtmann |
Subject: |
[PATCH v2 05/10] libvhost-user: Declare uffdio_register early to make it C90 compliant |
Date: |
Tue, 20 Dec 2022 20:27:17 +0100 |
When using libvhost-user source in an external project that wants to
comply with the C90 standard, it is best to declare variables before
code.
CC libvhost-user.o
libvhost-user.c: In function ‘generate_faults’:
libvhost-user.c:683:9: error: ISO C90 forbids mixed declarations and code
[-Werror=declaration-after-statement]
683 | struct uffdio_register reg_struct;
| ^~~~~~
In this case, it is also simple enough and doesn't cause any extra
ifdef additions.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
subprojects/libvhost-user/libvhost-user.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/subprojects/libvhost-user/libvhost-user.c
b/subprojects/libvhost-user/libvhost-user.c
index 211d31a4cc88..bf92cc85c086 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -626,6 +626,8 @@ generate_faults(VuDev *dev) {
VuDevRegion *dev_region = &dev->regions[i];
int ret;
#ifdef UFFDIO_REGISTER
+ struct uffdio_register reg_struct;
+
/*
* We should already have an open ufd. Mark each memory
* range as ufd.
@@ -659,7 +661,7 @@ generate_faults(VuDev *dev) {
"%s: Failed to madvise(NOHUGEPAGE) region %d: %s\n",
__func__, i, strerror(errno));
}
- struct uffdio_register reg_struct;
+
reg_struct.range.start = (uintptr_t)dev_region->mmap_addr;
reg_struct.range.len = dev_region->size + dev_region->mmap_offset;
reg_struct.mode = UFFDIO_REGISTER_MODE_MISSING;
--
2.38.1
- [PATCH v2 00/10] Compiler warning fixes for libvhost-user,libvduse, Marcel Holtmann, 2022/12/20
- [PATCH v2 02/10] libvhost-user: Replace typeof with __typeof__, Marcel Holtmann, 2022/12/20
- [PATCH v2 04/10] libvhost-user: Use unsigned int i for some for-loop iterations, Marcel Holtmann, 2022/12/20
- [PATCH v2 01/10] libvhost-user: Provide _GNU_SOURCE when compiling outside of QEMU, Marcel Holtmann, 2022/12/20
- [PATCH v2 03/10] libvhost-user: Cast rc variable to avoid compiler warning, Marcel Holtmann, 2022/12/20
- [PATCH v2 05/10] libvhost-user: Declare uffdio_register early to make it C90 compliant,
Marcel Holtmann <=
- [PATCH v2 08/10] libvduse: Provide _GNU_SOURCE when compiling outside of QEMU, Marcel Holtmann, 2022/12/20
- [PATCH v2 06/10] libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant, Marcel Holtmann, 2022/12/20
- [PATCH v2 07/10] libvhost-user: Switch to unsigned int for inuse field in struct VuVirtq, Marcel Holtmann, 2022/12/20
- [PATCH v2 09/10] libvduse: Switch to unsigned int for inuse field in struct VduseVirtq, Marcel Holtmann, 2022/12/20
- [RFC v2 10/10] libvduse: Fix assignment in vring_set_avail_event, Marcel Holtmann, 2022/12/20