From nobody Mon Nov 25 04:44:21 2024 Delivered-To: importer@patchew.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=1717509010; cv=none; d=zohomail.com; s=zohoarc; b=ZYblJEanAI/t//VVw7ZlQC9CsV625Ct6vZZkGsewMUnji/RN2iv2JZk+dPDd4Mjmoxj5eNCy+Co6AKfoYZzrhVZcRxkgAj8ZAqnKfXvNAKvIYnj1J/JyHp/1TQw8ew8KXb60FheLb0JMuJ8lvepcjfH+lvY1X5CEXOkhQC3VEtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717509010; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VTs1CazDuYQYyqNg17yZkKnnH71hmdmUVDNxDCO95G8=; b=Qmb9pR9sVh1Z7npfv8ILohwZkDb/hR7tLYmEw6cIrI1qMw0JE1y5F65kF647QC0Cr7XbdxmNLse0l6HKFMAF7xA6ZaCD3vX2R9IpuUoeKvIFgETaDmw/1f8F6X1i0/K1ctNUUw7UfTJG2F+y8/DCTnYuv7HrJj8zLnQc7IIzn6Q= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717509010773992.8037858943708; Tue, 4 Jun 2024 06:50:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEUY6-00063p-3L; Tue, 04 Jun 2024 09:50:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEUY3-0005ya-Sw for qemu-devel@nongnu.org; Tue, 04 Jun 2024 09:50:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEUY1-0002mt-4o for qemu-devel@nongnu.org; Tue, 04 Jun 2024 09:49:58 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-xtDvPf1jOh2icgWwWTMlXQ-1; Tue, 04 Jun 2024 09:49:52 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 90A8F101A521; Tue, 4 Jun 2024 13:49:52 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.39.194.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF9C6C15C46; Tue, 4 Jun 2024 13:49:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717508996; h=from:from: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; bh=VTs1CazDuYQYyqNg17yZkKnnH71hmdmUVDNxDCO95G8=; b=Jok0UYgwWMXc4YZaJ6KqH/6+ggs7IISSO6E29amsx139wtBNrS72fhw3g68QErAETCqizs EjgAEIiAJDyX01OAPAlkzM8lcXXu3elD8NGkt/9C98VbFoMoyV5oij5xHtmhQxWyyD31pg XbP+reCbmWvKOXYASuPZ5RJtDwPaSgY= X-MC-Unique: xtDvPf1jOh2icgWwWTMlXQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Konstantin Kostiuk , Michael Roth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH 07/20] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options Date: Tue, 4 Jun 2024 14:49:20 +0100 Message-ID: <20240604134933.220112-8-berrange@redhat.com> In-Reply-To: <20240604134933.220112-1-berrange@redhat.com> References: <20240604134933.220112-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717509012757100003 Defining these at the meson level allows them to be used a conditional tests in the QAPI schemas. Signed-off-by: Daniel P. Berrang=C3=A9 --- meson.build | 18 ++++++++++++++++++ qga/commands-common.h | 9 --------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index 6386607144..356b2a4817 100644 --- a/meson.build +++ b/meson.build @@ -2141,6 +2141,22 @@ have_virtfs_proxy_helper =3D get_option('virtfs_prox= y_helper') \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper re= quires libcap-ng') \ .allowed() =20 +qga_fsfreeze =3D false +qga_fstrim =3D false +if host_os =3D=3D 'windows' + qga_fsfreeze =3D true + qga_fstrim =3D true +elif host_os =3D=3D 'linux' + if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') + qga_fsfreeze =3D true + endif + if cc.has_header_symbol('linux/fs.h', 'FITRIM') + qga_fstrim =3D true + endif +elif host_os =3D=3D 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h', 'UF= SSUSPEND') + qga_fsfreeze =3D true +endif + if get_option('block_drv_ro_whitelist') =3D=3D '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') else @@ -2375,6 +2391,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', get_option('= debug_tcg')) config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) config_host_data.set('CONFIG_REPLICATION', get_option('replication').allow= ed()) +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) +config_host_data.set('CONFIG_FSTRIM', qga_fstrim) =20 # has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) diff --git a/qga/commands-common.h b/qga/commands-common.h index 8c1c56aac9..263e7c0525 100644 --- a/qga/commands-common.h +++ b/qga/commands-common.h @@ -15,19 +15,10 @@ =20 #if defined(__linux__) #include -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif /* __linux__ */ =20 #ifdef __FreeBSD__ #include -#ifdef UFSSUSPEND -#define CONFIG_FSFREEZE -#endif #endif /* __FreeBSD__ */ =20 #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM) --=20 2.45.1