To combine two drivers into one, they can't share ImageHandle as
DriverBindingHandle. So, update their code to use NULL as DriverBindingHandle.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
 OvmfPkg/QemuVideoDxe/Driver.c        | 2 +-
 OvmfPkg/VirtioGpuDxe/DriverBinding.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c
index fc8025e..ce66c02 100644
--- a/OvmfPkg/QemuVideoDxe/Driver.c
+++ b/OvmfPkg/QemuVideoDxe/Driver.c
@@ -954,7 +954,7 @@ InitializeQemuVideo (
              ImageHandle,
              SystemTable,
              &gQemuVideoDriverBinding,
-             ImageHandle,
+             NULL,
              &gQemuVideoComponentName,
              &gQemuVideoComponentName2
              );
diff --git a/OvmfPkg/VirtioGpuDxe/DriverBinding.c b/OvmfPkg/VirtioGpuDxe/DriverBinding.c
index 33c1ad3..908bd1d 100644
--- a/OvmfPkg/VirtioGpuDxe/DriverBinding.c
+++ b/OvmfPkg/VirtioGpuDxe/DriverBinding.c
@@ -839,6 +839,6 @@ VirtioGpuEntryPoint (
   )
 {
   return EfiLibInstallDriverBindingComponentName2 (ImageHandle, SystemTable,
-           &mDriverBinding, ImageHandle, NULL /* ComponentName */,
+           &mDriverBinding, NULL, NULL /* ComponentName */,
            &mComponentName2);
 }
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel