From nobody Tue Oct 28 01:16:07 2025 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599071558; cv=none; d=zohomail.com; s=zohoarc; b=DsbcggXVdC0PMfKHPscp7hd80AUcC/PQ1poxK5n4OcBZgv3W0PmmJk+VYhCm0XZ3ipwRRbCRp+7GgCr9pWbyb/X12jVV1gok42u2lYFwRZY2OBgCayudot1el1TJrby+KxeH+dbm6hT3VuAbuJqpQg9Td88V0DoxsUR0MPNldcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599071558; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=hNepObtXPm4N1O5edBmKFbP2Y+PrGFrGNmL2JCj+pQg=; b=LJ8A1PH18RVJcUvqVr1tXw+ezzbz36YnY5U+p0OH7JuX99RAK84valyF8XalzsIHIvA+C3DfLm6W+xLCiIH48MCBaBgfPIv0qZDKCKAylEX2eGI0GSYyNdh9cbfxhSDVmmCTgAZaWRT1FZSWL1FpGXmOU7lwB8RPbb8bVCngrt0= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159907155864120.888443734835732; Wed, 2 Sep 2020 11:32:38 -0700 (PDT) Received: from localhost ([::1]:58714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDXYj-0000b7-7t for importer@patchew.org; Wed, 02 Sep 2020 14:32:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDXXj-0008T8-GV for qemu-devel@nongnu.org; Wed, 02 Sep 2020 14:31:35 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:53955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kDXXh-0003O3-LU for qemu-devel@nongnu.org; Wed, 02 Sep 2020 14:31:35 -0400 Received: by mail-pj1-x1035.google.com with SMTP id k15so215828pji.3 for ; Wed, 02 Sep 2020 11:31:33 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id q5sm205944pfg.89.2020.09.02.11.31.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Sep 2020 11:31:30 -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:mime-version :content-transfer-encoding; bh=hNepObtXPm4N1O5edBmKFbP2Y+PrGFrGNmL2JCj+pQg=; b=AocT/wK+7WaECxCR/4Clls8+GvCfyVl5N4oH3S6ONdKDCMexFCua44Mqu7NMjvPryY 6dXDnaAOfN26uUoG23LqKgUepo2PjLcYj+p12X05JAuNvB38EiClaNeep73+QUWIE05l gkPGja1XBOelvR3rBzUAU++CQHukz915cbv4W15ZI+lF1m6g7Fab29nHDRVn9GMB8IHK CFA1WzwO7ul9Ag+8EDnnVx9PoLyTakFABgsABPnKQp6l9rs0M0J8afED175q77jS9Hlg OPJ3hYjzOLlGfnRZ8HZ7aFLlyuiC6/zONF0MiePviIgGYLJZQU/8EYexPxbSV4opPf+i GLRg== 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:mime-version :content-transfer-encoding; bh=hNepObtXPm4N1O5edBmKFbP2Y+PrGFrGNmL2JCj+pQg=; b=d8JXQMEYoq1rHxPs+jgEZ7Rqj/W1cgyJglP8/Pd3bJR8Lu3jmrK5cfxpLCfqkJ6ChF YKrZ2Rn5UUnld6L1n/mH18eG0KoVOUECl+ATLfWsK+hmuhAhDlx/J+NV4zNbMbC/zNQd tFhNBcLn8e7kGHgb3CQlrSg+o4VyRhkRR3PA66Eq4u+YEDeBHAXcGIkAULr/hrugjLs6 pBJeWaDcI8/sPdyq0lyXSrbKICxwaUHZco9C9WEaA8eFJRKYJnT9sEQLZFzhuRvu2HfG OFqJyN942M2FXQL/IVZgumbdfIX0MhkbzpDDY6IOx6PqzlKF9AJd5Y+0a14vrFrBFZJz c/PQ== X-Gm-Message-State: AOAM530b7t+FG/C/fpRJqxoyFC1jtg7HmmUivKq5KUE1zJSREwWqtI/r 4KaCj866DGpfd29ACse6m+ccoaybRCQ= X-Google-Smtp-Source: ABdhPJyxKyCX1DJjkol2tnyh6rON4lh+sCt2eM0uuuY0Ue1aapLBzlluGwyMcvFOYb2oibq2BnxmCg== X-Received: by 2002:a17:902:fe94:: with SMTP id x20mr2986260plm.117.1599071491473; Wed, 02 Sep 2020 11:31:31 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH] block: Fixes nfs on msys2/mingw Date: Thu, 3 Sep 2020 02:31:13 +0800 Message-Id: <20200902183113.708-1-luoyonggang@gmail.com> X-Mailer: git-send-email 2.27.0.windows.1 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::1035; envelope-from=luoyonggang@gmail.com; helo=mail-pj1-x1035.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: Paolo Bonzini , Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" --- block/nfs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 61a249a9fc..34b2cd5708 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,12 @@ #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) #define QEMU_NFS_MAX_DEBUG_LEVEL 2 =20 +#if defined (_WIN32) +#define nfs_stat __stat64 +#else +#define nfs_stat stat +#endif + typedef struct NFSClient { struct nfs_context *context; struct nfsfh *fh; @@ -58,7 +66,7 @@ typedef struct NFSClient { bool has_zero_init; AioContext *aio_context; QemuMutex mutex; - blkcnt_t st_blocks; + int64_t st_size; bool cache_used; NFSServer *server; char *path; @@ -70,7 +78,7 @@ typedef struct NFSRPC { int ret; int complete; QEMUIOVector *iov; - struct stat *st; + struct nfs_stat *st; Coroutine *co; NFSClient *client; } NFSRPC; @@ -419,7 +427,7 @@ static int64_t nfs_client_open(NFSClient *client, Block= devOptionsNfs *opts, int flags, int open_flags, Error **errp) { int64_t ret =3D -EINVAL; - struct stat st; + struct nfs_stat st; char *file =3D NULL, *strp =3D NULL; =20 qemu_mutex_init(&client->mutex); @@ -545,7 +553,7 @@ static int64_t nfs_client_open(NFSClient *client, Block= devOptionsNfs *opts, } =20 ret =3D DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); - client->st_blocks =3D st.st_blocks; + client->st_size =3D st.st_size; client->has_zero_init =3D S_ISREG(st.st_mode); *strp =3D '/'; goto out; @@ -729,11 +737,11 @@ static int64_t nfs_get_allocated_file_size(BlockDrive= rState *bs) { NFSClient *client =3D bs->opaque; NFSRPC task =3D {0}; - struct stat st; + struct nfs_stat st; =20 if (bdrv_is_read_only(bs) && !(bs->open_flags & BDRV_O_NOCACHE)) { - return client->st_blocks * 512; + return client->st_size; } =20 task.bs =3D bs; @@ -746,7 +754,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverS= tate *bs) nfs_set_events(client); BDRV_POLL_WHILE(bs, !task.complete); =20 - return (task.ret < 0 ? task.ret : st.st_blocks * 512); + return (task.ret < 0 ? task.ret : st.st_size); } =20 static int coroutine_fn @@ -778,7 +786,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, BlockReopenQueue *queue, Error **errp) { NFSClient *client =3D state->bs->opaque; - struct stat st; + struct nfs_stat st; int ret =3D 0; =20 if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { @@ -800,7 +808,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, nfs_get_error(client->context)); return ret; } - client->st_blocks =3D st.st_blocks; + client->st_size =3D st.st_size; } =20 return 0; --=20 2.27.0.windows.1