From nobody Sun May 19 00:17:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588150714; cv=none; d=zohomail.com; s=zohoarc; b=cOQNEBt8fFjYRn6Fplc9npGAMS5op7VxQbg2FDd85xZEF7fO1xJv2V5Nv0V+XVp8Z5QebB61OoBLc0dnCqT49+sckWEcCbdqgC7Bm8F2NUhs2g7/8Q4T+z1nPLyYW5ZHNFFJlJwDJdZCHf2EKbvt+NDrSgc5KcE+zIduvDIdV3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588150714; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=HO2z0RVC3DxPHsJmEAHqYlCK2Z5kGAbpw7tvGYyRMxE=; b=e/EnC//jMWjI8Uf39CIRALqmNDKLZQzmbgIoRVujb7SojxwhOlSLdnZ2Wv2H2tAdtq5yH7sLFQhQqHqonO0bVco9bby09VlaoY8mMb3rLNEo2brJbJ2DvUOt0N4JGXOJA7CkwKpgnqAYxOTVvl1M/9rmcCYn6bQC6syflcVo62Q= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 1588150714670328.05611535338164; Wed, 29 Apr 2020 01:58:34 -0700 (PDT) Received: from localhost ([::1]:52120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiY5-00054u-GK for importer@patchew.org; Wed, 29 Apr 2020 04:58:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiVc-0000rk-53 for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiV8-0001BE-HL for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:55:59 -0400 Received: from mga05.intel.com ([192.55.52.43]:25913) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTiV7-0000wb-II for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:55:30 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 01:55:26 -0700 Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by fmsmga005.fm.intel.com with ESMTP; 29 Apr 2020 01:55:24 -0700 IronPort-SDR: 0N+vlx/ELAfT5oIF/ePZwBRbQFV+MakLSGnSBew8Ia7rpK5HlUfbfGfnClNejhKgeD92p1uR7z W6/BRXBXyaqQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: f+c7rNMlyGB4ZDKLhVjyNARVSQZ5ut6OSNUKkx1QxvDtcF0XOuLKuYpkfDpFvobpv/g3A/0yRS 8QKcGSxvorZA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,331,1583222400"; d="scan'208";a="459114622" From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Joao Martins , Xiao Guangrong , Dan Williams Subject: [PATCH v3 1/3] exec: fetch the alignment of Linux devdax pmem character device nodes Date: Wed, 29 Apr 2020 16:50:09 +0800 Message-Id: <20200429085011.63752-2-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200429085011.63752-1-jingqi.liu@intel.com> References: <20200429085011.63752-1-jingqi.liu@intel.com> 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=192.55.52.43; envelope-from=jingqi.liu@intel.com; helo=mga05.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 04:55:24 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 192.55.52.43 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: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If the backend file is devdax pmem character device, the alignment specified by the option 'align=3DNUM' in the '-object memory-backend-file' needs to match the alignment requirement of the devdax pmem character devic= e. This patch uses the interfaces of libdaxctl to fetch the devdax pmem file 'align', so that we can compare it with the NUM of 'align=3DNUM'. The NUM needs to be larger than or equal to the devdax pmem file 'align'. It also fixes the problem that mmap() returns failure in qemu_ram_mmap() when the NUM of 'align=3DNUM' is less than the devdax pmem file 'align'. Suggested-by: Dan Williams Reviewed-by: Joao Martins Signed-off-by: Jingqi Liu --- exec.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index de9d949902..2c3444e47e 100644 --- a/exec.c +++ b/exec.c @@ -77,6 +77,10 @@ =20 #include "monitor/monitor.h" =20 +#ifdef CONFIG_LIBDAXCTL +#include +#endif + //#define DEBUG_SUBPAGE =20 #if !defined(CONFIG_USER_ONLY) @@ -1736,6 +1740,46 @@ static int64_t get_file_size(int fd) return size; } =20 +static int64_t get_file_align(int fd) +{ + int64_t align =3D -1; +#if defined(__linux__) && defined(CONFIG_LIBDAXCTL) + struct stat st; + + if (fstat(fd, &st) < 0) { + return -errno; + } + + /* Special handling for devdax character devices */ + if (S_ISCHR(st.st_mode)) { + g_autofree char *path =3D NULL; + g_autofree char *rpath =3D NULL; + struct daxctl_ctx *ctx; + struct daxctl_region *region; + int rc =3D 0; + + path =3D g_strdup_printf("/sys/dev/char/%d:%d", + major(st.st_rdev), minor(st.st_rdev)); + rpath =3D realpath(path, NULL); + + rc =3D daxctl_new(&ctx); + if (rc) { + return -1; + } + + daxctl_region_foreach(ctx, region) { + if (strstr(rpath, daxctl_region_get_path(region))) { + align =3D daxctl_region_get_align(region); + break; + } + } + daxctl_unref(ctx); + } +#endif /* defined(__linux__) && defined(CONFIG_LIBDAXCTL) */ + + return align; +} + static int file_ram_open(const char *path, const char *region_name, bool *created, @@ -2275,7 +2319,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, Mem= oryRegion *mr, { RAMBlock *new_block; Error *local_err =3D NULL; - int64_t file_size; + int64_t file_size, file_align; =20 /* Just support these ram flags by now. */ assert((ram_flags & ~(RAM_SHARED | RAM_PMEM)) =3D=3D 0); @@ -2311,6 +2355,14 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, Me= moryRegion *mr, return NULL; } =20 + file_align =3D get_file_align(fd); + if (file_align > 0 && mr && file_align > mr->align) { + error_setg(errp, "backing store align 0x%" PRIx64 + " is larger than 'align' option 0x" RAM_ADDR_FMT, + file_align, mr->align); + return NULL; + } + new_block =3D g_malloc0(sizeof(*new_block)); new_block->mr =3D mr; new_block->used_length =3D size; --=20 2.17.1 From nobody Sun May 19 00:17:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588150804; cv=none; d=zohomail.com; s=zohoarc; b=ec51lgaJkjL4F4GfE+KC8jhWNtmymfflsFromc15/r8Lo+SensJlO4fqhesiIWjtCCrBjxC9u03TH3NP78fiosdj0bJuL9seUX/yPOYvZWEnfhxzYc+7p3Pmm7/Kc2AMuOCbuWIg4jLXIFSHgC5aaJSY76HsIZnoMRH0ivIiiWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588150804; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=TYVpBO9Xnze6rsQVkSzWlvI3E8heXEzekGbAlsgJL3s=; b=UPGlKlvsw0BWRddLbBK1PM2HKw9oKNvW/uLEFzqLfWODGmmSxTZHrPLCc7+OLbPi9KfKN92n+hxR05iMgsegfoOi/a12N7zCVIhaDVf6FQuLEaUUs8XgcttaB6osrQhVNLhJ1Kas7GPmcyg+qVYk7xVgb+bpk4wx3pBy4jak9EA= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 1588150804931495.843831625834; Wed, 29 Apr 2020 02:00:04 -0700 (PDT) Received: from localhost ([::1]:57438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiZX-0007EC-NP for importer@patchew.org; Wed, 29 Apr 2020 05:00:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57800) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiVb-0000r9-JN for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiV8-0001BP-Pm for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:55:59 -0400 Received: from mga05.intel.com ([192.55.52.43]:25911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTiV8-0000gc-7H for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:55:30 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 01:55:29 -0700 Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by fmsmga005.fm.intel.com with ESMTP; 29 Apr 2020 01:55:26 -0700 IronPort-SDR: 2oMX5TntifhWqVnbEk9VVzVb7Aa5gG8P8WCx66ek340dhL71mbMFI7o36u+4o/LV1msX8XLchp yunIbaSzIONw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: ZFkaqk8cmi/LHsjtNeoKiMdBv9VSor/511H/4OSWoscttJ4kJFRBDMEjSxgIgOfKr4PLoeNdHV YWpATLIDYJ8g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,331,1583222400"; d="scan'208";a="459114644" From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Joao Martins , Xiao Guangrong , Dan Williams Subject: [PATCH v3 2/3] docs/nvdimm: add description of alignment requirement of device dax Date: Wed, 29 Apr 2020 16:50:10 +0800 Message-Id: <20200429085011.63752-3-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200429085011.63752-1-jingqi.liu@intel.com> References: <20200429085011.63752-1-jingqi.liu@intel.com> 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=192.55.52.43; envelope-from=jingqi.liu@intel.com; helo=mga05.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 04:55:24 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 192.55.52.43 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: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For device dax (e.g., /dev/dax0.0), the NUM of 'align=3DNUM' option needs to match the alignment requirement of the device dax. It must be larger than or equal to the 'align' of device dax. Reviewed-by: Joao Martins Signed-off-by: Jingqi Liu --- docs/nvdimm.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt index 362e99109e..c2c6e441b3 100644 --- a/docs/nvdimm.txt +++ b/docs/nvdimm.txt @@ -132,6 +132,16 @@ address to the page size (getpagesize(2)) by default. = However, some types of backends may require an alignment different than the page size. In that case, QEMU v2.12.0 and later provide 'align' option to memory-backend-file to allow users to specify the proper alignment. +For device dax (e.g., /dev/dax0.0), this alignment needs to match the +alignment requirement of the device dax. The NUM of 'align=3DNUM' option +must be larger than or equal to the 'align' of device dax. +We can use one of the following commands to show the 'align' of device dax. + + ndctl list -X + daxctl list -R + +In order to get the proper 'align' of device dax, you need to install +the library 'libdaxctl'. =20 For example, device dax require the 2 MB alignment, so we can use following QEMU command line options to use it (/dev/dax0.0) as the --=20 2.17.1 From nobody Sun May 19 00:17:14 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588150902; cv=none; d=zohomail.com; s=zohoarc; b=nvQ/Cm56vypI8ziiAylzcGTpxbYcMBZ26R5vzGHhadR+mjilXGf2Xl5B5uNAL1wE8QMqRWXb8pM1dyLFynfPNuxDWoGfdJjSNJi8H5qnO2/htpyMqNw3G9/RwaYIN3I1cZ6tFJb4A3PBlixTUvtjsblJG7cYhMKOCfZ1gpPeMPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588150902; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=jv7Tfr6L6eLepHXwcXX6KkfB1bxJ5RUYEV0FKSc2CP4=; b=LEO4hiqq5ZQwdLYckOH0zeU5z/C+/9MUJ/LC4FbWIoIFg8KRdx9xj+T//eWSXqOxi9c2Z3f0zoXXpn9/l/4oVLGpxd2s7GHFddGUlx8iIwqulWXMDzxANHYQGCGss6fIiTPycd1Mf1ZLlPnRHAJcX2xCFG6nrfWApnrcNFJb0S8= ARC-Authentication-Results: i=1; mx.zohomail.com; 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=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 1588150901950705.7869288541442; Wed, 29 Apr 2020 02:01:41 -0700 (PDT) Received: from localhost ([::1]:33580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTib6-0000mQ-M8 for importer@patchew.org; Wed, 29 Apr 2020 05:01:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57810) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTiVc-0000sL-NO for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTiVA-0001Be-4m for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:56:00 -0400 Received: from mga05.intel.com ([192.55.52.43]:25911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jTiV9-0000gc-Hr for qemu-devel@nongnu.org; Wed, 29 Apr 2020 04:55:31 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2020 01:55:31 -0700 Received: from dazhang1-mobile.sh.intel.com ([10.239.48.70]) by fmsmga005.fm.intel.com with ESMTP; 29 Apr 2020 01:55:29 -0700 IronPort-SDR: 1wlIdXL8mJxtI3qyfzb1NlYw/aQ9NbprN8kb/cR4BomJ4Y9hTDjM2Lip5cTlLq7RLfzjDVSXJL 0Ztay3OAc/Mw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: 6ooFJFD+nHmoB6ZMPhTg1hg9JHZMijx7fn1eAh+opWKS7WjN8vhmgaI+nlL+CwA1UnZe1OAfpj G2DhKIq10iNA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,331,1583222400"; d="scan'208";a="459114658" From: Jingqi Liu To: Paolo Bonzini , Richard Henderson , Joao Martins , Xiao Guangrong , Dan Williams Subject: [PATCH v3 3/3] configure: add libdaxctl support Date: Wed, 29 Apr 2020 16:50:11 +0800 Message-Id: <20200429085011.63752-4-jingqi.liu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200429085011.63752-1-jingqi.liu@intel.com> References: <20200429085011.63752-1-jingqi.liu@intel.com> 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=192.55.52.43; envelope-from=jingqi.liu@intel.com; helo=mga05.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 04:55:24 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Received-From: 192.55.52.43 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: Jingqi Liu , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a pair of configure options --{enable,disable}-libdaxctl to control whether QEMU is compiled with libdaxctl [1]. Libdaxctl is a utility library for managing the device dax subsystem. QEMU uses mmap(2) to maps vNVDIMM backends and aligns the mapping address to the page size (getpagesize(2)) by default. However, some types of backends may require an alignment different than the page size. The 'align' option is provided to memory-backend-file to allow users to specify the proper alignment. For device dax (e.g., /dev/dax0.0), the 'align' option needs to match the alignment requirement of the device dax, which can be fetched through the APIs of libdaxctl version 57 or up. [1] Libdaxctl is a part of ndctl project. The project's repository is: https://github.com/pmem/ndctl For more information about libdaxctl APIs, you can refer to the comments in source code of: pmem/ndctl/daxctl/lib/libdaxctl.c. Reviewed-by: Joao Martins Signed-off-by: Jingqi Liu --- configure | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/configure b/configure index e225a1e3ff..d2418084c1 100755 --- a/configure +++ b/configure @@ -509,6 +509,7 @@ libpmem=3D"" default_devices=3D"yes" plugins=3D"no" fuzzing=3D"no" +libdaxctl=3D"" =20 supported_cpu=3D"no" supported_os=3D"no" @@ -1601,6 +1602,10 @@ for opt do ;; --gdb=3D*) gdb_bin=3D"$optarg" ;; + --enable-libdaxctl) libdaxctl=3Dyes + ;; + --disable-libdaxctl) libdaxctl=3Dno + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1894,6 +1899,7 @@ disabled with --disable-FEATURE, default is enabled i= f available: debug-mutex mutex debugging support libpmem libpmem support xkbcommon xkbcommon support + libdaxctl libdaxctl support =20 NOTE: The object files are built at the place where configure is launched EOF @@ -6190,6 +6196,24 @@ if test "$libpmem" !=3D "no"; then fi fi =20 +########################################## +# check for libdaxctl + +if test "$libdaxctl" !=3D "no"; then + if $pkg_config --atleast-version=3D57 "libdaxctl"; then + libdaxctl=3D"yes" + libdaxctl_libs=3D$($pkg_config --libs libdaxctl) + libdaxctl_cflags=3D$($pkg_config --cflags libdaxctl) + libs_softmmu=3D"$libs_softmmu $libdaxctl_libs" + QEMU_CFLAGS=3D"$QEMU_CFLAGS $libdaxctl_cflags" + else + if test "$libdaxctl" =3D "yes" ; then + feature_not_found "libdaxctl" "Install libdaxctl" + fi + libdaxctl=3D"no" + fi +fi + ########################################## # check for slirp =20 @@ -6767,6 +6791,7 @@ echo "parallels support $parallels" echo "sheepdog support $sheepdog" echo "capstone $capstone" echo "libpmem support $libpmem" +echo "libdaxctl support $libdaxctl" echo "libudev $libudev" echo "default devices $default_devices" echo "plugin support $plugins" @@ -7590,6 +7615,10 @@ if test "$libpmem" =3D "yes" ; then echo "CONFIG_LIBPMEM=3Dy" >> $config_host_mak fi =20 +if test "$libdaxctl" =3D "yes" ; then + echo "CONFIG_LIBDAXCTL=3Dy" >> $config_host_mak +fi + if test "$bochs" =3D "yes" ; then echo "CONFIG_BOCHS=3Dy" >> $config_host_mak fi --=20 2.17.1