vendor: Vendor github.com/intel/govmm

This pulls in the following change to allow assigning
address to a bridge.

30aeacb qemu: Add qemu parameter for PCI address for a bridge.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2018-04-13 16:05:17 -07:00
parent 1c7a02e73d
commit ee2e15c724
3 changed files with 13 additions and 3 deletions

4
Gopkg.lock generated
View File

@ -85,7 +85,7 @@
[[projects]] [[projects]]
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
packages = ["qemu"] packages = ["qemu"]
revision = "1509acf1862ae5154c5c096f9318bd3eb434d816" revision = "9cf8ce6c6dda19d4a6d529e73714e231f6156820"
[[projects]] [[projects]]
name = "github.com/kata-containers/agent" name = "github.com/kata-containers/agent"
@ -257,6 +257,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "d8a31fdf495bbc93a234bdb9abd5250e2688e50c1c2ac88ae80d4b481cafba0d" inputs-digest = "1d1c6e1edc48dac73618d0ce04d505e22276ad5a3e299dd0964eca608fe8e2f1"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

View File

@ -56,7 +56,7 @@
[[constraint]] [[constraint]]
name = "github.com/intel/govmm" name = "github.com/intel/govmm"
revision = "1509acf1862ae5154c5c096f9318bd3eb434d816" revision = "9cf8ce6c6dda19d4a6d529e73714e231f6156820"
[[constraint]] [[constraint]]
name = "github.com/kata-containers/agent" name = "github.com/kata-containers/agent"

View File

@ -907,6 +907,9 @@ type BridgeDevice struct {
// SHPC is used to enable or disable the standard hot plug controller // SHPC is used to enable or disable the standard hot plug controller
SHPC bool SHPC bool
// PCI Slot
Addr string
} }
// Valid returns true if the BridgeDevice structure is valid and complete. // Valid returns true if the BridgeDevice structure is valid and complete.
@ -941,6 +944,13 @@ func (bridgeDev BridgeDevice) QemuParams(config *Config) []string {
} }
deviceParam := fmt.Sprintf("%s,bus=%s,id=%s,chassis_nr=%d,shpc=%s", deviceName, bridgeDev.Bus, bridgeDev.ID, bridgeDev.Chassis, shpc) deviceParam := fmt.Sprintf("%s,bus=%s,id=%s,chassis_nr=%d,shpc=%s", deviceName, bridgeDev.Bus, bridgeDev.ID, bridgeDev.Chassis, shpc)
if bridgeDev.Addr != "" {
addr, err := strconv.Atoi(bridgeDev.Addr)
if err == nil && addr >= 0 {
deviceParam += fmt.Sprintf(",addr=%x", addr)
}
}
qemuParams = append(qemuParams, "-device") qemuParams = append(qemuParams, "-device")
qemuParams = append(qemuParams, deviceParam) qemuParams = append(qemuParams, deviceParam)