Resync with internal repository

changeset:   305:e377a99e8721
tag:         tip
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Fri Jun 21 13:19:15 2013 +0100
summary:     [CA-109475] Handle __RangeSetAdd failure.

changeset:   304:7818aaf86215
parent:      303:37f03f68abf5
parent:      302:b576d67847cb
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Fri Jun 21 09:58:03 2013 +0100
summary:     Merge

changeset:   303:37f03f68abf5
parent:      299:f17689532d11
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Fri Jun 21 09:57:04 2013 +0100
summary:     * * *

changeset:   302:b576d67847cb
user:        Ben Chalmers <ben.chalmers@citrix.com>
date:        Wed Jun 19 10:30:32 2013 +0100
summary:     [CP-4195] Add README.md and associated files to xenbus

changeset:   301:407589c56880
user:        Owen Smith <owen.smith@citrix.com>
date:        Thu Jun 13 16:07:04 2013 +0100
summary:     Fix/suppress SDV warnings

changeset:   300:966e06420ce5
user:        Owen Smith <owen.smith@citrix.com>
date:        Wed Jun 12 16:48:22 2013 +0100
summary:     [CA-86240] Update sdv.py and vcxprojs to build targetting Vista, an
d attempt to produce sdv logs

changeset:   299:f17689532d11
user:        Owen Smith <owen.smith@citrix.com>
date:        Thu Jun 06 12:47:30 2013 +0100
summary:     Backed out merge changeset: b35edbab18ee

changeset:   298:b35edbab18ee
parent:      297:0675b68b3e8d
parent:      296:5aefe3d5985a
user:        Owen Smith <owen.smith@citrix.com>
date:        Tue Jun 04 12:18:12 2013 +0100
summary:     Merge

changeset:   297:0675b68b3e8d
parent:      294:28a400f3d92a
user:        Owen Smith <owen.smith@citrix.com>
date:        Tue Jun 04 12:17:26 2013 +0100
summary:     [CA-86240] Generate SDV logs with sdv.py script

changeset:   296:5aefe3d5985a
parent:      295:0fad50b631e3
parent:      294:28a400f3d92a
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Mon Jun 03 17:49:00 2013 +0100
summary:     Merge

changeset:   295:0fad50b631e3
parent:      293:5c23adc1aa58
user:        Paul Durrant <paul.durrant@citrix.com>
date:        Mon Jun 03 17:48:06 2013 +0100
summary:     Fix line endings

changeset:   294:28a400f3d92a
user:        Ben Chalmers <ben.chalmers@citrix.com>
date:        Wed May 29 14:57:17 2013 +0100
summary:     [CP-4685] Add BSD licence header to inf file

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644 (file)
index 0000000..00bf1f8
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+7.0.0 (2013-06-19):
+* Initial public release

diff --git a/INSTALL.md b/INSTALL.md
new file mode 100644 (file)
index 0000000..233d411
--- /dev/null
+++ b/INSTALL.md
@@ -0,0 +1,12 @@
+To install the XenServer Paravitual Bus Device Driver onto a XenServer Windows 
+guest VM:
+
+*    Copy xenbus.sys, xen.sys, xenfilt.sys, xenbus_coinst.dll and xenbus.inf 
+     onto the guest VM 
+*    Copy dpinst.exe from the Windows driver kit into the same folder as
+     xenbus.sys, xen.sys, xenfilt.sys, xenbus_coinst.dll and xeniface.inf on 
+     the guest vm, ensuring the version of dpinst.exe matches the architecture 
+     of the verison of Windows installed on your VM
+*    As administrator, run dpinst.exe on the guest vm
+*    If any warnings arise about unknown certificates, accept them
+

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644 (file)
index 0000000..e1e3564
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1,40 @@
+List of maintainers and how to submit changes
+=============================================
+
+This is an early public release of the XenServer XenBus drivers.
+
+At the moment we are working hard on improving this early release, to make
+it easier to build and install and test on your own systems.  As such things 
+are in a state of flux, and we may well find it difficult to take submissions.
+
+We hope things will have improved by January 2014
+
+If you do wish to submit code, we recommend reaching out to the maintainers
+first, who will attempt to steer you in the right direction.
+
+We also request you follow these guidelines:
+
+1.  All submissions must be made under the terms of the "Developer's Certificate
+    of Origin" (DC) and should include a Signed-off-by: line.
+
+2.  All Submissions should use Unix line endings for consitency with the rest of
+    the XenServer project
+
+3.  Each patch should include a descriptive commit comment that helps understand
+    why the patch is necessary and why it works. This will be used both for
+    initial review and for new people to understand how the code works later
+
+4.  Make sure you have the right to submit any changes you make. If you do 
+    changes at work you may find your employer owns the patches instead of 
+    you.
+
+
+Maintainers List
+----------------
+
+* Paul Durrant <paul.durrant@citrix.com>
+
+* Ben Chalmers <ben.chalmers@citrix.com>
+
+* Owen Smith <owen.smith@citrix.com>
+

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..0ec678a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,61 @@
+XenBus - The XenServer Windows Paravitual Bus Device Driver
+==========================================
+
+XenBus consists of three device drivers:
+
+*    XenBus.Sys is a bus driver which attaches to a virtual device on the PCI
+     bus and provides child devices for the other XenServer device drivers to
+     attach to.
+
+*    Xen.Sys is a support library which provides interfaces for communicating
+     with the XenServer host and hypervisor
+
+*    XenFile is a filter driver which is used to mask emulated devices (such
+     as disk and network devices) from Windows, when paravitulized devices
+     are available 
+
+Quick Start
+===========
+
+Prerequisites to build
+----------------------
+
+*   Visual Studio 2012 or later 
+*   Windows Driver Kit 8 or later
+*   Python 3 or later 
+
+Environment variables used in building driver
+-----------------------------
+
+MAJOR\_VERSION Major version number
+
+MINOR\_VERSION Minor version number
+
+MICRO\_VERSION Micro version number
+
+BUILD\_NUMBER Build number
+
+SYMBOL\_SERVER location of a writable symbol server directory
+
+KIT location of the Windows driver kit
+
+PROCESSOR\_ARCHITECTURE x86 or x64
+
+VS location of visual studio
+
+Commands to build
+-----------------
+
+    git clone http://github.com/xenserver/win-xenbus
+    cd win-xenbus
+    .\build.py [checked | free]
+
+Device tree diagram
+-------------------
+
+
+                                                             |     |
+                    XenBus--(Xen.Sys)               [====XenFilt===]
+                      |                             |  |  |  |  |  |
+    PCI Bus :---------+-----------------------------+--+--+--+--+--+
+               VEN_5853&DEV_0002&SUBSYS_00025853     Other Devices        

diff --git a/build.py b/build.py
index 1d7d32bbef153c4293334bb1c515b923b614b1af..613149b4846f73cf77915f4a7349bd60d450174e 100644 (file)
--- a/build.py
+++ b/build.py
@@ -154,8 +154,8 @@ def get_configuration_name(debug):
 def get_target_path(arch, debug):
     configuration = get_configuration_name(debug)
 
-    target = { 'x86': 'proj', 'x64': os.sep.join(['proj', 'x64']) }
-    target_path = os.sep.join([target[arch], configuration])
+    target = { 'x86': os.sep.join([configuration, 'Win32']), 'x64': os.sep.join([configuration, 'x64']) }
+    target_path = os.sep.join(['proj', target[arch]])
 
     return target_path
 
@@ -182,8 +182,6 @@ def msbuild(name, arch, debug):
     cwd = os.getcwd()
     configuration = get_configuration(debug)
 
