win-pvdrivers

changeset 299:3673f1f07746

Merge of 265 from 'wdf'
author Andy Grover <andy.grover@oracle.com>
date Mon Jun 09 21:54:42 2008 -0700 (2008-06-09)
parents 4d8d52ae8d13 416c3eb54528
children 47ec69c1046c
files xenhide/xenhide.c xennet/xennet_common.c xennet/xennet_rx.c xennet/xennet_tx.c xenpci/evtchn.c xenpci/gnttbl.c xenpci/xenbus.c
line diff
     1.1 --- a/xenhide/xenhide.c	Mon Jun 09 21:31:50 2008 -0700
     1.2 +++ b/xenhide/xenhide.c	Mon Jun 09 21:54:42 2008 -0700
     1.3 @@ -51,7 +51,7 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
     1.4    ULONG BufLen = 200;
     1.5    PKEY_VALUE_PARTIAL_INFORMATION KeyPartialValue;
     1.6    int State = 0;
     1.7 -  int StartPos = 0;
     1.8 +  size_t StartPos = 0;
     1.9    WCHAR *SystemStartOptions;
    1.10    size_t SystemStartOptionsLen;
    1.11    size_t i;
     2.1 --- a/xennet/xennet_common.c	Mon Jun 09 21:31:50 2008 -0700
     2.2 +++ b/xennet/xennet_common.c	Mon Jun 09 21:54:42 2008 -0700
     2.3 @@ -200,13 +200,15 @@ PMDL
     2.4  XenFreelist_GetPage(freelist_t *fl)
     2.5  {
     2.6    PMDL mdl;
     2.7 +  PFN_NUMBER pfn;
     2.8  
     2.9    if (fl->page_free == 0)
    2.10    {
    2.11      mdl = AllocatePagesExtra(1, sizeof(grant_ref_t));
    2.12 +    pfn = *MmGetMdlPfnArray(mdl);
    2.13      *(grant_ref_t *)(((UCHAR *)mdl) + MmSizeOfMdl(0, PAGE_SIZE)) = fl->xi->vectors.GntTbl_GrantAccess(
    2.14        fl->xi->vectors.context, 0,
    2.15 -      (ULONG)*MmGetMdlPfnArray(mdl), FALSE, 0);
    2.16 +      (uint32_t)pfn, FALSE, 0);
    2.17    }
    2.18    else
    2.19    {
     3.1 --- a/xenpci/evtchn.c	Mon Jun 09 21:31:50 2008 -0700
     3.2 +++ b/xenpci/evtchn.c	Mon Jun 09 21:54:42 2008 -0700
     3.3 @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fi
     3.4  
     3.5  #include "xenpci.h"
     3.6  
     3.7 -#if defined(_X86_)
     3.8 +#if defined(_WIN32)
     3.9    #define xchg(p1, p2) _InterlockedExchange(p1, p2)
    3.10    #define synch_clear_bit(p1, p2) _interlockedbittestandreset(p2, p1)
    3.11    #define synch_set_bit(p1, p2) _interlockedbittestandset(p2, p1)
     4.1 --- a/xenpci/gnttbl.c	Mon Jun 09 21:31:50 2008 -0700
     4.2 +++ b/xenpci/gnttbl.c	Mon Jun 09 21:54:42 2008 -0700
     4.3 @@ -74,7 +74,7 @@ grant_ref_t
     4.4  GntTbl_GrantAccess(
     4.5    PVOID Context,
     4.6    domid_t domid,
     4.7 -  uint32_t frame,
     4.8 +  uint32_t frame, // xen api limits pfn to 32bit, so no guests over 8TB
     4.9    int readonly,
    4.10    grant_ref_t ref)
    4.11  {