diff options
| author |   Matej Klotton <mklotton@cisco.com> | 2017-02-17 13:18:43 +0100 |
|---|---|---|
| committer | Matej Klotton <mklotton@cisco.com> | 2017-02-23 09:40:46 +0100 |
| commit | 8c465631f6029b174e6d2549e1305b5b4cb8b8de (patch) | |
| tree | 6cee8cc79889c361dd006c24416a8abf492d2053 /resources/tools/disk-image-builder/nested/image-patches | |
| parent | c5b285aebcfc93dcccf3285abbde672cf000e3cc (diff) | |
QemuUtil lib change to work with ubuntu and centos
- replace nc to socat for comunicating with qemu QGA
- change disk type to use virtio driver
- add check to bind only network interface for testpmd
Change-Id: I19ab16cbd8fec1ec78263ccfb1309a144e5af845
Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'resources/tools/disk-image-builder/nested/image-patches')
| -rwxr-xr-x | resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support | 11 | ||||
| -rw-r--r-- | resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support b/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support index 5990f0925b..2de4ad6962 100755 --- a/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support +++ b/resources/tools/disk-image-builder/nested/image-patches/06-dpdk-support @@ -46,10 +46,13 @@ echo 1af4 1000 > /sys/bus/pci/drivers/${TARGET_DRIVER}/new_id # for dev in $(find /sys/bus/pci/drivers/virtio-pci -type l -name '*:*:*.*' | sed -e 's/.*\///') do - echo Unbinding $dev from virtio-pci - echo $dev > /sys/bus/pci/drivers/virtio-pci/unbind - echo Binding $dev to ${TARGET_DRIVER} - echo $dev > /sys/bus/pci/drivers/${TARGET_DRIVER}/bind + class=$(cat /sys/bus/pci/drivers/virtio-pci/${dev}/class) + if [ "$class" = "0x020000" ]; then + echo Unbinding $dev from virtio-pci + echo $dev > /sys/bus/pci/drivers/virtio-pci/unbind + echo Binding $dev to ${TARGET_DRIVER} + echo $dev > /sys/bus/pci/drivers/${TARGET_DRIVER}/bind + fi done # RCU and IRQ affinity diff --git a/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk new file mode 100644 index 0000000000..5ef2782d52 --- /dev/null +++ b/resources/tools/disk-image-builder/nested/image-patches/08-virtio-disk @@ -0,0 +1,8 @@ +#!/bin/sh + +patch boot/grub/menu.lst <<"_EOF" +17c17 +< kernel /boot/bzImage rw root=/dev/sda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable +--- +> kernel /boot/bzImage rw root=/dev/vda1 ipv6.disable=1 console=ttyS0,115200n8 isolcpus=1,2,3,4 nohz_full=1,2,3,4 rcu_nocbs=1,2,3,4 intel_pstate=disable noapic +_EOF |