From nobody Sun May 12 08:10:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602548259; cv=none; d=zohomail.com; s=zohoarc; b=b+OU1rOQldZusbtvCKCzlDNGi5P5LeNwrJnHv7pdUCJRqZZ/1YIKiaDUH0PkiQwJHqdlLqg14Hvmicyujz62AL8jdg1p7piSBeXRrkgI2Of51SbxEa2aA2lMokD3e8ZUPegS2a39kFHzxYgPPzr/citY63by2FmIwRPEqXijhxc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602548259; h=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=wF+RcJqzfCr+BV1mB/A5rZx8x6O9otAFA5Q++rjKL+g=; b=n4+yDMiPDgNb3G7WEMA1DUnxbBIcPzwJc1flXw9Hmlh78Q3eE2VYmUJr8jLgYk+WSEZIIkaa3XcRycnVZq0s16jgPiIBZ19LA9sKH3rqt8ZAb8ruj5sf4eiwyyEAd4LIekXzk1i6CdlvT2f1Du/wcXw8V8vM1p0G3qswqSV108o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1602548259302389.0988814788259; Mon, 12 Oct 2020 17:17:39 -0700 (PDT) Received: from localhost ([::1]:59468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kS80X-0003no-W7 for importer@patchew.org; Mon, 12 Oct 2020 20:17:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kS7z8-0002R7-Ce; Mon, 12 Oct 2020 20:16:10 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:45275) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kS7z4-0003Ms-Tn; Mon, 12 Oct 2020 20:16:10 -0400 Received: by mail-pf1-x441.google.com with SMTP id e7so6325293pfn.12; Mon, 12 Oct 2020 17:16:05 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id e5sm5902961pfj.99.2020.10.12.17.16.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 17:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wF+RcJqzfCr+BV1mB/A5rZx8x6O9otAFA5Q++rjKL+g=; b=FLmsSGB+f1iLeje6YES7GHCBDe4zBJMRhsLZCTqkLwZdUlNEiNMMN8pCKDsm/E6Pc4 31f/YJBN6yAT/cP03WBqDsqG30BczqEqrSZaKwkqO+sM+5ybd4XQf1y7BORDq32YdTeH sMBh9jlDMvKWxwMcdslWdvMA3t8m4JzCjY9/ImGij88WlaW45aNoJf33KbrTV5IsIU4a dxHmQ/Qf2T6IRODOtA/5uq2BD2yopi0iC+zYOe47oysq5xwOQIRSGM2XSxuAISW1y5Er e/fsUa4ZojC4sEfvydtT8zcRo5GKXdM7CTe647vbyB9cC5oe7H/xPUHtWwOgnhLN9ffr 6/WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wF+RcJqzfCr+BV1mB/A5rZx8x6O9otAFA5Q++rjKL+g=; b=YSvKISwTrJPLV2WC3xY4i/kJLjKM9vgvw3h+ATwV9Cgf5NFQvKNJz0FnyyFX0CGkMd W2gWgSuwmXSrPSs6nSBO/Dp7P4Y3NFkPQ/QQoljNiKzx0kefj0GfG9L6h/5g+c/ui/iu zEY/KXWpHbxBMx3Dl+/0U3LGEYGUjyGCiRiyNhEpBbZqZ7MYQU3zwcazyXorhZXGmXHI 6TV79qerE+3c+vwWhJLT7YKJS0YxdEvZWu5A4iAkGpOiydydJXsCvpISAiyUQGesDHk6 RGwpONiIBoEZb4NNGarRNw3ffh5h25Tp1I3pQ7xVktT6/xKy1z6tOtX1hx7Uq2fTW75Q o16g== X-Gm-Message-State: AOAM533j4Zrr2ABdwuu0DuWm8sN8Om/ZHzymFvbJTtmU5r6hQlk+MrSF MiOFCqZqXiFPgC/UXFDJPQe7hECizXHRyw== X-Google-Smtp-Source: ABdhPJwh+j9F+ipeFw7Nj33Hjk9twtXlzUlvCi2RymuZRnAY12R03/UYy9K4twbxoGjf57DzAnfZ+Q== X-Received: by 2002:a17:90b:891:: with SMTP id bj17mr22034519pjb.44.1602548164243; Mon, 12 Oct 2020 17:16:04 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw Date: Tue, 13 Oct 2020 08:15:44 +0800 Message-Id: <20201013001545.1958-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201013001545.1958-1-luoyonggang@gmail.com> References: <20201013001545.1958-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::441; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , qemu-block@nongnu.org, QEMU Trivial , Peter Lieven , Max Reitz , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" These compiling errors are fixed: ../block/nfs.c:27:10: fatal error: poll.h: No such file or directory 27 | #include | ^~~~~~~~ compilation terminated. ../block/nfs.c:63:5: error: unknown type name 'blkcnt_t' 63 | blkcnt_t st_blocks; | ^~~~~~~~ ../block/nfs.c: In function 'nfs_client_open': ../block/nfs.c:550:27: error: 'struct _stat64' has no member named 'st_bloc= ks' 550 | client->st_blocks =3D st.st_blocks; | ^ ../block/nfs.c: In function 'nfs_get_allocated_file_size': ../block/nfs.c:751:41: error: 'struct _stat64' has no member named 'st_bloc= ks' 751 | return (task.ret < 0 ? task.ret : st.st_blocks * 512); | ^ ../block/nfs.c: In function 'nfs_reopen_prepare': ../block/nfs.c:805:31: error: 'struct _stat64' has no member named 'st_bloc= ks' 805 | client->st_blocks =3D st.st_blocks; | ^ ../block/nfs.c: In function 'nfs_get_allocated_file_size': ../block/nfs.c:752:1: error: control reaches end of non-void function [-Wer= ror=3Dreturn-type] 752 | } | ^ On msys2/mingw, there is no st_blocks in struct _stat64 yet, we disable the= usage of it on msys2/mingw, and create a typedef long long blkcnt_t; for further implem= entation Signed-off-by: Yonggang Luo --- block/nfs.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/nfs.c b/block/nfs.c index f86e660374..cf8795fb49 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -24,7 +24,9 @@ =20 #include "qemu/osdep.h" =20 +#if !defined(_WIN32) #include +#endif #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -51,6 +53,10 @@ #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) #define QEMU_NFS_MAX_DEBUG_LEVEL 2 =20 +#if defined(_WIN32) +typedef long long blkcnt_t; +#endif + typedef struct NFSClient { struct nfs_context *context; struct nfsfh *fh; @@ -545,7 +551,9 @@ static int64_t nfs_client_open(NFSClient *client, Block= devOptionsNfs *opts, } =20 ret =3D DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); +#if !defined(_WIN32) client->st_blocks =3D st.st_blocks; +#endif client->has_zero_init =3D S_ISREG(st.st_mode); *strp =3D '/'; goto out; @@ -706,6 +714,7 @@ static int nfs_has_zero_init(BlockDriverState *bs) return client->has_zero_init; } =20 +#if !defined(_WIN32) /* Called (via nfs_service) with QemuMutex held. */ static void nfs_get_allocated_file_size_cb(int ret, struct nfs_context *nfs, void *dat= a, @@ -748,6 +757,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverS= tate *bs) =20 return (task.ret < 0 ? task.ret : st.st_blocks * 512); } +#endif =20 static int coroutine_fn nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact, @@ -800,7 +810,9 @@ static int nfs_reopen_prepare(BDRVReopenState *state, nfs_get_error(client->context)); return ret; } +#if !defined(_WIN32) client->st_blocks =3D st.st_blocks; +#endif } =20 return 0; @@ -869,7 +881,10 @@ static BlockDriver bdrv_nfs =3D { .create_opts =3D &nfs_create_opts, =20 .bdrv_has_zero_init =3D nfs_has_zero_init, +/* libnfs does not provide the allocated filesize of a file on win32. */ +#if !defined(_WIN32) .bdrv_get_allocated_file_size =3D nfs_get_allocated_file_size, +#endif .bdrv_co_truncate =3D nfs_file_co_truncate, =20 .bdrv_file_open =3D nfs_file_open, --=20 2.28.0.windows.1 From nobody Sun May 12 08:10:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602548388; cv=none; d=zohomail.com; s=zohoarc; b=SUEMp7DC+xK/aN3741RgvuvSxDa9oNPzrk5c/EPPT6nvG9hECHsF0l4dANROddweazRCUda00mlc3g8o1BqJvZ0XQC+jvZnjRkRJsqkmD0wXi8SwrlXmH+njJxZp2T0TphobJoWCVukxSmtch+KXa4/VYJy7SxmmvKWrSgC4c98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602548388; h=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=FrTKTlG1EDZjcPSl/+JCmAi0vT/pVbtGMJNvgBv4AuU=; b=W20cdgynNVBd2++X1nxoXFUBz4hM27Z4s0qJTEabTudCnJJ0pEVYSWAX/nxkgty1mAgpICu0+9HtSM9J7dmm7Yv+geOYgBUcadY6qtdA+Z8Qw35QVWGuI/ZJ7NdcqmblW6je42fM5K74jQg9a+zZKwbByxQCR1e10mXFk9SKK14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1602548388125924.9087797002112; Mon, 12 Oct 2020 17:19:48 -0700 (PDT) Received: from localhost ([::1]:34674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kS82d-0005HY-2j for importer@patchew.org; Mon, 12 Oct 2020 20:19:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kS7zA-0002Si-Hr; Mon, 12 Oct 2020 20:16:12 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:32768) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kS7z8-0003NG-TM; Mon, 12 Oct 2020 20:16:12 -0400 Received: by mail-pf1-x441.google.com with SMTP id j18so2792002pfa.0; Mon, 12 Oct 2020 17:16:08 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id e5sm5902961pfj.99.2020.10.12.17.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 17:16:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FrTKTlG1EDZjcPSl/+JCmAi0vT/pVbtGMJNvgBv4AuU=; b=tY1BPi1jju2nEvVxJUN1LGMA3J/7rseZejcQiRQd3HPsQv7PEs6FLhTAWLunvoI2+a 4/SDlc/r+9gIaE7rUHE0KXCGwut50vkRGPpyUMuANqKXTJ3fr27AW7iJlHL48pq1Vwr9 yYXAG2SpCsNmrwdXo1SXHw9ebgyolQ31Q+d/LpFg5CDDD5P0G/LpMsef4yuIojLDwLmB FTVwKoD+SkLp8gZ6GHZlwnxhNBUYESC/WiB4EXs4mDDIx+eyNga5kzvtXN3leQjg8zU8 RIrDcB09FYFU6dHg74F+0GHA989oQ80j20GgAMoQKHiga8FOpbF6jaJWrsAVMMSh9gK7 jLTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FrTKTlG1EDZjcPSl/+JCmAi0vT/pVbtGMJNvgBv4AuU=; b=sxWBTOMQ+Js28rN+jf/cOlYn8+X4jCK6f5HC73YXIDtt16rG1fMuEr2K3fAlEv5zza NZK2GdATnoAyj/4izEsD8w14ukkGKfId1snUuc+t/i5urYyh2U/MyeTafwZuKaRXjpWo QA3GE6YsZWkV1x40zOZd3JHUDGuXW9+/YvghHuQmZaHrCTKbqut7piXAye/Q4+4Uow2b 2djAPiIkTgKkH5VD5k2et1SuvJiuPQwD8bQZKABYEa0t0Mhs7SoUA2eDsCssYtG86fq5 208XHBks7RgcWKhuV367RNUMVFNLPa90uHPx0gDA4Fjmgy38gHv7ettNPNDsbRaQ5Pg1 fLyQ== X-Gm-Message-State: AOAM532VDhDUcItZ55tTsqLcBpPGu+H+3fyqjB7rypkI0CK/fyCEWSi+ oZ9+7mSwA9PlPu8yKqv1gR9yXQqNA1f7Lg== X-Google-Smtp-Source: ABdhPJwhbFQORDR6WbChlaYB55Y1IKDWyYSLyzpFoFd9GNQn4bH84Xs3t9i0gx3TS0jXCH965uqPxg== X-Received: by 2002:a63:25c3:: with SMTP id l186mr14898012pgl.229.1602548167242; Mon, 12 Oct 2020 17:16:07 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml Date: Tue, 13 Oct 2020 08:15:45 +0800 Message-Id: <20201013001545.1958-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20201013001545.1958-1-luoyonggang@gmail.com> References: <20201013001545.1958-1-luoyonggang@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::441; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Kevin Wolf , qemu-block@nongnu.org, QEMU Trivial , Peter Lieven , Max Reitz , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" At the begging libnfs are not enabled because of compiling error, now it's fixed so enable it Signed-off-by: Yonggang Luo --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index f42ccb956a..2c6bf45e6d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -109,6 +109,7 @@ windows_msys2_task: mingw-w64-x86_64-cyrus-sasl \ mingw-w64-x86_64-curl \ mingw-w64-x86_64-gnutls \ + mingw-w64-x86_64-libnfs \ " bitsadmin /transfer msys_download /dynamic /download /priority FOR= EGROUND ` https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphi= nx-2.3.1-1-any.pkg.tar.xz ` --=20 2.28.0.windows.1