From nobody Tue May 21 09:57:54 2024 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=1659383971; cv=none; d=zohomail.com; s=zohoarc; b=C3rY3UgwBHk7uoL/aKGZgZ8RXzoH/oTZShlcKrnRrpWmTF8WxKNCTNE17lsUN1GIKFYBPN3XizjZnL4+sVrURHJNT2XYQ9bB+yQnd2HfPJvOF4/GdEYFtlMbQiCwDL8fjbSzJYiFA4IsLqFXR1vt+Sp0iFDAFRQwVDtFgmA1ABI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659383971; h=Content-Type:Content-Transfer-Encoding:Cc: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=qDthA60QJbdwVIk6RfgVOOKMSndPeV5vPthznVWLpJk=; b=d75ZDQjreuuEBytRCsSIWefGhGnXcAQLt/thLqcNtNqEn9jbKSCa4c7MxL6RMqz39UrBOpSBcO9I2+2wzYVSgx/hGGnLzQ93h9uaPE4Q5Fi6PA5RQQYCPRtuGvai5+6kaCKfBoo0nqvwFsyZzvMnrNeqMsqRvNgxHrDpsCILWEk= 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 1659383971252909.8117687663001; Mon, 1 Aug 2022 12:59:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-43-ut6xBPkXNoePaSkzRmVQzQ-1; Mon, 01 Aug 2022 15:59:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6F9A93C0CD4E; Mon, 1 Aug 2022 19:59:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BF9140D282F; Mon, 1 Aug 2022 19:59:22 +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 4CBC31946A56; Mon, 1 Aug 2022 19:59:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D06A51946A4A for ; Mon, 1 Aug 2022 19:59:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C2C072166B2B; Mon, 1 Aug 2022 19:59:20 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.8.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id A142C2166B26; Mon, 1 Aug 2022 19:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659383969; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=qDthA60QJbdwVIk6RfgVOOKMSndPeV5vPthznVWLpJk=; b=QOmKIhUnlOjMgnwr7BAXVNmclOoMPiSOqN0PI6yFQQAIBiEJxo/1BjcQxLr4937JVJkDQZ oztnG6LpOekMJd75fS3KyrAFfVwQFIo/A5RM9UqV/2ISEU1MjCP7HbNOT4I3IejimmgSkL BA0IXyuy6Bli5JBm0oHyUJj2f/rv66M= X-MC-Unique: ut6xBPkXNoePaSkzRmVQzQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH 1/2] lxc: containter: fix build with glibc 2.36 Date: Mon, 1 Aug 2022 15:59:14 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: , Cc: Cole Robinson Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659383971512100004 Content-Type: text/plain; charset="utf-8" With glibc 2.36, sys/mount.h and linux/mount.h conflict: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.= 3E_and_.3Csys.2Fmount.h.3E lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in linux/mount.h. linux/fs.h isn't required here though. glibc sys/mount.h has had MS_MOVE since 2.12 in 2010 Signed-off-by: Cole Robinson Reviewed-by: Erik Skultety --- src/lxc/lxc_container.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b5278831da..a5401c2186 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -33,9 +33,6 @@ /* Yes, we want linux private one, for _syscall2() macro */ #include =20 -/* For MS_MOVE */ -#include - #if WITH_CAPNG # include #endif --=20 2.36.1 From nobody Tue May 21 09:57:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1659383968; cv=none; d=zohomail.com; s=zohoarc; b=BEdXJuK4gvGgs78SPW97aUd/rZolyIzCAUL0iv1avxfbrLOk/0cSxEcnPhv73HhmrBK7ky2cHNbQYynJZ99rD571gY5kkzEh1z2/8e+mBsU7e1AFmYckVR8DvhTnUD6hnZHT5VGBIRs/f1bSUfRvxaFFG0fgiehtU2dYrVCMnfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659383968; h=Content-Type:Content-Transfer-Encoding:Cc: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=CXcettm/hKIgloTgm6eNVaYGmP5F8kiP8c5EOvA/7nM=; b=anU+I/daN9pS+OZoAav0WkYGOeCIfTq24JvwbTPJH5zQJjbgXonP6RIPORjcrpYjZMp+7tLkD2NOXejI7mMUgYtzB7egWaGYXxInXUhDsuHYpnVYs6/iEnH2xt8YzJ7nu9FLVmgwg8dHSxC0raUV+vs6NsSBegog8qJC//0OSqk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1659383968659184.3052025970302; Mon, 1 Aug 2022 12:59:28 -0700 (PDT) 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-414-ZPbBIEuQOAyfXyGGH00LFA-1; Mon, 01 Aug 2022 15:59:26 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 99DEA8057B9; Mon, 1 Aug 2022 19:59:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1FF42024CBD; Mon, 1 Aug 2022 19:59:22 +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 62C6E1946A5B; Mon, 1 Aug 2022 19:59:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1F55A1946A41 for ; Mon, 1 Aug 2022 19:59:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F374A2166B2A; Mon, 1 Aug 2022 19:59:20 +0000 (UTC) Received: from colepc.redhat.com (unknown [10.22.8.134]) by smtp.corp.redhat.com (Postfix) with ESMTP id D29682166B26; Mon, 1 Aug 2022 19:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659383967; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=CXcettm/hKIgloTgm6eNVaYGmP5F8kiP8c5EOvA/7nM=; b=Ho5NMIOk9tLwI9hxFmqu6qxaGpks11GgD0qFASjLXnVaPC/P2vCbO7jvPXH+hvmylaeVWn 2OoAAYIfb3e4LMq2DhqGSl9bDBujzf8RdN8mdaAf1L07XTk6VU0HyfoEKsL15wvlbPK0vn A/1zSKq8+yUpaDybfJFc4qELqMLYCX0= X-MC-Unique: ZPbBIEuQOAyfXyGGH00LFA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Cole Robinson To: libvir-list@redhat.com Subject: [PATCH 2/2] virfile: Fix build with glibc 2.36 Date: Mon, 1 Aug 2022 15:59:15 -0400 Message-Id: <3b6a3cfd76832efd504bb3e868675e0f27e16c3a.1659383873.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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: , Cc: Cole Robinson Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659383969709100001 Content-Type: text/plain; charset="utf-8" With glibc 2.36, sys/mount.h and linux/mount.h conflict: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.= 3E_and_.3Csys.2Fmount.h.3E virfile.c imports sys/mount.h and linux/fs.h, which pulls in linux/mount.h. Manually define the constants we need from linux/fs.h, like was done in llvm: https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02 Signed-off-by: Cole Robinson Reviewed-by: Erik Skultety --- src/util/virfile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 99da058db3..65d6d2a701 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -71,7 +71,9 @@ # endif # include # include -# include +# define FS_IOC_GETFLAGS _IOR('f', 1, long) +# define FS_IOC_SETFLAGS _IOR('f', 2, long) +# define FS_NOCOW_FL 0x00800000 #endif =20 #if WITH_LIBATTR --=20 2.36.1