dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libvhost-user: Change dev->postcopy_ufd assignment to make it C90 compliant

Browse Source 
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>
Message-Id: <74db52afb1203c4580ffc7fa462b4b2ba260a353.1671741278.git.marcel@holtmann.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marcel Holtmann
2022-12-22 21:36:45 +01:00
committed by Paolo Bonzini
parent d87a642403
commit f1c563d209
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
subprojects/libvhost-user/libvhost-user.c
View File

@@ -1599,12 +1599,13 @@ vu_set_config(VuDev *dev, VhostUserMsg *vmsg)
static bool static bool
vu_set_postcopy_advise(VuDev *dev, VhostUserMsg *vmsg) vu_set_postcopy_advise(VuDev *dev, VhostUserMsg *vmsg)
{ {
dev->postcopy_ufd = -1;
#ifdef UFFDIO_API #ifdef UFFDIO_API
struct uffdio_api api_struct; struct uffdio_api api_struct;
dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); dev->postcopy_ufd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK);
vmsg->size = 0; vmsg->size = 0;
#else
dev->postcopy_ufd = -1;
#endif #endif
if (dev->postcopy_ufd == -1) { if (dev->postcopy_ufd == -1) {