Re: [PATCH 1/2] XenVbd: Added MSBuild map file generation and handling.

[Owen Smith <owen.smith@xxxxxxxxxx>]

I will resubmit with better patch comments

Owen

On Thu, Feb 1, 2024 at 5:59 PM Paul Durrant <xadimgnik@xxxxxxxxx> wrote:

On 31/01/2024 11:37, Owen Smith wrote:
> Suggested-by: Alex Burke <Alex.Burke@xxxxxxxxx>
> Signed-off-by: Owen Smith <owen.smith@xxxxxxxxx>

For this and the remaining patches tagged XenVif, please supply some
text in the commit comment.

   Paul

> ---
>   build.ps1                      | 8 ++++++++
>   vs2019/xencrsh/xencrsh.vcxproj | 2 ++
>   vs2019/xendisk/xendisk.vcxproj | 2 ++
>   vs2019/xenvbd/xenvbd.vcxproj   | 2 ++
>   vs2022/xencrsh/xencrsh.vcxproj | 2 ++
>   vs2022/xendisk/xendisk.vcxproj | 2 ++
>   vs2022/xenvbd/xenvbd.vcxproj   | 2 ++
>   7 files changed, 20 insertions(+)
>
> diff --git a/build.ps1 b/build.ps1
> index 4ff02c1..a178660 100644
> --- a/build.ps1
> +++ b/build.ps1
> @@ -14,6 +14,7 @@ param(
>   #
>   # Script Body
>   #
> +$TargetPath = "xenvbd"
>   
>   Function Build {
>       param(
> @@ -37,6 +38,13 @@ Function Build {
>               Write-Host -ForegroundColor Red "ERROR: Build failed, code:" $LASTEXITCODE
>               Exit $LASTEXITCODE
>       }
> +     # Find and Move map files
> +     foreach ($item in Get-ChildItem -Path $solutiondir[$visualstudioversion] -Include *.map -Recurse)
> +     {
> +             $filename = Split-Path -Path $item -Leaf -Resolve
> +             $newpath = "$TargetPath\$Arch\$filename"
> +             Move-Item $item -Destination $newpath -Force
> +     }
>   }
>   
>   Function SdvBuild {
> diff --git a/vs2019/xencrsh/xencrsh.vcxproj b/vs2019/xencrsh/xencrsh.vcxproj
> index 5433a39..d610072 100644
> --- a/vs2019/xencrsh/xencrsh.vcxproj
> +++ b/vs2019/xencrsh/xencrsh.vcxproj
> @@ -36,6 +36,8 @@
>         <AdditionalDependencies>$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
> diff --git a/vs2019/xendisk/xendisk.vcxproj b/vs2019/xendisk/xendisk.vcxproj
> index 6e714ae..7024581 100644
> --- a/vs2019/xendisk/xendisk.vcxproj
> +++ b/vs2019/xendisk/xendisk.vcxproj
> @@ -34,6 +34,8 @@
>         <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
> diff --git a/vs2019/xenvbd/xenvbd.vcxproj b/vs2019/xenvbd/xenvbd.vcxproj
> index 470d16d..80a13a2 100644
> --- a/vs2019/xenvbd/xenvbd.vcxproj
> +++ b/vs2019/xenvbd/xenvbd.vcxproj
> @@ -34,6 +34,8 @@
>         <AdditionalDependencies>$(ProjectDir)..\$(ConfigurationName)\$(Platform)\xencrsh.lib;$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
> diff --git a/vs2022/xencrsh/xencrsh.vcxproj b/vs2022/xencrsh/xencrsh.vcxproj
> index 2026310..d4d9ad3 100644
> --- a/vs2022/xencrsh/xencrsh.vcxproj
> +++ b/vs2022/xencrsh/xencrsh.vcxproj
> @@ -36,6 +36,8 @@
>         <AdditionalDependencies>$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
> diff --git a/vs2022/xendisk/xendisk.vcxproj b/vs2022/xendisk/xendisk.vcxproj
> index 2fe56f5..ae2f56d 100644
> --- a/vs2022/xendisk/xendisk.vcxproj
> +++ b/vs2022/xendisk/xendisk.vcxproj
> @@ -34,6 +34,8 @@
>         <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
> diff --git a/vs2022/xenvbd/xenvbd.vcxproj b/vs2022/xenvbd/xenvbd.vcxproj
> index 6d51630..fd95608 100644
> --- a/vs2022/xenvbd/xenvbd.vcxproj
> +++ b/vs2022/xenvbd/xenvbd.vcxproj
> @@ -34,6 +34,8 @@
>         <AdditionalDependencies>$(ProjectDir)..\$(ConfigurationName)\$(Platform)\xencrsh.lib;$(DDK_LIB_PATH)/storport.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
>         <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
>         <CETCompat>true</CETCompat>
> +      <GenerateMapFile>true</GenerateMapFile>
> +      <MapExports>true</MapExports>
>       </Link>
>       <DriverSign>
>         <FileDigestAlgorithm>sha256</FileDigestAlgorithm>