github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 22:43:05 +00:00
Code Issues Projects Releases Wiki Activity

qemu: support QEMU 6

Browse Source 
Use `on` and `off` to enable or disable features,
`no` prefix is deprecated

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2021-03-24 10:54:05 -06:00
parent 7d320e8f5d
commit 6213dea42a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qemu/examples_test.go
View File

@ -34,7 +34,7 @@ func Example() {
// kvm // kvm
params = append(params, "-enable-kvm", "-cpu", "host") params = append(params, "-enable-kvm", "-cpu", "host")
// qmp socket // qmp socket
params = append(params, "-daemonize", "-qmp", "unix:/tmp/qmp-socket,server,nowait") params = append(params, "-daemonize", "-qmp", "unix:/tmp/qmp-socket,server=on,wait=off")
// resources // resources
params = append(params, "-m", "370", "-smp", "cpus=2") params = append(params, "-m", "370", "-smp", "cpus=2")

6
qemu/qemu.go
View File

@ -552,7 +552,7 @@ func (cdev CharDevice) QemuParams(config *Config) []string {
cdevParams = append(cdevParams, string(cdev.Backend)) cdevParams = append(cdevParams, string(cdev.Backend))
cdevParams = append(cdevParams, fmt.Sprintf(",id=%s", cdev.ID)) cdevParams = append(cdevParams, fmt.Sprintf(",id=%s", cdev.ID))
if cdev.Backend == Socket { if cdev.Backend == Socket {
cdevParams = append(cdevParams, fmt.Sprintf(",path=%s,server,nowait", cdev.Path)) cdevParams = append(cdevParams, fmt.Sprintf(",path=%s,server=on,wait=off", cdev.Path))
} else { } else {
cdevParams = append(cdevParams, fmt.Sprintf(",path=%s", cdev.Path)) cdevParams = append(cdevParams, fmt.Sprintf(",path=%s", cdev.Path))
} }
@ -2385,9 +2385,9 @@ func (config *Config) appendQMPSockets() {
qmpParams := append([]string{}, fmt.Sprintf("%s:", q.Type)) qmpParams := append([]string{}, fmt.Sprintf("%s:", q.Type))
qmpParams = append(qmpParams, q.Name) qmpParams = append(qmpParams, q.Name)
if q.Server { if q.Server {
qmpParams = append(qmpParams, ",server") qmpParams = append(qmpParams, ",server=on")
if q.NoWait { if q.NoWait {
qmpParams = append(qmpParams, ",nowait") qmpParams = append(qmpParams, ",wait=off")
} }
} }

6
qemu/qemu_test.go
View File

@ -288,7 +288,7 @@ func TestAppendDeviceSerial(t *testing.T) {
testAppend(sdev, deviceSerialString, t) testAppend(sdev, deviceSerialString, t)
} }
var deviceSerialPortString = "-device virtserialport,chardev=char0,id=channel0,name=channel.0 -chardev socket,id=char0,path=/tmp/char.sock,server,nowait" var deviceSerialPortString = "-device virtserialport,chardev=char0,id=channel0,name=channel.0 -chardev socket,id=char0,path=/tmp/char.sock,server=on,wait=off"
func TestAppendDeviceSerialPort(t *testing.T) { func TestAppendDeviceSerialPort(t *testing.T) {
chardev := CharDevice{ chardev := CharDevice{
@ -741,7 +741,7 @@ func TestFailToAppendCPUs(t *testing.T) {
} }
} }
var qmpSingleSocketServerString = "-qmp unix:cc-qmp,server,nowait" var qmpSingleSocketServerString = "-qmp unix:cc-qmp,server=on,wait=off"
var qmpSingleSocketString = "-qmp unix:cc-qmp" var qmpSingleSocketString = "-qmp unix:cc-qmp"
func TestAppendSingleQMPSocketServer(t *testing.T) { func TestAppendSingleQMPSocketServer(t *testing.T) {
@ -765,7 +765,7 @@ func TestAppendSingleQMPSocket(t *testing.T) {
testAppend(qmp, qmpSingleSocketString, t) testAppend(qmp, qmpSingleSocketString, t)
} }
var qmpSocketServerString = "-qmp unix:cc-qmp-1,server,nowait -qmp unix:cc-qmp-2,server,nowait" var qmpSocketServerString = "-qmp unix:cc-qmp-1,server=on,wait=off -qmp unix:cc-qmp-2,server=on,wait=off"
func TestAppendQMPSocketServer(t *testing.T) { func TestAppendQMPSocketServer(t *testing.T) {
qmp := []QMPSocket{ qmp := []QMPSocket{