From nobody Mon Apr 29 01:56:22 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560773290; cv=none; d=zoho.com; s=zohoarc; b=imKXrXPf2hN0STqhl5sP+5GezADXFksnRea1fo5QdXBaieNixWOgZZi0RupQYNMMkEeTqzSUA/BRuCudoNvu9UUkfIcN6cn6j78UBNSI8iBCAX8Xb1pDFHwcvseUSXHHt9MoT4Qu+L747DvOmRhrHHcofF/SbGLbiNb+YOEa1Gw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560773290; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=AOUVviDrn1Xx59R6deGnsIm7DCiEh1XBbIpIEGOFYH0=; b=VyY8qmEqv28Xq+TrqVQAEqY/O0ULrR68DiZQBm7NyEonm4p/jTcRipltD6CjlQv4Unt8GskTjF6A1TtTgr58lGDj2bSkCtg492mtUIHcx//oUV77mM0w48N+9AyrGkNtw9nZ9hwnR7y3iJxPsdFil52WEsMfUS2TKZM3Mz0MW3g= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1560773290958825.837422835601; Mon, 17 Jun 2019 05:08:10 -0700 (PDT) Received: from localhost ([::1]:46418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcqQW-0003j1-O5 for importer@patchew.org; Mon, 17 Jun 2019 08:07:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55590) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcq0b-0004f7-B5 for qemu-devel@nongnu.org; Mon, 17 Jun 2019 07:41:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcq0Y-0004wl-FY for qemu-devel@nongnu.org; Mon, 17 Jun 2019 07:41:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58880) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcq0T-0004Ft-TY for qemu-devel@nongnu.org; Mon, 17 Jun 2019 07:41:05 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id CBB0D309266A; Mon, 17 Jun 2019 11:40:08 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBFB15B2E6; Mon, 17 Jun 2019 11:40:07 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Mon, 17 Jun 2019 12:40:05 +0100 Message-Id: <20190617114005.24603-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 17 Jun 2019 11:40:14 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] linux-user: fix includes to find SIOCGSTAMP with latest kernel headers 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: , Cc: Riku Voipio , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The SIOCGSTAMP symbol was previously defined in the asm-generic/sockios.h header file. QEMU sees that header indirectly via sys/socket.h -> bits/socket.h -> asm/socket.h -> asm-generic/socket.h -> asm/sockios.h -> asm-generic/sockios.h In linux kernel commit 0768e17073dc527ccd18ed5f96ce85f9985e9115 the asm-generic/sockios.h header no longer defines SIOCGSTAMP. Instead it provides only SIOCGSTAMP_OLD. The linux/sockios.h header now defines SIOCGSTAMP using either SIOCGSTAMP_OLD or SIOCGSTAMP_NEW as appropriate. This linux only header file is not pulled in by QEMU though, so we get a build failure: qemu/linux-user/ioctls.h:225:9: error: =E2=80=98SIOCGSTAMP=E2=80=99 undecla= red here (not in a function); did you mean =E2=80=98SIOCSRARP=E2=80=99? 225 | IOCTL(SIOCGSTAMP, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timeval))) | ^~~~~~~~~~ qemu/linux-user/syscall.c:4855:23: note: in definition of macro =E2=80=98IO= CTL=E2=80=99 4855 | { TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } }, | ^~~ qemu/linux-user/ioctls.h:226:9: error: =E2=80=98SIOCGSTAMPNS=E2=80=99 undec= lared here (not in a function); did you mean =E2=80=98SIOCGSTAMP_OLD=E2=80= =99? 226 | IOCTL(SIOCGSTAMPNS, IOC_R, MK_PTR(MK_STRUCT(STRUCT_timespec))) | ^~~~~~~~~~~~ qemu/linux-user/syscall.c:4855:23: note: in definition of macro =E2=80=98IO= CTL=E2=80=99 4855 | { TARGET_ ## cmd, cmd, #cmd, access, 0, { __VA_ARGS__ } }, | ^~~ Signed-off-by: Daniel P. Berrang=C3=A9 --- linux-user/syscall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index b187c1281d..f13e260b02 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include --=20 2.21.0