Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

vc: Add some defaultQemuMachineOptions for qemu 4.0#1772

Merged
devimc merged 1 commit intokata-containers:masterfrom
nitkon:qemu4.0
Jun 6, 2019
Merged

vc: Add some defaultQemuMachineOptions for qemu 4.0#1772
devimc merged 1 commit intokata-containers:masterfrom
nitkon:qemu4.0

Conversation

@nitkon
Copy link
Copy Markdown
Contributor

@nitkon nitkon commented Jun 6, 2019

We need to add a few extra defaultQemuMachineOptions
for ppc64le for kata to work with qemu 4.0 version.

Fixes: #1771

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com

@nitkon
vc: Add some defaultQemuMachineOptions for qemu 4.0
726720d 
We need to add a few extra defaultQemuMachineOptions
for ppc64le for kata to work with  qemu 4.0 version.

Fixes: kata-containers#1771

Signed-off-by: Nitesh Konkar niteshkonkar@in.ibm.com
@nitkon
Copy link
Copy Markdown
Contributor Author

nitkon commented Jun 6, 2019

/test

@nitkon nitkon mentioned this pull request Jun 6, 2019
Merged
@codecov
Copy link
Copy Markdown

codecov bot commented Jun 6, 2019

Codecov Report

Merging #1772 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1772   +/-   ##
=======================================
  Coverage   53.96%   53.96%           
=======================================
  Files         106      106           
  Lines       13174    13174           
=======================================
  Hits         7110     7110           
  Misses       5215     5215           
  Partials      849      849

jodh-intel
jodh-intel reviewed Jun 6, 2019
View reviewed changes
virtcontainers/qemu_ppc64le.go
const defaultQemuMachineType = QemuPseries

const defaultQemuMachineOptions = "accel=kvm,usb=off"
const defaultQemuMachineOptions = "accel=kvm,usb=off,cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken"
Copy link
Copy Markdown

@jodh-intel jodh-intel Jun 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you confirm that these new options will still work with the older version of qemu?

Copy link
Copy Markdown
Contributor Author

@nitkon nitkon Jun 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked locally and it seems to be working.

root     49527 23.4  0.5 2670976 355584 ?      SLl  15:43   0:05 /usr/bin/qemu-system-ppc64 -name sandbox-6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55 -uuid 1141e5b2-1ab8-41a3-8cb9-60a77816bc7e -machine pseries,accel=kvm,usb=off,cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken -cpu host -qmp unix:/run/vc/vm/6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55/qmp.sock,server,nowait -m 2048M,slots=10,maxmem=33280M -device pci-bridge,bus=pci.0,id=pci-bridge-0,chassis_nr=1,shpc=on,addr=2,romfile= -device virtio-serial-pci,disable-modern=false,id=serial0,romfile= -device virtconsole,chardev=charconsole0,id=console0 -chardev socket,id=charconsole0,path=/run/vc/vm/6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55/console.sock,server,nowait -device virtio-scsi-pci,id=scsi0,disable-modern=false,romfile= -object rng-random,id=rng0,filename=/dev/urandom -device virtio-rng,rng=rng0,romfile= -device virtserialport,chardev=charch0,id=channel0,name=agent.channel.0 -chardev socket,id=charch0,path=/run/vc/vm/6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55/kata.sock,server,nowait -device virtio-9p-pci,disable-modern=false,fsdev=extra-9p-kataShared,mount_tag=kataShared,romfile= -fsdev local,id=extra-9p-kataShared,path=/run/kata-containers/shared/sandboxes/6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55,security_model=none -netdev tap,id=network-0,vhost=on,vhostfds=3,fds=4 -device driver=virtio-net-pci,netdev=network-0,mac=02:42:ac:11:00:02,disable-modern=false,mq=on,vectors=4,romfile= -global kvm-pit.lost_tick_policy=discard -vga none -no-user-config -nodefaults -nographic -daemonize -kernel /usr/share/kata-containers/vmlinux.container -initrd /usr/share/kata-containers/kata-containers-initrd.img -append tsc=reliable no_timer_check rcupdate.rcu_expedited=1 noreplace-smp reboot=k console=hvc0 console=hvc1 cryptomgr.notests net.ifnames=0 quiet panic=1 nr_cpus=10 agent.use_vsock=false -pidfile /run/vc/vm/6aa89a1b2225848c2254b6241f1b304dd88865f6bb65cd14d278f252e0c82e55/pid -smp 1,cores=1,threads=1,sockets=10,maxcpus=10

