From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C8304609D4 for ; Thu, 3 Sep 2020 10:59:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1E1016E71 for ; Thu, 3 Sep 2020 10:59:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9507C16E08 for ; Thu, 3 Sep 2020 10:59:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5DB6E449EA for ; Thu, 3 Sep 2020 10:59:04 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Thu, 3 Sep 2020 10:58:49 +0200 Message-Id: <20200903085851.5073-6-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200903085851.5073-1-s.reiter@proxmox.com> References: <20200903085851.5073-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.052 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server 5/7] config_to_command: use -no-shutdown option X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Sep 2020 08:59:09 -0000 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/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 + 19 files changed, 20 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 2747c66..a5ff16f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3027,6 +3027,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/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.20.1