From patchwork Sat Mar 15 23:11:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alin Gabriel Serdean X-Patchwork-Id: 2060984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LesKasDx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4ZFcTP5QX9z1yD0 for ; Sun, 16 Mar 2025 10:12:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 71B1F83AAF; Sat, 15 Mar 2025 23:12:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id KZx8xg-amUuU; Sat, 15 Mar 2025 23:12:33 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.9.56; helo=lists.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A3D218379C Authentication-Results: smtp1.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LesKasDx Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id A3D218379C; Sat, 15 Mar 2025 23:12:32 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4097CC003A; Sat, 15 Mar 2025 23:12:32 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id B2520C0004 for ; Sat, 15 Mar 2025 23:12:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 920F26076D for ; Sat, 15 Mar 2025 23:12:30 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id NE2cCHeMQrWK for ; Sat, 15 Mar 2025 23:12:28 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::136; helo=mail-lf1-x136.google.com; envelope-from=alinserdean@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 3C4EE606B1 Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 3C4EE606B1 Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LesKasDx Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by smtp3.osuosl.org (Postfix) with ESMTPS id 3C4EE606B1 for ; Sat, 15 Mar 2025 23:12:27 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-5498d2a8b89so3502086e87.1 for ; Sat, 15 Mar 2025 16:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742080345; x=1742685145; darn=openvswitch.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=imZMXkiNVXeHsjHID1nMvM969ijvCoEcFUElmivKdeE=; b=LesKasDxKe62GYDAKJgBsO6MFvlXEtinqU9skUsayaZ+0OESijulLzpoG0pmsCqKJ3 Ve48SUBk3Nb86kHIrihwEwMOUzbM4jWSHGhcPipCDvQUZhGS3R2g0/P8mHG/Ugyt5/Ac oj60Ak6A0TSFeHrzgW8bjkpRu73GU3x+XgKlPfXo3Rj3sG/RqPNFKkhZkJ/g0nuvpvJ0 s8vHwBwoo4HZ0va70JYf0Ogsq5seKQgc9DwqflXska+1cWX29aXl5QBKkd/x6RM65Jsc 6IdEw6gUV7icmK1HUqAP+TtW8V3Bu49/m11dXt3a0qhgjJEuANcj3U9I0XJXAL3ZpD8Z SKiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742080345; x=1742685145; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=imZMXkiNVXeHsjHID1nMvM969ijvCoEcFUElmivKdeE=; b=XW5Ymg8xztz+z/sHELO+BwFDTlwZ1GLEoFWlOS0xO6JLvXgIJLaTq70+yZvY/oczjY gPzefKF1tTOCErLS/ZHNlf2BPY1+enwnxSjzXkwT59Svkk84fsl7TrwhRl1SXPpmclcv 3d0nhDO4HL2mPmfEYLEQcsgctikwRtbDU/Pq/xgaxwJ/BcIjtrdMV0sBfH1MIbSxdBaz DOzdsQSb1pmStTiguP5YFmZfU9yRVom+uqH3xvOHl1EC6VIlFJoKLVo2yL3wZ5Eu0LOI Hr/xHx3OmMlH4/29NiFCWlre+ZFEOHjpnhN/45gk8HTiS2+OBWfA/0AhXmRFgu+ZErSd Rcag== X-Gm-Message-State: AOJu0YwoIC/fjEQwQPV+xvjmD63JNuqUsDnYQMofCo+tba7mnlYJVf+5 dtbDO/pnSotIdxiWlPhFzTFZCOqp73h6k7NMz43OYApTeL22lWR+jeQXe+QG X-Gm-Gg: ASbGncsbS1/Rx15wVnnUeD9b1QIXoVqHF36t7LFuA8DY34yhKy0z+I+aGKbsWyd/Sro t5qt/j11vKN3TNCW/wPBRnJNY1rXzNcvCTE5HQgBjvt5m0mRUKvssZjbosx+p3M1psM0WCrVkjL O4zuUJwADhwiub0N90yBsH5DFRXGiUdtfONp3tIEg+THqJto7gnbt03IjxRzF3+hJG2aShNl2zR rPQO6RDAyUBVk8XzJcn6Gk7/UfITgK4j1+ilH6IuFaM3v8B/mrAPttHHPiIBthUjg7/ArlL0yYE G6lHirjwqkmn3/FGOHglDjH0Bfv2Ppl2a9z6a/DANXi59G/uUsO0fwM7Eqshx1ZU0uCuydXz2j8 VX4JELpIMPJlr88ZabV4Y3Is3qTnf X-Google-Smtp-Source: AGHT+IE6s2Aiit6lQthXTurQoVcHdhflWHETBPET6QWGRQ+Ye2b6MB1czGlOnztFYtIig232X3oyPQ== X-Received: by 2002:a05:6512:3d05:b0:549:8d07:ff13 with SMTP id 2adb3069b0e04-549c3989d78mr2521184e87.51.1742080344465; Sat, 15 Mar 2025 16:12:24 -0700 (PDT) Received: from localhost.localdomain (84-216-124-106.customers.ownit.se. [84.216.124.106]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549ba7bee7fsm920524e87.54.2025.03.15.16.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 16:12:22 -0700 (PDT) From: Alin Gabriel Serdean X-Google-Original-From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Sun, 16 Mar 2025 00:11:58 +0100 Message-ID: <20250315231202.184-1-aserdean@ovn.org> X-Mailer: git-send-email 2.45.0.windows.1 MIME-Version: 1.0 Subject: [ovs-dev] [PATCH] datapath-windows: Fix build and deprecate 2012 and 2012 R2 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" This patch drops support for Microsoft 8 and 8.1 family (2012 and 2012R2). This patch also fixes compilation on the lastest WDK and uplifts the solution to VStudio 2022. Co-authored-by: Frank Wagner Signed-off-by: Alin Gabriel Serdean --- Documentation/intro/install/windows.rst | 8 +- Makefile.am | 12 - datapath-windows/Package/package.VcxProj | 234 ----------- datapath-windows/Package/package.VcxProj.user | 30 -- datapath-windows/automake.mk | 4 - datapath-windows/ovsext.sln | 71 +--- datapath-windows/ovsext/Util.c | 22 +- datapath-windows/ovsext/ovsext.inf | 1 + datapath-windows/ovsext/ovsext.vcxproj | 381 ++++-------------- datapath-windows/ovsext/ovsext.vcxproj.user | 24 +- m4/openvswitch.m4 | 8 +- windows/automake.mk | 14 +- .../ovs-windows-installer/Driver/.gitignore | 2 - windows/ovs-windows-installer/Product.wxs | 30 -- 14 files changed, 104 insertions(+), 737 deletions(-) delete mode 100644 datapath-windows/Package/package.VcxProj delete mode 100644 datapath-windows/Package/package.VcxProj.user diff --git a/Documentation/intro/install/windows.rst b/Documentation/intro/install/windows.rst index 2ca3a4e26..40fecc792 100644 --- a/Documentation/intro/install/windows.rst +++ b/Documentation/intro/install/windows.rst @@ -200,7 +200,7 @@ Finally, to the kernel module also: Possible values for ```` are: ``Debug`` and ``Release`` Possible values for ```` is a comma separated list -of target versions to compile among: ``Win8,Win8.1,Win10`` +of target versions to compile among: ``Win10`` .. note:: @@ -267,9 +267,9 @@ The Kernel Module If you are building the kernel module, you will need to copy the below files to the target Hyper-V machine. -- ``./datapath-windows/x64/Win8.1Debug/package/ovsext.inf`` -- ``./datapath-windows/x64/Win8.1Debug/package/OVSExt.sys`` -- ``./datapath-windows/x64/Win8.1Debug/package/ovsext.cat`` +- ``./datapath-windows/x64/Win10Debug/ovsext/ovsext.inf`` +- ``./datapath-windows/x64/Win10Debug/ovsext/ovsext.sys`` +- ``./datapath-windows/x64/Win10Debug/ovsext/ovsext.cat`` - ``./datapath-windows/misc/install.cmd`` - ``./datapath-windows/misc/uninstall.cmd`` diff --git a/Makefile.am b/Makefile.am index a61a1cadf..c266aaf6f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -433,12 +433,6 @@ if VSTUDIO_DDK ALL_LOCAL += ovsext ARCH = x64 ovsext: datapath-windows/ovsext.sln $(srcdir)/datapath-windows/include/OvsDpInterface.h -if VSTUDIO_WIN8 - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) -endif -if VSTUDIO_WIN8_1 - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) -endif if VSTUDIO_WIN10 MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) endif @@ -446,12 +440,6 @@ endif CLEAN_LOCAL += ovsext_clean ovsext_clean: datapath-windows/ovsext.sln -if VSTUDIO_WIN8 - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) -endif -if VSTUDIO_WIN8_1 - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) -endif if VSTUDIO_WIN10 MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) endif diff --git a/datapath-windows/Package/package.VcxProj b/datapath-windows/Package/package.VcxProj deleted file mode 100644 index 994c34dc2..000000000 --- a/datapath-windows/Package/package.VcxProj +++ /dev/null @@ -1,234 +0,0 @@ - - - - - Win10 Debug - x64 - - - Win10 Release - x64 - - - Win10Analyze - x64 - - - Win8.1 Debug - x64 - - - Win8 Debug - x64 - - - Win8.1 Release - x64 - - - Win8 Release - x64 - - - Win8.1Analyze - x64 - - - Win8Analyze - x64 - - - - Utility - Package - true - Win8 Debug - - - $(VCTargetsPath11) - 10.0 - 8.1 - - - - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2} - {E753AF15-94DC-4773-AED9-06A6636E6E67} - $(MSBuildProjectName) - - - WindowsV6.3 - true - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - WindowsV6.3 - true - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - - - true - 10.0 - WindowsKernelModeDriver$(PlatformToolsetVer) - Desktop - - - - true - 10.0 - WindowsKernelModeDriver$(PlatformToolsetVer) - Desktop - - - Windows8 - true - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - Windows8 - true - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - - - false - 10.0 - WindowsKernelModeDriver$(PlatformToolsetVer) - Universal - - - WindowsV6.3 - false - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - Windows8 - false - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - - - - - - - - true - - - true - - - DbgengKernelDebugger - False - False - None - - - - - - %PathToInf% - False - False - True - - 133563 - - - true - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - true - - - SHA256 - - - - - - - - - {63FE215D-98BE-4440-8081-C6160EFB80FA} - - - - - - \ No newline at end of file diff --git a/datapath-windows/Package/package.VcxProj.user b/datapath-windows/Package/package.VcxProj.user deleted file mode 100644 index 5b0c53539..000000000 --- a/datapath-windows/Package/package.VcxProj.user +++ /dev/null @@ -1,30 +0,0 @@ - - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - - TestSign - - \ No newline at end of file diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk index 7d0d82d41..e0e6a036c 100644 --- a/datapath-windows/automake.mk +++ b/datapath-windows/automake.mk @@ -1,6 +1,4 @@ EXTRA_DIST += \ - datapath-windows/Package/package.VcxProj \ - datapath-windows/Package/package.VcxProj.user \ datapath-windows/include/OvsDpInterfaceExt.h \ datapath-windows/include/OvsDpInterfaceCtExt.h \ datapath-windows/misc/DriverRecommendedRules.ruleset \ @@ -90,8 +88,6 @@ EXTRA_DIST += \ datapath_windows_analyze: all MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Analyze" - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze" - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze" datapath_windows: all MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10Debug" diff --git a/datapath-windows/ovsext.sln b/datapath-windows/ovsext.sln index ab006e84f..f4c1153f7 100644 --- a/datapath-windows/ovsext.sln +++ b/datapath-windows/ovsext.sln @@ -1,13 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35825.156 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{6BA8554E-AE50-49B0-9C98-4592447FEF8D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OVSExt", "OVSExt", "{4A841675-477D-40A2-9CC6-128C3B8714F8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "package", "Package\package.VcxProj", "{911D7389-3E61-449F-B8F3-14AD7EE9A0F2}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ovsext", "ovsext\ovsext.vcxproj", "{63FE215D-98BE-4440-8081-C6160EFB80FA}" EndProject Global @@ -15,68 +9,19 @@ Global Win10Analyze|x64 = Win10Analyze|x64 Win10Debug|x64 = Win10Debug|x64 Win10Release|x64 = Win10Release|x64 - Win8.1Analyze|x64 = Win8.1Analyze|x64 - Win8.1Debug|x64 = Win8.1Debug|x64 - Win8.1Release|x64 = Win8.1Release|x64 - Win8Analyze|x64 = Win8Analyze|x64 - Win8Debug|x64 = Win8Debug|x64 - Win8Release|x64 = Win8Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Analyze|x64.Build.0 = Win10Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Build.0 = Win10 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.ActiveCfg = Win10 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Build.0 = Win10 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win10Release|x64.Deploy.0 = Win10 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Analyze|x64.ActiveCfg = Win8.1Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Analyze|x64.Build.0 = Win8.1Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Analyze|x64.Deploy.0 = Win8.1Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.ActiveCfg = Win8.1 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Debug|x64.Build.0 = Win8.1 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Release|x64.ActiveCfg = Win8.1 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8.1Release|x64.Build.0 = Win8.1 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Analyze|x64.ActiveCfg = Win8Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Analyze|x64.Build.0 = Win8Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Analyze|x64.Deploy.0 = Win8Analyze|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Debug|x64.ActiveCfg = Win8 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Debug|x64.Build.0 = Win8 Debug|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.ActiveCfg = Win8 Release|x64 - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2}.Win8Release|x64.Build.0 = Win8 Release|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.ActiveCfg = Win10Analyze|x64 {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Analyze|x64.Build.0 = Win10Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.ActiveCfg = Win10 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Build.0 = Win10 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Deploy.0 = Win10 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.ActiveCfg = Win10 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Build.0 = Win10 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Deploy.0 = Win10 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Analyze|x64.ActiveCfg = Win8.1Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Analyze|x64.Build.0 = Win8.1Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Analyze|x64.Deploy.0 = Win8.1Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.ActiveCfg = Win8.1 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Build.0 = Win8.1 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Debug|x64.Deploy.0 = Win8.1 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Release|x64.ActiveCfg = Win8.1 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Release|x64.Build.0 = Win8.1 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8.1Release|x64.Deploy.0 = Win8.1 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Analyze|x64.ActiveCfg = Win8Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Analyze|x64.Build.0 = Win8Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Analyze|x64.Deploy.0 = Win8Analyze|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Debug|x64.ActiveCfg = Win8 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Debug|x64.Build.0 = Win8 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Debug|x64.Deploy.0 = Win8 Debug|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Release|x64.ActiveCfg = Win8 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Release|x64.Build.0 = Win8 Release|x64 - {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win8Release|x64.Deploy.0 = Win8 Release|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.ActiveCfg = Win10Debug|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Debug|x64.Build.0 = Win10Debug|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.ActiveCfg = Win10Release|x64 + {63FE215D-98BE-4440-8081-C6160EFB80FA}.Win10Release|x64.Build.0 = Win10Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {911D7389-3E61-449F-B8F3-14AD7EE9A0F2} = {6BA8554E-AE50-49B0-9C98-4592447FEF8D} - {63FE215D-98BE-4440-8081-C6160EFB80FA} = {4A841675-477D-40A2-9CC6-128C3B8714F8} + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D41CD98E-3777-4976-A99B-E01415A9291F} EndGlobalSection EndGlobal diff --git a/datapath-windows/ovsext/Util.c b/datapath-windows/ovsext/Util.c index d703b2468..7f58c5ba4 100644 --- a/datapath-windows/ovsext/Util.c +++ b/datapath-windows/ovsext/Util.c @@ -48,26 +48,6 @@ OvsAllocateMemory(size_t size) (UINT32)size, OVS_MEMORY_TAG, NormalPoolPriority); } -_Use_decl_annotations_ -VOID * -OvsAllocateAlignedMemory(size_t size, UINT16 align) -{ - ASSERT((align == 8) || (align == 16)); - - if ((align == 8) || (align == 16)) { - /* - * XXX: NdisAllocateMemory*() functions don't talk anything about - * alignment. Hence using ExAllocatePool*(); - */ - return (VOID *)ExAllocatePoolWithTagPriority(NonPagedPoolNx, size, - OVS_MEMORY_TAG, - NormalPoolPriority); - } - - /* Invalid user input. */ - return NULL; -} - VOID OvsFreeMemory(VOID *ptr) { @@ -179,4 +159,4 @@ OvsIpv6AddressToString(struct in6_addr ipv6Addr, char* ip6String) returnedIpv6Str = RtlIpv6AddressToStringA((&ipv6Addr), ip6String); return returnedIpv6Str; -} \ No newline at end of file +} diff --git a/datapath-windows/ovsext/ovsext.inf b/datapath-windows/ovsext/ovsext.inf index e68b94a36..59ae5304b 100644 --- a/datapath-windows/ovsext/ovsext.inf +++ b/datapath-windows/ovsext/ovsext.inf @@ -9,6 +9,7 @@ ClassGUID = {4D36E974-E325-11CE-BFC1-08002BE10318} Provider = %OVS% CatalogFile = ovsext.cat DriverVer = 10/10/2013,1.0 +PnpLockdown = 1 [Manufacturer] %OVS%=OVS,NTx86,NTia64,NTamd64 diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj index e1c43fd56..11fae9db0 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj +++ b/datapath-windows/ovsext/ovsext.vcxproj @@ -1,42 +1,18 @@  - - Win10 Debug + + Win10Debug x64 - - Win10 Release + + Win10Release x64 Win10Analyze x64 - - Win8.1 Debug - x64 - - - Win8 Debug - x64 - - - Win8.1 Release - x64 - - - Win8 Release - x64 - - - Win8.1Analyze - x64 - - - Win8Analyze - x64 - WDM @@ -44,256 +20,74 @@ $(VCTargetsPath11) - Win8 Debug - Win32 {0D37F250-E766-44C7-90B4-D7E07E77D1AA} 10.0 - 8.1 {63FE215D-98BE-4440-8081-C6160EFB80FA} $(MSBuildProjectName) + $(LatestTargetPlatformVersion) - - WindowsV6.3 - True - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - WindowsV6.3 - True - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - - + + Windows10 True 10.0 WindowsKernelModeDriver$(PlatformToolsetVer) - Desktop + Universal - + Windows10 True 10.0 WindowsKernelModeDriver$(PlatformToolsetVer) - Desktop - - - Windows8 - True - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - Windows8 - True - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) + Universal - - WindowsV6.3 - False - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) - - - - + + Windows10 False 10.0 WindowsKernelModeDriver$(PlatformToolsetVer) - Desktop - - - Windows8 - False - 8.1 - WindowsKernelModeDriver$(PlatformToolsetVer) + Universal - - $(IntDir) - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OVSExt - - + true $(CRT_IncludePath);$(KM_IncludePath); + ..\$(IntDir) + false + false + false - + true $(CRT_IncludePath);$(KM_IncludePath); + ..\$(IntDir) + false + false + false true ..\misc\DriverRecommendedRules.ruleset true $(CRT_IncludePath);$(KM_IncludePath); + ..\$(IntDir) + false + false + false - - true - ..\misc\DriverRecommendedRules.ruleset - $(CRT_IncludePath);$(KM_IncludePath); - - - true - ..\misc\DriverRecommendedRules.ruleset - $(CRT_IncludePath);$(KM_IncludePath); - - - $(CRT_IncludePath);$(KM_IncludePath); - - - $(CRT_IncludePath);$(KM_IncludePath); - - - $(CRT_IncludePath);$(KM_IncludePath); - - - $(CRT_IncludePath);$(KM_IncludePath); - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1 - - - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - - - + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 @@ -304,7 +98,7 @@ %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 - + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1 @@ -335,62 +129,64 @@ Level4 - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) + .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\.. - .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) - true - true - true - true - true - true + .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) + true true - true - true - true - true + true true - $(Version) - $(Version) - - - $(Version) - $(Version) - - - $(Version) - $(Version) - - - $(Version) - - - $(Version) - - - $(Version) + * + * + * - SHA256 - SHA256 - SHA256 - SHA256 - SHA256 - SHA256 SHA256 - SHA256 - SHA256 + SHA256 + SHA256 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -433,25 +229,14 @@ - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS630=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) + %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) %(PreprocessorDefinitions);NDIS_WDM=1;NDIS640=1;VersionWithDots=$(Version);VersionWithCommas=$(Version.Replace('.',',')) - - - - - - + - + \ No newline at end of file diff --git a/datapath-windows/ovsext/ovsext.vcxproj.user b/datapath-windows/ovsext/ovsext.vcxproj.user index 5b0c53539..8ad59cc60 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj.user +++ b/datapath-windows/ovsext/ovsext.vcxproj.user @@ -1,30 +1,12 @@  - - TestSign - - - TestSign - - - TestSign - - - TestSign - - + TestSign TestSign - - TestSign - - - TestSign - - + TestSign - \ No newline at end of file + diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 6d41ffc44..eb2569b34 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -184,28 +184,22 @@ if test "$WIN32" = yes; then AC_ARG_WITH([vstudiotargetver], [AS_HELP_STRING([--with-vstudiotargetver=target_ver1,target_ver2], - [Target versions: Win8,Win8.1,Win10])], + [Target versions: Win10])], [ targetver=`echo "$withval" | tr -s , ' ' ` for ver in $targetver; do case "$ver" in - "Win8") VSTUDIO_WIN8=true ;; - "Win8.1") VSTUDIO_WIN8_1=true ;; "Win10") VSTUDIO_WIN10=true ;; *) AC_MSG_ERROR([No valid Visual Studio target version found]) ;; esac done ], [ - VSTUDIO_WIN8=true - VSTUDIO_WIN8_1=true VSTUDIO_WIN10=true ] ) AC_DEFINE([VSTUDIO_DDK], [1], [System uses the Visual Studio build target.]) fi -AM_CONDITIONAL([VSTUDIO_WIN8], [test -n "$VSTUDIO_WIN8"]) -AM_CONDITIONAL([VSTUDIO_WIN8_1], [test -n "$VSTUDIO_WIN8_1"]) AM_CONDITIONAL([VSTUDIO_WIN10], [test -n "$VSTUDIO_WIN10"]) AM_CONDITIONAL([VSTUDIO_DDK], [test -n "$VSTUDIO_CONFIG"]) ]) diff --git a/windows/automake.mk b/windows/automake.mk index 489343028..90e819368 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -26,18 +26,10 @@ windows_installer: all cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb windows/ovs-windows-installer/Symbols/ #Third party files needed by the installer cp -f $(PTHREAD_WIN32_DIR_DLL_WIN_FORM)/*.dll windows/ovs-windows-installer/Binaries/ - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x86.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x86.msm - cp -f "/c/Program Files (x86)/Common Files/Merge Modules/Microsoft_VC140_CRT_x64.msm" windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x64.msm #Forwarding extension files needed for the installer - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/OVSExt.sys windows/ovs-windows-installer/Driver/Win8/ovsext.sys - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win10/ovsext.cat - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win10/ovsext.inf - cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win10/ovsext.sys + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/ovsext/ovsext.cat windows/ovs-windows-installer/Driver/Win10/ovsext.cat + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/ovsext/ovsext.inf windows/ovs-windows-installer/Driver/Win10/ovsext.inf + cp -f $(top_srcdir)/datapath-windows/x64/Win10$(VSTUDIO_CONFIG)/ovsext/ovsext.sys windows/ovs-windows-installer/Driver/Win10/ovsext.sys MSBuild.exe windows/ovs-windows-installer.sln //nologo //target:Build //p:Configuration="Release" //p:Version="$(PACKAGE_VERSION)" //p:Platform=$(PLATFORM) EXTRA_DIST += \ diff --git a/windows/ovs-windows-installer/Driver/.gitignore b/windows/ovs-windows-installer/Driver/.gitignore index 3de517016..b6b6f2787 100644 --- a/windows/ovs-windows-installer/Driver/.gitignore +++ b/windows/ovs-windows-installer/Driver/.gitignore @@ -1,6 +1,4 @@ * !.gitignore -!Win8 -!Win8.1 !Win10 diff --git a/windows/ovs-windows-installer/Product.wxs b/windows/ovs-windows-installer/Product.wxs index 61289da6b..237341eee 100644 --- a/windows/ovs-windows-installer/Product.wxs +++ b/windows/ovs-windows-installer/Product.wxs @@ -53,21 +53,10 @@ - - - - - - - - - @@ -251,18 +240,6 @@ - - - - - - - - - - - - 10000]]> @@ -272,11 +249,4 @@ - - - - - - -