public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC v2 qemu-server 3/3] cfg2cmd: drop custom id parameter
Date: Wed, 24 May 2023 15:56:51 +0200	[thread overview]
Message-ID: <20230524135654.214008-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230524135654.214008-1-f.ebner@proxmox.com>

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 <f.ebner@proxmox.com>
---

No changes in v2.

 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





  parent reply	other threads:[~2023-05-24 13:57 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-24 13:56 [pve-devel] [PATCH-SERIES v2 qemu-server/qemu] Some breaking QEMU changes Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [PATCH v2 qemu-server 1/3] remove left-over mentions of to-be-dropped, outdated QMP commands Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [RFC v2 qemu-server 2/3] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner
2023-05-24 13:56 ` Fiona Ebner [this message]
2023-05-24 13:56 ` [pve-devel] [PATCH v2 qemu 1/3] drop patch for custom get_link_status QMP command Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [PATCH v2 qemu 2/3] drop deprecated custom drive snapshot QMP commands Fiona Ebner
2023-05-24 13:56 ` [pve-devel] [RFC v2 qemu 3/3] drop patch for custom dummy id CLI argument Fiona Ebner
2023-06-07 17:39 ` [pve-devel] partially-applied-series: [PATCH-SERIES v2 qemu-server/qemu] Some breaking QEMU changes Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230524135654.214008-4-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal