[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[win-pv-devel] [PATCH 7/7 vs] Remove generic store accessors in frontend



From: Owen Smith <owen.smith@xxxxxxxxxx>

Replace with specific use functions.

* Add missing parameter to Verbose() in FrontendSetDeviceUsage()

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenvbd/frontend.c | 154 ++++++++++++++++++++------------------------------
 src/xenvbd/frontend.h |  30 ++++------
 src/xenvbd/target.c   |  35 ++----------
 3 files changed, 79 insertions(+), 140 deletions(-)

diff --git a/src/xenvbd/frontend.c b/src/xenvbd/frontend.c
index 42eaa0b..d7fff89 100644
--- a/src/xenvbd/frontend.c
+++ b/src/xenvbd/frontend.c
@@ -183,103 +183,70 @@ FrontendGetInquiryOverride(
     }
 }
 
-NTSTATUS
-FrontendStoreWriteFrontend(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Name,
-    __in  PCHAR                 Value
+VOID
+FrontendSetEjected(
+    IN  PXENVBD_FRONTEND    Frontend
     )
 {
-    return XENBUS_STORE(Printf,
+    (VOID) XENBUS_STORE(Printf,
                         &Frontend->StoreInterface,
                         NULL,
                         Frontend->FrontendPath,
-                        Name,
-                        Value);
+                        "ejected",
+                        "1");
 }
-NTSTATUS
-FrontendStoreReadBackend(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Name,
-    __out PCHAR*                Value
-    )
-{
-    NTSTATUS    Status;
-
-    Status = STATUS_INVALID_PARAMETER;
-    if (Frontend->BackendPath == NULL)
-        goto fail1;
-
-    Status = XENBUS_STORE(Read,
-                          &Frontend->StoreInterface,
-                          NULL,
-                          Frontend->BackendPath,
-                          Name,
-                          Value);
-    if (!NT_SUCCESS(Status))
-        goto fail2;
 
-    return STATUS_SUCCESS;
-
-fail2:
-fail1:
-    return Status;
-}
 VOID
-FrontendStoreFree(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Value
+FrontendSetEjectFailed(
+    IN  PXENVBD_FRONTEND    Frontend
     )
 {
-    XENBUS_STORE(Free,
-                 &Frontend->StoreInterface,
-                 Value);
+    (VOID) XENBUS_STORE(Printf,
+                        &Frontend->StoreInterface,
+                        NULL,
+                        Frontend->FrontendPath,
+                        "error",
+                        "Unplug failed due to open handle(s)!");
 }
-__drv_maxIRQL(DISPATCH_LEVEL)
-NTSTATUS
-FrontendWriteUsage(
-    __in  PXENVBD_FRONTEND        Frontend
+
+VOID
+FrontendSetDeviceUsage(
+    IN  PXENVBD_FRONTEND                Frontend,
+    IN  DEVICE_USAGE_NOTIFICATION_TYPE  Type,
+    IN  BOOLEAN                         Value
     )
 {
-    NTSTATUS    Status;
+    PCHAR                               UsageName;
 
-    Status = XENBUS_STORE(Printf,
-                          &Frontend->StoreInterface,
-                          NULL,
-                          Frontend->TargetPath, 
-                          "paging",
-                          "%u",
-                          Frontend->Caps.Paging);
-    if (!NT_SUCCESS(Status))
-        goto out;
-
-    Status = XENBUS_STORE(Printf,
-                          &Frontend->StoreInterface,
-                          NULL,
-                          Frontend->TargetPath, 
-                          "hibernation",
-                          "%u",
-                          Frontend->Caps.Hibernation);
-    if (!NT_SUCCESS(Status))
-        goto out;
-
-    Status = XENBUS_STORE(Printf,
-                          &Frontend->StoreInterface,
-                          NULL,
-                          Frontend->TargetPath, 
-                          "dump",
-                          "%u",
-                          Frontend->Caps.DumpFile);
-    if (!NT_SUCCESS(Status))
-        goto out;
+    switch (Type) {
+    case DeviceUsageTypePaging:
+        UsageName = "paging";
+        Frontend->Caps.Paging = Value;
+        break;
+    case DeviceUsageTypeHibernation:
+        UsageName = "hibernation";
+        Frontend->Caps.Hibernation = Value;
+        break;
+    case DeviceUsageTypeDumpFile:
+        UsageName = "dump";
+        Frontend->Caps.DumpFile = Value;
+        break;
+    default:
+        return;
+    }
 
-    Verbose("Target[%d] : %s %s %s\n", Frontend->TargetId,
-            Frontend->Caps.DumpFile ? "DUMP" : "NOT_DUMP", 
-            Frontend->Caps.Hibernation ? "HIBER" : "NOT_HIBER",
-            Frontend->Caps.Paging ? "PAGE" : "NOT_PAGE");
+    (VOID) XENBUS_STORE(Printf,
+                        &Frontend->StoreInterface,
+                        NULL,
+                        Frontend->TargetPath,
+                        UsageName,
+                        "%u",
+                        Value);
 
-out:
-    return Status;
+    Verbose("Target[%u] %s %s\n",
+            FrontendGetTargetId(Frontend),
+            Value ? "ADDING" : "REMOVING",
+            UsageName);
 }
 
 //=============================================================================
@@ -1037,10 +1004,15 @@ FrontendPrepare(
     if (!NT_SUCCESS(Status))
         goto fail2;
 
-    // write targetpath
-    Status = FrontendWriteUsage(Frontend);
-    if (!NT_SUCCESS(Status))
-        goto fail3;
+    FrontendSetDeviceUsage(Frontend,
+                           DeviceUsageTypePaging,
+                           Frontend->Caps.Paging);
+    FrontendSetDeviceUsage(Frontend,
+                           DeviceUsageTypeHibernation,
+                           Frontend->Caps.Hibernation);
+    FrontendSetDeviceUsage(Frontend,
+                           DeviceUsageTypeDumpFile,
+                           Frontend->Caps.DumpFile);
 
     Status = XENBUS_STORE(Printf,
                           &Frontend->StoreInterface,
@@ -1050,7 +1022,7 @@ FrontendPrepare(
                           "%s",
                           Frontend->FrontendPath);
     if (!NT_SUCCESS(Status))
-        goto fail4;
+        goto fail3;
 
     Status = XENBUS_STORE(Printf,
                           &Frontend->StoreInterface,
@@ -1060,24 +1032,24 @@ FrontendPrepare(
                           "%u",
                           Frontend->DeviceId);
     if (!NT_SUCCESS(Status))
-        goto fail5;
+        goto fail4;
 
     // Frontend: -> INITIALIZING
     Status = ___SetState(Frontend, XenbusStateInitialising);
     if (!NT_SUCCESS(Status))
-        goto fail6;
+        goto fail5;
 
     // Backend : -> INITWAIT
     BackendState = XenbusStateUnknown;
     do {
         Status = __WaitState(Frontend, &BackendState);
         if (!NT_SUCCESS(Status))
-            goto fail7;
+            goto fail6;
     } while (BackendState == XenbusStateClosed || 
              BackendState == XenbusStateInitialising);
     Status = STATUS_UNSUCCESSFUL;
     if (BackendState != XenbusStateInitWait)
-        goto fail8;
+        goto fail7;
 
     // read features and caps (removable, ring-order, ...)
     Verbose("Target[%d] : BackendId %d (%s)\n",
@@ -1089,8 +1061,6 @@ FrontendPrepare(
     
     return STATUS_SUCCESS;
 
-fail8:
-    Error("Fail8\n");
 fail7:
     Error("Fail7\n");
 fail6:
diff --git a/src/xenvbd/frontend.h b/src/xenvbd/frontend.h
index 0931914..46f2e39 100644
--- a/src/xenvbd/frontend.h
+++ b/src/xenvbd/frontend.h
@@ -88,27 +88,21 @@ FrontendGetInquiryOverride(
     OUT PULONG              Length
     );
 
-extern NTSTATUS
-FrontendStoreWriteFrontend(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Name,
-    __in  PCHAR                 Value
+extern VOID
+FrontendSetEjected(
+    IN  PXENVBD_FRONTEND    Frontend
     );
-extern NTSTATUS
-FrontendStoreReadBackend(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Name,
-    __out PCHAR*                Value
+
+extern VOID
+FrontendSetEjectFailed(
+    IN  PXENVBD_FRONTEND    Frontend
     );
+
 extern VOID
-FrontendStoreFree(
-    __in  PXENVBD_FRONTEND      Frontend,
-    __in  PCHAR                 Value
-    );    
-__drv_maxIRQL(DISPATCH_LEVEL)
-extern NTSTATUS
-FrontendWriteUsage(
-    __in  PXENVBD_FRONTEND        Frontend
+FrontendSetDeviceUsage(
+    IN  PXENVBD_FRONTEND                Frontend,
+    IN  DEVICE_USAGE_NOTIFICATION_TYPE  Type,
+    IN  BOOLEAN                         Value
     );
 
 __checkReturn
diff --git a/src/xenvbd/target.c b/src/xenvbd/target.c
index cecfcf5..fd8621d 100644
--- a/src/xenvbd/target.c
+++ b/src/xenvbd/target.c
@@ -957,9 +957,7 @@ TargetIssueDeviceEject(
             Reason);
     if (!Target->WrittenEjected) {
         Target->WrittenEjected = TRUE;
-        FrontendStoreWriteFrontend(Target->Frontend,
-                                   "ejected",
-                                   "1");
+        FrontendSetEjected(Target->Frontend);
     }
     if (DoEject) {
         Verbose("Target[%d] : IoRequestDeviceEject(0x%p)\n",
@@ -982,35 +980,14 @@ __TargetDeviceUsageNotification(
     PIO_STACK_LOCATION              StackLocation;
     BOOLEAN                         Value;
     DEVICE_USAGE_NOTIFICATION_TYPE  Type;
-    PXENVBD_CAPS                    Caps = FrontendGetCaps(Target->Frontend);
 
     StackLocation = IoGetCurrentIrpStackLocation(Irp);
     Value = StackLocation->Parameters.UsageNotification.InPath;
     Type  = StackLocation->Parameters.UsageNotification.Type;
 
-    switch (Type) {
-    case DeviceUsageTypePaging:
-        if (Caps->Paging == Value)
-            return;
-        Caps->Paging = Value;
-        break;
-
-    case DeviceUsageTypeHibernation:
-        if (Caps->Hibernation == Value)
-            return;
-        Caps->Hibernation = Value;
-        break;
-
-    case DeviceUsageTypeDumpFile:
-        if (Caps->DumpFile == Value)
-            return;
-        Caps->DumpFile = Value;
-        break;
-
-    default:
-        return;
-    }
-    FrontendWriteUsage(Target->Frontend);
+    FrontendSetDeviceUsage(Target->Frontend,
+                           Type,
+                           Value);
 }
 
 static FORCEINLINE VOID
@@ -1055,9 +1032,7 @@ __TargetCheckEjectFailed(
     if (EjectFailed) {
         Error("Target[%d] : Unplug failed due to open handle(s)!\n",
               TargetGetTargetId(Target));
-        FrontendStoreWriteFrontend(Target->Frontend,
-                                   "error",
-                                   "Unplug failed due to open handle(s)!");
+        FrontendSetEjectFailed(Target->Frontend);
     }
 }
 
-- 
2.8.3


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.