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 396219AF56 for ; Wed, 24 May 2023 12:54:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C32751D332 for ; Wed, 24 May 2023 12:54:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Wed, 24 May 2023 12:54:10 +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 C0C6246D67 for ; Wed, 24 May 2023 12:54:09 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 24 May 2023 12:54:01 +0200 Message-Id: <20230524105403.98049-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230524105403.98049-1-f.ebner@proxmox.com> References: <20230524105403.98049-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [RFC qemu-server 2/2] cfg2cmd: drop custom id parameter 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: Wed, 24 May 2023 10:54:44 -0000 Since the last commit, none of our tools should rely on it anymore. The id argument is a Proxmox-specific extension to QEMU, which can be dropped after this change to reduce our differences with upstream QEMU. Signed-off-by: Fiona Ebner --- 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/cputype-icelake-client-deprecation.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-template.conf.cmd | 1 - test/cfg2cmd/efi-raw.conf.cmd | 1 - test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 1 - test/cfg2cmd/efi-secboot-and-tpm.conf.cmd | 1 - test/cfg2cmd/efidisk-on-rbd.conf.cmd | 1 - test/cfg2cmd/i440fx-win10-hostpci.conf.cmd | 1 - test/cfg2cmd/memory-hotplug-hugepages.conf.cmd | 1 - test/cfg2cmd/memory-hotplug.conf.cmd | 1 - test/cfg2cmd/memory-hugepages-1g.conf.cmd | 1 - test/cfg2cmd/memory-hugepages-2m.conf.cmd | 1 - test/cfg2cmd/minimal-defaults.conf.cmd | 1 - test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd | 1 - test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd | 1 - test/cfg2cmd/netdev-7.1.conf.cmd | 1 - test/cfg2cmd/netdev.conf.cmd | 1 - test/cfg2cmd/pinned-version-pxe-pve.conf.cmd | 1 - test/cfg2cmd/pinned-version-pxe.conf.cmd | 1 - test/cfg2cmd/pinned-version.conf.cmd | 1 - test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd | 1 - test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd | 1 - test/cfg2cmd/q35-linux-hostpci.conf.cmd | 1 - test/cfg2cmd/q35-simple-6.0.conf.cmd | 1 - test/cfg2cmd/q35-simple-7.0.conf.cmd | 1 - test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd | 1 - test/cfg2cmd/q35-simple.conf.cmd | 1 - test/cfg2cmd/q35-usb2.conf.cmd | 1 - test/cfg2cmd/q35-usb3.conf.cmd | 1 - test/cfg2cmd/q35-win10-hostpci.conf.cmd | 1 - test/cfg2cmd/qemu-xhci-7.1.conf.cmd | 1 - test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd | 1 - test/cfg2cmd/seabios_serial.conf.cmd | 1 - test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd | 1 - test/cfg2cmd/simple-btrfs.conf.cmd | 1 - test/cfg2cmd/simple-virtio-blk.conf.cmd | 1 - test/cfg2cmd/simple1-template.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 - 49 files changed, 50 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index ab33aa37..8b88bead 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3663,8 +3663,6 @@ sub config_to_command { push @$cmd, $kvm_binary; - push @$cmd, '-id', $vmid; - my $vmname = $conf->{name} || "vm$vmid"; push @$cmd, '-name', "$vmname,debug-threads=on"; diff --git a/test/cfg2cmd/bootorder-empty.conf.cmd b/test/cfg2cmd/bootorder-empty.conf.cmd index 855c6e2d..84f99d97 100644 --- a/test/cfg2cmd/bootorder-empty.conf.cmd +++ b/test/cfg2cmd/bootorder-empty.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/bootorder-legacy.conf.cmd b/test/cfg2cmd/bootorder-legacy.conf.cmd index 2320abb6..0168ae38 100644 --- a/test/cfg2cmd/bootorder-legacy.conf.cmd +++ b/test/cfg2cmd/bootorder-legacy.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/bootorder.conf.cmd b/test/cfg2cmd/bootorder.conf.cmd index 8ba36dce..bfdd05ed 100644 --- a/test/cfg2cmd/bootorder.conf.cmd +++ b/test/cfg2cmd/bootorder.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd b/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd index bf084432..244c8690 100644 --- a/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd +++ b/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd index 15b31fb0..cf3cc4af 100644 --- a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'customcpu-defaults,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ 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 98230248..4b8373f6 100644 --- a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'customcpu,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/custom-cpu-model.conf.cmd b/test/cfg2cmd/custom-cpu-model.conf.cmd index 2e66a6b5..db8e3d9d 100644 --- a/test/cfg2cmd/custom-cpu-model.conf.cmd +++ b/test/cfg2cmd/custom-cpu-model.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'customcpu,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efi-raw-old.conf.cmd b/test/cfg2cmd/efi-raw-old.conf.cmd index dfd381d0..3d922b5a 100644 --- a/test/cfg2cmd/efi-raw-old.conf.cmd +++ b/test/cfg2cmd/efi-raw-old.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efi-raw-template.conf.cmd b/test/cfg2cmd/efi-raw-template.conf.cmd index b1d4d1f6..e2d49eba 100644 --- a/test/cfg2cmd/efi-raw-template.conf.cmd +++ b/test/cfg2cmd/efi-raw-template.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efi-raw.conf.cmd b/test/cfg2cmd/efi-raw.conf.cmd index cf9804bc..09dce548 100644 --- a/test/cfg2cmd/efi-raw.conf.cmd +++ b/test/cfg2cmd/efi-raw.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd index 911ead05..320b7fa1 100644 --- a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd +++ b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd index 68a85ea0..da312ddd 100644 --- a/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd +++ b/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/test/cfg2cmd/efidisk-on-rbd.conf.cmd index 4d47586d..95f4a995 100644 --- a/test/cfg2cmd/efidisk-on-rbd.conf.cmd +++ b/test/cfg2cmd/efidisk-on-rbd.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd index 89834e34..36b76c1a 100644 --- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd +++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd b/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd index 6d4d8e84..7b396984 100644 --- a/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd +++ b/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/memory-hotplug.conf.cmd b/test/cfg2cmd/memory-hotplug.conf.cmd index 2da7955e..3e6b04be 100644 --- a/test/cfg2cmd/memory-hotplug.conf.cmd +++ b/test/cfg2cmd/memory-hotplug.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/memory-hugepages-1g.conf.cmd b/test/cfg2cmd/memory-hugepages-1g.conf.cmd index 63792d27..0bee4b4f 100644 --- a/test/cfg2cmd/memory-hugepages-1g.conf.cmd +++ b/test/cfg2cmd/memory-hugepages-1g.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/memory-hugepages-2m.conf.cmd b/test/cfg2cmd/memory-hugepages-2m.conf.cmd index 287c0eda..057300fc 100644 --- a/test/cfg2cmd/memory-hugepages-2m.conf.cmd +++ b/test/cfg2cmd/memory-hugepages-2m.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/minimal-defaults.conf.cmd b/test/cfg2cmd/minimal-defaults.conf.cmd index 8da69fee..f72a047f 100644 --- a/test/cfg2cmd/minimal-defaults.conf.cmd +++ b/test/cfg2cmd/minimal-defaults.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd index 6892de34..a9caaabe 100644 --- a/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd +++ b/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'netdev-multiq,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd b/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd index d7532bd3..b044483e 100644 --- a/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd +++ b/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'netdev,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/netdev-7.1.conf.cmd b/test/cfg2cmd/netdev-7.1.conf.cmd index 6f9c1776..63f23e52 100644 --- a/test/cfg2cmd/netdev-7.1.conf.cmd +++ b/test/cfg2cmd/netdev-7.1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'netdev,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/netdev.conf.cmd b/test/cfg2cmd/netdev.conf.cmd index 3ae60753..a5909492 100644 --- a/test/cfg2cmd/netdev.conf.cmd +++ b/test/cfg2cmd/netdev.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'netdev,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd index d17d4deb..9e2791fc 100644 --- a/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd +++ b/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'pinned,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/pinned-version-pxe.conf.cmd b/test/cfg2cmd/pinned-version-pxe.conf.cmd index 892fc148..c1a95bc7 100644 --- a/test/cfg2cmd/pinned-version-pxe.conf.cmd +++ b/test/cfg2cmd/pinned-version-pxe.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'pinned,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/pinned-version.conf.cmd b/test/cfg2cmd/pinned-version.conf.cmd index 13361edf..c00c1cef 100644 --- a/test/cfg2cmd/pinned-version.conf.cmd +++ b/test/cfg2cmd/pinned-version.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'pinned,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd index 5b7b3e4b..092feb04 100644 --- a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd +++ b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd index 6507703d..3e8d2976 100644 --- a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd +++ b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/test/cfg2cmd/q35-linux-hostpci.conf.cmd index 0774047d..9258d3a6 100644 --- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd +++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-simple-6.0.conf.cmd b/test/cfg2cmd/q35-simple-6.0.conf.cmd index 789c2408..949b695e 100644 --- a/test/cfg2cmd/q35-simple-6.0.conf.cmd +++ b/test/cfg2cmd/q35-simple-6.0.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-simple-7.0.conf.cmd b/test/cfg2cmd/q35-simple-7.0.conf.cmd index 9344f5a9..03b33ad2 100644 --- a/test/cfg2cmd/q35-simple-7.0.conf.cmd +++ b/test/cfg2cmd/q35-simple-7.0.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd index b8c59dfe..3dd4dadb 100644 --- a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd +++ b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-simple.conf.cmd b/test/cfg2cmd/q35-simple.conf.cmd index ef939f28..a46a87fa 100644 --- a/test/cfg2cmd/q35-simple.conf.cmd +++ b/test/cfg2cmd/q35-simple.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-usb2.conf.cmd b/test/cfg2cmd/q35-usb2.conf.cmd index 825f27f8..be4844f7 100644 --- a/test/cfg2cmd/q35-usb2.conf.cmd +++ b/test/cfg2cmd/q35-usb2.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'q35-usb2,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-usb3.conf.cmd b/test/cfg2cmd/q35-usb3.conf.cmd index 956481f3..a1ea65a5 100644 --- a/test/cfg2cmd/q35-usb3.conf.cmd +++ b/test/cfg2cmd/q35-usb3.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'q35-usb3,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd index 430be7e5..53edfe89 100644 --- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd +++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd index df4c7030..7841de51 100644 --- a/test/cfg2cmd/qemu-xhci-7.1.conf.cmd +++ b/test/cfg2cmd/qemu-xhci-7.1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'spiceusb3,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd b/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd index 9b45ae9b..c5143d7c 100644 --- a/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd +++ b/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'q35-qemu-xhci,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/seabios_serial.conf.cmd b/test/cfg2cmd/seabios_serial.conf.cmd index 0c3e3ed4..e3799bec 100644 --- a/test/cfg2cmd/seabios_serial.conf.cmd +++ b/test/cfg2cmd/seabios_serial.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'seabiosserial,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd index a094704f..4a68276d 100644 --- a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd +++ b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/simple-btrfs.conf.cmd b/test/cfg2cmd/simple-btrfs.conf.cmd index 148e688d..f975d3c7 100644 --- a/test/cfg2cmd/simple-btrfs.conf.cmd +++ b/test/cfg2cmd/simple-btrfs.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/simple-virtio-blk.conf.cmd b/test/cfg2cmd/simple-virtio-blk.conf.cmd index 4e063f39..f2e1dac0 100644 --- a/test/cfg2cmd/simple-virtio-blk.conf.cmd +++ b/test/cfg2cmd/simple-virtio-blk.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/simple1-template.conf.cmd b/test/cfg2cmd/simple1-template.conf.cmd index a24151f8..516d5e94 100644 --- a/test/cfg2cmd/simple1-template.conf.cmd +++ b/test/cfg2cmd/simple1-template.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/simple1.conf.cmd b/test/cfg2cmd/simple1.conf.cmd index 2b1b185a..833d51b6 100644 --- a/test/cfg2cmd/simple1.conf.cmd +++ b/test/cfg2cmd/simple1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'simple,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/spice-enhancments.conf.cmd b/test/cfg2cmd/spice-enhancments.conf.cmd index 81acdcc9..0b7115b5 100644 --- a/test/cfg2cmd/spice-enhancments.conf.cmd +++ b/test/cfg2cmd/spice-enhancments.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'vm8006,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/spice-linux-4.1.conf.cmd b/test/cfg2cmd/spice-linux-4.1.conf.cmd index e4a60a76..1ec04192 100644 --- a/test/cfg2cmd/spice-linux-4.1.conf.cmd +++ b/test/cfg2cmd/spice-linux-4.1.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'spicelinux,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/test/cfg2cmd/spice-usb3.conf.cmd index ab35b297..f0e1323c 100644 --- a/test/cfg2cmd/spice-usb3.conf.cmd +++ b/test/cfg2cmd/spice-usb3.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'spiceusb3,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ diff --git a/test/cfg2cmd/spice-win.conf.cmd b/test/cfg2cmd/spice-win.conf.cmd index 544b30a7..942cca56 100644 --- a/test/cfg2cmd/spice-win.conf.cmd +++ b/test/cfg2cmd/spice-win.conf.cmd @@ -1,5 +1,4 @@ /usr/bin/kvm \ - -id 8006 \ -name 'spiceusb3,debug-threads=on' \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ -- 2.39.2