win-pvdrivers

changeset 155:06ff6f324c80

Updated ini files to properly build for x86 and amd64. XenNet works under amd64. XenVbd doesn't yet.
author James Harper <james.harper@bendigoit.com.au>
date Thu Jan 24 21:05:03 2008 +1100 (2008-01-24)
parents f799098694b5
children 9a1f4acc38fb
files doc/TODO.txt xenenum/xenenum.c xenenum/xenenum.h xenenum/xenenum.inx xennet/xennet.inx xenpci/xenpci.inx xenvbd/xenvbd.inx
line diff
     1.1 --- a/doc/TODO.txt	Thu Jan 24 10:29:29 2008 +1100
     1.2 +++ b/doc/TODO.txt	Thu Jan 24 21:05:03 2008 +1100
     1.3 @@ -19,3 +19,4 @@ TODO:
     1.4  . Fix BSoD crash dump under vbd (currently just hangs without writing
     1.5    a dump file)
     1.6  . Correctly handle CD changes
     1.7 +. Prevent xenvbd loading if the pci ide driver is loaded (bad things will happen)
     2.1 --- a/xenenum/xenenum.c	Thu Jan 24 10:29:29 2008 +1100
     2.2 +++ b/xenenum/xenenum.c	Thu Jan 24 21:05:03 2008 +1100
     2.3 @@ -210,12 +210,6 @@ XenEnum_AddDevice(WDFDRIVER Driver, PWDF
     2.4  
     2.5    WdfDeviceSetBusInformationForChildren(GlobalDevice, &BusInfo);
     2.6  
     2.7 -/*
     2.8 -  WdfDeviceSetSpecialFileSupport(GlobalDevice, WdfSpecialFilePaging, TRUE);
     2.9 -  WdfDeviceSetSpecialFileSupport(GlobalDevice, WdfSpecialFileHibernation, TRUE);
    2.10 -  WdfDeviceSetSpecialFileSupport(GlobalDevice, WdfSpecialFileDump, TRUE);
    2.11 -*/
    2.12 -
    2.13    status = STATUS_SUCCESS;
    2.14  
    2.15    KdPrint((__DRIVER_NAME " <-- DeviceAdd\n"));
     3.1 --- a/xenenum/xenenum.h	Thu Jan 24 10:29:29 2008 +1100
     3.2 +++ b/xenenum/xenenum.h	Thu Jan 24 21:05:03 2008 +1100
     3.3 @@ -23,26 +23,5 @@
     3.4  #define XENENUM_POOL_TAG (ULONG) 'XENM'
     3.5  
     3.6  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
     3.7 -#define BLK_RING_SIZE __RING_SIZE((blkif_sring_t *)0, PAGE_SIZE)
     3.8 -
     3.9 -/*
    3.10 -struct
    3.11 -{
    3.12 -  LIST_ENTRY Entry;
    3.13 -  char Path[128];
    3.14 -  char BackendPath[128];
    3.15 -  ULONG DeviceIndex;
    3.16 -} typedef XENENUM_CHILD_DEVICE_DATA, *PXENENUM_CHILD_DEVICE_DATA, **PPXENENUM_CHILD_DEVICE_DATA;
    3.17 -
    3.18 -WDF_DECLARE_CONTEXT_TYPE_WITH_NAME(PXENENUM_CHILD_DEVICE_DATA, GetChildDeviceData);
    3.19 -
    3.20 -typedef struct _XENENUM_DEVICE_IDENTIFICATION_DESCRIPTION
    3.21 -{
    3.22 -  WDF_CHILD_IDENTIFICATION_DESCRIPTION_HEADER Header;
    3.23 -  UNICODE_STRING DeviceType;
    3.24 -  ULONG DeviceIndex;
    3.25 -  char Path[128];
    3.26 -} XENENUM_DEVICE_IDENTIFICATION_DESCRIPTION, *PXENENUM_DEVICE_IDENTIFICATION_DESCRIPTION;
    3.27 -*/
    3.28  
    3.29  #endif
     4.1 --- a/xenenum/xenenum.inx	Thu Jan 24 10:29:29 2008 +1100
     4.2 +++ b/xenenum/xenenum.inx	Thu Jan 24 21:05:03 2008 +1100
     4.3 @@ -2,7 +2,7 @@
     4.4  Signature="$WINDOWS NT$"
     4.5  Class=System
     4.6  ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
     4.7 -Provider=%JAMESHARPER%
     4.8 +Provider=%XenGplPv%
     4.9  
    4.10  [DestinationDirs]
    4.11  DefaultDestDir = 12
    4.12 @@ -13,9 +13,13 @@ CoInstaller_CopyFiles = 11
    4.13  ExcludeFromSelect=*
    4.14  
    4.15  [Manufacturer]
    4.16 -%JAMESHARPER%=JAMESHARPER,NT$ARCH$
    4.17 +%XenGplPv%=XenGplPv,NTx86
    4.18 +%XenGplPv%=XenGplPv,NTAMD64
    4.19  
    4.20 -[JAMESHARPER.NT$ARCH$]
    4.21 +[XenGplPv.NTx86]
    4.22 +%XenEnum.DRVDESC%=XenEnum_Inst, XEN\VIF
    4.23 +
    4.24 +[XenGplPv.NTAMD64]
    4.25  %XenEnum.DRVDESC%=XenEnum_Inst, XEN\VIF
    4.26  
    4.27  [XenEnum_Inst.NT]
    4.28 @@ -53,9 +57,12 @@ KmdfLibraryVersion = 1.0
    4.29  xenenum.sys=1
    4.30  WdfCoinstaller01005.dll=1,,
    4.31  
    4.32 -[SourceDisksNames]
    4.33 +[SourceDisksNames.x86]
    4.34  1 = %DISK_NAME%,,,\i386
    4.35  
    4.36 +[SourceDisksNames.amd64]
    4.37 +1 = %DISK_NAME%,,,\amd64
    4.38 +
    4.39  [CoInstaller_CopyFiles]
    4.40  WdfCoinstaller01005.dll,,,2
    4.41  
    4.42 @@ -63,7 +70,7 @@ WdfCoinstaller01005.dll,,,2
    4.43  HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
    4.44  
    4.45  [Strings]
    4.46 -JAMESHARPER = "James Harper"
    4.47 +XenGplPv = "Xen GPL PV Driver Developers"
    4.48  XenEnum.SVCDESC = "Xen Enum Device Driver"
    4.49  XenEnum.DRVDESC = "Xen Enum Device Driver"
    4.50  DISK_NAME = "Xen Enum Device Driver Install Disk"
     5.1 --- a/xennet/xennet.inx	Thu Jan 24 10:29:29 2008 +1100
     5.2 +++ b/xennet/xennet.inx	Thu Jan 24 21:05:03 2008 +1100
     5.3 @@ -2,8 +2,7 @@
     5.4  Signature="$WINDOWS NT$"
     5.5  Class=Net
     5.6  ClassGuid={4D36E972-E325-11CE-BFC1-08002BE10318}
     5.7 -Provider=%JAMESHARPER%
     5.8 -;DriverVer=11/11/2007,1.0.1.290
     5.9 +Provider=%XenGplPv%
    5.10  
    5.11  [DestinationDirs]
    5.12  DefaultDestDir = 12
    5.13 @@ -29,9 +28,13 @@ ExcludeFromSelect=*
    5.14  
    5.15  
    5.16  [Manufacturer]
    5.17 -%JAMESHARPER%=JAMESHARPER,NT$ARCH$
    5.18 +%XenGplPv%=XenGplPv,NTx86
    5.19 +%XenGplPv%=XenGplPv,NTamd64
    5.20  
    5.21 -[JAMESHARPER.NT$ARCH$]
    5.22 +[XenGplPv.NTx86]
    5.23 +%XenNet.DRVDESC%=XenNet_Inst, XEN\VIFDEV
    5.24 +
    5.25 +[XenGplPv.NTamd64]
    5.26  %XenNet.DRVDESC%=XenNet_Inst, XEN\VIFDEV
    5.27  
    5.28  [XenNet_Inst.NT]
    5.29 @@ -51,9 +54,12 @@ xennet.sys
    5.30  xennet.sys=1
    5.31  WdfCoinstaller01005.dll=1,,
    5.32  
    5.33 -[SourceDisksNames]
    5.34 +[SourceDisksNames.x86]
    5.35  1 = %DISK_NAME%,,,\i386
    5.36  
    5.37 +[SourceDisksNames.amd64]
    5.38 +1 = %DISK_NAME%,,,\amd64
    5.39 +
    5.40  [XenNet_Inst.Services]
    5.41  AddService=XenNet,2,XenNet_Service 
    5.42  
    5.43 @@ -90,7 +96,7 @@ KmdfService = xennet, xennet_wdfsect
    5.44  KmdfLibraryVersion = 1.0
    5.45  
    5.46  [Strings]
    5.47 -JAMESHARPER = "James Harper"
    5.48 +XenGplPv = "Xen GPL PV Driver Developers"
    5.49  ClassName = "Network Adapters"
    5.50  XenNet.SVCDESC = "Xen Net Device Driver"
    5.51  XenNet.DRVDESC = "Xen Net Device Driver"
     6.1 --- a/xenpci/xenpci.inx	Thu Jan 24 10:29:29 2008 +1100
     6.2 +++ b/xenpci/xenpci.inx	Thu Jan 24 21:05:03 2008 +1100
     6.3 @@ -2,8 +2,7 @@
     6.4  Signature="$WINDOWS NT$"
     6.5  Class=System
     6.6  ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}
     6.7 -Provider=%JAMESHARPER%
     6.8 -DriverVer=12/05/2007,0.4.0.1
     6.9 +Provider=%XenGplPv%
    6.10  
    6.11  [DestinationDirs]
    6.12  DefaultDestDir = 12
    6.13 @@ -14,19 +13,13 @@ CoInstaller_CopyFiles = 11
    6.14  ExcludeFromSelect=*
    6.15  
    6.16  [Manufacturer]
    6.17 -%JAMESHARPER%=JAMESHARPER,NTx86
    6.18 -%JAMESHARPER%=JAMESHARPER,NTAMD64
    6.19 +%XenGplPv%=XenGplPv,NTx86
    6.20 +%XenGplPv%=XenGplPv,NTAMD64
    6.21  
    6.22 -; For Win2K
    6.23 -;[JAMESHARPER]
    6.24 -; DisplayName            Section           DeviceId
    6.25 -; -----------       	 -------           --------
    6.26 -;%XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    6.27 -
    6.28 -[JAMESHARPER.NTx86]
    6.29 +[XenGplPv.NTx86]
    6.30  %XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    6.31  
    6.32 -[JAMESHARPER.NTAMD64]
    6.33 +[XenGplPv.NTAMD64]
    6.34  %XenPCI.DRVDESC%=XenPCI_Inst, PCI\VEN_5853&DEV_0001
    6.35  
    6.36  [XenPCI_Inst.NT]
    6.37 @@ -73,7 +66,7 @@ KmdfService = xenpci, xenpci_wdfsect
    6.38  KmdfLibraryVersion = 1.0
    6.39  
    6.40  [Strings]
    6.41 -JAMESHARPER = "James Harper"
    6.42 +XenGplPv = "Xen GPL PV Driver Developers"
    6.43  XenPCI.SVCDESC = "Xen PCI Device Driver"
    6.44  XenPCI.DRVDESC = "Xen PCI Device Driver"
    6.45  DISK_NAME = "Xen PCI Device Driver Install Disk"
     7.1 --- a/xenvbd/xenvbd.inx	Thu Jan 24 10:29:29 2008 +1100
     7.2 +++ b/xenvbd/xenvbd.inx	Thu Jan 24 21:05:03 2008 +1100
     7.3 @@ -2,7 +2,7 @@
     7.4  Signature="$WINDOWS NT$"
     7.5  Class=SCSIAdapter
     7.6  ClassGuid={4D36E97B-E325-11CE-BFC1-08002BE10318}
     7.7 -Provider=%JAMESHARPER%
     7.8 +Provider=%XenGplPv%
     7.9  DriverVer=12/10/2007,0.4.0.1
    7.10  
    7.11  [DestinationDirs]
    7.12 @@ -14,11 +14,14 @@ CoInstaller_CopyFiles = 11
    7.13  ExcludeFromSelect=*
    7.14  
    7.15  [Manufacturer]
    7.16 -%JAMESHARPER%=JAMESHARPER,NT$ARCH$
    7.17 +%XenGplPv%=XenGplPv,NTx86
    7.18 +%XenGplPv%=XenGplPv,NTamd64
    7.19  
    7.20 -[JAMESHARPER.NT$ARCH$]
    7.21 +[XenGplPv.NTx86]
    7.22  %XenVbd.DRVDESC%=XenVbd_Inst, XEN\VBD
    7.23 -;%XenAddResource.DRVDESC%=XenAddResource_INST, XEN\VBD
    7.24 +
    7.25 +[XenGplPv.NTamd64]
    7.26 +%XenVbd.DRVDESC%=XenVbd_Inst, XEN\VBD
    7.27  
    7.28  [XenVbd_Inst.NT]
    7.29  CopyFiles=XenVbd.CopyFiles
    7.30 @@ -104,9 +107,12 @@ xenvbd.sys=1
    7.31  xenaddresource.sys=1
    7.32  WdfCoinstaller01005.dll=1,,
    7.33  
    7.34 -[SourceDisksNames]
    7.35 +[SourceDisksNames.x86]
    7.36  1 = %DISK_NAME%,,,\i386
    7.37  
    7.38 +[SourceDisksNames.amd64]
    7.39 +1 = %DISK_NAME%,,,\amd64
    7.40 +
    7.41  [CoInstaller_CopyFiles]
    7.42  WdfCoinstaller01005.dll,,,2
    7.43  
    7.44 @@ -114,7 +120,7 @@ WdfCoinstaller01005.dll,,,2
    7.45  HKR,,CoInstallers32,0x00010000, "WdfCoinstaller01005.dll,WdfCoInstaller"
    7.46  
    7.47  [Strings]
    7.48 -JAMESHARPER = "James Harper"
    7.49 +XenGplPv = "Xen GPL PV Driver Developers"
    7.50  XenVbd.SVCDESC = "Xen Block Device Driver"
    7.51  XenVbd.DRVDESC = "Xen Block Device Driver"
    7.52  XenAddResource.DRVDESC = "Xen Resource Adder"