-    os.environ['SOLUTION'] = name
-
     if arch == 'x86':
         os.environ['PLATFORM'] = 'Win32'
     elif arch == 'x64':
@@ -191,6 +189,8 @@ def msbuild(name, arch, debug):
 
     os.environ['CONFIGURATION'] = configuration
     os.environ['TARGET'] = 'Build'
+    os.environ['BUILD_ARGS'] = '/p:SignMode="ProductionSign"'
+    os.environ['BUILD_FILE'] = name + '.sln'
 
     os.chdir('proj')
     status = shell('msbuild.bat')

diff --git a/proj/configs.props b/proj/configs.props
new file mode 100644 (file)
index 0000000..2567bcf
--- /dev/null
+++ b/proj/configs.props
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 
+       <ItemGroup Label="ProjectConfigurations"> 
+               <ProjectConfiguration Include="Windows 8 Debug|Win32"> 
+                       <Configuration>Windows 8 Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Debug|Win32"> 
+                       <Configuration>Windows 7 Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Debug|Win32"> 
+                       <Configuration>Windows Vista Debug</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Release|Win32"> 
+                       <Configuration>Windows 8 Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Release|Win32"> 
+                       <Configuration>Windows 7 Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Release|Win32"> 
+                       <Configuration>Windows Vista Release</Configuration> 
+                       <Platform>Win32</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Debug|x64"> 
+                       <Configuration>Windows8 Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Debug|x64"> 
+                       <Configuration>Windows 7 Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Debug|x64"> 
+                       <Configuration>Windows Vista Debug</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 8 Release|x64"> 
+                       <Configuration>Windows 8 Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows 7 Release|x64"> 
+                       <Configuration>Windows 7 Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+               <ProjectConfiguration Include="Windows Vista Release|x64"> 
+                       <Configuration>Windows Vista Release</Configuration> 
+                       <Platform>x64</Platform> 
+               </ProjectConfiguration> 
+       </ItemGroup> 
+</Project>
\ No newline at end of file

diff --git a/proj/msbuild.bat b/proj/msbuild.bat
index 0d3f6cb81eb18ca6feae714f23493931daf1e0d4..143feb1151db44fa7dd636c7fde79da425301173 100644 (file)
--- a/proj/msbuild.bat
+++ b/proj/msbuild.bat
@@ -1,5 +1,5 @@
 call "%VS%\VC\vcvarsall.bat" x86
-msbuild.exe /m:4 /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" /p:SignMode="ProductionSign" %SOLUTION%.sln
+msbuild.exe /m:4 /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" /t:"%TARGET%" %BUILD_ARGS% %BUILD_FILE%
 if errorlevel 1 goto error
 exit 0
 

diff --git a/proj/msbuild_dvl.bat b/proj/msbuild_dvl.bat
deleted file mode 100644 (file)
index 4c256b2..0000000
--- a/proj/msbuild_dvl.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-call "%VS%\VC\vcvarsall.bat" x86
-echo msbuild.exe "%SDV_PROJ%" /t:dvl /p:Configuration="Windows 8 Release" /p:Platform=x64
-msbuild.exe "%SDV_PROJ%" /t:dvl /p:Configuration="Windows 8 Release" /p:Platform=x64
-if errorlevel 1 goto error
-exit 0
-
-:error
-exit 1

diff --git a/proj/msbuild_sdv.bat b/proj/msbuild_sdv.bat
deleted file mode 100644 (file)
index b3b7202..0000000
--- a/proj/msbuild_sdv.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-call "%VS%\VC\vcvarsall.bat" x86
-echo msbuild.exe "%SDV_PROJ%" /t:sdv /p:Inputs="%SDV_ARG%" /p:Configuration="Windows 8 Release" /p:Platform=x64
-msbuild.exe "%SDV_PROJ%" /t:sdv /p:Inputs="%SDV_ARG%" /p:Configuration="Windows 8 Release" /p:Platform=x64
-if errorlevel 1 goto error
-exit 0
-
-:error
-exit 1

diff --git a/proj/package/package.vcxproj b/proj/package/package.vcxproj
index 8decac282cc4876d8b46007517af11ab2e9d287e..15d84d7069b356da6d69e11e557f4abc66ae2162 100644 (file)
--- a/proj/package/package.vcxproj
+++ b/proj/package/package.vcxproj
@@ -1,163 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{92E5A46B-913C-45C6-B6F8-7E062D85279F}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Utility</ConfigurationType>
-    <DriverType>Package</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <EnableInf2cat>true</EnableInf2cat>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform)</Inf2CatWindowsVersionList>
-    <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform)</Inf2CatWindowsVersionList>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-    <EnableDeployment>False</EnableDeployment>
-    <ImportToStore>False</ImportToStore>
-    <InstallMode>None</InstallMode>
-    <HardwareIdString />
-    <CommandLine />
-    <ScriptPath />
-    <DeployFiles />
-    <ScriptName />
-    <ScriptDeviceQuery>%PathToInf%</ScriptDeviceQuery>
-    <EnableVerifier>False</EnableVerifier>
-    <AllDrivers>False</AllDrivers>
-    <VerifyProjectOutput>True</VerifyProjectOutput>
-    <VerifyDrivers />
-    <VerifyFlags>133563</VerifyFlags>
-    <PackageDir>..\..\xenbus\$(DDKPlatform)</PackageDir>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\xenfilt\xenfilt.vcxproj">
-      <Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\xenbus_coinst\xenbus_coinst.vcxproj">
-      <Project>{4bf41378-c01b-4002-8581-563c5f703362}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\xenbus\xenbus.vcxproj">
-      <Project>{14c16c29-77c9-475b-a618-1b01e67cf985}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\xen\xen.vcxproj">
-      <Project>{9c6a5d48-a331-4b1f-a004-7bb67ba5be1c}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
-    <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+       <Import Project="..\configs.props" />
+       
+       <PropertyGroup Label="PropertySheets">
+           <DriverType>WDM</DriverType> 
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset> 
+               <ConfigurationType>Utility</ConfigurationType>
+               <DriverType>Package</DriverType>
+               <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+       </PropertyGroup>
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+       
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{92E5A46B-913C-45C6-B6F8-7E062D85279F}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+  
+       <PropertyGroup>
+               <EnableInf2cat>true</EnableInf2cat>
+               <Inf2CatWindowsVersionList Condition="'$(Platform)'=='x64'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform);Server2008R2_$(DDKPlatform)</Inf2CatWindowsVersionList>
+               <Inf2CatWindowsVersionList Condition="'$(Platform)'=='Win32'">Vista_$(DDKPlatform);7_$(DDKPlatform);Server2008_$(DDKPlatform)</Inf2CatWindowsVersionList>
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
+               <EnableDeployment>False</EnableDeployment>
+               <ImportToStore>False</ImportToStore>
+               <InstallMode>None</InstallMode>
+               <ScriptDeviceQuery>%PathToInf%</ScriptDeviceQuery>
+               <EnableVerifier>False</EnableVerifier>
+               <AllDrivers>False</AllDrivers>
+               <VerifyProjectOutput>True</VerifyProjectOutput>
+               <VerifyDrivers />
+               <VerifyFlags>133563</VerifyFlags>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+               <PackageDir>..\..\xenbus\$(DDKPlatform)</PackageDir>
+       </PropertyGroup>
+  
+       <ItemGroup>
+               <ProjectReference Include="..\xenfilt\xenfilt.vcxproj">
+                       <Project>{d7411b2c-2c43-434d-9f56-e10a3d2f5bad}</Project>
+               </ProjectReference>
+               <ProjectReference Include="..\xenbus_coinst\xenbus_coinst.vcxproj">
+                       <Project>{4bf41378-c01b-4002-8581-563c5f703362}</Project>
+               </ProjectReference>
+               <ProjectReference Include="..\xenbus\xenbus.vcxproj">
+                       <Project>{14c16c29-77c9-475b-a618-1b01e67cf985}</Project>
+               </ProjectReference>
+               <ProjectReference Include="..\xen\xen.vcxproj">
+                       <Project>{9c6a5d48-a331-4b1f-a004-7bb67ba5be1c}</Project>
+               </ProjectReference>
+       </ItemGroup>
+       <ItemGroup>
+               <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x86\dpinst.exe" Condition="'$(Platform)'=='Win32'" />
+               <FilesToPackage Include="$(KIT)\Redist\DIFx\dpinst\EngMui\x64\dpinst.exe" Condition="'$(Platform)'=='x64'" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <ImportGroup Label="ExtensionTargets">
+       </ImportGroup>
+</Project>

diff --git a/proj/targets.props b/proj/targets.props
new file mode 100644 (file)
index 0000000..c8aba92
--- /dev/null
+++ b/proj/targets.props
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Debug|Win32'"> 
+               <TargetVersion>Windows8</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Release|Win32'"> 
+               <TargetVersion>Windows8</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Debug|x64'"> 
+               <TargetVersion>Windows8</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 8 Release|x64'"> 
+               <TargetVersion>Windows8</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'"> 
+               <TargetVersion>Windows7</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'"> 
+               <TargetVersion>Windows7</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'"> 
+               <TargetVersion>Windows7</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'"> 
+               <TargetVersion>Windows7</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup>
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>true</UseDebugLibraries> 
+       </PropertyGroup> 
+       <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'"> 
+               <TargetVersion>Vista</TargetVersion> 
+               <UseDebugLibraries>false</UseDebugLibraries> 
+       </PropertyGroup>
+</Project>

diff --git a/proj/xen/xen.vcxproj b/proj/xen/xen.vcxproj
index 0c738caae1d1dbaec959fcde3c84e9c58dc5de75..6a1ab27e76de5cd4055152ec59721dfe0eac1833 100644 (file)
--- a/proj/xen/xen.vcxproj
+++ b/proj/xen/xen.vcxproj
@@ -1,206 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xen</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XEN";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>$(DDK_LIB_PATH)/libcntpr.lib;$(DDK_LIB_PATH)/aux_klib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>../../src/xen/xen.def</ModuleDefinitionFile>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XEN";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>$(DDK_LIB_PATH)/libcntpr.lib;$(DDK_LIB_PATH)/aux_klib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>../../src/xen/xen.def</ModuleDefinitionFile>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\xen\driver.c" />
-    <ClCompile Include="..\..\src\xen\event_channel.c" />
-    <ClCompile Include="..\..\src\xen\grant_table.c" />
-    <ClCompile Include="..\..\src\xen\hvm.c" />
-    <ClCompile Include="..\..\src\xen\hypercall.c" />
-    <ClCompile Include="..\..\src\xen\memory.c" />
-    <ClCompile Include="..\..\src\xen\sched.c" />
-    <ClCompile Include="..\..\src\xen\log.c" />
-    <ClCompile Include="..\..\src\xen\debug.c" />
-    <ClCompile Include="..\..\src\xen\dump.c" />
-    <ClCompile Include="..\..\src\xen\module.c" />
-    <ClCompile Include="..\..\src\xen\process.c" />
-    <ClCompile Include="..\..\src\xen\unplug.c" />
-    <ClCompile Include="..\..\src\xen\system.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\..\src\xen\amd64\hypercall_gate.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-    </MASM>
-    <MASM Include="..\..\src\xen\i386\hypercall_gate.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-    </MASM>
-    <MASM Include="..\..\src\xen\amd64\util.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
-    </MASM>
-    <MASM Include="..\..\src\xen\i386\util.asm">
-      <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\xen\xen.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\src\xen\xen.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+       
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       <PropertyGroup Label="PropertySheets">
+           <DriverType>WDM</DriverType> 
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset> 
+               <ConfigurationType>Driver</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+       </PropertyGroup>
+
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <PreprocessorDefinitions>__MODULE__="XEN";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+                       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+                       <EnablePREfast>true</EnablePREfast>
+               </ClCompile>
+               <Link>
+                       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+                       <AdditionalDependencies>$(DDK_LIB_PATH)/libcntpr.lib;$(DDK_LIB_PATH)/aux_klib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+                       <ModuleDefinitionFile>../../src/xen/xen.def</ModuleDefinitionFile>
+                       <EnableCOMDATFolding>false</EnableCOMDATFolding>
+               </Link>
+               <Inf>
+                       <SpecifyArchitecture>true</SpecifyArchitecture>
+                       <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
+                       <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
+                       <EnableVerbose>true</EnableVerbose>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>x86</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>amd64</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+
+       <ItemGroup>
+               <FilesToPackage Include="$(TargetPath)" />
+               <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+               <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+       </ItemGroup>
+       <ItemGroup>
+               <ClCompile Include="..\..\src\xen\driver.c" />
+               <ClCompile Include="..\..\src\xen\event_channel.c" />
+               <ClCompile Include="..\..\src\xen\grant_table.c" />
+               <ClCompile Include="..\..\src\xen\hvm.c" />
+               <ClCompile Include="..\..\src\xen\hypercall.c" />
+               <ClCompile Include="..\..\src\xen\memory.c" />
+               <ClCompile Include="..\..\src\xen\sched.c" />
+               <ClCompile Include="..\..\src\xen\log.c" />
+               <ClCompile Include="..\..\src\xen\debug.c" />
+               <ClCompile Include="..\..\src\xen\dump.c" />
+               <ClCompile Include="..\..\src\xen\module.c" />
+               <ClCompile Include="..\..\src\xen\process.c" />
+               <ClCompile Include="..\..\src\xen\unplug.c" />
+               <ClCompile Include="..\..\src\xen\system.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <MASM Include="..\..\src\xen\amd64\hypercall_gate.asm">
+                       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
+               </MASM>
+               <MASM Include="..\..\src\xen\i386\hypercall_gate.asm">
+                       <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
+               </MASM>
+               <MASM Include="..\..\src\xen\amd64\util.asm">
+                       <ExcludedFromBuild Condition="'$(Platform)'=='Win32'">true</ExcludedFromBuild>
+               </MASM>
+               <MASM Include="..\..\src\xen\i386\util.asm">
+                       <ExcludedFromBuild Condition="'$(Platform)'=='x64'">true</ExcludedFromBuild>
+               </MASM>
+       </ItemGroup>
+       <ItemGroup>
+               <ResourceCompile Include="..\..\src\xen\xen.rc" />
+       </ItemGroup>
+       <ItemGroup>
+               <None Include="..\..\src\xen\xen.def" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file

diff --git a/proj/xenbus.sln b/proj/xenbus.sln
index c87980eec3fabc3fe6d56390bffa33a4378e5460..d8e471deff7fece5f43c314d4d0668274494d8bd 100644 (file)
--- a/proj/xenbus.sln
+++ b/proj/xenbus.sln
@@ -28,10 +28,10 @@ Global
                Windows 7 Debug|x64 = Windows 7 Debug|x64
                Windows 7 Release|Win32 = Windows 7 Release|Win32
                Windows 7 Release|x64 = Windows 7 Release|x64
