github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 21:39:26 +00:00
Code Issues Projects Releases Wiki Activity

runtime: Hot-plug virtio-mem device on PCI bridge

Browse Source 
Currently the virtio-mem device is hotplugged on the root bus.
This doesn't work for PCIe machines like q35.

Hotplug the virtio-mem device into the pci bridge instead.

Fixes #1953
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
Marcel Apfelbaum
2021-06-21 20:13:13 +03:00
parent 789a59549e
commit ac6b9c53d2
5 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/runtime/virtcontainers/qemu.go
View File

@@ -708,7 +708,7 @@ func (q *qemu) getMemArgs() (bool, string, string, error) {
return share, target, memoryBack, nil
}
func (q *qemu) setupVirtioMem() error {
func (q *qemu) setupVirtioMem(ctx context.Context) error {
maxMem, err := q.hostMemMB()
if err != nil {
return err
@@ -724,7 +724,19 @@ func (q *qemu) setupVirtioMem() error {
if err = q.qmpSetup(); err != nil {
return err
}
err = q.qmpMonitorCh.qmp.ExecMemdevAdd(q.qmpMonitorCh.ctx, memoryBack, "virtiomem", target, sizeMB, share, "virtio-mem-pci", "virtiomem0")
addr, bridge, err := q.arch.addDeviceToBridge(ctx, "virtiomem-dev", types.PCI)
if err != nil {
return err
}
defer func() {
if err != nil {
q.arch.removeDeviceFromBridge("virtiomem-dev")
}
}()
err = q.qmpMonitorCh.qmp.ExecMemdevAdd(q.qmpMonitorCh.ctx, memoryBack, "virtiomem", target, sizeMB, share, "virtio-mem-pci", "virtiomem0", addr, bridge.ID)
if err == nil {
q.config.VirtioMem = true
q.Logger().Infof("Setup %dMB virtio-mem-pci success", sizeMB)
@@ -832,7 +844,7 @@ func (q *qemu) startSandbox(ctx context.Context, timeout int) error {
}
if q.config.VirtioMem {
err = q.setupVirtioMem()
err = q.setupVirtioMem(ctx)
}
return err