github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 08:47:56 +00:00
Code Issues Projects Releases Wiki Activity

qemu: cleanup qmp channel setup and teardown

Browse Source 
Unify qmp channel setup and teardown. This also fixes the issue that
sometimes qmp pointer is not reset after qmp is shutdown.

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao 2018-07-22 10:58:05 +08:00
parent 14d25b82a4
commit c9bd12aa19
1 changed files with 38 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
virtcontainers/qemu.go
View File

@ -507,12 +507,6 @@ func (q *qemu) startSandbox() error {
// waitSandbox will wait for the Sandbox's VM to be up and running.
func (q *qemu) waitSandbox(timeout int) error {
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
if timeout < 0 {
return fmt.Errorf("Invalid timeout %ds", timeout)
}
@ -537,8 +531,9 @@ func (q *qemu) waitSandbox(timeout int) error {
time.Sleep(time.Duration(50) * time.Millisecond)
}
q.qmpMonitorCh.qmp = qmp
defer q.qmpShutdown()
qemuMajorVersion = ver.Major
qemuMinorVersion = ver.Minor
@ -559,23 +554,15 @@ func (q *qemu) waitSandbox(timeout int) error {
// stopSandbox will stop the Sandbox's VM.
func (q *qemu) stopSandbox() error {
cfg := govmmQemu.QMPConfig{Logger: newQMPLogger()}
disconnectCh := make(chan struct{})
q.Logger().Info("Stopping Sandbox")
qmp, _, err := govmmQemu.QMPStart(q.qmpMonitorCh.ctx, q.qmpMonitorCh.path, cfg, disconnectCh)
err := q.qmpSetup()
if err != nil {
q.Logger().WithError(err).Error("Failed to connect to QEMU instance")
return err
}
defer q.qmpShutdown()
err = qmp.ExecuteQMPCapabilities(q.qmpMonitorCh.ctx)
if err != nil {
q.Logger().WithError(err).Error(qmpCapErrMsg)
return err
}
err = qmp.ExecuteQuit(q.qmpMonitorCh.ctx)
err = q.qmpMonitorCh.qmp.ExecuteQuit(q.qmpMonitorCh.ctx)
if err != nil {
q.Logger().WithError(err).Error("Fail to execute qmp QUIT")
return err
@ -590,30 +577,11 @@ func (q *qemu) stopSandbox() error {
}
func (q *qemu) togglePauseSandbox(pause bool) error {
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
cfg := govmmQemu.QMPConfig{Logger: newQMPLogger()}
// Auto-closed by QMPStart().
disconnectCh := make(chan struct{})
qmp, _, err := govmmQemu.QMPStart(q.qmpMonitorCh.ctx, q.qmpMonitorCh.path, cfg, disconnectCh)
err := q.qmpSetup()
if err != nil {
q.Logger().WithError(err).Error("Failed to connect to QEMU instance")
return err
}
q.qmpMonitorCh.qmp = qmp
err = qmp.ExecuteQMPCapabilities(q.qmpMonitorCh.ctx)
if err != nil {
q.Logger().WithError(err).Error(qmpCapErrMsg)
return err
}
defer q.qmpShutdown()
if pause {
err = q.qmpMonitorCh.qmp.ExecuteStop(q.qmpMonitorCh.ctx)
@ -628,7 +596,11 @@ func (q *qemu) togglePauseSandbox(pause bool) error {
return nil
}
func (q *qemu) qmpSetup() (*govmmQemu.QMP, error) {
func (q *qemu) qmpSetup() error {
if q.qmpMonitorCh.qmp != nil {
return nil
}
cfg := govmmQemu.QMPConfig{Logger: newQMPLogger()}
// Auto-closed by QMPStart().
@ -637,16 +609,25 @@ func (q *qemu) qmpSetup() (*govmmQemu.QMP, error) {
qmp, _, err := govmmQemu.QMPStart(q.qmpMonitorCh.ctx, q.qmpMonitorCh.path, cfg, disconnectCh)
if err != nil {
q.Logger().WithError(err).Error("Failed to connect to QEMU instance")
return nil, err
return err
}
err = qmp.ExecuteQMPCapabilities(q.qmpMonitorCh.ctx)
if err != nil {
qmp.Shutdown()
q.Logger().WithError(err).Error(qmpCapErrMsg)
return nil, err
return err
}
q.qmpMonitorCh.qmp = qmp
return qmp, nil
return nil
}
func (q *qemu) qmpShutdown() {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
q.qmpMonitorCh.qmp = nil
}
}
func (q *qemu) addDeviceToBridge(ID string) (string, Bridge, error) {
@ -678,18 +659,11 @@ func (q *qemu) removeDeviceFromBridge(ID string) error {
}
func (q *qemu) hotplugBlockDevice(drive *deviceDrivers.Drive, op operation) error {
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
qmp, err := q.qmpSetup()
err := q.qmpSetup()
if err != nil {
return err
}
q.qmpMonitorCh.qmp = qmp
defer q.qmpShutdown()
devID := "virtio-" + drive.ID
@ -747,18 +721,11 @@ func (q *qemu) hotplugBlockDevice(drive *deviceDrivers.Drive, op operation) erro
}
func (q *qemu) hotplugVFIODevice(device deviceDrivers.VFIODevice, op operation) error {
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
qmp, err := q.qmpSetup()
err := q.qmpSetup()
if err != nil {
return err
}
q.qmpMonitorCh.qmp = qmp
defer q.qmpShutdown()
devID := "vfio-" + device.DeviceInfo.ID
@ -829,18 +796,11 @@ func (q *qemu) hotplugCPUs(vcpus uint32, op operation) (uint32, error) {
return 0, nil
}
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
qmp, err := q.qmpSetup()
err := q.qmpSetup()
if err != nil {
return 0, err
}
q.qmpMonitorCh.qmp = qmp
defer q.qmpShutdown()
if op == addDevice {
return q.hotplugAddCPUs(vcpus)
@ -964,22 +924,13 @@ func (q *qemu) hotplugMemory(memDev *memoryDevice, op operation) error {
}
func (q *qemu) hotplugAddMemory(memDev *memoryDevice) error {
// setup qmp channel if necessary
if q.qmpMonitorCh.qmp == nil {
qmp, err := q.qmpSetup()
if err != nil {
return err
}
q.qmpMonitorCh.qmp = qmp
defer func() {
qmp.Shutdown()
q.qmpMonitorCh.qmp = nil
}()
err := q.qmpSetup()
if err != nil {
return err
}
defer q.qmpShutdown()
err := q.qmpMonitorCh.qmp.ExecHotplugMemory(q.qmpMonitorCh.ctx, "memory-backend-ram", "mem"+strconv.Itoa(memDev.slot), "", memDev.sizeMB)
err = q.qmpMonitorCh.qmp.ExecHotplugMemory(q.qmpMonitorCh.ctx, "memory-backend-ram", "mem"+strconv.Itoa(memDev.slot), "", memDev.sizeMB)
if err != nil {
q.Logger().WithError(err).Error("hotplug memory")
return err
@ -1032,32 +983,13 @@ func (q *qemu) getSandboxConsole(id string) (string, error) {
}
func (q *qemu) saveSandbox() error {
defer func(qemu *qemu) {
if q.qmpMonitorCh.qmp != nil {
q.qmpMonitorCh.qmp.Shutdown()
}
}(q)
q.Logger().Info("save sandbox")
cfg := govmmQemu.QMPConfig{Logger: newQMPLogger()}
// Auto-closed by QMPStart().
disconnectCh := make(chan struct{})
qmp, _, err := govmmQemu.QMPStart(q.qmpMonitorCh.ctx, q.qmpMonitorCh.path, cfg, disconnectCh)
err := q.qmpSetup()
if err != nil {
q.Logger().WithError(err).Error("Failed to connect to QEMU instance")
return err
}
q.qmpMonitorCh.qmp = qmp
err = qmp.ExecuteQMPCapabilities(q.qmpMonitorCh.ctx)
if err != nil {
q.Logger().WithError(err).Error(qmpCapErrMsg)
return err
}
defer q.qmpShutdown()
// BootToBeTemplate sets the VM to be a template that other VMs can clone from. We would want to
// bypass shared memory when saving the VM to a local file through migration exec.