-               Windows Developer Preview Debug|Win32 = Windows Developer Preview Debug|Win32
-               Windows Developer Preview Debug|x64 = Windows Developer Preview Debug|x64
-               Windows Developer Preview Release|Win32 = Windows Developer Preview Release|Win32
-               Windows Developer Preview Release|x64 = Windows Developer Preview Release|x64
+               Windows 8 Debug|Win32 = Windows 8 Debug|Win32
+               Windows 8 Debug|x64 = Windows 8 Debug|x64
+               Windows 8 Release|Win32 = Windows 8 Release|Win32
+               Windows 8 Release|x64 = Windows 8 Release|x64
                Windows Vista Debug|Win32 = Windows Vista Debug|Win32
                Windows Vista Debug|x64 = Windows Vista Debug|x64
                Windows Vista Release|Win32 = Windows Vista Release|Win32
@@ -46,14 +46,14 @@ Global
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {14C16C29-77C9-475B-A618-1B01E67CF985}.Windows Vista Debug|x64.ActiveCfg = Windows Vista Debug|x64
@@ -70,14 +70,14 @@ Global
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {4BF41378-C01B-4002-8581-563C5F703362}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {4BF41378-C01B-4002-8581-563C5F703362}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {4BF41378-C01B-4002-8581-563C5F703362}.Windows Vista Debug|x64.ActiveCfg = Windows Vista Debug|x64
@@ -98,18 +98,18 @@ Global
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 7 Release|x64.Deploy.0 = Windows 7 Release|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|Win32.Deploy.0 = Windows Developer Preview Debug|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Debug|x64.Deploy.0 = Windows Developer Preview Debug|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|Win32.Deploy.0 = Windows Developer Preview Release|Win32
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
-               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Developer Preview Release|x64.Deploy.0 = Windows Developer Preview Release|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|Win32.Deploy.0 = Windows 8 Debug|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Debug|x64.Deploy.0 = Windows 8 Debug|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|Win32.Deploy.0 = Windows 8 Release|Win32
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
+               {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows 8 Release|x64.Deploy.0 = Windows 8 Release|x64
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {92E5A46B-913C-45C6-B6F8-7E062D85279F}.Windows Vista Debug|Win32.Deploy.0 = Windows Vista Debug|Win32
@@ -130,14 +130,14 @@ Global
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {9C6A5D48-A331-4B1F-A004-7BB67BA5BE1C}.Windows Vista Debug|x64.ActiveCfg = Windows Vista Debug|x64
@@ -154,14 +154,14 @@ Global
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|Win32.Build.0 = Windows 7 Release|Win32
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|x64.ActiveCfg = Windows 7 Release|x64
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 7 Release|x64.Build.0 = Windows 7 Release|x64
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Debug|Win32.ActiveCfg = Windows Developer Preview Debug|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Debug|Win32.Build.0 = Windows Developer Preview Debug|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Debug|x64.ActiveCfg = Windows Developer Preview Debug|x64
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Debug|x64.Build.0 = Windows Developer Preview Debug|x64
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Release|Win32.ActiveCfg = Windows Developer Preview Release|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Release|Win32.Build.0 = Windows Developer Preview Release|Win32
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Release|x64.ActiveCfg = Windows Developer Preview Release|x64
-               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Developer Preview Release|x64.Build.0 = Windows Developer Preview Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|Win32.ActiveCfg = Windows 8 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|Win32.Build.0 = Windows 8 Debug|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|x64.ActiveCfg = Windows 8 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Debug|x64.Build.0 = Windows 8 Debug|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|Win32.ActiveCfg = Windows 8 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|Win32.Build.0 = Windows 8 Release|Win32
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|x64.ActiveCfg = Windows 8 Release|x64
+               {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows 8 Release|x64.Build.0 = Windows 8 Release|x64
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Vista Debug|Win32.ActiveCfg = Windows Vista Debug|Win32
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Vista Debug|Win32.Build.0 = Windows Vista Debug|Win32
                {D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}.Windows Vista Debug|x64.ActiveCfg = Windows Vista Debug|x64

diff --git a/proj/xenbus/xenbus.vcxproj b/proj/xenbus/xenbus.vcxproj
index ee0dd89f12edbf98e6427622974f00f7c065e179..d740b044164f67bcbdcc153a8c18e12cdcb474e5 100644 (file)
--- a/proj/xenbus/xenbus.vcxproj
+++ b/proj/xenbus/xenbus.vcxproj
@@ -1,203 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{14C16C29-77C9-475B-A618-1B01E67CF985}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xenbus</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XENBUS";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>$(SolutionDir)$(ConfigurationName)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Inf>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <Architecture>x86</Architecture>
-      <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
-      <EnableVerbose>true</EnableVerbose>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XENBUS";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>$(SolutionDir)$(Platform)\$(ConfigurationName)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-    <Inf>
-      <SpecifyArchitecture>true</SpecifyArchitecture>
-      <Architecture>amd64</Architecture>
-      <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
-      <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
-      <EnableVerbose>true</EnableVerbose>
-    </Inf>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\xenbus\bus.c" />
-    <ClCompile Include="..\..\src\xenbus\dma.c" />
-    <ClCompile Include="..\..\src\xenbus\debug.c" />
-    <ClCompile Include="..\..\src\xenbus\driver.c" />
-    <ClCompile Include="..\..\src\xenbus\evtchn.c" />
-    <ClCompile Include="..\..\src\xenbus\fdo.c" />
-    <ClCompile Include="..\..\src\xenbus\gnttab.c" />
-    <ClCompile Include="..\..\src\xenbus\pdo.c" />
-    <ClCompile Include="..\..\src\xenbus\registry.c" />
-    <ClCompile Include="..\..\src\xenbus\shared_info.c" />
-    <ClCompile Include="..\..\src\xenbus\store.c" />
-    <ClCompile Include="..\..\src\xenbus\suspend.c" />
-    <ClCompile Include="..\..\src\xenbus\sync.c" />
-    <ClCompile Include="..\..\src\xenbus\thread.c" />
-    <ClCompile Include="..\..\src\xenbus\range_set.c" />
-    <ClCompile Include="..\..\src\xenbus\balloon.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\xenbus\xenbus.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Inf Include="..\xenbus.inf" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+       
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       <PropertyGroup Label="PropertySheets">
+           <DriverType>WDM</DriverType> 
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset> 
+               <ConfigurationType>Driver</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{14C16C29-77C9-475B-A618-1B01E67CF985}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+       </PropertyGroup>
+
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <PreprocessorDefinitions>__MODULE__="XENBUS";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+                       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+                       <EnablePREfast>true</EnablePREfast>
+               </ClCompile>
+               <Link>
+                       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+                       <AdditionalDependencies>$(ProjectDir)..\$(ConfigurationName)\$(Platform)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+                       <EnableCOMDATFolding>false</EnableCOMDATFolding>
+               </Link>
+               <Inf>
+                       <SpecifyArchitecture>true</SpecifyArchitecture>
+                       <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
+                       <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
+                       <EnableVerbose>true</EnableVerbose>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>x86</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>amd64</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+
+       <ItemGroup>
+               <FilesToPackage Include="$(TargetPath)" />
+               <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+               <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+       </ItemGroup>
+       <ItemGroup>
+               <ClCompile Include="..\..\src\xenbus\bus.c" />
+               <ClCompile Include="..\..\src\xenbus\dma.c" />
+               <ClCompile Include="..\..\src\xenbus\debug.c" />
+               <ClCompile Include="..\..\src\xenbus\driver.c" />
+               <ClCompile Include="..\..\src\xenbus\evtchn.c" />
+               <ClCompile Include="..\..\src\xenbus\fdo.c" />
+               <ClCompile Include="..\..\src\xenbus\gnttab.c" />
+               <ClCompile Include="..\..\src\xenbus\pdo.c" />
+               <ClCompile Include="..\..\src\xenbus\registry.c" />
+               <ClCompile Include="..\..\src\xenbus\shared_info.c" />
+               <ClCompile Include="..\..\src\xenbus\store.c" />
+               <ClCompile Include="..\..\src\xenbus\suspend.c" />
+               <ClCompile Include="..\..\src\xenbus\sync.c" />
+               <ClCompile Include="..\..\src\xenbus\thread.c" />
+               <ClCompile Include="..\..\src\xenbus\range_set.c" />
+               <ClCompile Include="..\..\src\xenbus\balloon.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <ResourceCompile Include="..\..\src\xenbus\xenbus.rc" />
+       </ItemGroup>
+       <ItemGroup>
+               <Inf Include="..\xenbus.inf" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

diff --git a/proj/xenbus_coinst/xenbus_coinst.vcxproj b/proj/xenbus_coinst/xenbus_coinst.vcxproj
index c9aba6d5fb4eee4ca0a8bebcdec5fec7147109e7..4321abea0f0e3c56462aad2b1d1c57f120bf4a22 100644 (file)
--- a/proj/xenbus_coinst/xenbus_coinst.vcxproj
+++ b/proj/xenbus_coinst/xenbus_coinst.vcxproj
@@ -1,177 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4BF41378-C01B-4002-8581-563C5F703362}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xenbus_coinst</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsApplicationForDrivers8.0</PlatformToolset>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XENBUS_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>../../src/coinst/xenbus_coinst.def</ModuleDefinitionFile>
-      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XENBUS_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
-      <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>../../src/coinst/xenbus_coinst.def</ModuleDefinitionFile>
-      <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\coinst\coinst.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\src\coinst\xenbus_coinst.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+       
+       <PropertyGroup Label="PropertySheets">
+           <DriverType>WDM</DriverType> 
+               <PlatformToolset>WindowsApplicationForDrivers8.0</PlatformToolset>
+               <ConfigurationType>DynamicLibrary</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+       
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{4BF41378-C01B-4002-8581-563C5F703362}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <IncludePath>$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+       </PropertyGroup>
+       
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+                       <PreprocessorDefinitions>__MODULE__="XENBUS_COINST";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+                       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+                       <EnablePREfast>true</EnablePREfast>
+                       <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='true'">MultiThreadedDebug</RuntimeLibrary>
+                       <RuntimeLibrary Condition="'$(UseDebugLibraries)'=='false'">MultiThreaded</RuntimeLibrary>
+               </ClCompile>
+               <Link>
+                       <ModuleDefinitionFile>../../src/coinst/xenbus_coinst.def</ModuleDefinitionFile>
+                       <AdditionalDependencies>setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+               </Link>
+               <ResourceCompile>
+                       <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+               </ResourceCompile>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+       </ItemDefinitionGroup>
+ 
+       <ItemGroup>
+               <FilesToPackage Include="$(TargetPath)" />
+               <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+               <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+       </ItemGroup>
+       <ItemGroup>
+               <ClCompile Include="..\..\src\coinst\coinst.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <None Include="..\..\src\coinst\xenbus_coinst.def" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
\ No newline at end of file

diff --git a/proj/xenfilt/xenfilt.vcxproj b/proj/xenfilt/xenfilt.vcxproj
index e19c4a7d615a72c39784e4e7d9b6fc92b36ba0c3..5ca6b2481c84b72e2c61ef61f0c917d3eb2c61ea 100644 (file)
--- a/proj/xenfilt/xenfilt.vcxproj
+++ b/proj/xenfilt/xenfilt.vcxproj
@@ -1,179 +1,88 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Windows Developer Preview Debug|Win32">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|Win32">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|Win32">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|Win32">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|Win32">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|Win32">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Debug|x64">
-      <Configuration>Windows Developer Preview Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Developer Preview Release|x64">
-      <Configuration>Windows Developer Preview Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Debug|x64">
-      <Configuration>Windows 7 Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows 7 Release|x64">
-      <Configuration>Windows 7 Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Debug|x64">
-      <Configuration>Windows Vista Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Windows Vista Release|x64">
-      <Configuration>Windows Vista Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}</ProjectGuid>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
-    <ProjectName>xenfilt</ProjectName>
-  </PropertyGroup>
-  <PropertyGroup Label="PropertySheets">
-    <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset>
-    <ConfigurationType>Driver</ConfigurationType>
-    <DriverType>WDM</DriverType>
-    <Configuration>Windows Developer Preview Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|Win32'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Developer Preview Release|x64'" Label="Configuration">
-    <TargetVersion>Windows8</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows 7 Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Debug|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Windows Vista Release|x64'" Label="Configuration">
-    <TargetVersion>Vista</TargetVersion>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-    <EnableInf2cat>false</EnableInf2cat>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__i386__;__MODULE__="XENFILT";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-      <AdditionalDependencies>$(SolutionDir)$(ConfigurationName)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>__x86_64__;__MODULE__="XENFILT";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
-      <DisableSpecificWarnings>4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnablePREfast>true</EnablePREfast>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>$(SolutionDir)$(Platform)\$(ConfigurationName)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToPackage Include="$(TargetPath)" />
-    <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
-    <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="../../src/xenfilt/driver.c" />
-    <ClCompile Include="../../src/xenfilt/fdo.c" />
-    <ClCompile Include="../../src/xenfilt/emulated.c" />
-    <ClCompile Include="../../src/xenfilt/pdo.c" />
-    <ClCompile Include="../../src/xenfilt/registry.c" />
-    <ClCompile Include="../../src/xenfilt/thread.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\xenfilt\xenfilt.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+       <Import Project="..\configs.props" />
+       
+       <PropertyGroup Label="Globals">
+               <Configuration>Windows Vista Debug</Configuration>
+               <Platform Condition="'$(Platform)' == ''">Win32</Platform> 
+               <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor> 
+       </PropertyGroup>
+       <PropertyGroup Label="PropertySheets">
+           <DriverType>WDM</DriverType> 
+               <PlatformToolset>WindowsKernelModeDriver8.0</PlatformToolset> 
+               <ConfigurationType>Driver</ConfigurationType>
+               <DriverType>WDM</DriverType>
+       </PropertyGroup>
+       
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+       <PropertyGroup Label="Globals">
+               <ProjectGuid>{D7411B2C-2C43-434D-9F56-E10A3D2F5BAD}</ProjectGuid>
+       </PropertyGroup>
+       
+       <Import Project="..\targets.props" />
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 
+
+       <PropertyGroup>
+               <IncludePath>..\..\include;$(IncludePath)</IncludePath>
+               <RunCodeAnalysis>true</RunCodeAnalysis>
+               <EnableInf2cat>false</EnableInf2cat>
+               <IntDir>..\$(ProjectName)\$(ConfigurationName)\$(Platform)\</IntDir>
+               <OutDir>..\$(ConfigurationName)\$(Platform)\</OutDir>
+       </PropertyGroup>
+
+       <ItemDefinitionGroup>
+               <ClCompile>
+                       <PreprocessorDefinitions>__MODULE__="XENFILT";POOL_NX_OPTIN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                       <WarningLevel>EnableAllWarnings</WarningLevel>
+                       <DisableSpecificWarnings>4711;4548;4820;4668;4255;6001;6054;28196;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+                       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+                       <EnablePREfast>true</EnablePREfast>
+               </ClCompile>
+               <Link>
+                       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+                       <AdditionalDependencies>$(ProjectDir)..\$(ConfigurationName)\$(Platform)\xen.lib;$(DDK_LIB_PATH)/libcntpr.lib;%(AdditionalDependencies)</AdditionalDependencies>
+                       <EnableCOMDATFolding>false</EnableCOMDATFolding>
+               </Link>
+               <Inf>
+                       <SpecifyArchitecture>true</SpecifyArchitecture>
+                       <SpecifyDriverVerDirectiveVersion>true</SpecifyDriverVerDirectiveVersion>
+                       <TimeStamp>$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION).$(BUILD_NUMBER)</TimeStamp>
+                       <EnableVerbose>true</EnableVerbose>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__i386__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>x86</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+       <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+               <ClCompile>
+                       <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+               </ClCompile>
+               <Inf>
+                       <Architecture>amd64</Architecture>
+               </Inf>
+       </ItemDefinitionGroup>
+
+       <ItemGroup>
+               <FilesToPackage Include="$(TargetPath)" />
+               <FilesToPackage Include="$(OutDir)$(TargetName).pdb" />
+               <FilesToPackage Include="@(Inf->'%(CopyOutput)')" Condition="'@(Inf)'!=''" />
+       </ItemGroup>
+       <ItemGroup>
+               <ClCompile Include="../../src/xenfilt/driver.c" />
+               <ClCompile Include="../../src/xenfilt/fdo.c" />
+               <ClCompile Include="../../src/xenfilt/emulated.c" />
+               <ClCompile Include="../../src/xenfilt/pdo.c" />
+               <ClCompile Include="../../src/xenfilt/registry.c" />
+               <ClCompile Include="../../src/xenfilt/thread.c" />
+       </ItemGroup>
+       <ItemGroup>
+               <ResourceCompile Include="..\..\src\xenfilt\xenfilt.rc" />
+       </ItemGroup>
+       <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>

