From patchwork Thu Nov 12 20:15:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 84077 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C69C8A09DE; Thu, 12 Nov 2020 21:15:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A2695928; Thu, 12 Nov 2020 21:15:26 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by dpdk.org (Postfix) with ESMTP id 574C156A3 for ; Thu, 12 Nov 2020 21:15:25 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id p19so6867216wmg.0 for ; Thu, 12 Nov 2020 12:15:25 -0800 (PST) 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=i6iY5zp5Xwg/ZWblcQ+9WJN6J6HFAETjovdATzMqaDw=; b=bzwHJN6WFIxBMF9mWvPjWXlQ4JCAGzbHKiT4PI9iT7ULB+8j+0+iL6ARVlVWSFxboP +L/2o0/4/WFJyOguW850tp5fJ88x8JxwXr2S8T3EWlUwH7OWSgkur6ymzPetDesSGHN0 6NsT8zCt4n5ZuAFnQ0vC/quMWH5vtGhL3Z/FFe08fr30u032/AgCUvKzYerrR+wWyRlJ RxYgBKWbJLP4dqKT3/ToCjgJcQcXX3VCYepE72tvfHQOaBUXkln9zmcbuo/wXOhChqT9 m8Ev0mIIfvZBqrifKDHXt08zMySNBpVnrnRYmfqdDXMTCv0p5TWGUfpferNZeo0kIN4y Yr2Q== 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=i6iY5zp5Xwg/ZWblcQ+9WJN6J6HFAETjovdATzMqaDw=; b=FN2mhnS9XYi96VLzHcxzqZjErrU1o2DdoY1/hxegxrV2RhqtP1K2DlsFTzq05JDPj1 mw3m7xIC1sX0ONg/yBryDjJocQ+l6//RL7TRYHm8v1EUk/WA4wtMxJu5xI/SnK/tBIEe RBCwI6AkutpYNYrVINcJMnONXuFV/jJBm6xLm8xjwOJsZ/uVwU4Ah4wOBMZjtzCija9W Z/eNvSjgQVkUUY1xQi3uEaShbwOjsEdQqtRzAc9BVF3eWY+Zkc7iREpVA9ZflKeiK8mh t5UhkMlPCgih28p41M7+Q9R33b0h5cXabgN2yhcyJIXSIJrLOsL9n500fQRwPOrr3Ex0 Bp/w== X-Gm-Message-State: AOAM5313is72WwovaBZjbwF7wPgu9m+1L6iNwBysnfWSRFPriOIiEodR tvOEgXgmHhIHe/nbLtdri84H5mtpYQNloQ== X-Google-Smtp-Source: ABdhPJxo77b33nlr6oSE5NnD66fh+HcrjkQ7hZIvEUjEGACtdtehz6ekumXD9sdYPkSzaAG4FbMAlw== X-Received: by 2002:a1c:bd08:: with SMTP id n8mr1343042wmf.136.1605212123293; Thu, 12 Nov 2020 12:15:23 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:7a8e:ed70:5c52:ea3]) by smtp.gmail.com with ESMTPSA id d63sm7640089wmd.12.2020.11.12.12.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 12:15:22 -0800 (PST) From: luca.boccassi@gmail.com To: dev@dpdk.org Cc: thomas@monjalon.net, Dmitry Kozlyuk , John Alexander , Luca Boccassi Date: Thu, 12 Nov 2020 20:15:09 +0000 Message-Id: <20201112201509.1002479-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> References: <20201029225505.30093-1-dmitry.kozliuk@gmail.com> MIME-Version: 1.0 Subject: [dpdk-dev] [kmods PATCH v2] windows: normalize line-endings X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Dmitry Kozlyuk MSBuild XML files have to use CRLF line-endings, otherwise any change results in the whole file being rewritten with CRLF line-endings by Visual Studio. However, it's inconvenient to have such files checked-out with CLRF in Unix environments. Add suggested git configuration to top-level README, so that Unix developers don't miss it. Remove .gitattributes, because core.autocrlf overrides eol= attribute. Convert line-endings of the existing files in the repository. Suggested-by: John Alexander Signed-off-by: Dmitry Kozlyuk Signed-off-by: Luca Boccassi --- v2 from Luca: run dos2unix on all files in windows/virt2phys folder README | 5 + windows/.gitattributes | 4 - windows/virt2phys/virt2phys.sln | 54 +-- windows/virt2phys/virt2phys.vcxproj | 454 ++++++++++---------- windows/virt2phys/virt2phys.vcxproj.filters | 72 ++-- 5 files changed, 295 insertions(+), 294 deletions(-) delete mode 100644 windows/.gitattributes diff --git a/README b/README index e71dbba..0aaf58e 100644 --- a/README +++ b/README @@ -8,3 +8,8 @@ Now the preference is to contribute kernel modules to the upstream project if possible, otherwise to host kernel code in dpdk-kmods.git. The license can be BSD-3-Clause or GPL-2.0. + +Some Windows files use have to use CRLF line-endings. +Unix developers can configure git to get only LF on checkout: + + git config core.autocrlf input diff --git a/windows/.gitattributes b/windows/.gitattributes deleted file mode 100644 index 13482db..0000000 --- a/windows/.gitattributes +++ /dev/null @@ -1,4 +0,0 @@ -* text=auto - -*.sln text eol=crlf -*.vcxproj text eol=crlf diff --git a/windows/virt2phys/virt2phys.sln b/windows/virt2phys/virt2phys.sln index 0f5ecdc..ae95c7b 100644 --- a/windows/virt2phys/virt2phys.sln +++ b/windows/virt2phys/virt2phys.sln @@ -1,27 +1,27 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29613.14 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virt2phys", "virt2phys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg = Debug|x64 - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 = Debug|x64 - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 = Debug|x64 - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg = Release|x64 - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 = Release|x64 - {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {845012FB-4471-4A12-A1C4-FF7E05C40E8E} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29613.14 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "virt2phys", "virt2phys.vcxproj", "{0EEF826B-9391-43A8-A722-BDD6F6115137}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.ActiveCfg = Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Build.0 = Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Debug|x64.Deploy.0 = Debug|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.ActiveCfg = Release|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Build.0 = Release|x64 + {0EEF826B-9391-43A8-A722-BDD6F6115137}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {845012FB-4471-4A12-A1C4-FF7E05C40E8E} + EndGlobalSection +EndGlobal diff --git a/windows/virt2phys/virt2phys.vcxproj b/windows/virt2phys/virt2phys.vcxproj index fa51916..fc2a771 100644 --- a/windows/virt2phys/virt2phys.vcxproj +++ b/windows/virt2phys/virt2phys.vcxproj @@ -1,228 +1,228 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - Debug - ARM - - - Release - ARM - - - Debug - ARM64 - - - Release - ARM64 - - - - - - - - - - - - - {0EEF826B-9391-43A8-A722-BDD6F6115137} - {497e31cb-056b-4f31-abb8-447fd55ee5a5} - v4.5 - 12.0 - Debug - Win32 - virt2phys - - - - Windows10 - true - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - false - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - true - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - false - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - true - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - false - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - true - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - Windows10 - false - WindowsKernelModeDriver10.0 - Driver - KMDF - Universal - - - - - - - - - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - DbgengKernelDebugger - - - - true - true - trace.h - true - - - - - true - true - trace.h - true - - - - - false - true - trace.h - true - - - $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) - - - 0.1 - - - - - true - true - trace.h - true - - - - - true - true - trace.h - true - - - - - true - true - trace.h - true - - - - - true - true - trace.h - true - - - - - true - true - trace.h - true - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + Debug + ARM + + + Release + ARM + + + Debug + ARM64 + + + Release + ARM64 + + + + + + + + + + + + + {0EEF826B-9391-43A8-A722-BDD6F6115137} + {497e31cb-056b-4f31-abb8-447fd55ee5a5} + v4.5 + 12.0 + Debug + Win32 + virt2phys + + + + Windows10 + true + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + true + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + true + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + true + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + + + + + + + + + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + DbgengKernelDebugger + + + + true + true + trace.h + true + + + + + true + true + trace.h + true + + + + + false + true + trace.h + true + + + $(DDK_LIB_PATH)wdmsec.lib;%(AdditionalDependencies) + + + 0.1 + + + + + true + true + trace.h + true + + + + + true + true + trace.h + true + + + + + true + true + trace.h + true + + + + + true + true + trace.h + true + + + + + true + true + trace.h + true + + + + + + + + \ No newline at end of file diff --git a/windows/virt2phys/virt2phys.vcxproj.filters b/windows/virt2phys/virt2phys.vcxproj.filters index 0fe65fc..9e7e732 100644 --- a/windows/virt2phys/virt2phys.vcxproj.filters +++ b/windows/virt2phys/virt2phys.vcxproj.filters @@ -1,36 +1,36 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {8E41214B-6785-4CFE-B992-037D68949A14} - inf;inv;inx;mof;mc; - - - - - Driver Files - - - - - Header Files - - - - - Source Files - - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {8E41214B-6785-4CFE-B992-037D68949A14} + inf;inv;inx;mof;mc; + + + + + Driver Files + + + + + Header Files + + + + + Source Files + + +