From nobody Sun Feb 8 23:03:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670510200; cv=none; d=zohomail.com; s=zohoarc; b=nGpuVYtdwgen1wGFu2a9/uUGj5H1yLVgVvu1+l9icAm9dSRZmntGmDYHUSzyezVYi4BEMODxJ/ShmBhzSX/pUkGYXVl3IVgi5ZK8igWXO0NfISvus+B+sVV39Hly5yJuut5TR77kT61lL7bQWm1saP/q6y6mLDG3f9IPtoW6kLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670510200; 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=Nm6rNcvZRP+bnk+EH8yaL94wQk6HBSzwAjkbhu/yBlo=; b=JEvzA1gJ4yWo8MrkIYPcUaTcKRD1yI262QNgZd361W5MQvZGpqhXWu2w1r4YmO91ETBW6W1XF3byJG589TlfPZ22nBe7Sd07Ysoj9nbm9kQMG2Opq2EivvfjSHBNWm4agLV3QZyrl2GoT+eQxuAFH4bv1SQrhzhywI6wa8A9Y0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1670510200464876.8311221483148; Thu, 8 Dec 2022 06:36:40 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-bZBzxKJwM9GO4KKPQYVuLw-1; Thu, 08 Dec 2022 09:36:35 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B3E5E82DFE2; Thu, 8 Dec 2022 14:35:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0F4117582; Thu, 8 Dec 2022 14:35:58 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C1E581947067; Thu, 8 Dec 2022 14:35:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B536C1947B92 for ; Thu, 8 Dec 2022 14:35:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C308C20290AF; Thu, 8 Dec 2022 14:35:47 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.33.36.117]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B7E420290AE; Thu, 8 Dec 2022 14:35:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670510199; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Nm6rNcvZRP+bnk+EH8yaL94wQk6HBSzwAjkbhu/yBlo=; b=YcLFtGE0SQMLu3Qo180vplVp5Q1yb1kAS0b9sc82tXGSiZTi6SaBnipoO3VjSQB5SglhaD qpO+ntEsIqtiNFIwspJEycfZeUFOHUFCPD2P917xyb1bmOv8Iqut2Qukgbnhc3IxwTuvjb RAigl+aQ4cAIA+Ck4vMj8OuaQst800o= X-MC-Unique: bZBzxKJwM9GO4KKPQYVuLw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 19/21] meson: remove obsolete check for VHOST_VSOCK_SET_GUEST_CID Date: Thu, 8 Dec 2022 14:35:23 +0000 Message-Id: <20221208143525.1731853-20-berrange@redhat.com> In-Reply-To: <20221208143525.1731853-1-berrange@redhat.com> References: <20221208143525.1731853-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1670510209473100009 The VHOST_VSOCK_SET_GUEST_CID constant was introduced to Linux in commit 433fc58e6bf2c8bd97e57153ed28e64fd78207b8 Author: Asias He Date: Thu Jul 28 15:36:34 2016 +0100 VSOCK: Introduce vhost_vsock.ko This is old enough that all our supported platforms can be assumed to have this feature. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 3 --- src/util/virvsock.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index 612257a351..95bc89ec52 100644 --- a/meson.build +++ b/meson.build @@ -646,9 +646,6 @@ symbols =3D [ =20 if host_machine.system() =3D=3D 'linux' symbols +=3D [ - # check for VHOST_VSOCK_SET_GUEST_CID - [ 'linux/vhost.h', 'VHOST_VSOCK_SET_GUEST_CID' ], - # Check if we have new enough kernel to support BPF devices for cgroup= s v2 [ 'linux/bpf.h', 'BPF_PROG_QUERY' ], [ 'linux/bpf.h', 'BPF_CGROUP_DEVICE' ], diff --git a/src/util/virvsock.c b/src/util/virvsock.c index 4bbbf78167..c6f8b362b8 100644 --- a/src/util/virvsock.c +++ b/src/util/virvsock.c @@ -21,7 +21,7 @@ # include #endif =20 -#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID +#ifdef __linux__ # include #endif =20 @@ -35,7 +35,7 @@ =20 VIR_LOG_INIT("util.vsock"); =20 -#if WITH_DECL_VHOST_VSOCK_SET_GUEST_CID +#ifdef __linux__ static int virVsockSetGuestCidQuiet(int fd, unsigned int guest_cid) --=20 2.38.1