diff --git a/sdv.py b/sdv.py
index f75c4830ec480bd604eec3044c1de16423bc3e0b..16861e70ab38e7495009ab8f05863d8697f3330a 100644 (file)
--- a/sdv.py
+++ b/sdv.py
@@ -18,32 +18,49 @@ def shell(command):
 
     return pipe.close()
 
-
 class msbuild_failure(Exception):
     def __init__(self, value):
         self.value = value
     def __str__(self):
         return repr(self.value)
 
-def msbuild(batfile, projdir, name, sdv_arg):
+def msbuild(name, target, sdv_arg):
     cwd = os.getcwd()
 
-    os.environ['CONFIGURATION'] = 'Windows Developer Preview Release'
-    os.environ['SDV_PROJ'] = name
-    os.environ['SDV_ARG'] = sdv_arg
+    os.environ['CONFIGURATION'] = 'Windows 8 Release'
+    os.environ['PLATFORM'] = 'x64'
+    os.environ['TARGET'] = target
+    os.environ['BUILD_FILE'] = name + '.vcxproj'
+    os.environ['BUILD_ARGS'] = sdv_arg
 
     os.chdir('proj')
-    os.chdir(projdir)
-    status = shell(batfile)
+    os.chdir(name)
+    status = shell('..\\msbuild.bat')
     os.chdir(cwd)
 
 #    if (status != None):
 #        raise msbuild_failure(sdv_arg)
 
