From 2216d528f6bca0badb13027be7b310f8c03999af Mon Sep 17 00:00:00 2001
From: Zhao Xinda <xinda.zhao@intel.com>
Date: Thu, 20 Sep 2018 14:55:20 +0800
Subject: [PATCH] vendor: Update govmm to add vfio mediated device support on
 root bus

In addition to supporting hotplug for VFIO mediated device on PCI bridge,
this patch adds hotplug functionality on root bus.

When parameter bus and addr are set to be empty, the system will pick up
an empty slot on root bus.

Fixes #542

Signed-off-by: Zhao Xinda <xinda.zhao@intel.com>
---
 Gopkg.lock                                | 2 +-
 Gopkg.toml                                | 2 +-
 vendor/github.com/intel/govmm/qemu/qmp.go | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 96a608433d..d95c83259a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -127,7 +127,7 @@
   name = "github.com/intel/govmm"
   packages = ["qemu"]
   pruneopts = "NUT"
-  revision = "032705ba6aae05a9bf41e296cf89c8529cffb822"
+  revision = "9905ae92c5915c07abeb669eaa4d7f7408834b51"
 
 [[projects]]
   digest = "1:672470f31bc4e50f9ba09a1af7ab6035bf8b1452db64dfd79b1a22614bb30710"
diff --git a/Gopkg.toml b/Gopkg.toml
index 013fd3fb62..eb4723c046 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -52,7 +52,7 @@
 
 [[constraint]]
   name = "github.com/intel/govmm"
-  revision = "032705ba6aae05a9bf41e296cf89c8529cffb822"
+  revision = "9905ae92c5915c07abeb669eaa4d7f7408834b51"
 
 [[constraint]]
   name = "github.com/kata-containers/agent"
diff --git a/vendor/github.com/intel/govmm/qemu/qmp.go b/vendor/github.com/intel/govmm/qemu/qmp.go
index e9fa65e52d..4f981f6bb0 100644
--- a/vendor/github.com/intel/govmm/qemu/qmp.go
+++ b/vendor/github.com/intel/govmm/qemu/qmp.go
@@ -946,11 +946,13 @@ func (q *QMP) ExecutePCIVFIOMediatedDeviceAdd(ctx context.Context, devID, sysfsd
 		"id":       devID,
 		"driver":   "vfio-pci",
 		"sysfsdev": sysfsdev,
-		"addr":     addr,
 	}
 	if bus != "" {
 		args["bus"] = bus
 	}
+	if addr != "" {
+		args["addr"] = addr
+	}
 	return q.executeCommand(ctx, "device_add", args, nil)
 }