[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/29] libvhost-user: Declare uffdio_register early to make it C90
From: |
Paolo Bonzini |
Subject: |
[PULL 20/29] libvhost-user: Declare uffdio_register early to make it C90 compliant |
Date: |
Tue, 10 Jan 2023 17:02:24 +0100 |
From: Marcel Holtmann <marcel@holtmann.org>
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id:
<556c2d00c01fa134d13c0371d4014c90694c2943.1671741278.git.marcel@holtmann.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
- [PULL 12/29] util/error: add G_GNUC_PRINTF for various functions, (continued)
- [PULL 13/29] tests: add G_GNUC_PRINTF for various functions, Paolo Bonzini, 2023/01/10
- [PULL 16/29] libvhost-user: Provide _GNU_SOURCE when compiling outside of QEMU, Paolo Bonzini, 2023/01/10
- [PULL 18/29] libvhost-user: Cast rc variable to avoid compiler warning, Paolo Bonzini, 2023/01/10
- [PULL 19/29] libvhost-user: Use unsigned int i for some for-loop iterations, Paolo Bonzini, 2023/01/10
- [PULL 28/29] target/i386: fix operand size of unary SSE operations, Paolo Bonzini, 2023/01/10
- [PULL 20/29] libvhost-user: Declare uffdio_register early to make it C90 compliant,
Paolo Bonzini <=
- [PULL 29/29] configure: remove backwards-compatibility code, Paolo Bonzini, 2023/01/10
- [PULL 27/29] libvduse: Add extra compiler warnings, Paolo Bonzini, 2023/01/10
- [PULL 23/29] libvduse: Switch to unsigned int for inuse field in struct VduseVirtq, Paolo Bonzini, 2023/01/10
- [PULL 26/29] libvhost-user: Add extra compiler warnings, Paolo Bonzini, 2023/01/10
- [PULL 25/29] libvhost-user: Fix assignment in vring_set_avail_event, Paolo Bonzini, 2023/01/10
- Re: [PULL 00/29] Misc patches for 2023-01-10, Peter Maydell, 2023/01/10