+def archive(filename, files, tgz=False):
+    access='w'
+    if tgz:
+        access='w:gz'
+    tar = tarfile.open(filename, access)
+    for name in files :
+        try:
+            print('adding '+name)
+            tar.add(name)
+        except:
+            pass
+    tar.close()
 
 if __name__ == '__main__':
-    msbuild('..\msbuild_sdv.bat', 'xenbus', 'xenbus.vcxproj', '/clean')
-
-    msbuild('..\msbuild_sdv.bat', 'xenbus', 'xenbus.vcxproj', '/check:default.sdv')
-
-    msbuild('..\msbuild_dvl.bat', 'xenbus', 'xenbus.vcxproj', '')
+    msbuild('xen', 'sdv', '/p:Inputs="/clean"')
+    msbuild('xenfilt', 'sdv', '/p:Inputs="/clean"')
+    msbuild('xenbus', 'sdv', '/p:Inputs="/clean"')
+    msbuild('xen', 'sdv', '/p:Inputs="/check:default.sdv"')
+    msbuild('xenfilt', 'sdv', '/p:Inputs="/check:default.sdv"')
+    msbuild('xenbus', 'sdv', '/p:Inputs="/check:default.sdv"')
+    msbuild('xen', 'dvl', '')
+    msbuild('xenfilt', 'dvl', '')
+    msbuild('xenbus', 'dvl', '')

diff --git a/src/xen/debug.c b/src/xen/debug.c
index 92f66a76e0c543236c5622187c8b04de0386e35e..c0f073fcb12c8f88e41d0059b673f918e000bbe8 100644 (file)
--- a/src/xen/debug.c
+++ b/src/xen/debug.c
@@ -51,6 +51,10 @@ DebugTeardown(
     (VOID) KeDeregisterBugCheckCallback(&DebugBugCheckCallbackRecord);
 }
 
+#pragma warning(push)
+#pragma warning(disable: 6320) // Exception-filter expression is the constant EXCEPTION_EXECUTE_HANDLER. This might mask exceptions that were not intended to be handled.
+#pragma warning(disable: 6322) // Empty _except block.
+
 static DECLSPEC_NOINLINE VOID
 DebugDumpExceptionRecord(
     IN  PEXCEPTION_RECORD   Exception
@@ -879,6 +883,8 @@ DebugDefaultHandler(
     }
 }
 
+#pragma warning(pop)
+
 KBUGCHECK_CALLBACK_ROUTINE DebugBugCheckCallback;
 
 VOID                     

diff --git a/src/xen/dump.c b/src/xen/dump.c
index df3dcb7e2a41d0c3f02117a2f27c1f0b53c5be5e..1bc80990900b08ff7b0a3f954788c109d8d672f6 100644 (file)
--- a/src/xen/dump.c
+++ b/src/xen/dump.c
@@ -42,7 +42,7 @@
 // To enable you need to customize /opt/xensource/libexec/qemu-dm-wrapper in dom0 to add the following
 // arguments to the qemu command line:
 //
-// -priv -dumpdir <directory> -dumpquota <quota>
+// -dumpdir <directory> -dumpquota <quota>
 //
 // <directory> is best pointed at an empty directory. Files will be created with numeric names starting at 0.
 // <quota> should be the total size in MB of all possible crash dump files. I.e. once sufficient crash dumps have
