f08c85737a
As we add kata container support for StarlingX
with the latest kata containers stable version 3.1.3.
We need to upgrade qemu to 7.2.0 version to make them
compatible.
Test plan:
PASS - Build qemu package.
PASS - Build /install image on AIO-SX.
PASS - Verify the package is installed in the system.
PASS - Verify the qemu-utils correctly installed by
running qemi-image -V
PASS - Verify the qemu x86_64 correctly installed by
running qemu-system-x86_64 --version
PASS - Verify stx-openstack works correctly with sanity
and regression tests.
PASS - Verify that the kata-runtime check command print
system is capable of running kata containers.
PASS - Verify that kubectl could create pod with kata
containers runtime, and pod start successfully.
Story: 2010781
Task: 48183
Change-Id: Ie9fba13999023e3dce37c620864710707bc679ed
Signed-off-by: David Liu <david.liu@windriver.com>
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
From 6b809649650c367ea0458928434600ca064206c1 Mon Sep 17 00:00:00 2001
|
|
From: Paul Barrette <paul.barrette@windriver.com>
|
|
Date: Fri, 26 Apr 2019 17:41:04 -0300
|
|
Subject: [PATCH] STX: qemu: add -enable-dpdk runtime flag
|
|
|
|
For Intel's dpdk openvswitch support, qemu takes a set of dpdk
|
|
specific command line args. Qemu will dump and error if it doesn't
|
|
recognize the CLI args. So, add a new runtime flag to tell qemu that
|
|
it is using dpdk and then the main function can take the appropriate
|
|
action. This way, qemu can take dpdk args or run normally without
|
|
dpdk.
|
|
|
|
Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
[ Update qemu-options.hx struc ]
|
|
Signed-off-by: Rafael Falcao <Rafael.VieiraFalcao@windriver.com>
|
|
[Rebased original changes to the qemu 7.2 version]
|
|
Signed-off-by: david.liu <david.liu@windriver.com>
|
|
---
|
|
qemu-options.hx | 7 +++++++
|
|
softmmu/vl.c | 1 +
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
index 7f99d15b..fd6a45f1 100644
|
|
--- a/qemu-options.hx
|
|
+++ b/qemu-options.hx
|
|
@@ -1147,6 +1147,13 @@ backend describes how QEMU handles the data.
|
|
|
|
ERST
|
|
|
|
+DEF("enable-dpdk", 0, QEMU_OPTION_enable_dpdk,
|
|
+ "-enable-dpdk initialized DPDK EAL environment\n", QEMU_ARCH_ALL)
|
|
+SRST
|
|
+``-enable-dpdk``
|
|
+ Enable DPDK EAL environment at init time (expecting DPDK CLI params).
|
|
+ERST
|
|
+
|
|
DEF("fda", HAS_ARG, QEMU_OPTION_fda,
|
|
"-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
|
|
DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
|
|
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
|
index 6c68f123..95fd30aa 100644
|
|
--- a/softmmu/vl.c
|
|
+++ b/softmmu/vl.c
|
|
@@ -3552,6 +3552,7 @@ void qemu_init(int argc, char **argv)
|
|
qsp_enable();
|
|
break;
|
|
case QEMU_OPTION_nouserconfig:
|
|
+ case QEMU_OPTION_enable_dpdk:
|
|
/* Nothing to be parsed here. Especially, do not error out below. */
|
|
break;
|
|
default:
|
|
--
|
|
2.30.2
|
|
|