OvmfPkg: Import XENMEM_memory_map hypercall to Xen/memory.h

[mirror_edk2.git] / OvmfPkg / XenBusDxe / XenBusDxe.c

diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.c b/OvmfPkg/XenBusDxe/XenBusDxe.c
index 439b060ddcea545e845e7e1724cfb0254fdf7c97..634c7b71eb551b889add898bdefa4aa22c9039d2 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBusDxe.c
+++ b/OvmfPkg/XenBusDxe/XenBusDxe.c
@@ -13,13 +13,7 @@
 \r
   Copyright (C) 2014, Citrix Ltd.\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -452,12 +446,10 @@ XenBusDxeDriverBindingStop (
       continue;\r
     }\r
     ChildData = XENBUS_PRIVATE_DATA_FROM_THIS (XenBusIo);\r
-    Status = gBS->DisconnectController (ChildData->Handle, NULL, NULL);\r
-    if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "XenBusDxe: error disconnecting child: %r\n",\r
-              Status));\r
-      continue;\r
-    }\r
+\r
+    Status = gBS->CloseProtocol (Dev->ControllerHandle, &gXenIoProtocolGuid,\r
+                    Dev->This->DriverBindingHandle, ChildData->Handle);\r
+    ASSERT_EFI_ERROR (Status);\r
 \r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                ChildData->Handle,\r