From 27b25d037e3a48fddbcbad254bfad245f1e296de Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Mon, 19 Oct 2020 14:18:40 +0200 Subject: [PATCH] config_to_command: use -no-shutdown option Ignore shutdowns triggered from within the guest in favor of detecting them via qmeventd and stopping the QEMU process that way. Signed-off-by: Stefan Reiter --- PVE/QemuServer.pm | 2 ++ test/cfg2cmd/bootorder-empty.conf.cmd | 1 + test/cfg2cmd/bootorder-legacy.conf.cmd | 1 + test/cfg2cmd/bootorder.conf.cmd | 1 + test/cfg2cmd/custom-cpu-model-defaults.conf.cmd | 1 + test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd | 1 + test/cfg2cmd/custom-cpu-model.conf.cmd | 1 + test/cfg2cmd/efi-raw-old.conf.cmd | 1 + test/cfg2cmd/efi-raw.conf.cmd | 1 + test/cfg2cmd/i440fx-win10-hostpci.conf.cmd | 1 + test/cfg2cmd/minimal-defaults.conf.cmd | 1 + test/cfg2cmd/netdev.conf.cmd | 1 + test/cfg2cmd/pinned-version.conf.cmd | 1 + test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd | 1 + test/cfg2cmd/q35-linux-hostpci.conf.cmd | 1 + test/cfg2cmd/q35-win10-hostpci.conf.cmd | 1 + test/cfg2cmd/simple-virtio-blk.conf.cmd | 1 + test/cfg2cmd/simple1.conf.cmd | 1 + test/cfg2cmd/spice-enhancments.conf.cmd | 1 + test/cfg2cmd/spice-linux-4.1.conf.cmd | 1 + test/cfg2cmd/spice-usb3.conf.cmd | 1 + test/cfg2cmd/spice-win.conf.cmd | 1 + 22 files changed, 23 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index fb68ce5..3d59703 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3087,6 +3087,8 @@ sub config_to_command { push @$cmd, '-name', $vmname; + push @$cmd, '-no-shutdown'; + my $use_virtio = 0; my $qmpsocket = PVE::QemuServer::Helpers::qmp_socket($vmid); diff --git a/test/cfg2cmd/bootorder-empty.conf.cmd b/test/cfg2cmd/bootorder-empty.conf.cmd index 1f2b2fb..066b0b7 100644 --- a/test/cfg2cmd/bootorder-empty.conf.cmd +++ b/test/cfg2cmd/bootorder-empty.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name simple \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/bootorder-legacy.conf.cmd b/test/cfg2cmd/bootorder-legacy.conf.cmd index f624ea2..fd49088 100644 --- a/test/cfg2cmd/bootorder-legacy.conf.cmd +++ b/test/cfg2cmd/bootorder-legacy.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name simple \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/bootorder.conf.cmd b/test/cfg2cmd/bootorder.conf.cmd index 86cae07..4cb81dc 100644 --- a/test/cfg2cmd/bootorder.conf.cmd +++ b/test/cfg2cmd/bootorder.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name simple \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd index ca8fcb0..084b397 100644 --- a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name customcpu-defaults \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd index fb6e8c8..ea5dfc8 100644 --- a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name customcpu \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/custom-cpu-model.conf.cmd b/test/cfg2cmd/custom-cpu-model.conf.cmd index b30163c..7ad2e9b 100644 --- a/test/cfg2cmd/custom-cpu-model.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name customcpu \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/efi-raw-old.conf.cmd b/test/cfg2cmd/efi-raw-old.conf.cmd index 666cdb1..f6c38d4 100644 --- a/test/cfg2cmd/efi-raw-old.conf.cmd +++ b/test/cfg2cmd/efi-raw-old.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/efi-raw.conf.cmd b/test/cfg2cmd/efi-raw.conf.cmd index cb0e984..edaf1be 100644 --- a/test/cfg2cmd/efi-raw.conf.cmd +++ b/test/cfg2cmd/efi-raw.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd index 2fe34a1..a9c2720 100644 --- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd +++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/minimal-defaults.conf.cmd b/test/cfg2cmd/minimal-defaults.conf.cmd index 0735f43..304121f 100644 --- a/test/cfg2cmd/minimal-defaults.conf.cmd +++ b/test/cfg2cmd/minimal-defaults.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/netdev.conf.cmd b/test/cfg2cmd/netdev.conf.cmd index 4294fa0..91c6148 100644 --- a/test/cfg2cmd/netdev.conf.cmd +++ b/test/cfg2cmd/netdev.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name netdev \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/pinned-version.conf.cmd b/test/cfg2cmd/pinned-version.conf.cmd index a7d0ae2..cef2e8d 100644 --- a/test/cfg2cmd/pinned-version.conf.cmd +++ b/test/cfg2cmd/pinned-version.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name pinned \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd index a008939..cfef54d 100644 --- a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd +++ b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/test/cfg2cmd/q35-linux-hostpci.conf.cmd index 7e829ae..14112ca 100644 --- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd +++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd index 133c086..4572348 100644 --- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd +++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/simple-virtio-blk.conf.cmd b/test/cfg2cmd/simple-virtio-blk.conf.cmd index 6933edf..4b94d65 100644 --- a/test/cfg2cmd/simple-virtio-blk.conf.cmd +++ b/test/cfg2cmd/simple-virtio-blk.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name simple \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/simple1.conf.cmd b/test/cfg2cmd/simple1.conf.cmd index 3485064..87a70cc 100644 --- a/test/cfg2cmd/simple1.conf.cmd +++ b/test/cfg2cmd/simple1.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name simple \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/spice-enhancments.conf.cmd b/test/cfg2cmd/spice-enhancments.conf.cmd index 3951c06..838a65a 100644 --- a/test/cfg2cmd/spice-enhancments.conf.cmd +++ b/test/cfg2cmd/spice-enhancments.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name vm8006 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/spice-linux-4.1.conf.cmd b/test/cfg2cmd/spice-linux-4.1.conf.cmd index 2748cc9..1d308c0 100644 --- a/test/cfg2cmd/spice-linux-4.1.conf.cmd +++ b/test/cfg2cmd/spice-linux-4.1.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name spicelinux \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/test/cfg2cmd/spice-usb3.conf.cmd index c515644..578e2e5 100644 --- a/test/cfg2cmd/spice-usb3.conf.cmd +++ b/test/cfg2cmd/spice-usb3.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name spiceusb3 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ diff --git a/test/cfg2cmd/spice-win.conf.cmd b/test/cfg2cmd/spice-win.conf.cmd index 22dfa9d..78e3c5e 100644 --- a/test/cfg2cmd/spice-win.conf.cmd +++ b/test/cfg2cmd/spice-win.conf.cmd @@ -1,6 +1,7 @@ /usr/bin/kvm \ -id 8006 \ -name spiceusb3 \ + -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server,nowait' \ -mon 'chardev=qmp,mode=control' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ -- 2.39.2