[PATCH virtme-docker 1/3] change watchdog to device

Geliang Tang posted 3 patches 8 months, 3 weeks ago
[PATCH virtme-docker 1/3] change watchdog to device
Posted by Geliang Tang 8 months, 3 weeks ago
This patch should be merged into virtme repo:

'''
architectures: use qemu -device option

Use qemu '-device' option instead of '-watchdog' to fix this error in
Ubuntu 23.04:

  qemu-system-x86_64: -watchdog: invalid option

         ret = Arch.qemuargs(is_native)

         # Add a watchdog.  This is useful for testing.
-        ret.extend(['-watchdog', 'i6300esb'])
+        ret.extend(['-device', 'i6300esb'])

         if is_native and os.access('/dev/kvm', os.R_OK):
             # If we're likely to use KVM, request a full-featured CPU.
'''

Signed-off-by: Geliang Tang <geliang@kernel.org>
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bf7f733..cf8c692 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,8 @@ ARG VIRTME_GIT_SHA="a680c0861cf6f9dc6a8a821e9e58ae43c5e68435"
 RUN cd /opt && \
 	git clone "${VIRTME_GIT_URL}" && \
 	cd virtme && \
-		git checkout "${VIRTME_GIT_SHA}"
+		git checkout "${VIRTME_GIT_SHA}" && \
+		sed -i 's/-watchdog/-device/g' virtme/architectures.py
 
 # byobu (not to have a dep to iproute2)
 ARG BYOBU_URL="https://launchpad.net/byobu/trunk/5.133/+download/byobu_5.133.orig.tar.gz"
-- 
2.40.1