[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 4/6] Delete xencons_monitor.dll

  • To: win-pv-devel@xxxxxxxxxxxxxxxxxxxx
  • From: "Tu Dinh" <ngoc-tu.dinh@xxxxxxxxxx>
  • Date: Wed, 15 Apr 2026 07:11:05 +0000
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=mte1 header.d=mandrillapp.com header.i="@mandrillapp.com" header.h="From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding"; dkim=pass header.s=mte1 header.d=vates.tech header.i="ngoc-tu.dinh@xxxxxxxxxx" header.h="From:Subject:To:Cc:Message-Id:In-Reply-To:References:Feedback-ID:Date:MIME-Version:Content-Type:Content-Transfer-Encoding"
  • Cc: "Tu Dinh" <ngoc-tu.dinh@xxxxxxxxxx>, "Owen Smith" <owen.smith@xxxxxxxxxx>
  • Delivery-date: Wed, 15 Apr 2026 07:19:48 +0000
  • Feedback-id: 30504962:30504962.20260415:md
  • List-id: Developer list for the Windows PV Drivers subproject <win-pv-devel.lists.xenproject.org>
Now that trace logging is used, the DLL is not needed any more. Remove
it from the build and package.

Ported from Xenbus.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
v3: Rebase against upstream
---
 src/monitor/messages.mc                       | 55 -------------------
 src/monitor/monitor.c                         |  2 -
 src/monitor/xencons_monitor.rc                |  1 -
 src/xencons.inf                               | 11 +---
 .../xencons_monitor/xencons_monitor.vcxproj   | 17 ------
 .../xencons_monitor/xencons_monitor.vcxproj   | 12 ----
 6 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 src/monitor/messages.mc

diff --git a/src/monitor/messages.mc b/src/monitor/messages.mc
deleted file mode 100644
index eb1d382..0000000
--- a/src/monitor/messages.mc
+++ /dev/null
@@ -1,55 +0,0 @@
-; // Copyright (c) Xen Project.
-; // Copyright (c) Cloud Software Group, Inc.
-; // All rights reserved.
-; //
-; // Redistribution and use in source and binary forms,
-; // with or without modification, are permitted provided
-; // that the following conditions are met:
-; //
-; // *   Redistributions of source code must retain the above
-; //     copyright notice, this list of conditions and the
-; //     following disclaimer.
-; // *   Redistributions in binary form must reproduce the above
-; //     copyright notice, this list of conditions and the
-; //     following disclaimer in the documentation and/or other
-; //     materials provided with the distribution.
-; //
-; // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-; // CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-; // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-; // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-; // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-; // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-; // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-; // BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-; // SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-; // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-; // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-; // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-; // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-; // SUCH DAMAGE.
-
-MessageIdTypedef=DWORD
-
-SeverityNames=(
-       Success=0x0:STATUS_SEVERITY_SUCCESS
-       Informational=0x1:STATUS_SEVERITY_INFORMATIONAL
-       Warning=0x2:STATUS_SEVERITY_WARNING
-       Error=0x3:STATUS_SEVERITY_ERROR
-       )
-
-
-FacilityNames=(
-       System=0x0:FACILITY_SYSTEM
-       Runtime=0x2:FACILITY_RUNTIME
-       Stubs=0x3:FACILITY_STUBS
-       Io=0x4:FACILITY_IO_ERROR_CODE
-       )
-
-MessageId=0x1
-Severity=Informational
-Facility=System
-SymbolicName=MONITOR_LOG
-Language=English
-%1
-.
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c
index 78d67e1..3ff7d7c 100644
--- a/src/monitor/monitor.c
+++ b/src/monitor/monitor.c
@@ -50,8 +50,6 @@
 #include <xencons_device.h>
 #include <version.h>

-#include "messages.h"
-
 #define stringify_literal(_text) #_text
 #define stringify(_text) stringify_literal(_text)
 #define __MODULE__ stringify(PROJECT)
