qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "David 'Digit' Turner" <digit@google.com>
To: qemu-devel@nongnu.org
Cc: "David 'Digit' Turner" <digit@google.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [PATCH 1/2] Fix libvhost-user.c compilation.
Date: Wed,  5 Apr 2023 14:59:19 +0200	[thread overview]
Message-ID: <20230405125920.2951721-2-digit@google.com> (raw)
In-Reply-To: <20230405125920.2951721-1-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>
---
 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 0200b78e8e..0a5768cb55 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.348.gf938b09366-goog



  reply	other threads:[~2023-04-05 13:22 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-05 12:59 [PATCH 0/2] Fix QEMU compilation on Debian 10 David 'Digit' Turner
2023-04-05 12:59 ` David 'Digit' Turner [this message]
2023-04-07  7:56   ` [PATCH 1/2] Fix libvhost-user.c compilation Michael S. Tsirkin
2023-04-26 19:13     ` Paolo Bonzini
2023-04-05 12:59 ` [PATCH 2/2] Add missing Linux kernel headers David 'Digit' Turner
2023-04-05 13:06   ` Cornelia Huck
2023-04-05 13:42     ` David Turner
2023-04-05 15:54       ` Cornelia Huck
2023-04-05 16:41         ` Peter Maydell
2023-04-05 17:22           ` David Turner
2023-04-26 19:10 ` [PATCH 0/2] Fix QEMU compilation on Debian 10 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=20230405125920.2951721-2-digit@google.com \
    --to=digit@google.com \
    --cc=mst@redhat.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).