root@kata1:/home/nitesh/split_patch/src/github.com/kata-containers/runtime#  /usr/bin/qemu-system-ppc64 --version
QEMU emulator version 2.11.2 (v2.11.2-dirty)
Copyright (c) 2003-2017 Fabrice Bellard and the QEMU Project developers

@nitkon
Copy link
Copy Markdown
Contributor Author

nitkon commented Jun 6, 2019

/test-power

devimc
devimc approved these changes Jun 6, 2019
View reviewed changes
Copy link
Copy Markdown

@devimc devimc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @nitkon

@devimc
Copy link
Copy Markdown

devimc commented Jun 6, 2019

power8 is failing because network issues, nothing related to this pr, @nitkon should we merge it?

Stderr: 
Running command '/usr/bin/docker [docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]'
command failed error 'exit status 139'
[docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]
Timeout: 900 seconds
Exit Code: 139
Stdout: 
Stderr: 
Running command '/usr/bin/docker [docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]'
command failed error 'exit status 139'
[docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]
Timeout: 900 seconds
Exit Code: 139
Stdout: 
Stderr: 
Running command '/usr/bin/docker [docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]'
command failed error 'exit status 139'
[docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]
Timeout: 900 seconds
Exit Code: 139
Stdout: 
Stderr: 
Running command '/usr/bin/docker [docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]'
command failed error 'exit status 139'
[docker exec SGLy9e6biy0XAV712ctm0pBAxOvbU1 dnf -y update]
Timeout: 900 seconds
Exit Code: 139
Stdout: 
Stderr: 
Running command '/usr/bin/docker [docker ps -a -f name=SGLy9e6biy0XAV712ctm0pBAxOvbU1 --format {{.Status}}]'
[docker ps -a -f name=SGLy9e6biy0XAV712ctm0pBAxOvbU1 --format {{.Status}}]
Timeout: 120 seconds
Exit Code: 0
Stdout: Up 50 seconds

Stderr: 

• Failure [55.812 seconds]
[Serial Test] package manager update test
/home/jenkins/workspace/kata-containers-runtime-Power8-ubuntu-16-04-PR-initrd/go/src/github.com/kata-containers/tests/integration/docker/package_manager_test.go:32
  check dnf update
  /home/jenkins/workspace/kata-containers-runtime-Power8-ubuntu-16-04-PR-initrd/go/src/github.com/kata-containers/tests/integration/docker/package_manager_test.go:70
    should not fail [It]
    /home/jenkins/workspace/kata-containers-runtime-Power8-ubuntu-16-04-PR-initrd/go/src/github.com/kata-containers/tests/integration/docker/package_manager_test.go:71

    Expected
        <int>: 139
    to be zero-valued

    /home/jenkins/workspace/kata-containers-runtime-Power8-ubuntu-16-04-PR-initrd/go/src/github.com/kata-containers/tests/integration/docker/package_manager_test.go:82
------------------------------

@nitkon
Copy link
Copy Markdown
Contributor Author

nitkon commented Jun 6, 2019

@devimc: I am ok to merge. Looks like a network issue ...

@devimc
Copy link
Copy Markdown

devimc commented Jun 6, 2019

@nitkon ok, thanks

@devimc devimc merged commit 7885e75 into kata-containers:master Jun 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

3 more reviewers

@jodh-intel jodh-intel jodh-intel left review comments

@devimc devimc devimc approved these changes

@GabyCT GabyCT GabyCT approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

power8 CI fails with QEMU 4

4 participants

@nitkon @devimc @jodh-intel @GabyCT