From patchwork Thu Oct 27 18:36:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 619198 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp496197pvb; Thu, 27 Oct 2022 11:52:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lb5h5aqBh0iw/bCwIFtRh4oVPpAv3cU2IV5CNLSvJbegelBXmAjs7e9kOSZeeBtSB+Mjm X-Received: by 2002:a05:620a:bc9:b0:6ef:417:d4fa with SMTP id s9-20020a05620a0bc900b006ef0417d4famr28126670qki.715.1666896769154; Thu, 27 Oct 2022 11:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666896769; cv=none; d=google.com; s=arc-20160816; b=ML7vUwsz78ShRSG0yCQbm50l8d4EUMcYfCe2niZAdbBGqte/E8DteJxq05mIFkC5R9 6UKJXagjeLCnBrnZLmqocOY43H4TjSkN5Xszr9Cx5dMhUV+gx76l0KlMDqAS7Kh8sNYs rv4Wq2qjo9SVXDfH6D0AYgKWmEbo1Z9FqzMDOhpk+HqXD6vkXiv+EX4mIshHCTq7FmuO ZVF1CUFojYaNNRFs/t1cOP7peJPS8OmvzT080jbk+PczFDbTAMrspv4wERVDaNage4/o PKDbIrjTVt3ROsabRFhV1brwDiSPPjWNyNYGwGjFLFiVmjtbW0M9yt/eNIs+gc0TABtb Rhxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=aQZCvE50MfxR29zAAfQ8hh/Z0TMDIY0tBk1sFqzac2Mh7Mz5UJZbcNkwvK8EtFXrPD Q8QidYrqZceQlTZbvieeQ4oaysd9kzR9wizC221WKgVcO1iYZonmFVM33N8GHlMKa3Pd sLYDnN8RtnzJjjHR0oKKgGzZHO1+FYW/x8FMwH52JRpeMmJUE4gk0UklpbBER6n24Ju1 OAXb3xqBzmJ9ze5F0qrPfeqkFR3S6+vDIniEaEfsxRWslvmvUBpJ+Wb7m4Myo0+yY/00 i9ajMhsNM/Io6fcCVYwGQVp/CidErrVgAqV1MpxzHlvVdIf4ysQhApDMX/pCPQ56q51R 0GuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wmLL495c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id c9-20020ac81e89000000b003979d6bb76asi1428848qtm.31.2022.10.27.11.52.49 for ; Thu, 27 Oct 2022 11:52:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wmLL495c; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oo7nF-0002X1-0g; Thu, 27 Oct 2022 14:39:53 -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 1oo7kN-0001Ql-GG for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:55 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oo7kH-0003MH-EG for qemu-devel@nongnu.org; Thu, 27 Oct 2022 14:36:55 -0400 Received: by mail-wr1-x435.google.com with SMTP id z14so3674060wrn.7 for ; Thu, 27 Oct 2022 11:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=wmLL495czepYmkyydFGd6Q9CqrIQLowE+DzTWKZyfiV8bctujX4+STGWczl0GSPKTy L/+Bh1lovsNQrskycn+Z25iv1fP5a0GcfAh0cpFWn5JT5y3W6kFNsPwg+bZDCn6LQt7l HrT+VmU/uSu3lGIrVxuj6rPbyvTqyQX4iyT9zdtZWtiNUBSXUCn8au9cXjPrR+FzYLO0 PBgVHaqzg57Xco47hoA6LBl4g7YjCPHcyj+atYQqFO6ZSsv1jGuzFgJEyGho1V/feZnu cCwOJmqzH3XCblfwpFVs48ilbZwIEXkYLi24w/o955+QB64v0v31XeMm2fwHv/VsucCI 9dmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kxOg283PDRzw1JKCDvt6daLgqQYdA1dzevXBfcHGyeE=; b=2gqcZ8jwkHFUoUWIpgc5EYa3ORCmst69nBGE+hkNA3B+s+yJ6AS0Zx1D3BariaThhk wVsMS9rPi9DAr99FNjdzfOWz2ozQ1VGKxUczB+RF0RKsbHLzTfzyw9r4GMSTLqfvhHJw QEh4Qe+KLs5fbV7t3XyQLwSGv3k6pcYfCTy8IbdCxeUA8XGbNZQ60cAanqk1UoiMyGII krKYkypOg0trJ1C7Y3Fbp+reeSQiRcoJyOzpTnu8B2fJVIHCXgNav7dAwjwZK232FdoB AuvEwikMuCWCn0kCyxWN7/DWA0787qOCWONmB1uMm0nSvZiPPK0U8mLgbBSUldu/23wZ A0gw== X-Gm-Message-State: ACrzQf0jMt3F/cPvlxX+U59xabmVtmmpqV0kkT3vcUKxYdDRQqWw2xYe CdVQOdt6j6Y0KCLRk7zl6SPKNQ== X-Received: by 2002:adf:f04e:0:b0:236:5d8d:8a1e with SMTP id t14-20020adff04e000000b002365d8d8a1emr19821045wro.392.1666895807917; Thu, 27 Oct 2022 11:36:47 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n4-20020a056000170400b002302dc43d77sm1915829wrc.115.2022.10.27.11.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Oct 2022 11:36:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8FE221FFC4; Thu, 27 Oct 2022 19:36:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Bin Meng , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= , Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Hanna Reitz , qemu-block@nongnu.org (open list:vvfat) Subject: [PATCH v4 13/30] block/vvfat: Unify the mkdir() call Date: Thu, 27 Oct 2022 19:36:19 +0100 Message-Id: <20221027183637.2772968-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221027183637.2772968-1-alex.bennee@linaro.org> References: <20221027183637.2772968-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bin Meng There is a difference in the mkdir() call for win32 and non-win32 platforms, and currently is handled in the codes with #ifdefs. glib provides a portable g_mkdir() API and we can use it to unify the codes without #ifdefs. Signed-off-by: Bin Meng Reviewed-by: Marc-André Lureau Signed-off-by: Alex Bennée Reviewed-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221006151927.2079583-6-bmeng.cn@gmail.com> --- block/vvfat.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index d6dd919683..723beef025 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include +#include #include "qapi/error.h" #include "block/block_int.h" #include "block/qdict.h" @@ -2726,13 +2727,9 @@ static int handle_renames_and_mkdirs(BDRVVVFATState* s) mapping_t* mapping; int j, parent_path_len; -#ifdef __MINGW32__ - if (mkdir(commit->path)) + if (g_mkdir(commit->path, 0755)) { return -5; -#else - if (mkdir(commit->path, 0755)) - return -5; -#endif + } mapping = insert_mapping(s, commit->param.mkdir.cluster, commit->param.mkdir.cluster + 1);