75a234904f
This change adds the necessary files for the qemu package to be built for Debian. This review follows the same approach used on the virt/libvirt [1]. The base version selected comes from the Debian archive [2] since the salsa-debian [3] version was not fully compatible with stx build tools. The full upstream build was quite long (time) and big (size) so we patched the Debian files with debian_patches to drop unnecessary packages, that is, packages that starlingx does not need. The patches dir will contain source code patches required for stx-qemu, that is, the code that was earlier added on top of 3.0.0 qemu release to add StarlingX required functionalities. The work done on this change is simply porting the code changes, copying it and doing the minimum required updates when it is needed. The list of commits follow, where the "-" character indicates that the commit was dropped now that we are based on 5.2: d3400d STX: virtio-serial: don't touch virtqueue if vm is stopped 71dc08 STX: Modify live migration auto-converge threshold 9be81b STX: Suspend/Resume for VMs with PCIPT+Virtio 876a3c STX: realtime uses mlock instead of mlockall 007444 STX: qemu dpdk custom config 3f6344 STX: add libdl dbda73 STX: qemu: add compile define for CONFIG_DPDK 626bfd STX: qemu: add -enable-dpdk runtime flag 79ea26 STX: qemu dpdk changes for openvswitch dpdk 9c83db STX: migration thread affinity and priority qmp e7fbe5 STX: Add support statement to -help output -48de9c STX: Changes for running on CentOS -32b6f0 Upstream: Workaround: make sure vdev->vq[i].inuse never goes below 0 -246b26 virtio: Return true from virtio_queue_empty if broken [1] https://review.opendev.org/c/starlingx/integ/+/863561 [2] https://snapshot.debian.org/archive/debian/20221109T211529Z/pool/main/q/qemu/ [3] https://salsa.debian.org/qemu-team/qemu/-/tree/debian-bullseye Test Plan: PASS: Build the qemu packages PASS: Build iso with qemu packages PASS: Bootstrap Debian ISO on AIO-SX PASS: Ensure qemu packages are installed (apt list --installed) PASS: Lock/Unlock AIO-SX * * Future tests regarding the libvirt/qemu runtime features will be done once all the pieces are in place in the ISO. Depends-On: https://review.opendev.org/c/starlingx/root/+/864942 Story: 2010317 Task: 46390 Signed-off-by: Rafael Falcao <rafael.vieirafalcao@windriver.com> Co-Authored-by: Thales Elero Cervi <thaleselero.cervi@windriver.com> Change-Id: I424debf7eb24c024ba82a490cda746dbd5af0019
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 80c5f13e549cb59adc781335c4d6a8f81f578615 Mon Sep 17 00:00:00 2001
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Fri, 26 Apr 2019 17:41:04 -0300
|
|
Subject: [PATCH] STX: virtio-serial: don't touch virtqueue if vm is stopped
|
|
Candidate for upstreaming.
|
|
|
|
During migration there is a window where virtio-serial
|
|
data has been transmitted to the receiving side, but
|
|
the region caches haven't been initialized there yet.
|
|
This causes an assertion fail crash.
|
|
|
|
The fix is inspired by:
|
|
|
|
70e53e6 virtio-net: don't touch virtqueue if vm is stopped
|
|
|
|
We remove the call to virtio_queue_ready as it is covered
|
|
by the call to virtio_queue_empty already, and replace it
|
|
with a test to ensure that the vm is running.
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
[ Trimmed the shortlog ]
|
|
Signed-off-by: Rafael Falcao <Rafael.VieiraFalcao@windriver.com>
|
|
---
|
|
hw/char/virtio-serial-bus.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
|
|
index cf08ef9728..9b4b258413 100644
|
|
--- a/hw/char/virtio-serial-bus.c
|
|
+++ b/hw/char/virtio-serial-bus.c
|
|
@@ -311,7 +311,7 @@ size_t virtio_serial_guest_ready(VirtIOSerialPort *port)
|
|
VirtQueue *vq = port->ivq;
|
|
unsigned int bytes;
|
|
|
|
- if (!virtio_queue_ready(vq) ||
|
|
+ if (!vdev->vm_running ||
|
|
!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) ||
|
|
virtio_queue_empty(vq)) {
|
|
return 0;
|
|
--
|
|
2.25.1
|