From nobody Fri Oct 3 11:38:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579802537; cv=none; d=zohomail.com; s=zohoarc; b=IrXY9HFSP2gAA8ujI+7rnrBnona5pktSXJiyj8KU3ZWIRFatvXouUhz0qHXi3xpZbsVd4sD+LTURfggYFbXWRTq2m+4/OlqxJYU5dw2P28oSheYllJh2ff9T9dd2UPUO8+59HF7T821bikN9Xxp5RKrabv9bazn2/7FkJnY9jsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579802537; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ToN5OA+OYIWiz1ocOLRwTVQ2bvWzssRm5w/2+kmT8qs=; b=SIRfGrmC4FRlUZrX1iOQn4ZWR9TTP+g92v5P+cn/0Xbt2Ire1IdFvRjcI8xXqOodAe/aSyvTGnRjAZdz4xX4ARFQi8+RIWCdA6T6ivEvUqMFBV9NuQzd8URKG9/NAlTdFj1Wb/4OAbX6I2giua3pYGO31We2AkiVfcyVULz7LyE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579802537697371.04015015926905; Thu, 23 Jan 2020 10:02:17 -0800 (PST) Received: from localhost ([::1]:34198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iugo3-0002uX-Vs for importer@patchew.org; Thu, 23 Jan 2020 13:02:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40910) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdM-0004KX-82 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdK-0006Dg-T5 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:08 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:24567 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufdK-0006DX-QK for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-303-z_5Nq8yeMbyTO_2h0ffPKA-1; Thu, 23 Jan 2020 11:47:02 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B918D63AD9 for ; Thu, 23 Jan 2020 16:47:01 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12CF428D06; Thu, 23 Jan 2020 16:47:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ToN5OA+OYIWiz1ocOLRwTVQ2bvWzssRm5w/2+kmT8qs=; b=DV7rzPcoYGqhVb5nPIN2fk6Hd4V0jCEmxATazgDn+mlrH2p5KYQWbcj0mDSshm6TslKO2s hhBbIX6gbO29u6A4/LMLEF+tTc/fg9QmV60Zr11Ed3iHOFZKfRx6H4dTu3VuFAv1oL7Y4o FIN+GUCU/OJwXM/kMTOdR5ePtzj9HqU= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 012/108] virtiofsd: Fix common header and define for QEMU builds Date: Thu, 23 Jan 2020 16:44:54 +0000 Message-Id: <20200123164630.91498-13-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: z_5Nq8yeMbyTO_2h0ffPKA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" All of the fuse files include config.h and define GNU_SOURCE where we don't have either under our build - remove them. Fixup path to the kernel's fuse.h in the QEMUs world. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/buffer.c | 4 +--- tools/virtiofsd/fuse_i.h | 3 +++ tools/virtiofsd/fuse_log.c | 1 + tools/virtiofsd/fuse_lowlevel.c | 6 ++---- tools/virtiofsd/fuse_opt.c | 2 +- tools/virtiofsd/fuse_signals.c | 2 +- tools/virtiofsd/helper.c | 1 + tools/virtiofsd/passthrough_ll.c | 8 ++------ 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/tools/virtiofsd/buffer.c b/tools/virtiofsd/buffer.c index 4d507f3302..772efa922d 100644 --- a/tools/virtiofsd/buffer.c +++ b/tools/virtiofsd/buffer.c @@ -9,9 +9,7 @@ * See the file COPYING.LIB */ =20 -#define _GNU_SOURCE - -#include "config.h" +#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" #include diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h index e63cb58388..bae06992e0 100644 --- a/tools/virtiofsd/fuse_i.h +++ b/tools/virtiofsd/fuse_i.h @@ -6,6 +6,9 @@ * See the file COPYING.LIB */ =20 +#define FUSE_USE_VERSION 31 + + #include "fuse.h" #include "fuse_lowlevel.h" =20 diff --git a/tools/virtiofsd/fuse_log.c b/tools/virtiofsd/fuse_log.c index 11345f9ec8..c301ff6da1 100644 --- a/tools/virtiofsd/fuse_log.c +++ b/tools/virtiofsd/fuse_log.c @@ -8,6 +8,7 @@ * See the file COPYING.LIB */ =20 +#include "qemu/osdep.h" #include "fuse_log.h" =20 #include diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 3da80de233..07fb8a6095 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -9,11 +9,9 @@ * See the file COPYING.LIB */ =20 -#define _GNU_SOURCE - -#include "config.h" +#include "qemu/osdep.h" #include "fuse_i.h" -#include "fuse_kernel.h" +#include "standard-headers/linux/fuse.h" #include "fuse_misc.h" #include "fuse_opt.h" =20 diff --git a/tools/virtiofsd/fuse_opt.c b/tools/virtiofsd/fuse_opt.c index edd36f4a3b..28922361a2 100644 --- a/tools/virtiofsd/fuse_opt.c +++ b/tools/virtiofsd/fuse_opt.c @@ -9,8 +9,8 @@ * See the file COPYING.LIB */ =20 +#include "qemu/osdep.h" #include "fuse_opt.h" -#include "config.h" #include "fuse_i.h" #include "fuse_misc.h" =20 diff --git a/tools/virtiofsd/fuse_signals.c b/tools/virtiofsd/fuse_signals.c index 19d6791cb9..dc7c8ac025 100644 --- a/tools/virtiofsd/fuse_signals.c +++ b/tools/virtiofsd/fuse_signals.c @@ -8,7 +8,7 @@ * See the file COPYING.LIB */ =20 -#include "config.h" +#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" =20 diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index d9227d7367..9333691525 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -10,6 +10,7 @@ * See the file COPYING.LIB. */ =20 +#include "qemu/osdep.h" #include "fuse_i.h" #include "fuse_lowlevel.h" #include "fuse_misc.h" diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 126a56ccbd..322a889cdf 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -35,15 +35,11 @@ * \include passthrough_ll.c */ =20 -#define _GNU_SOURCE -#define FUSE_USE_VERSION 31 - -#include "config.h" - +#include "qemu/osdep.h" +#include "fuse_lowlevel.h" #include #include #include -#include #include #include #include --=20 2.24.1