win-pvdrivers

changeset 41:932802ddab71

more merge fixes
author Andy Grover <andy.grover@oracle.com>
date Wed Dec 05 12:39:59 2007 -0800 (2007-12-05)
parents 2b0eaa721206
children 5dc3e004cf94
files xenpci/xenbus.c
line diff
     1.1 --- a/xenpci/xenbus.c	Wed Dec 05 12:04:20 2007 -0800
     1.2 +++ b/xenpci/xenbus.c	Wed Dec 05 12:39:59 2007 -0800
     1.3 @@ -316,11 +316,11 @@ XenBus_Init(WDFDEVICE Device)
     1.4  
     1.5    //InitializeObjectAttributes(&oa, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
     1.6    //Status = PsCreateSystemThread(&XenBus_ReadThreadHandle, THREAD_ALL_ACCESS, &oa, NULL, NULL, XenBus_ReadThreadProc, NULL);
     1.7 -  Status = PsCreateSystemThread(&xpdd->XenBus_ReadThreadHandle, THREAD_ALL_ACCESS, NULL, NULL, NULL, XenBus_ReadThreadProc, NULL);
     1.8 +  Status = PsCreateSystemThread(&xpdd->XenBus_ReadThreadHandle, THREAD_ALL_ACCESS, NULL, NULL, NULL, XenBus_ReadThreadProc, Device);
     1.9  
    1.10    //InitializeObjectAttributes(&oa, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
    1.11    //Status = PsCreateSystemThread(&XenBus_WatchThreadHandle, THREAD_ALL_ACCESS, &oa, NULL, NULL, XenBus_WatchThreadProc, NULL);
    1.12 -  Status = PsCreateSystemThread(&xpdd->XenBus_WatchThreadHandle, THREAD_ALL_ACCESS, NULL, NULL, NULL, XenBus_WatchThreadProc, NULL);
    1.13 +  Status = PsCreateSystemThread(&xpdd->XenBus_WatchThreadHandle, THREAD_ALL_ACCESS, NULL, NULL, NULL, XenBus_WatchThreadProc, Device);
    1.14  
    1.15    KdPrint((__DRIVER_NAME " <-- XenBus_Init\n"));
    1.16  
    1.17 @@ -334,7 +334,7 @@ XenBus_Start(WDFDEVICE Device)
    1.18  
    1.19    KdPrint((__DRIVER_NAME " --> XenBus_Start\n"));
    1.20  
    1.21 -  EvtChn_Bind(Device, xpdd->xen_store_evtchn, XenBus_Interrupt, NULL);
    1.22 +  EvtChn_Bind(Device, xpdd->xen_store_evtchn, XenBus_Interrupt, Device);
    1.23  
    1.24    KdPrint((__DRIVER_NAME " <-- XenBus_Start\n"));
    1.25