diff --git a/src/monitor/xencons_monitor.rc b/src/monitor/xencons_monitor.rc
index 3fba041..6c077f8 100644
--- a/src/monitor/xencons_monitor.rc
+++ b/src/monitor/xencons_monitor.rc
@@ -54,4 +54,3 @@
 #define VER_FILESUBTYPE                    VFT2_UNKNOWN

 #include "common.ver"
-#include "messages.rc"
diff --git a/src/xencons.inf b/src/xencons.inf
index 6bbd83b..6f9b361 100644
--- a/src/xencons.inf
+++ b/src/xencons.inf
@@ -51,12 +51,10 @@ Tty_CopyFiles=11
 [SourceDisksFiles]
 xencons.sys=0,,
 xencons_monitor.exe=0,,
-xencons_monitor.dll=0,,
 xencons_tty.exe=0,,

 [Monitor_CopyFiles]
 
xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe,xencons_monitor.exe
-xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll,xencons_monitor.dll

 [Tty_CopyFiles]
 
xencons_tty_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe,xencons_tty.exe
@@ -81,7 +79,7 @@ FeatureScore=0xFE
 xencons.sys

 [XenCons_Inst.Services]
-AddService=xencons_monitor,%SPSVCSINST_STARTSERVICE%,Monitor_Service,Monitor_EventLog
+AddService=xencons_monitor,%SPSVCSINST_STARTSERVICE%,Monitor_Service
 AddService=xencons,%SPSVCINST_ASSOCSERVICE%,XenCons_Service

 [XenCons_Service]
@@ -109,13 +107,6 @@ AddReg = Monitor_Parameters
 HKR,"Parameters",,0x00000010
 
HKR,"Parameters\default","Executable",0x00000000,"xencons_tty_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.exe"

-[Monitor_EventLog]
-AddReg=Monitor_EventLog_AddReg
-
-[Monitor_EventLog_AddReg]
-HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\xencons_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll"
-HKR,,TypesSupported,0x00010001,7
-
 [Strings]

 Vendor="@VENDOR_NAME@"
diff --git a/vs2019/xencons_monitor/xencons_monitor.vcxproj 
b/vs2019/xencons_monitor/xencons_monitor.vcxproj
index ca1da4e..d0a601c 100644
--- a/vs2019/xencons_monitor/xencons_monitor.vcxproj
+++ b/vs2019/xencons_monitor/xencons_monitor.vcxproj
@@ -17,9 +17,6 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
-  <PropertyGroup>
-    <CustomBuildAfterTargets>Link</CustomBuildAfterTargets>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       
<AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -49,29 +46,15 @@
     <ClCompile>
       
<PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x86 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
     <ClCompile>
       
<PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x64 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <MessageCompile Include="..\..\src\monitor\messages.mc" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\monitor\monitor.c" />
diff --git a/vs2022/xencons_monitor/xencons_monitor.vcxproj 
b/vs2022/xencons_monitor/xencons_monitor.vcxproj
index 58e881d..66754d3 100644
--- a/vs2022/xencons_monitor/xencons_monitor.vcxproj
+++ b/vs2022/xencons_monitor/xencons_monitor.vcxproj
@@ -17,9 +17,6 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <EnableInf2cat>false</EnableInf2cat>
   </PropertyGroup>
-  <PropertyGroup>
-    <CustomBuildAfterTargets>Link</CustomBuildAfterTargets>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       
<AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -49,19 +46,10 @@
     <ClCompile>
       
<PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <CustomBuildStep>
-      <Outputs>$(TargetDir)$(TargetName).dll</Outputs>
-      <Inputs>$(IntDir)$(TargetName).res</Inputs>
-      <Command>link -machine:x64 -dll -noentry -out:%(Outputs) 
%(Inputs)</Command>
-    </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemGroup>
     <FilesToPackage Include="$(TargetPath)" />
     <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <MessageCompile Include="..\..\src\monitor\messages.mc" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\monitor\monitor.c" />
--
2.53.0.windows.2


--
Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech

 

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.

Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.