@@ -159,7 +159,7 @@ DumpBugCheckReasonCallback(
     PKBUGCHECK_DUMP_IO                      DumpIo = (PKBUGCHECK_DUMP_IO)ReasonSpecificData;
 
     UNREFERENCED_PARAMETER(ReasonSpecificDataLength);
-    
+
     ASSERT3U(Reason, ==, KbCallbackDumpIo);
     ASSERT3P(Record, ==, &DumpBugCheckReasonCallbackRecord);
     ASSERT(DumpIo != NULL);

diff --git a/src/xen/log.c b/src/xen/log.c
index 2c3e2d464c6688655f8867fc26147431c928fd6e..a1a116aff579fa1dbab713da5889cdbfcb55336b 100644 (file)
--- a/src/xen/log.c
+++ b/src/xen/log.c
@@ -178,10 +178,10 @@ LogCchVPrintf(
             ASSERT(Character != '\0');
         }
 
-        if (isdigit(Character)) {
+        if (isdigit((unsigned char)Character)) {
             ZeroPrefix = (Character == '0') ? TRUE : FALSE;
 
-            while (isdigit(Character)) {
+            while (isdigit((unsigned char)Character)) {
                 Pad = (Pad * 10) + (Character - '0');
                 Character = *Format++;
                 ASSERT(Character != '\0');

diff --git a/src/xen/log.h b/src/xen/log.h
index 09366071a35819a23f4c8eb68f163662ce1f1142..3a2d80b0c56a42c368fdd3129f64c9ba9c573dae 100644 (file)
--- a/src/xen/log.h
+++ b/src/xen/log.h
@@ -32,6 +32,8 @@
 #ifndef _XEN_LOG_H
 #define _XEN_LOG_H
 
+#define __MODULE__ "XEN"
+
 #include <ntddk.h>
 #include <stdarg.h>
 

diff --git a/src/xenbus.inf b/src/xenbus.inf
index 210a35a258580ad4fa3999f8f50462f251b260fc..107f22fd8e6a06cb82e471b19d562c770678ceda 100644 (file)
--- a/src/xenbus.inf
+++ b/src/xenbus.inf
@@ -1,6 +1,32 @@
-; Copyright 2011 Citrix Systems Inc. All rights reserved.
-; Use is subject to license terms.
-; 
+; Copyright (c) Citrix Systems 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.
  
 [Version] 
 Signature="$Windows NT$" 

diff --git a/src/xenbus/balloon.c b/src/xenbus/balloon.c
index 9fa75121fc931f805c31c9bfc594fd6dd19837e5..3b2d817840d2ee0b277a573337623282389dfeaf 100644 (file)
--- a/src/xenbus/balloon.c
+++ b/src/xenbus/balloon.c
@@ -506,10 +506,12 @@ __BalloonReleasePfnArray(
         status = RangeSetPut(Balloon->RangeSet,
                              (ULONGLONG)Balloon->PfnArray[Index],
                              (ULONGLONG)Balloon->PfnArray[Next]);
-        ASSERT(NT_SUCCESS(status));
+        if (!NT_SUCCESS(status))
+            break;
 
         Index = Next + 1;
     }
+    Requested = Index;
 
     Count = __BalloonDecreaseReservation(Requested, Balloon->PfnArray);
 
@@ -627,7 +629,7 @@ BalloonDeflate(
     Count = 0;
     Abort = FALSE;
 
-    while (Count < Requested) {
+    while (Count < Requested && !Abort) {
         ULONG   ThisTime = (ULONG)__min(Requested - Count, BALLOON_PFN_ARRAY_SIZE);
         ULONG   Populated;
         ULONG   Freed;

diff --git a/src/xenbus/dma.c b/src/xenbus/dma.c
index 85fcbd63716a9198bdef8590de5957ff47706143..ffbc801879ff299dbb867123885f1071257ccde1 100644 (file)
--- a/src/xenbus/dma.c
+++ b/src/xenbus/dma.c
@@ -286,6 +286,7 @@ static PXENBUS_DMA_CONTEXT  DmaContext[NR_CONTEXT_BUCKETS];
 #define DMA_CONTEXT_BUCKET(_Key)    \
     (((ULONG_PTR)(_Key) >> 8) % NR_CONTEXT_BUCKETS)
 
+#pragma warning(suppress: 28167) // changes the IRQL and does not restore the IRQL before it exits
 static FORCEINLINE  KIRQL
 __DmaAcquireLock(
     IN  PKSPIN_LOCK         Lock
@@ -301,6 +302,7 @@ __DmaAcquireLock(
     return Irql;
 }
 
+#pragma warning(suppress: 28167) // changes the IRQL and does not restore the IRQL before it exits
 static FORCEINLINE  VOID
 __DmaReleaseLock(
     IN  PKSPIN_LOCK         Lock,
@@ -336,11 +338,14 @@ __DmaRemoveContext(
     IN  PXENBUS_DMA_CONTEXT Context
     )
 {
-    PVOID                   Key = Context->Key;
+    PVOID                   Key;
     KIRQL                   Irql;
     ULONG_PTR               Bucket;
     PXENBUS_DMA_CONTEXT     *Entry;
 
+    ASSERT(Context != NULL);
+    Key = Context->Key;
+
     Irql = __DmaAcquireLock(&DmaContextLock);
     Bucket = DMA_CONTEXT_BUCKET(Key);
     Entry = &DmaContext[Bucket];

diff --git a/src/xenbus/evtchn.c b/src/xenbus/evtchn.c
index 5a7ed2e0e68ee24c108891bd21d969b61bf2e0b0..7dda022ea7a0f0ef24ddcbbefe73e9839c4a4f63 100644 (file)
--- a/src/xenbus/evtchn.c
+++ b/src/xenbus/evtchn.c
@@ -114,6 +114,34 @@ __EvtchnFree(
     __FreePoolWithTag(Buffer, EVTCHN_TAG);
 }
 
+#pragma warning(push)
+#pragma warning(disable: 28230)
+#pragma warning(disable: 28285)
+
+_IRQL_requires_max_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+_IRQL_saves_
+_IRQL_raises_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+static FORCEINLINE KIRQL
+__AcquireInterruptLock(
+    _Inout_ PKINTERRUPT             Interrupt
+    )
+{
+    return KeAcquireInterruptSpinLock(Interrupt);
+}
+
+_IRQL_requires_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+static FORCEINLINE VOID
+__ReleaseInterruptLock(
+    _Inout_ PKINTERRUPT             Interrupt,
+    _In_ _IRQL_restores_ KIRQL      Irql
+    )
+{
+#pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
+    KeReleaseInterruptSpinLock(Interrupt, Irql);
+}
+
+#pragma warning(pop)
+
 static FORCEINLINE NTSTATUS
 __EvtchnOpenFixed(
     IN  PXENBUS_EVTCHN_DESCRIPTOR   Descriptor,
@@ -292,7 +320,7 @@ EvtchnOpen(
 
     LocalPort = Descriptor->LocalPort;
 
-    (VOID) KeAcquireInterruptSpinLock(Context->InterruptObject);
+    (VOID) __AcquireInterruptLock(Context->InterruptObject);
 
     ASSERT3P(Context->Descriptor[LocalPort], ==, NULL);
     Context->Descriptor[LocalPort] = Descriptor;
@@ -300,8 +328,7 @@ EvtchnOpen(
 
     InsertTailList(&Context->List, &Descriptor->ListEntry);
 
-#pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-    KeReleaseInterruptSpinLock(Context->InterruptObject, DISPATCH_LEVEL);
+    __ReleaseInterruptLock(Context->InterruptObject, DISPATCH_LEVEL);
 
     KeLowerIrql(Irql);
 
@@ -341,7 +368,7 @@ EvtchnUnmask(
     BOOLEAN                         Pending;
 
     if (!Locked)
-        Irql = KeAcquireInterruptSpinLock(Context->InterruptObject);
+        Irql = __AcquireInterruptLock(Context->InterruptObject);
 
     if (Descriptor->Active) {
         Pending = SHARED_INFO(EvtchnUnmask,
@@ -382,7 +409,7 @@ EvtchnUnmask(
 
     if (!Locked)
 #pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-        KeReleaseInterruptSpinLock(Context->InterruptObject, Irql);
+        __ReleaseInterruptLock(Context->InterruptObject, Irql);
 
     return Pending;
 }
@@ -443,7 +470,7 @@ EvtchnTrigger(
     KIRQL                           Irql;
     BOOLEAN                         DoneSomething;
 
-    Irql = KeAcquireInterruptSpinLock(Context->InterruptObject);
+    Irql = __AcquireInterruptLock(Context->InterruptObject);
 
     if (Descriptor->Active) {
         DoneSomething = __EvtchnCallback(Context, Descriptor);
@@ -453,7 +480,7 @@ EvtchnTrigger(
     }
 
 #pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-    KeReleaseInterruptSpinLock(Context->InterruptObject, Irql);
+    __ReleaseInterruptLock(Context->InterruptObject, Irql);
 
     return DoneSomething;
 }
@@ -466,7 +493,7 @@ EvtchnClose(
 {
     KIRQL                           Irql;
 
-    Irql = KeAcquireInterruptSpinLock(Context->InterruptObject);
+    Irql = __AcquireInterruptLock(Context->InterruptObject);
 
     RemoveEntryList(&Descriptor->ListEntry);
     RtlZeroMemory(&Descriptor->ListEntry, sizeof (LIST_ENTRY));
@@ -488,7 +515,7 @@ EvtchnClose(
     }
 
 #pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-    KeReleaseInterruptSpinLock(Context->InterruptObject, Irql);
+    __ReleaseInterruptLock(Context->InterruptObject, Irql);
 
     Descriptor->LocalPort = 0;
     RtlZeroMemory(&Descriptor->Parameters, sizeof (EVTCHN_PARAMETERS));

diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index 50a32566534f9b6a5d71d31ec7cc85c4b1a1d919..f6ae1f1a3bf022814b4ccb596efc0526ed9b5d47 100644 (file)
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -118,6 +118,34 @@ __FdoFree(
     __FreePoolWithTag(Buffer, FDO_TAG);
 }
 
+#pragma warning(push)
+#pragma warning(disable: 28230)
+#pragma warning(disable: 28285)
+
+_IRQL_requires_max_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+_IRQL_saves_
+_IRQL_raises_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+static FORCEINLINE KIRQL
+__AcquireInterruptLock(
+    _Inout_ PKINTERRUPT             Interrupt
+    )
+{
+    return KeAcquireInterruptSpinLock(Interrupt);
+}
+
+_IRQL_requires_(HIGH_LEVEL) // HIGH_LEVEL is best approximation of DIRQL
+static FORCEINLINE VOID
+__ReleaseInterruptLock(
+    _Inout_ PKINTERRUPT             Interrupt,
+    _In_ _IRQL_restores_ KIRQL      Irql
+    )
+{
+#pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
+    KeReleaseInterruptSpinLock(Interrupt, Irql);
+}
+
+#pragma warning(pop)
+
 static FORCEINLINE VOID
 __FdoSetDevicePnpState(
     IN  PXENBUS_FDO         Fdo,
@@ -947,6 +975,7 @@ FdoBalloon(
     PXENBUS_FDO         Fdo = Context;
     PKEVENT             Event;
     BOOLEAN             Active;
+    static ULONGLONG    Maximum;    // Should never change in the lifetime of the VM
     NTSTATUS            status;
 
     Trace("====>\n");
@@ -957,7 +986,6 @@ FdoBalloon(
 
     for (;;) {
         PCHAR       Buffer;
-        ULONGLONG   Maximum;
         ULONGLONG   Target;
         BOOLEAN     AllowInflation;
         BOOLEAN     AllowDeflation;
@@ -983,19 +1011,21 @@ FdoBalloon(
         if (__FdoGetDevicePowerState(Fdo) != PowerDeviceD0)
             goto loop;
 
-        status = STORE(Read,
-                       &Fdo->StoreInterface,
-                       NULL,
-                       "memory",
-                       "static-max",
-                       &Buffer);
-        if (!NT_SUCCESS(status))
-            goto loop;
-
-        Maximum = _strtoui64(Buffer, NULL, 10) / 4;
-        STORE(Free,
-              &Fdo->StoreInterface,
-              Buffer);
+        if (Maximum == 0) {
+            status = STORE(Read,
+                           &Fdo->StoreInterface,
+                           NULL,
+                           "memory",
+                           "static-max",
+                           &Buffer);
+            if (!NT_SUCCESS(status))
+                goto loop;
+
+            Maximum = _strtoui64(Buffer, NULL, 10) / 4;
+            STORE(Free,
+                  &Fdo->StoreInterface,
+                  Buffer);
+        }
 
         status = STORE(Read,
                        &Fdo->StoreInterface,
@@ -1314,11 +1344,10 @@ __FdoEnableInterrupt(
 
     InterruptObject = __FdoGetInterruptObject(Fdo);
 
-    Irql = KeAcquireInterruptSpinLock(InterruptObject);
+    Irql = __AcquireInterruptLock(InterruptObject);
     Fdo->InterruptEnabled = TRUE;
 
-#pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-    KeReleaseInterruptSpinLock(InterruptObject, Irql);
+    __ReleaseInterruptLock(InterruptObject, Irql);
 }
     
 static FORCEINLINE VOID
@@ -1331,11 +1360,10 @@ __FdoDisableInterrupt(
 
     InterruptObject = __FdoGetInterruptObject(Fdo);
 
-    Irql = KeAcquireInterruptSpinLock(InterruptObject);
+    Irql = __AcquireInterruptLock(InterruptObject);
     Fdo->InterruptEnabled = FALSE;
 
-#pragma prefast(suppress:28121) // The function is not permitted to be called at the current IRQ level
-    KeReleaseInterruptSpinLock(InterruptObject, Irql);
+    __ReleaseInterruptLock(InterruptObject, Irql);
 }
 
 PXENBUS_DEBUG_INTERFACE

diff --git a/src/xenbus/log.h b/src/xenbus/log.h
index f15e5b8d62117db081f5ed4435f300e2713fc62d..8799ce7df33bf0517d1143a852ba69ce179b1443 100644 (file)
--- a/src/xenbus/log.h
+++ b/src/xenbus/log.h
@@ -32,6 +32,8 @@
 #ifndef _XENBUS_LOG_H
 #define _XENBUS_LOG_H
 
+#define __MODULE__ "XENBUS"
+
 #include <ntddk.h>
 #include <stdarg.h>
 

diff --git a/src/xenfilt/fdo.c b/src/xenfilt/fdo.c
index 6dbb3e1da90dd781c6e5446dbbd9aa56be4819e1..6507f2fc399e5adfca379e55b89f7f1d744731af 100644 (file)
--- a/src/xenfilt/fdo.c
+++ b/src/xenfilt/fdo.c
@@ -314,6 +314,7 @@ __FdoEnumerate(
 
     // Walk the list and create PDO filters for any new devices
     for (Index = 0; Index < Count; Index++) {
+#pragma warning(suppress:6385)  // Reading invalid data from 'PhysicalDeviceObject'
         if (PhysicalDeviceObject[Index] != NULL) {
             (VOID) PdoCreate(Fdo, PhysicalDeviceObject[Index]);
             ObDereferenceObject(PhysicalDeviceObject[Index]);

diff --git a/src/xenfilt/log.h b/src/xenfilt/log.h
index e6e65c183a8bd9b6bf4f3aab5316078a52b75a65..69e1819d235b95945094ee2984bc328059283806 100644 (file)
--- a/src/xenfilt/log.h
+++ b/src/xenfilt/log.h
@@ -32,6 +32,8 @@
 #ifndef _XENFILT_LOG_H
 #define _XENFILT_LOG_H
 
+#define __MODULE__ "XENFILT"
+
 #include <ntddk.h>
 #include <stdarg.h>