qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: David 'Digit' Turner <digit@google.com>
Subject: [PULL 11/17] Fix libvhost-user.c compilation.
Date: Sat, 29 Apr 2023 14:16:30 +0200	[thread overview]
Message-ID: <20230429121636.230934-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20230429121636.230934-1-pbonzini@redhat.com>

From: David 'Digit' Turner <digit@google.com>

The source file uses VIRTIO_F_VERSION_1 which is
not defined by <linux/virtio_config.h> on Debian 10.

The system-provided <linux/virtio_config.h> which
does not include the macro definition is included
through <linux/vhost.h>, so fix the issue by including
the standard-headers version before that.

Signed-off-by: David 'Digit' Turner <digit@google.com>
Message-Id: <20230405125920.2951721-2-digit@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 subprojects/libvhost-user/libvhost-user.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/subprojects/libvhost-user/libvhost-user.c b/subprojects/libvhost-user/libvhost-user.c
index 0abd898a52c4..8fb61e2df2fe 100644
--- a/subprojects/libvhost-user/libvhost-user.c
+++ b/subprojects/libvhost-user/libvhost-user.c
@@ -32,6 +32,12 @@
 #include <sys/mman.h>
 #include <endian.h>
 
+/* Necessary to provide VIRTIO_F_VERSION_1 on system
+ * with older linux headers. Must appear before
+ * <linux/vhost.h> below.
+ */
+#include "standard-headers/linux/virtio_config.h"
+
 #if defined(__linux__)
 #include <sys/syscall.h>
 #include <fcntl.h>
-- 
2.40.0



  parent reply	other threads:[~2023-04-29 12:18 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-29 12:16 [PULL 00/17] Misc patches for 2023-04-29 Paolo Bonzini
2023-04-29 12:16 ` [PULL 01/17] qapi, i386/sev: Change the reduced-phys-bits value from 5 to 1 Paolo Bonzini
2023-04-29 12:16 ` [PULL 02/17] qemu-options.hx: Update the reduced-phys-bits documentation Paolo Bonzini
2023-04-29 12:16 ` [PULL 03/17] i386/sev: Update checks and information related to reduced-phys-bits Paolo Bonzini
2023-04-29 12:16 ` [PULL 04/17] i386/cpu: Update how the EBX register of CPUID 0x8000001F is set Paolo Bonzini
2023-04-29 12:16 ` [PULL 05/17] target/i386: Add support for CMPCCXADD in CPUID enumeration Paolo Bonzini
2023-04-29 12:16 ` [PULL 06/17] target/i386: Add support for AMX-FP16 " Paolo Bonzini
2023-04-29 12:16 ` [PULL 07/17] target/i386: Add support for AVX-IFMA " Paolo Bonzini
2023-04-29 12:16 ` [PULL 08/17] target/i386: Add support for AVX-VNNI-INT8 " Paolo Bonzini
2023-04-29 12:16 ` [PULL 09/17] target/i386: Add support for AVX-NE-CONVERT " Paolo Bonzini
2023-04-29 12:16 ` [PULL 10/17] target/i386: Add support for PREFETCHIT0/1 " Paolo Bonzini
2023-04-29 12:16 ` Paolo Bonzini [this message]
2023-04-29 12:16 ` [PULL 12/17] update-linux-headers.sh: Add missing kernel headers Paolo Bonzini
2023-04-29 12:16 ` [PULL 13/17] Update linux headers to v6.3rc5 Paolo Bonzini
2023-04-29 12:16 ` [PULL 14/17] tests: vhost-user-test: release mutex on protocol violation Paolo Bonzini
2023-04-29 12:16 ` [PULL 15/17] target/hexagon: fix = vs. == mishap Paolo Bonzini
2023-04-29 12:16 ` [PULL 16/17] async: Suppress GCC13 false positive in aio_bh_poll() Paolo Bonzini
2023-04-29 12:16 ` [PULL 17/17] cpus-common: stop using mb_set/mb_read Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230429121636.230934-12-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=digit@google.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).