github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 17:37:20 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Fix the support of PCIe bridge

Browse Source 
In case the type of bridge is PCIEBridge, which we expect as ending
up using pcie-pci-bridge device from Qemu, the properties chassis_nr
and shpc don't exist.

This commit simply fixes this use case by removing those parameters
from the command line.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2018-10-02 13:43:24 -07:00
parent 6ba3b3fad1
commit ef7250508c
2 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
qemu/qemu.go
View File

@@ -938,18 +938,19 @@ func (bridgeDev BridgeDevice) Valid() bool {
// QemuParams returns the qemu parameters built out of this bridge device. // QemuParams returns the qemu parameters built out of this bridge device.
func (bridgeDev BridgeDevice) QemuParams(config *Config) []string { func (bridgeDev BridgeDevice) QemuParams(config *Config) []string {
var qemuParams []string var qemuParams []string
var deviceParam string
shpc := "off" switch bridgeDev.Type {
if bridgeDev.SHPC { case PCIEBridge:
shpc = "on" deviceParam = fmt.Sprintf("pcie-pci-bridge,bus=%s,id=%s", bridgeDev.Bus, bridgeDev.ID)
default:
shpc := "off"
if bridgeDev.SHPC {
shpc = "on"
}
deviceParam = fmt.Sprintf("pci-bridge,bus=%s,id=%s,chassis_nr=%d,shpc=%s", bridgeDev.Bus, bridgeDev.ID, bridgeDev.Chassis, shpc)
} }
deviceName := "pci-bridge"
if bridgeDev.Type == PCIEBridge {
deviceName = "pcie-pci-bridge"
}
deviceParam := fmt.Sprintf("%s,bus=%s,id=%s,chassis_nr=%d,shpc=%s", deviceName, bridgeDev.Bus, bridgeDev.ID, bridgeDev.Chassis, shpc)
if bridgeDev.Addr != "" { if bridgeDev.Addr != "" {
addr, err := strconv.Atoi(bridgeDev.Addr) addr, err := strconv.Atoi(bridgeDev.Addr)
if err == nil && addr >= 0 { if err == nil && addr >= 0 {

20
qemu/qemu_test.go
View File

@@ -420,9 +420,9 @@ func TestAppendDeviceSCSIController(t *testing.T) {
testAppend(scsiCon, deviceSCSIControllerBusAddrStr, t) testAppend(scsiCon, deviceSCSIControllerBusAddrStr, t)
} }
var deviceBridgeString = "-device pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,chassis_nr=5,shpc=on,addr=ff" var devicePCIBridgeString = "-device pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,chassis_nr=5,shpc=on,addr=ff"
func TestAppendBridgeDevice(t *testing.T) { func TestAppendPCIBridgeDevice(t *testing.T) {
bridge := BridgeDevice{ bridge := BridgeDevice{
Type: PCIBridge, Type: PCIBridge,
@@ -433,7 +433,21 @@ func TestAppendBridgeDevice(t *testing.T) {
SHPC: true, SHPC: true,
} }
testAppend(bridge, deviceBridgeString, t) testAppend(bridge, devicePCIBridgeString, t)
}
var devicePCIEBridgeString = "-device pcie-pci-bridge,bus=/pci-bus/pcie.0,id=mybridge,addr=ff"
func TestAppendPCIEBridgeDevice(t *testing.T) {
bridge := BridgeDevice{
Type: PCIEBridge,
ID: "mybridge",
Bus: "/pci-bus/pcie.0",
Addr: "255",
}
testAppend(bridge, devicePCIEBridgeString, t)
} }
func TestAppendEmptyDevice(t *testing.T) { func TestAppendEmptyDevice(t *testing.T) {