Tidy up Driver.h/.c

Signed-off-by: Owen Smith <owen.smith@citrix.com>

diff --git a/src/xenvbd/adapter.c b/src/xenvbd/adapter.c
index 4782ed35e63f52828b0bb07302c175748afd44a7..fd224e3f418038830195f9c276e40fa3b330936a 100644 (file)
--- a/src/xenvbd/adapter.c
+++ b/src/xenvbd/adapter.c
@@ -430,27 +430,30 @@ __DeviceType(
         return XENVBD_DEVICE_TYPE_CDROM;
     return XENVBD_DEVICE_TYPE_UNKNOWN;
 }
-__checkReturn
+
 static FORCEINLINE BOOLEAN
 __AdapterHiddenTarget(
-    __in PXENVBD_ADAPTER                 Adapter,
-    __in PCHAR                       DeviceId,
-    __out PXENVBD_DEVICE_TYPE        DeviceType
+    IN  PXENVBD_ADAPTER     Adapter,
+    IN  PCHAR               DeviceId,
+    OUT PXENVBD_DEVICE_TYPE DeviceType
     )
 {
-    NTSTATUS    Status;
-    PCHAR       FrontendPath;
+    NTSTATUS    status;
     PCHAR       Buffer;
+    CHAR        Path[sizeof("device/vbd/XXXXXXXX")];
     ULONG       Value;
 
     *DeviceType = XENVBD_DEVICE_TYPE_UNKNOWN;
-    FrontendPath = DriverFormat("device/%s/%s", AdapterEnum(Adapter), DeviceId);
-    if (!FrontendPath)
+    status = RtlStringCbPrintfA(Path,
+                                sizeof(Path),
+                                "device/vbd/%s",
+                                DeviceId);
+    if (!NT_SUCCESS(status))
         goto fail;
 
     // Ejected?
-    Status = XENBUS_STORE(Read, &Adapter->Store, NULL, FrontendPath, "ejected", &Buffer);
-    if (NT_SUCCESS(Status)) {
+    status = XENBUS_STORE(Read, &Adapter->Store, NULL, Path, "ejected", &Buffer);
+    if (NT_SUCCESS(status)) {
         Value = strtoul(Buffer, NULL, 10);
         XENBUS_STORE(Free, &Adapter->Store, Buffer);
 
@@ -459,8 +462,8 @@ __AdapterHiddenTarget(
     }
 
     // Not Disk?
-    Status = XENBUS_STORE(Read, &Adapter->Store, NULL, FrontendPath, "device-type", &Buffer);
-    if (!NT_SUCCESS(Status))
+    status = XENBUS_STORE(Read, &Adapter->Store, NULL, Path, "device-type", &Buffer);
+    if (!NT_SUCCESS(status))
         goto ignore;
     *DeviceType = __DeviceType(Buffer);
     XENBUS_STORE(Free, &Adapter->Store, Buffer);
@@ -468,16 +471,11 @@ __AdapterHiddenTarget(
     switch (*DeviceType) {
     case XENVBD_DEVICE_TYPE_DISK:
         break;
-    case XENVBD_DEVICE_TYPE_CDROM:
-        if (DriverParameters.PVCDRom)
-            break;
-        // intentional fall-through
     default:
         goto ignore;
     }
 
     // Try to Create
-    DriverFormatFree(FrontendPath);
     return FALSE;
 
 fail:
@@ -485,7 +483,6 @@ fail:
     return TRUE;
 
 ignore:
-    DriverFormatFree(FrontendPath);
     return TRUE;
 }
 __checkReturn
@@ -1548,13 +1545,6 @@ __AdapterInitialize(
     if (!NT_SUCCESS(Status))
         goto fail4;
 
-    // query enumerator
-    // fix this up to query from device location(?)
-    //RtlInitAnsiString(&Adapter->Enumerator, "vbd");
-
-    // link fdo
-    DriverLinkAdapter(Adapter);
-
     Trace("<===== (%d)\n", KeGetCurrentIrql());
     return STATUS_SUCCESS;
 
@@ -1585,7 +1575,6 @@ __AdapterTerminate(
 
     Trace("=====> (%d)\n", KeGetCurrentIrql());
 
-    DriverUnlinkAdapter(Adapter);
     ASSERT3U(Adapter->DevicePower, ==, PowerDeviceD3);
 
     // stop device power thread

diff --git a/src/xenvbd/blockring.c b/src/xenvbd/blockring.c
index 8d914d3f95b2cc5a2730e1910f3f59d7ccde79c3..a0ba7c7a1f4023eb6b926b4ae1dc5acbff413575 100644 (file)
--- a/src/xenvbd/blockring.c
+++ b/src/xenvbd/blockring.c
@@ -41,6 +41,8 @@
 #include <xenvbd-ntstrsafe.h>
 
 #define TAG_HEADER                  'gaTX'
+#define XENVBD_MAX_RING_PAGE_ORDER  (4)
+#define XENVBD_MAX_RING_PAGES       (1 << XENVBD_MAX_RING_PAGE_ORDER)
 
 struct _XENVBD_BLOCKRING {
     PXENVBD_FRONTEND                Frontend;

diff --git a/src/xenvbd/driver.c b/src/xenvbd/driver.c
index d4efaf1cca5c371578e464c256cffbb10b4dd8c3..b45db24364ee91e4cdb2e92d0b6f2be8286285c9 100644 (file)
--- a/src/xenvbd/driver.c
+++ b/src/xenvbd/driver.c
@@ -29,59 +29,36 @@
  * SUCH DAMAGE.
  */ 
 
+#include <ntddk.h>
+#include <storport.h>
+#include <ntstrsafe.h>
+
+#include <version.h>
+#include <names.h>
+#include <xencrsh_interface.h>
+
 #include "driver.h"
 #include "adapter.h"
-#include "target.h"
 #include "registry.h"
 #include "srbext.h"
 #include "buffer.h"
+
+#include "util.h"
 #include "debug.h"
 #include "assert.h"
-#include "util.h"
-#include <version.h>
-#include <names.h>
-#include <xencrsh_interface.h>
-#include <xenvbd-ntstrsafe.h>
 
 typedef struct _XENVBD_DRIVER {
+    PXENVBD_ADAPTER     Adapter;
     HANDLE              ParametersKey;
     PDRIVER_DISPATCH    StorPortDispatchPnp;
     PDRIVER_DISPATCH    StorPortDispatchPower;
     PDRIVER_UNLOAD      StorPortDriverUnload;
-    PXENVBD_ADAPTER         Adapter;
-    KSPIN_LOCK          Lock;
 } XENVBD_DRIVER;
 
 static XENVBD_DRIVER Driver;
 
-XENVBD_PARAMETERS   DriverParameters;
-
 #define XENVBD_POOL_TAG     'dbvX'
 
-static DECLSPEC_NOINLINE VOID
-__DriverParseOption(
-    IN  const CHAR  *Key,
-    OUT PBOOLEAN    Flag
-    )
-{
-    PANSI_STRING    Option;
-    PCHAR           Value;
-    NTSTATUS        status;
-
-    *Flag = FALSE;
-
-    status = RegistryQuerySystemStartOption(Key, &Option);
-    if (!NT_SUCCESS(status))
-        return;
-
-    Value = Option->Buffer + strlen(Key);
-
-    if (strcmp(Value, "ON") == 0)
-        *Flag = TRUE;
-
-    RegistryFreeSzValue(Option);
-}
-
 static FORCEINLINE HANDLE
 __DriverGetParametersKey(
     VOID
@@ -116,53 +93,6 @@ DriverDispatchPower(
     return Driver.StorPortDispatchPower(DeviceObject, Irp);
 }
 
-VOID
-DriverLinkAdapter(
-    IN  PXENVBD_ADAPTER Adapter
-    )
-{
-    KIRQL       Irql;
-
-    KeAcquireSpinLock(&Driver.Lock, &Irql);
-    Driver.Adapter = Adapter;
-    KeReleaseSpinLock(&Driver.Lock, Irql);
-}
-
-VOID
-DriverUnlinkAdapter(
-    IN  PXENVBD_ADAPTER Adapter
-    )
-{
-    KIRQL       Irql;
-
-    UNREFERENCED_PARAMETER(Adapter);
-
-    KeAcquireSpinLock(&Driver.Lock, &Irql);
-    Driver.Adapter = NULL;
-    KeReleaseSpinLock(&Driver.Lock, Irql);
-}
-
-static FORCEINLINE BOOLEAN
-__DriverGetAdapter(
-    IN  PDEVICE_OBJECT      DeviceObject,
-    OUT PXENVBD_ADAPTER         *Adapter
-    )
-{
-    KIRQL       Irql;
-    BOOLEAN     IsAdapter = FALSE;
-
-    KeAcquireSpinLock(&Driver.Lock, &Irql);
-    *Adapter = Driver.Adapter;
-    if (*Adapter) {
-        if (AdapterGetDeviceObject(*Adapter) == DeviceObject) {
-            IsAdapter = TRUE;
-        }
-    }
-    KeReleaseSpinLock(&Driver.Lock, Irql);
-
-    return IsAdapter;
-}
-
 #define MAXNAMELEN  256
 
 VOID
@@ -238,88 +168,25 @@ fail1:
     Error("fail1 (%08x)\n", status);
 }
 
-__checkReturn
-__drv_allocatesMem(mem)
-static FORCEINLINE PCHAR
-#pragma warning(suppress: 28195)
-__DriverFormatV(
-    __in PCHAR       Fmt,
-    __in va_list     Args
-    )
-{
-    NTSTATUS    Status;
-    PCHAR       Str;
-    ULONG       Size = 32;
-
-    for (;;) {
-        Str = (PCHAR)__AllocatePoolWithTag(NonPagedPool, Size,
-                                           XENVBD_POOL_TAG);
-        if (!Str) {
-            return NULL;
-        }
-
-        Status = RtlStringCchVPrintfA(Str, Size - 1, Fmt, Args);
-
-        if (Status == STATUS_SUCCESS) {
-            Str[Size - 1] = '\0';
-            return Str;
-        } 
-        
-        __FreePoolWithTag(Str, XENVBD_POOL_TAG);
-        if (Status == STATUS_BUFFER_OVERFLOW) {
-            Size *= 2;
-        } else {
-            return NULL;
-        }
-    }
-}
-
-__checkReturn
-__drv_allocatesMem(mem)
-PCHAR
-DriverFormat(
-    __in PCHAR       Format,
-    ...
-    )
-{
-    va_list Args;
-    PCHAR   Str;
-
-    va_start(Args, Format);
-    Str = __DriverFormatV(Format, Args);
-    va_end(Args);
-    return Str;
-}
-
-VOID
-#pragma warning(suppress: 28197)
-DriverFormatFree(
-    __in __drv_freesMem(mem) PCHAR  Buffer
-    )
-{
-    if (Buffer)
-        __FreePoolWithTag(Buffer, XENVBD_POOL_TAG);
-}
-
-HW_INITIALIZE       HwInitialize;
+HW_INITIALIZE   HwInitialize;
 
 BOOLEAN 
 HwInitialize(
-    __in PVOID   HwDeviceExtension
+    IN  PVOID   DevExt
     )
 {
-    UNREFERENCED_PARAMETER(HwDeviceExtension);
+    UNREFERENCED_PARAMETER(DevExt);
     return TRUE;
 }
 
-HW_INTERRUPT        HwInterrupt;
+HW_INTERRUPT    HwInterrupt;
 
 BOOLEAN 
 HwInterrupt(
-    __in PVOID   HwDeviceExtension
+    IN  PVOID   DevExt
     )
 {
-    UNREFERENCED_PARAMETER(HwDeviceExtension);
+    UNREFERENCED_PARAMETER(DevExt);
     return TRUE;
 }
 
@@ -327,21 +194,19 @@ HW_ADAPTER_CONTROL  HwAdapterControl;
 
 SCSI_ADAPTER_CONTROL_STATUS
 HwAdapterControl(
-    __in PVOID                       HwDeviceExtension,
-    __in SCSI_ADAPTER_CONTROL_TYPE   ControlType,
-    __in PVOID                       Parameters
+    IN  PVOID                       DevExt,
+    IN  SCSI_ADAPTER_CONTROL_TYPE   ControlType,
+    IN  PVOID                       Parameters
     )
 {
     PSCSI_SUPPORTED_CONTROL_TYPE_LIST   List;
-    ULONG                               Index;
 
-    UNREFERENCED_PARAMETER(HwDeviceExtension);
+    UNREFERENCED_PARAMETER(DevExt);
 
     switch (ControlType) {
     case ScsiQuerySupportedControlTypes:
         List = Parameters;
-        for (Index = 0; Index < List->MaxControlType; ++Index)
-            List->SupportedTypeList[Index] = TRUE;
+        List->SupportedTypeList[ScsiQuerySupportedControlTypes] = TRUE;
         break;
 
     case ScsiStopAdapter:
@@ -358,47 +223,52 @@ HW_RESET_BUS        HwResetBus;
 
 BOOLEAN
 HwResetBus(
-    __in PVOID   HwDeviceExtension,
-    __in ULONG   PathId
+    IN  PVOID   DevExt,
+    IN  ULONG   PathId
     )
 {
     UNREFERENCED_PARAMETER(PathId);
 
-    return AdapterResetBus((PXENVBD_ADAPTER)HwDeviceExtension);
+    return AdapterResetBus(DevExt);
 }
 
 HW_FIND_ADAPTER     HwFindAdapter;
 
 ULONG
 HwFindAdapter(
-    IN PVOID                               HwDeviceExtension,
-    IN PVOID                               Context,
-    IN PVOID                               BusInformation,
-    IN PCHAR                               ArgumentString,
-    IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo,
-    OUT PBOOLEAN                           Again
+    IN  PVOID                               DevExt,
+    IN  PVOID                               Context,
+    IN  PVOID                               BusInformation,
+    IN  PCHAR                               ArgumentString,
+    IN OUT PPORT_CONFIGURATION_INFORMATION  ConfigInfo,
+    OUT PBOOLEAN                            Again
     )
 {
+    ULONG                                   Return;
+
     UNREFERENCED_PARAMETER(Context);
     UNREFERENCED_PARAMETER(BusInformation);
     UNREFERENCED_PARAMETER(ArgumentString);
     UNREFERENCED_PARAMETER(Again);
 
-    return AdapterFindAdapter((PXENVBD_ADAPTER)HwDeviceExtension, ConfigInfo);
+    Return = AdapterFindAdapter(DevExt, ConfigInfo);
+    if (Return == SP_RETURN_FOUND)
+        Driver.Adapter = DevExt;
+    return Return;
 }
 
 static FORCEINLINE BOOLEAN
 __FailStorageRequest(
-    __in PVOID               HwDeviceExtension,
-    __in PSCSI_REQUEST_BLOCK Srb
+    IN  PVOID               DevExt,
+    IN  PSCSI_REQUEST_BLOCK Srb
     )
 {
     if (Srb->Function == SRB_FUNCTION_STORAGE_REQUEST_BLOCK) {
         // Win8 and above storport request. not supported
         // complete the request (with fail code)
         Srb->SrbStatus = SRB_STATUS_INVALID_REQUEST;
-        StorPortNotification(RequestComplete, HwDeviceExtension, Srb);
-        Error("(0x%p) STORAGE_REQUEST_BLOCK not supported\n", HwDeviceExtension);
+        StorPortNotification(RequestComplete, DevExt, Srb);
+        Error("(0x%p) STORAGE_REQUEST_BLOCK not supported\n", DevExt);
         return TRUE;
     }
 
@@ -409,28 +279,28 @@ HW_BUILDIO          HwBuildIo;
 
 BOOLEAN 
 HwBuildIo(
-    __in PVOID               HwDeviceExtension,
-    __in PSCSI_REQUEST_BLOCK Srb
+    IN  PVOID               DevExt,
+    IN  PSCSI_REQUEST_BLOCK Srb
     )
 {
-    if (__FailStorageRequest(HwDeviceExtension, Srb))
+    if (__FailStorageRequest(DevExt, Srb))
         return FALSE; // dont pass to HwStartIo
 
-    return AdapterBuildIo((PXENVBD_ADAPTER)HwDeviceExtension, Srb);
+    return AdapterBuildIo(DevExt, Srb);
 }
 
 HW_STARTIO          HwStartIo;
 
 BOOLEAN 
 HwStartIo(
-    __in PVOID               HwDeviceExtension,
-    __in PSCSI_REQUEST_BLOCK Srb
+    IN  PVOID               DevExt,
+    IN  PSCSI_REQUEST_BLOCK Srb
     )
 {
-    if (__FailStorageRequest(HwDeviceExtension, Srb))
+    if (__FailStorageRequest(DevExt, Srb))
         return TRUE; // acknowledge the srb
 
-    return AdapterStartIo((PXENVBD_ADAPTER)HwDeviceExtension, Srb);
+    return AdapterStartIo(DevExt, Srb);
 }
 
 __drv_dispatchType(IRP_MJ_PNP)
@@ -442,15 +312,13 @@ DispatchPnp(
     IN PIRP             Irp
     )
 {
-    PXENVBD_ADAPTER         Adapter;
+    if (Driver.Adapter == NULL)
+        return DriverDispatchPnp(DeviceObject, Irp);
 
-    if (__DriverGetAdapter(DeviceObject, &Adapter))
-        return AdapterDispatchPnp(Adapter, DeviceObject, Irp);
+    if (AdapterGetDeviceObject(Driver.Adapter) == DeviceObject)
+        return AdapterDispatchPnp(Driver.Adapter, DeviceObject, Irp);
 
-    if (Adapter != NULL)
-        return AdapterForwardPnp(Adapter, DeviceObject, Irp);
-
-    return DriverDispatchPnp(DeviceObject, Irp);
+    return AdapterForwardPnp(Driver.Adapter, DeviceObject, Irp);
 }
 
 __drv_dispatchType(IRP_MJ_POWER)
@@ -462,40 +330,52 @@ DispatchPower(
     IN PIRP             Irp
     )
 {
-    PXENVBD_ADAPTER         Adapter;
+    if (Driver.Adapter == NULL)
+        return DriverDispatchPower(DeviceObject, Irp);
 
-    if (__DriverGetAdapter(DeviceObject, &Adapter))
-        return AdapterDispatchPower(Adapter, DeviceObject, Irp);
+    if (AdapterGetDeviceObject(Driver.Adapter) == DeviceObject)
+        return AdapterDispatchPower(Driver.Adapter, DeviceObject, Irp);
 
     return DriverDispatchPower(DeviceObject, Irp);
 }
 
-DRIVER_UNLOAD               DriverUnload;
+DRIVER_UNLOAD           DriverUnload;
 
 VOID
 DriverUnload(
-    IN PDRIVER_OBJECT  _DriverObject
+    IN  PDRIVER_OBJECT  DriverObject
     )
 {
-    Trace("===> (Irql=%d)\n", KeGetCurrentIrql());
-    Verbose("%s (%s)\n",
-         MAJOR_VERSION_STR "." MINOR_VERSION_STR "." MICRO_VERSION_STR "." BUILD_NUMBER_STR,
-         DAY_STR "/" MONTH_STR "/" YEAR_STR);
+    Verbose("%u.%u.%u.%u (%02u/%02u/%04u)\n",
+         MAJOR_VERSION,
+         MINOR_VERSION,
+         MICRO_VERSION,
+         BUILD_NUMBER,
+         DAY,
+         MONTH,
+         YEAR);
+
+    Driver.Adapter = NULL;
+
+    Driver.StorPortDriverUnload(DriverObject);
+    Driver.StorPortDriverUnload = NULL;
+    Driver.StorPortDispatchPnp = NULL;
+    Driver.StorPortDispatchPower = NULL;
 
-    Driver.StorPortDriverUnload(_DriverObject);
     BufferTerminate();
+
     RegistryCloseKey(Driver.ParametersKey);
-    RegistryTeardown();
+    Driver.ParametersKey = NULL;
 
-    Trace("<=== (Irql=%d)\n", KeGetCurrentIrql());
+    RegistryTeardown();
 }
 
 DRIVER_INITIALIZE           DriverEntry;
 
 NTSTATUS
 DriverEntry(
-    IN PDRIVER_OBJECT       _DriverObject,
-    IN PUNICODE_STRING      RegistryPath
+    IN  PDRIVER_OBJECT      DriverObject,
+    IN  PUNICODE_STRING     RegistryPath
     )
 {
     HW_INITIALIZATION_DATA  InitData;
@@ -505,15 +385,19 @@ DriverEntry(
 
     // RegistryPath == NULL if crashing!
     if (RegistryPath == NULL) {
-        return XencrshEntryPoint(_DriverObject);
+        return XencrshEntryPoint(DriverObject);
     }
 
     ExInitializeDriverRuntime(DrvRtPoolNxOptIn);
     
-    Trace("===> (Irql=%d)\n", KeGetCurrentIrql());
-    Verbose("%s (%s)\n",
-         MAJOR_VERSION_STR "." MINOR_VERSION_STR "." MICRO_VERSION_STR "." BUILD_NUMBER_STR,
-         DAY_STR "/" MONTH_STR "/" YEAR_STR);
+    Verbose("%u.%u.%u.%u (%02u/%02u/%04u)\n",
+         MAJOR_VERSION,
+         MINOR_VERSION,
+         MICRO_VERSION,
+         BUILD_NUMBER,
+         DAY,
+         MONTH,
+         YEAR);
 
     status = RegistryInitialize(RegistryPath);
     if (!NT_SUCCESS(status))
@@ -531,73 +415,65 @@ DriverEntry(
         goto fail3;
 
     Driver.ParametersKey = ParametersKey;
-
-    RegistryCloseKey(ServiceKey);
-    ServiceKey = NULL;
-
-    KeInitializeSpinLock(&Driver.Lock);
     Driver.Adapter = NULL;
     BufferInitialize();
 
-    __DriverParseOption("XENVBD:SYNTH_INQ=",
-                        &DriverParameters.SynthesizeInquiry);
-    __DriverParseOption("XENVBD:PVCDROM=",
-                        &DriverParameters.PVCDRom);
-
     RtlZeroMemory(&InitData, sizeof(InitData));
-
-    InitData.HwInitializationDataSize   =   sizeof(InitData);
-    InitData.AdapterInterfaceType       =   Internal;
-    InitData.HwInitialize               =   HwInitialize;
-    InitData.HwStartIo                  =   HwStartIo;
-    InitData.HwInterrupt                =   HwInterrupt;
+    InitData.HwInitializationDataSize   = sizeof(InitData);
+    InitData.AdapterInterfaceType       = Internal;
+    InitData.HwInitialize               = HwInitialize;
+    InitData.HwStartIo                  = HwStartIo;
+    InitData.HwInterrupt                = HwInterrupt;
 #pragma warning(suppress : 4152)
-    InitData.HwFindAdapter              =   HwFindAdapter;
-    InitData.HwResetBus                 =   HwResetBus;
-    InitData.HwDmaStarted               =   NULL;
-    InitData.HwAdapterState             =   NULL;
-    InitData.DeviceExtensionSize        =   AdapterSizeofXenvbdAdapter();
-    InitData.SpecificLuExtensionSize    =   sizeof (ULONG); // not actually used
-    InitData.SrbExtensionSize           =   sizeof(XENVBD_SRBEXT);
-    InitData.NumberOfAccessRanges       =   2;
-    InitData.MapBuffers                 =   STOR_MAP_NON_READ_WRITE_BUFFERS;
-    InitData.NeedPhysicalAddresses      =   TRUE;
-    InitData.TaggedQueuing              =   TRUE;
-    InitData.AutoRequestSense           =   TRUE;
-    InitData.MultipleRequestPerLu       =   TRUE;
-    InitData.HwAdapterControl           =   HwAdapterControl;
-    InitData.HwBuildIo                  =   HwBuildIo;
-
-    status = StorPortInitialize(_DriverObject,
+    InitData.HwFindAdapter              = HwFindAdapter;
+    InitData.HwResetBus                 = HwResetBus;
+    InitData.HwDmaStarted               = NULL;
+    InitData.HwAdapterState             = NULL;
+    InitData.DeviceExtensionSize        = AdapterSizeofXenvbdAdapter();
+    InitData.SpecificLuExtensionSize    = sizeof(ULONG); // not actually used
+    InitData.SrbExtensionSize           = sizeof(XENVBD_SRBEXT);
+    InitData.NumberOfAccessRanges       = 2;
+    InitData.MapBuffers                 = STOR_MAP_NON_READ_WRITE_BUFFERS;
+    InitData.NeedPhysicalAddresses      = TRUE;
+    InitData.TaggedQueuing              = TRUE;
+    InitData.AutoRequestSense           = TRUE;
+    InitData.MultipleRequestPerLu       = TRUE;
+    InitData.HwAdapterControl           = HwAdapterControl;
+    InitData.HwBuildIo                  = HwBuildIo;
+
+    status = StorPortInitialize(DriverObject,
                                 RegistryPath,
                                 &InitData,
                                 NULL);
     if (!NT_SUCCESS(status))
         goto fail4;
 
-    Driver.StorPortDispatchPnp     = _DriverObject->MajorFunction[IRP_MJ_PNP];
-    Driver.StorPortDispatchPower   = _DriverObject->MajorFunction[IRP_MJ_POWER];
-    Driver.StorPortDriverUnload    = _DriverObject->DriverUnload;
+    Driver.StorPortDispatchPnp   = DriverObject->MajorFunction[IRP_MJ_PNP];
+    Driver.StorPortDispatchPower = DriverObject->MajorFunction[IRP_MJ_POWER];
+    Driver.StorPortDriverUnload  = DriverObject->DriverUnload;
+
+    DriverObject->MajorFunction[IRP_MJ_PNP]   = DispatchPnp;
+    DriverObject->MajorFunction[IRP_MJ_POWER] = DispatchPower;
+    DriverObject->DriverUnload                = DriverUnload;
 
-    _DriverObject->MajorFunction[IRP_MJ_PNP]    = DispatchPnp;
-    _DriverObject->MajorFunction[IRP_MJ_POWER]  = DispatchPower;
-    _DriverObject->DriverUnload                 = DriverUnload;
+    RegistryCloseKey(ServiceKey);
+    ServiceKey = NULL;
 
-    Trace("<=== (%08x) (Irql=%d)\n", STATUS_SUCCESS, KeGetCurrentIrql());
     return STATUS_SUCCESS;
 
 fail4:
     Error("fail4\n");
 
     BufferTerminate();
+
     RegistryCloseKey(Driver.ParametersKey);
     Driver.ParametersKey = NULL;
 
 fail3:
     Error("fail3\n");
 
-    if (ServiceKey)
-        RegistryCloseKey(ServiceKey);
+    RegistryCloseKey(ServiceKey);
+    ServiceKey = NULL;
 
 fail2:
     Error("fail2\n");

diff --git a/src/xenvbd/driver.h b/src/xenvbd/driver.h
index cea7b428c201b02ac7c6ea3a0a424c31e0e89ec5..13c613555fc77f334df2c3f2907d6a1134492d31 100644 (file)
--- a/src/xenvbd/driver.h
+++ b/src/xenvbd/driver.h
@@ -29,34 +29,15 @@
  * SUCH DAMAGE.
  */ 
 
-#ifndef _XENVBD_XENVBD_H
-#define _XENVBD_XENVBD_H
+#ifndef _XENVBD_DRIVER_H
+#define _XENVBD_DRIVER_H
 
-#include <xen.h>
+#include <ntddk.h>
 
-// Global Constants
 #define XENVBD_MAX_TARGETS              (255)
-
-#define XENVBD_MAX_RING_PAGE_ORDER      (4)
-#define XENVBD_MAX_RING_PAGES           (1 << XENVBD_MAX_RING_PAGE_ORDER)
-
-#define XENVBD_MAX_SEGMENTS_PER_REQUEST (BLKIF_MAX_SEGMENTS_PER_REQUEST)
-#define XENVBD_MAX_REQUESTS_PER_SRB     (16)
-#define XENVBD_MAX_SEGMENTS_PER_SRB     (XENVBD_MAX_REQUESTS_PER_SRB * XENVBD_MAX_SEGMENTS_PER_REQUEST)
-#define XENVBD_MAX_TRANSFER_LENGTH      (XENVBD_MAX_SEGMENTS_PER_SRB * PAGE_SIZE)
-#define XENVBD_MAX_PHYSICAL_BREAKS      (XENVBD_MAX_SEGMENTS_PER_SRB - 1)
-#define XENVBD_MAX_QUEUE_DEPTH          (254)
-
-#define XENVBD_MIN_GRANT_REFS           (XENVBD_MAX_SEGMENTS_PER_SRB)
-
-typedef struct _XENVBD_PARAMETERS {
-    BOOLEAN     SynthesizeInquiry;
-    BOOLEAN     PVCDRom;
-} XENVBD_PARAMETERS;
-
-extern XENVBD_PARAMETERS    DriverParameters;
-
-#include "adapter.h"
+#define XENVBD_MAX_PAGES_PER_SRB        (1024)
+#define XENVBD_MAX_TRANSFER_LENGTH      (XENVBD_MAX_PAGES_PER_SRB * PAGE_SIZE)
+#define XENVBD_MAX_PHYSICAL_BREAKS      (XENVBD_MAX_PAGES_PER_SRB - 1)
 
 extern HANDLE
 DriverGetParametersKey(
@@ -75,33 +56,9 @@ DriverDispatchPower(
     IN  PIRP            Irp
     );
 
-// Fdo Device Extension management
-extern VOID
-DriverLinkAdapter(
-    IN  PXENVBD_ADAPTER Adapter
-    );
-
-extern VOID
-DriverUnlinkAdapter(
-    IN  PXENVBD_ADAPTER Adapter
-    );
-
 extern VOID
 DriverRequestReboot(
     VOID
     );
 
-__checkReturn
-__drv_allocatesMem(mem)
-extern PCHAR
-DriverFormat(
-    __in PCHAR                   Format,
-    ...
-    );
-
-extern VOID
-DriverFormatFree(
-    __in __drv_freesMem(mem) PCHAR Buffer
-    );
-
-#endif // _XENVBD_XENVBD_H
+#endif // _XENVBD_DRIVER_H

diff --git a/src/xenvbd/frontend.c b/src/xenvbd/frontend.c
index 1d7d51eaf5cf350a22e3af12bcf954f40574dad6..838b1977ad009dacc954b13ff7d0134503c7a01b 100644 (file)
--- a/src/xenvbd/frontend.c
+++ b/src/xenvbd/frontend.c
@@ -50,12 +50,12 @@
 
 struct _XENVBD_FRONTEND {
     // Frontend
-    PXENVBD_TARGET                 Target;
+    PXENVBD_TARGET              Target;
     ULONG                       TargetId;
     ULONG                       DeviceId;
-    PCHAR                       FrontendPath;
+    CHAR                        FrontendPath[sizeof("device/vbd/XXXXXXXX")];
     PCHAR                       BackendPath;
-    PCHAR                       TargetPath;
+    CHAR                        TargetPath[sizeof("data/scsi/target/XXXX")];
     USHORT                      BackendId;
     XENVBD_STATE                State;
     KSPIN_LOCK                  StateLock;
@@ -1572,23 +1572,22 @@ FrontendBackend(
 
 }
 
-__checkReturn
 NTSTATUS
 FrontendCreate(
-    __in  PXENVBD_TARGET             Target,
-    __in  PCHAR                   DeviceId, 
-    __in  ULONG                   TargetId, 
-    __out PXENVBD_FRONTEND*       _Frontend
+    IN  PXENVBD_TARGET          Target,
+    IN  PCHAR                   DeviceId,
+    IN  ULONG                   TargetId,
+    OUT PXENVBD_FRONTEND*       _Frontend
     )
 {
-    NTSTATUS            Status;
+    NTSTATUS            status;
     PXENVBD_FRONTEND    Frontend;
 
     Trace("Target[%d] @ (%d) =====>\n", TargetId, KeGetCurrentIrql());
 
     Frontend = __FrontendAlloc(sizeof(XENVBD_FRONTEND));
 
-    Status = STATUS_NO_MEMORY;
+    status = STATUS_NO_MEMORY;
     if (Frontend == NULL)
         goto fail1;
 
@@ -1600,29 +1599,34 @@ FrontendCreate(
     Frontend->DiskInfo.SectorSize = 512; // default sector size
     Frontend->BackendId = DOMID_INVALID;
     
-    Status = STATUS_INSUFFICIENT_RESOURCES;
-    Frontend->FrontendPath = DriverFormat("device/%s/%s", AdapterEnum(TargetGetAdapter(Target)), DeviceId);
-    if (Frontend->FrontendPath == NULL) 
+    status = RtlStringCbPrintfA(Frontend->FrontendPath,
+                                sizeof(Frontend->FrontendPath),
+                                "device/vbd/%u",
+                                Frontend->DeviceId);
+    if (!NT_SUCCESS(status))
         goto fail2;
 
-    Frontend->TargetPath = DriverFormat("data/scsi/target/%d", TargetId);
-    if (Frontend->TargetPath == NULL)
+    status = RtlStringCbPrintfA(Frontend->TargetPath,
+                                sizeof(Frontend->TargetPath),
+                                "data/scsi/target/%u",
+                                TargetId);
+    if (!NT_SUCCESS(status))
         goto fail3;
 
-    Status = NotifierCreate(Frontend, &Frontend->Notifier);
-    if (!NT_SUCCESS(Status))
+    status = NotifierCreate(Frontend, &Frontend->Notifier);
+    if (!NT_SUCCESS(status))
         goto fail4;
 
-    Status = BlockRingCreate(Frontend, Frontend->DeviceId, &Frontend->BlockRing);
-    if (!NT_SUCCESS(Status))
+    status = BlockRingCreate(Frontend, Frontend->DeviceId, &Frontend->BlockRing);
+    if (!NT_SUCCESS(status))
         goto fail5;
 
-    Status = GranterCreate(Frontend, &Frontend->Granter);
-    if (!NT_SUCCESS(Status))
+    status = GranterCreate(Frontend, &Frontend->Granter);
+    if (!NT_SUCCESS(status))
         goto fail6;
 
-    Status = ThreadCreate(FrontendBackend, Frontend, &Frontend->BackendThread);
-    if (!NT_SUCCESS(Status))
+    status = ThreadCreate(FrontendBackend, Frontend, &Frontend->BackendThread);
+    if (!NT_SUCCESS(status))
         goto fail7;
 
     // kernel objects
@@ -1646,19 +1650,15 @@ fail5:
     Frontend->Notifier = NULL;
 fail4:
     Error("fail4\n");
-    DriverFormatFree(Frontend->TargetPath);
-    Frontend->TargetPath = NULL;
 fail3:
     Error("fail3\n");
-    DriverFormatFree(Frontend->FrontendPath);
-    Frontend->FrontendPath = NULL;
 fail2:
     Error("Fail2\n");
     __FrontendFree(Frontend);
 fail1:
-    Error("Fail1 (%08x)\n", Status);
+    Error("Fail1 (%08x)\n", status);
     *_Frontend = NULL;
-    return Status;
+    return status;
 }
 
 VOID
@@ -1686,12 +1686,6 @@ FrontendDestroy(
     NotifierDestroy(Frontend->Notifier);
     Frontend->Notifier = NULL;
 
-    DriverFormatFree(Frontend->TargetPath);
-    Frontend->TargetPath = NULL;
-
-    DriverFormatFree(Frontend->FrontendPath);
-    Frontend->FrontendPath = NULL;
-
     ASSERT3P(Frontend->BackendPath, ==, NULL);
     ASSERT3P(Frontend->Inquiry, ==, NULL);
     ASSERT3P(Frontend->SuspendLateCallback, ==, NULL);

diff --git a/src/xenvbd/frontend.h b/src/xenvbd/frontend.h
index a192cff3ed6e3988ba883eed3260d0171b7f7630..99a2718ff86e876eaec8511ea3f52768b74f56a2 100644 (file)
--- a/src/xenvbd/frontend.h
+++ b/src/xenvbd/frontend.h
@@ -171,13 +171,12 @@ FrontendSetState(
     __in  XENVBD_STATE            State
     );
 
-__checkReturn
 extern NTSTATUS
 FrontendCreate(
-    __in  PXENVBD_TARGET          Target,
-    __in  PCHAR                   DeviceId, 
-    __in  ULONG                   TargetId, 
-    __out PXENVBD_FRONTEND*       _Frontend
+    IN  PXENVBD_TARGET          Target,
+    IN  PCHAR                   DeviceId,
+    IN  ULONG                   TargetId,
+    OUT PXENVBD_FRONTEND*       _Frontend
     );
 
 extern VOID

diff --git a/src/xenvbd/pdoinquiry.c b/src/xenvbd/pdoinquiry.c
index 5a21c91eda4bf47f4267756ddb5749c1d93ff8e0..b8946ff2af90277299d86089eeadd2818182bf76 100644 (file)
--- a/src/xenvbd/pdoinquiry.c
+++ b/src/xenvbd/pdoinquiry.c
@@ -286,8 +286,7 @@ __HandlePage80(
     ULONG   Length = Srb->DataTransferLength;
 
        RtlZeroMemory(Data, Length);
-       if (DriverParameters.SynthesizeInquiry ||
-        Inquiry == NULL || 
+       if (Inquiry == NULL ||
         Inquiry->Page80.Data == NULL || 
         Inquiry->Page80.Length == 0) {
         // generate the serial number page
@@ -329,8 +328,7 @@ __HandlePage83(
     ULONG   Length = Srb->DataTransferLength;
 
     RtlZeroMemory(Data, Length);
-    if (DriverParameters.SynthesizeInquiry ||
-        Inquiry == NULL || 
+    if (Inquiry == NULL ||
         Inquiry->Page83.Data == NULL || 
         Inquiry->Page83.Length == 0) {
         // generate the id page data

diff --git a/src/xenvbd/target.c b/src/xenvbd/target.c
index a504e5a0f66c4311b8f6fcf980c63f77b81a30ec..678ffde72c8886480faa79b785229a262ddb35d4 100644 (file)
--- a/src/xenvbd/target.c
+++ b/src/xenvbd/target.c
@@ -48,6 +48,8 @@
 #include <debug_interface.h>
 #include <suspend_interface.h>
 
+#define XENVBD_MAX_QUEUE_DEPTH          (254)
+
 typedef struct _XENVBD_SG_LIST {
     // SGList from SRB
     PSTOR_SCATTER_GATHER_LIST   SGList;