kata-deploy: QEMU, for 2.x, already includes virtiofs

There's no reason to ship qemu & qemu-virtiofs when the former already
includes vitiofs support (and that's the default for 2.x deployments).

In case we will enable experimental qemu DAX support, we should add a
new target, a "qemu-experimental" target, as Carlos has been working on.

Fixes: #1424

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio
2021-02-18 11:59:15 +01:00
parent 657bd789a3
commit f21c54a985
15 changed files with 7 additions and 334 deletions

View File

@@ -147,13 +147,6 @@ install_qemu() {
kata_version="${kata_version}" "${pkg_root_dir}/static-build/qemu/build-static-qemu.sh"
}
# Install static qemu-virtiofsd asset
install_qemu_virtiofsd() {
kata_version=${1:-$kata_version}
info "build static qemu-virtiofs"
kata_version="${kata_version}" "${pkg_root_dir}/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh"
}
# Install static firecracker asset
install_firecracker() {
kata_version=${1:-$kata_version}
@@ -211,8 +204,6 @@ install_kata_components() {
untar_qemu_binaries() {
info "Install static qemu"
tar xf kata-static-qemu.tar.gz -C "${destdir}"
info "Install static qemu-virtiofs"
tar xf kata-static-qemu-virtiofsd.tar.gz -C "${destdir}"
}
main() {
@@ -242,7 +233,6 @@ main() {
install_kernel
install_clh
install_qemu
install_qemu_virtiofsd
install_firecracker
install_image