[win-pv-devel] [PATCH 2/2] Fix some SDV issues

[Owen Smith <owen.smith@xxxxxxxxxx>]

Fix issues where variables were redefined inside a code block.

Signed-off-by: Owen Smith <owen.smith@xxxxxxxxxx>
---
 src/xenbus/balloon.c | 12 ++++++------
 src/xenbus/fdo.c     |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/xenbus/balloon.c b/src/xenbus/balloon.c
index dab4d81..1909ef7 100644
--- a/src/xenbus/balloon.c
+++ b/src/xenbus/balloon.c
@@ -466,8 +466,8 @@ BalloonReleasePfnArray(
     Index = 0;
     while (Index < Requested) {
         ULONG       Next = Index;
-        LONGLONG    Start;
-        LONGLONG    End;
+        LONGLONG    StartLL;
+        LONGLONG    EndLL;
         NTSTATUS    status;
 
         while (Next + 1 < Requested) {
@@ -479,14 +479,14 @@ BalloonReleasePfnArray(
             Next++;
         }
 
-        Start = (LONGLONG)Context->PfnArray[Index];
-        End = (LONGLONG)Context->PfnArray[Next];
+        StartLL = (LONGLONG)Context->PfnArray[Index];
+        EndLL = (LONGLONG)Context->PfnArray[Next];
 
         status = XENBUS_RANGE_SET(Put,
                                   &Context->RangeSetInterface,
                                   Context->RangeSet,
-                                  Start,
-                                  End + 1 - Start);
+                                  StartLL,
+                                  EndLL + 1 - StartLL);
         if (!NT_SUCCESS(status))
             break;
 
diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index cc0c775..8dd5c20 100644
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -741,8 +741,6 @@ FdoEnumerate(
         PANSI_STRING Class = &Classes[Index];
 
         if (Class->Length != 0) {
-            NTSTATUS    status;
-
             status = PdoCreate(Fdo, Class);
             if (NT_SUCCESS(status))
                 NeedInvalidate = TRUE;
-- 
1.9.4.msysgit.1


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