win-pvdrivers

changeset 484:8f8c9edeac01

merge with head
author James Harper <james.harper@bendigoit.com.au>
date Sat Dec 06 16:23:28 2008 +1100 (2008-12-06)
parents 59dc8e8f5647 4cb1179f76d8
children 0c0efefd40f4
files
line diff
     1.1 --- a/ShutdownMon/ShutdownMon.csproj	Sat Dec 06 16:22:39 2008 +1100
     1.2 +++ b/ShutdownMon/ShutdownMon.csproj	Sat Dec 06 16:23:28 2008 +1100
     1.3 @@ -1,8 +1,8 @@
     1.4 -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     1.5 +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
     1.6    <PropertyGroup>
     1.7      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     1.8      <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     1.9 -    <ProductVersion>8.0.50727</ProductVersion>
    1.10 +    <ProductVersion>9.0.21022</ProductVersion>
    1.11      <SchemaVersion>2.0</SchemaVersion>
    1.12      <ProjectGuid>{26FF5B06-2383-454E-821F-306186171677}</ProjectGuid>
    1.13      <OutputType>Exe</OutputType>
    1.14 @@ -11,6 +11,11 @@
    1.15      <AssemblyName>ShutdownMon</AssemblyName>
    1.16      <StartupObject>
    1.17      </StartupObject>
    1.18 +    <FileUpgradeFlags>
    1.19 +    </FileUpgradeFlags>
    1.20 +    <OldToolsVersion>2.0</OldToolsVersion>
    1.21 +    <UpgradeBackupLocation>
    1.22 +    </UpgradeBackupLocation>
    1.23    </PropertyGroup>
    1.24    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    1.25      <DebugSymbols>true</DebugSymbols>
    1.26 @@ -42,6 +47,14 @@
    1.27      </Compile>
    1.28      <Compile Include="Properties\AssemblyInfo.cs" />
    1.29    </ItemGroup>
    1.30 +  <ItemGroup>
    1.31 +    <None Include="makefile" />
    1.32 +    <None Include="sources" />
    1.33 +  </ItemGroup>
    1.34 +  <ItemGroup>
    1.35 +    <Content Include="makefile.inc" />
    1.36 +    <Content Include="shutdownmon.c" />
    1.37 +  </ItemGroup>
    1.38    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    1.39    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
    1.40         Other similar extension points exist, see Microsoft.Common.targets.
     2.1 --- a/common/include/xen_windows.h	Sat Dec 06 16:22:39 2008 +1100
     2.2 +++ b/common/include/xen_windows.h	Sat Dec 06 16:23:28 2008 +1100
     2.3 @@ -3,6 +3,7 @@
     2.4  
     2.5  #pragma warning( disable : 4201 ) // nonstandard extension used : nameless struct/union
     2.6  #pragma warning( disable : 4214 ) // nonstandard extension used : bit field types other than int
     2.7 +#pragma warning( disable : 4505 ) // 'XenDbgPrint' : unreferenced local function has been removed
     2.8  
     2.9  #define __XEN_INTERFACE_VERSION__ 0x00030205
    2.10  #if defined(_AMD64_)
    2.11 @@ -193,7 +194,7 @@ FreePages(PMDL Mdl)
    2.12  
    2.13  #define XEN_IOPORT_DEBUG_PORT_BASE 0x10
    2.14  
    2.15 -static XenDbgPrint(PCHAR format, ...)
    2.16 +static void XenDbgPrint(PCHAR format, ...)
    2.17  {
    2.18    CHAR buf[512];
    2.19    va_list ap;
     3.1 --- a/xenvbd/xenvbd.c	Sat Dec 06 16:22:39 2008 +1100
     3.2 +++ b/xenvbd/xenvbd.c	Sat Dec 06 16:23:28 2008 +1100
     3.3 @@ -16,7 +16,7 @@ You should have received a copy of the G
     3.4  along with this program; if not, write to the Free Software
     3.5  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     3.6  */
     3.7 -
     3.8 +
     3.9  #define INITGUID
    3.10  #include "xenvbd.h"
    3.11  #include <io/blkif.h>
    3.12 @@ -901,8 +901,13 @@ XenVbd_HwScsiInterrupt(PVOID DeviceExten
    3.13          }
    3.14          for (j = 0; j < shadow->req.nr_segments; j++)
    3.15          {
    3.16 -          BOOLEAN result = xvdd->vectors.GntTbl_EndAccess(xvdd->vectors.context, shadow->req.seg[j].gref, TRUE);
    3.17 +#if DBG
    3.18 +          BOOLEAN result = 
    3.19 +#endif
    3.20 +              xvdd->vectors.GntTbl_EndAccess(xvdd->vectors.context, shadow->req.seg[j].gref, TRUE);
    3.21 +#if DBG
    3.22            ASSERT(result);
    3.23 +#endif
    3.24            put_grant_on_freelist(xvdd, shadow->req.seg[j].gref);
    3.25          }
    3.26