From nobody Sun Feb 8 10:48:52 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592409561; cv=none; d=zohomail.com; s=zohoarc; b=eHjOpcq8T+8Zw7a2qyH2FUNGZ0lCUNIAXLofH8wHwACieQlsgK+ROVA5ux5HSEj5i1/qlQermfm5koLu6Tzb2F63d5W7erbzzPBPB0jU1Wur9yZILSe2vopTWZvoGWFObf8HTsjzLH5Xjkt//BPS0xuIdY4NKcZ9WuA6ACx1h3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592409561; 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=jEcnhQLbQArWHmjZvZzaU2ZOIMfXkBpjG4UfKowEOIE=; b=bntFUyobpa7k8ba+xz6WIqFqqW3+Zp1458jXFPLmHO20cEg2J20JBp/ihGD2UVcGswuRuheXLKOvS7bjHc67L8S/ja6GhFEaYWCIjgCf+o+jpPGAPSl8BY+5DOfXtjrhaQFRhgiaiMsn3+3+Jqt+FYlTRWJusKR2HGlw+igvDQ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1592409561223503.4914413113969; Wed, 17 Jun 2020 08:59:21 -0700 (PDT) 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-507-5AYD9YeGNFOf9_sQ2NrZrw-1; Wed, 17 Jun 2020 11:59:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F477250FF3; Wed, 17 Jun 2020 15:59:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3EFD79302; Wed, 17 Jun 2020 15:59:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C2BC1809554; Wed, 17 Jun 2020 15:59:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05HFwrfY021539 for ; Wed, 17 Jun 2020 11:58:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99E9A1C8; Wed, 17 Jun 2020 15:58:53 +0000 (UTC) Received: from catbus.gsslab.fab.redhat.com (mustard.gsslab.fab.redhat.com [10.33.8.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0854A5F7D8; Wed, 17 Jun 2020 15:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592409560; 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=jEcnhQLbQArWHmjZvZzaU2ZOIMfXkBpjG4UfKowEOIE=; b=EMZerPOSJF2pHFkQr09Jimov/9wIsHdWh+ErBimHJCNrGcVQbviqe5EmFySob6wxsdjh1R RyPbz1pP3qSe06FgdVaJPj9Mto9Owggi2OC98VthywA/RDyFOAqzSV5wD1t5L0u9fPwXiK yMRbnCJ/8Xy9VmBCOzm+HYzIFuvg/8o= X-MC-Unique: 5AYD9YeGNFOf9_sQ2NrZrw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] lxc: drop compat code for mount constants Date: Wed, 17 Jun 2020 16:51:51 +0100 Message-Id: <20200617155153.1637033-2-berrange@redhat.com> In-Reply-To: <20200617155153.1637033-1-berrange@redhat.com> References: <20200617155153.1637033-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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) Given our supported platform matrix, we can safely assume that all the mount constants we need are defined by the system headers. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/lxc/lxc_container.c | 17 ----------------- src/lxc/lxc_controller.c | 8 -------- 2 files changed, 25 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 77df49ea75..b0a6deeb56 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -527,23 +527,6 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr = vmDef, /*_syscall2(int, pivot_root, char *, newroot, const char *, oldroot)*/ extern int pivot_root(const char * new_root, const char * put_old); =20 -#ifndef MS_REC -# define MS_REC 16384 -#endif - -#ifndef MNT_DETACH -# define MNT_DETACH 0x00000002 -#endif - -#ifndef MS_PRIVATE -# define MS_PRIVATE (1<<18) -#endif - -#ifndef MS_SLAVE -# define MS_SLAVE (1<<19) -#endif - - static int lxcContainerUnmountSubtree(const char *prefix, bool isOldRootFS) { diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4672920574..594d7f7e17 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2052,14 +2052,6 @@ static int lxcSetPersonality(virDomainDefPtr def) return 0; } =20 -#ifndef MS_REC -# define MS_REC 16384 -#endif - -#ifndef MS_SLAVE -# define MS_SLAVE (1<<19) -#endif - /* Create a private tty using the private devpts at PTMX, returning * the master in *TTYMASTER and the name of the slave, _from the * perspective of the guest after remounting file systems_, in --=20 2.24.1