* [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes
@ 2023-05-24 10:53 Fiona Ebner
2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 1/2] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Fiona Ebner @ 2023-05-24 10:53 UTC (permalink / raw)
To: pve-devel
First one is dropping the custom get_link_status QMP command which I
could not find any users for.
Second one is dropping the dummy id CLI parameter, where the only
remaining user I found is qmeventd, which is adapted to parse the VM
ID from the cgroup proc file instead.
Of course, new pve-qemu-kvm will break old qemu-server, requiring a
versioned breaks.
qemu-server:
Fiona Ebner (2):
qmeventd: extract vmid from cgroup file instead of cmdline
cfg2cmd: drop custom id parameter
PVE/QemuServer.pm | 2 -
qmeventd/qmeventd.c | 50 +++++++++++--------
test/cfg2cmd/bootorder-empty.conf.cmd | 1 -
test/cfg2cmd/bootorder-legacy.conf.cmd | 1 -
test/cfg2cmd/bootorder.conf.cmd | 1 -
...putype-icelake-client-deprecation.conf.cmd | 1 -
.../custom-cpu-model-defaults.conf.cmd | 1 -
.../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 -
.../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 -
.../q35-linux-hostpci-multifunction.conf.cmd | 1 -
...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 -
...imple-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 -
50 files changed, 30 insertions(+), 70 deletions(-)
qemu:
Fiona Ebner (2):
drop patch for custom get_link_status QMP command
drop patch for custom dummy id CLI argument
...VE-Up-glusterfs-allow-partial-reads.patch} | 0
.../0007-PVE-Up-qmp-add-get_link_status.patch | 98 -------------------
...eturn-success-on-info-without-snaps.patch} | 0
...d-add-osize-and-read-from-to-stdin-.patch} | 0
...-Up-qemu-img-dd-add-isize-parameter.patch} | 0
...VE-Up-qemu-img-dd-add-n-skip_create.patch} | 0
...add-l-option-for-loading-a-snapshot.patch} | 0
...irtio-balloon-improve-query-balloon.patch} | 4 +-
...0014-PVE-qapi-modify-query-machines.patch} | 0
...=> 0015-PVE-qapi-modify-spice-query.patch} | 0
...nel-implementation-for-savevm-async.patch} | 0
...sync-for-background-state-snapshots.patch} | 0
...dd-optional-buffer-size-to-QEMUFile.patch} | 0
...dd-the-zeroinit-block-driver-filter.patch} | 0
...-target-i386-disable-LINT0-after-re.patch} | 0
...-Add-dummy-id-command-line-parameter.patch | 55 -----------
...e-posix-make-locking-optiono-on-cre.patch} | 0
...-PVE-monitor-disable-oob-capability.patch} | 0
...ed-balloon-qemu-4-0-config-size-fal.patch} | 0
...-Allow-version-code-in-machine-type.patch} | 4 +-
...-bcs-bitmap-initialization-to-job-c.patch} | 0
...E-Backup-add-vma-backup-format-code.patch} | 0
...Backup-add-backup-dump-block-driver.patch} | 0
...-sequential-job-transaction-support.patch} | 0
...kup-Proxmox-backup-patches-for-QEMU.patch} | 0
...store-new-command-to-restore-from-p.patch} | 0
...-driver-to-map-backup-archives-into.patch} | 4 +-
...t-stderr-to-journal-when-daemonized.patch} | 0
...grate-dirty-bitmap-state-via-savevm.patch} | 0
...irty-bitmap-migrate-other-bitmaps-e.patch} | 0
...ll-back-to-open-iscsi-initiatorname.patch} | 0
...VE-block-stream-increase-chunk-size.patch} | 0
...ccept-NULL-qiov-in-bdrv_pad_request.patch} | 0
...> 0038-block-add-alloc-track-driver.patch} | 0
...rbd-workaround-for-ceph-issue-53784.patch} | 0
...fix-handling-of-holes-in-.bdrv_co_b.patch} | 0
...-rbd-implement-bdrv_co_block_status.patch} | 0
...lloc-track-fix-deadlock-during-drop.patch} | 0
...pshots-hold-the-BQL-during-setup-ca.patch} | 0
...m-async-don-t-hold-BQL-during-setup.patch} | 0
debian/patches/series | 78 +++++++--------
41 files changed, 44 insertions(+), 199 deletions(-)
rename debian/patches/pve/{0008-PVE-Up-glusterfs-allow-partial-reads.patch => 0007-PVE-Up-glusterfs-allow-partial-reads.patch} (100%)
delete mode 100644 debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch
rename debian/patches/pve/{0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch => 0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch} (100%)
rename debian/patches/pve/{0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch => 0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch} (100%)
rename debian/patches/pve/{0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch => 0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch} (100%)
rename debian/patches/pve/{0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch => 0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch} (100%)
rename debian/patches/pve/{0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch => 0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch} (100%)
rename debian/patches/pve/{0014-PVE-virtio-balloon-improve-query-balloon.patch => 0013-PVE-virtio-balloon-improve-query-balloon.patch} (99%)
rename debian/patches/pve/{0015-PVE-qapi-modify-query-machines.patch => 0014-PVE-qapi-modify-query-machines.patch} (100%)
rename debian/patches/pve/{0016-PVE-qapi-modify-spice-query.patch => 0015-PVE-qapi-modify-spice-query.patch} (100%)
rename debian/patches/pve/{0017-PVE-add-IOChannel-implementation-for-savevm-async.patch => 0016-PVE-add-IOChannel-implementation-for-savevm-async.patch} (100%)
rename debian/patches/pve/{0018-PVE-add-savevm-async-for-background-state-snapshots.patch => 0017-PVE-add-savevm-async-for-background-state-snapshots.patch} (100%)
rename debian/patches/pve/{0019-PVE-add-optional-buffer-size-to-QEMUFile.patch => 0018-PVE-add-optional-buffer-size-to-QEMUFile.patch} (100%)
rename debian/patches/pve/{0020-PVE-block-add-the-zeroinit-block-driver-filter.patch => 0019-PVE-block-add-the-zeroinit-block-driver-filter.patch} (100%)
rename debian/patches/pve/{0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch => 0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch} (100%)
delete mode 100644 debian/patches/pve/0021-PVE-Add-dummy-id-command-line-parameter.patch
rename debian/patches/pve/{0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch => 0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch} (100%)
rename debian/patches/pve/{0024-PVE-monitor-disable-oob-capability.patch => 0022-PVE-monitor-disable-oob-capability.patch} (100%)
rename debian/patches/pve/{0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch => 0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch} (100%)
rename debian/patches/pve/{0026-PVE-Allow-version-code-in-machine-type.patch => 0024-PVE-Allow-version-code-in-machine-type.patch} (98%)
rename debian/patches/pve/{0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch => 0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch} (100%)
rename debian/patches/pve/{0028-PVE-Backup-add-vma-backup-format-code.patch => 0026-PVE-Backup-add-vma-backup-format-code.patch} (100%)
rename debian/patches/pve/{0029-PVE-Backup-add-backup-dump-block-driver.patch => 0027-PVE-Backup-add-backup-dump-block-driver.patch} (100%)
rename debian/patches/pve/{0030-PVE-Add-sequential-job-transaction-support.patch => 0028-PVE-Add-sequential-job-transaction-support.patch} (100%)
rename debian/patches/pve/{0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch => 0029-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch} (100%)
rename debian/patches/pve/{0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch => 0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch} (100%)
rename debian/patches/pve/{0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (99%)
rename debian/patches/pve/{0034-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0032-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%)
rename debian/patches/pve/{0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0033-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (100%)
rename debian/patches/pve/{0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0034-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%)
rename debian/patches/pve/{0037-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0035-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%)
rename debian/patches/pve/{0038-PVE-block-stream-increase-chunk-size.patch => 0036-PVE-block-stream-increase-chunk-size.patch} (100%)
rename debian/patches/pve/{0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch => 0037-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch} (100%)
rename debian/patches/pve/{0040-block-add-alloc-track-driver.patch => 0038-block-add-alloc-track-driver.patch} (100%)
rename debian/patches/pve/{0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch => 0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch} (100%)
rename debian/patches/pve/{0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch => 0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch} (100%)
rename debian/patches/pve/{0043-Revert-block-rbd-implement-bdrv_co_block_status.patch => 0041-Revert-block-rbd-implement-bdrv_co_block_status.patch} (100%)
rename debian/patches/pve/{0044-alloc-track-fix-deadlock-during-drop.patch => 0042-alloc-track-fix-deadlock-during-drop.patch} (100%)
rename debian/patches/pve/{0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch => 0043-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch} (100%)
rename debian/patches/pve/{0046-savevm-async-don-t-hold-BQL-during-setup.patch => 0044-savevm-async-don-t-hold-BQL-during-setup.patch} (100%)
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread* [pve-devel] [RFC qemu-server 1/2] qmeventd: extract vmid from cgroup file instead of cmdline 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner @ 2023-05-24 10:54 ` Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 2/2] cfg2cmd: drop custom id parameter Fiona Ebner ` (3 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Fiona Ebner @ 2023-05-24 10:54 UTC (permalink / raw) To: pve-devel This is the single remaining user of the id argument. The id argument is a Proxmox-specific extension to QEMU, which we'd like to drop to reduce our differences with upstream QEMU. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> --- qmeventd/qmeventd.c | 50 +++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/qmeventd/qmeventd.c b/qmeventd/qmeventd.c index a843da5f..921c0dca 100644 --- a/qmeventd/qmeventd.c +++ b/qmeventd/qmeventd.c @@ -75,14 +75,13 @@ get_pid_from_fd(int fd) } /* - * reads the vmid from /proc/<pid>/cmdline - * after the '-id' argument + * parses the vmid from the qemu.slice entry of /proc/<pid>/cgroup */ static unsigned long get_vmid_from_pid(pid_t pid) { char filename[32] = { 0 }; - int len = snprintf(filename, sizeof(filename), "/proc/%d/cmdline", pid); + int len = snprintf(filename, sizeof(filename), "/proc/%d/cgroup", pid); if (len < 0) { fprintf(stderr, "error during snprintf for %d: %s\n", pid, strerror(errno)); @@ -99,41 +98,52 @@ get_vmid_from_pid(pid_t pid) } unsigned long vmid = 0; - ssize_t rc = 0; char *buf = NULL; size_t buflen = 0; - while ((rc = getdelim(&buf, &buflen, '\0', fp)) >= 0) { - if (!strcmp(buf, "-id")) { - break; + + while (getline(&buf, &buflen, fp) >= 0) { + char *cgroup_path = strrchr(buf, ':'); + if (!cgroup_path) { + fprintf(stderr, "unexpected cgroup entry %s\n", buf); + goto ret; } - } + cgroup_path++; - if (rc < 0) { - goto err; - } + if (strncmp(cgroup_path, "/qemu.slice", 11)) { + continue; + } - if (getdelim(&buf, &buflen, '\0', fp) >= 0) { - if (buf[0] == '-' || buf[0] == '\0') { - fprintf(stderr, "invalid vmid %s\n", buf); + char *vmid_start = strrchr(buf, '/'); + if (!vmid_start) { + fprintf(stderr, "unexpected cgroup entry %s\n", buf); + goto ret; + } + vmid_start++; + + if (vmid_start[0] == '-' || vmid_start[0] == '\0') { + fprintf(stderr, "invalid vmid in cgroup entry %s\n", buf); goto ret; } errno = 0; char *endptr = NULL; - vmid = strtoul(buf, &endptr, 10); + vmid = strtoul(vmid_start, &endptr, 10); if (errno != 0) { + fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); vmid = 0; - goto err; - } else if (*endptr != '\0') { - fprintf(stderr, "invalid vmid %s\n", buf); + } else if (*endptr != '.') { + fprintf(stderr, "unexpected cgroup entry %s\n", buf); vmid = 0; } goto ret; } -err: - fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); + if (errno) { + fprintf(stderr, "error parsing vmid for %d: %s\n", pid, strerror(errno)); + } else { + fprintf(stderr, "error parsing vmid for %d: no qemu.slice cgroup entry\n", pid); + } ret: free(buf); -- 2.39.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [pve-devel] [RFC qemu-server 2/2] cfg2cmd: drop custom id parameter 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 1/2] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner @ 2023-05-24 10:54 ` Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [PATCH qemu 1/2] drop patch for custom get_link_status QMP command Fiona Ebner ` (2 subsequent siblings) 4 siblings, 0 replies; 6+ messages in thread From: Fiona Ebner @ 2023-05-24 10:54 UTC (permalink / raw) To: pve-devel 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> --- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [pve-devel] [PATCH qemu 1/2] drop patch for custom get_link_status QMP command 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 1/2] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 2/2] cfg2cmd: drop custom id parameter Fiona Ebner @ 2023-05-24 10:54 ` Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu 2/2] drop patch for custom dummy id CLI argument Fiona Ebner 2023-05-24 13:42 ` [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner 4 siblings, 0 replies; 6+ messages in thread From: Fiona Ebner @ 2023-05-24 10:54 UTC (permalink / raw) To: pve-devel There doesn't seem to be any Proxmox VE code using this. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> --- ...VE-Up-glusterfs-allow-partial-reads.patch} | 0 .../0007-PVE-Up-qmp-add-get_link_status.patch | 98 ------------------- ...eturn-success-on-info-without-snaps.patch} | 0 ...d-add-osize-and-read-from-to-stdin-.patch} | 0 ...-Up-qemu-img-dd-add-isize-parameter.patch} | 0 ...VE-Up-qemu-img-dd-add-n-skip_create.patch} | 0 ...add-l-option-for-loading-a-snapshot.patch} | 0 ...irtio-balloon-improve-query-balloon.patch} | 4 +- ...0014-PVE-qapi-modify-query-machines.patch} | 0 ...=> 0015-PVE-qapi-modify-spice-query.patch} | 0 ...nel-implementation-for-savevm-async.patch} | 0 ...sync-for-background-state-snapshots.patch} | 0 ...dd-optional-buffer-size-to-QEMUFile.patch} | 0 ...dd-the-zeroinit-block-driver-filter.patch} | 0 ...Add-dummy-id-command-line-parameter.patch} | 0 ...-target-i386-disable-LINT0-after-re.patch} | 0 ...e-posix-make-locking-optiono-on-cre.patch} | 0 ...-PVE-monitor-disable-oob-capability.patch} | 0 ...ed-balloon-qemu-4-0-config-size-fal.patch} | 0 ...-Allow-version-code-in-machine-type.patch} | 0 ...-bcs-bitmap-initialization-to-job-c.patch} | 0 ...E-Backup-add-vma-backup-format-code.patch} | 0 ...Backup-add-backup-dump-block-driver.patch} | 0 ...-sequential-job-transaction-support.patch} | 0 ...kup-Proxmox-backup-patches-for-QEMU.patch} | 0 ...store-new-command-to-restore-from-p.patch} | 0 ...-driver-to-map-backup-archives-into.patch} | 4 +- ...t-stderr-to-journal-when-daemonized.patch} | 0 ...grate-dirty-bitmap-state-via-savevm.patch} | 0 ...irty-bitmap-migrate-other-bitmaps-e.patch} | 0 ...ll-back-to-open-iscsi-initiatorname.patch} | 0 ...VE-block-stream-increase-chunk-size.patch} | 0 ...ccept-NULL-qiov-in-bdrv_pad_request.patch} | 0 ...> 0039-block-add-alloc-track-driver.patch} | 0 ...rbd-workaround-for-ceph-issue-53784.patch} | 0 ...fix-handling-of-holes-in-.bdrv_co_b.patch} | 0 ...-rbd-implement-bdrv_co_block_status.patch} | 0 ...lloc-track-fix-deadlock-during-drop.patch} | 0 ...pshots-hold-the-BQL-during-setup-ca.patch} | 0 ...m-async-don-t-hold-BQL-during-setup.patch} | 0 debian/patches/series | 79 ++++++++------- 41 files changed, 43 insertions(+), 142 deletions(-) rename debian/patches/pve/{0008-PVE-Up-glusterfs-allow-partial-reads.patch => 0007-PVE-Up-glusterfs-allow-partial-reads.patch} (100%) delete mode 100644 debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch rename debian/patches/pve/{0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch => 0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch} (100%) rename debian/patches/pve/{0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch => 0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch} (100%) rename debian/patches/pve/{0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch => 0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch} (100%) rename debian/patches/pve/{0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch => 0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch} (100%) rename debian/patches/pve/{0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch => 0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch} (100%) rename debian/patches/pve/{0014-PVE-virtio-balloon-improve-query-balloon.patch => 0013-PVE-virtio-balloon-improve-query-balloon.patch} (99%) rename debian/patches/pve/{0015-PVE-qapi-modify-query-machines.patch => 0014-PVE-qapi-modify-query-machines.patch} (100%) rename debian/patches/pve/{0016-PVE-qapi-modify-spice-query.patch => 0015-PVE-qapi-modify-spice-query.patch} (100%) rename debian/patches/pve/{0017-PVE-add-IOChannel-implementation-for-savevm-async.patch => 0016-PVE-add-IOChannel-implementation-for-savevm-async.patch} (100%) rename debian/patches/pve/{0018-PVE-add-savevm-async-for-background-state-snapshots.patch => 0017-PVE-add-savevm-async-for-background-state-snapshots.patch} (100%) rename debian/patches/pve/{0019-PVE-add-optional-buffer-size-to-QEMUFile.patch => 0018-PVE-add-optional-buffer-size-to-QEMUFile.patch} (100%) rename debian/patches/pve/{0020-PVE-block-add-the-zeroinit-block-driver-filter.patch => 0019-PVE-block-add-the-zeroinit-block-driver-filter.patch} (100%) rename debian/patches/pve/{0021-PVE-Add-dummy-id-command-line-parameter.patch => 0020-PVE-Add-dummy-id-command-line-parameter.patch} (100%) rename debian/patches/pve/{0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch => 0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch} (100%) rename debian/patches/pve/{0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch => 0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch} (100%) rename debian/patches/pve/{0024-PVE-monitor-disable-oob-capability.patch => 0023-PVE-monitor-disable-oob-capability.patch} (100%) rename debian/patches/pve/{0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch => 0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch} (100%) rename debian/patches/pve/{0026-PVE-Allow-version-code-in-machine-type.patch => 0025-PVE-Allow-version-code-in-machine-type.patch} (100%) rename debian/patches/pve/{0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch => 0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch} (100%) rename debian/patches/pve/{0028-PVE-Backup-add-vma-backup-format-code.patch => 0027-PVE-Backup-add-vma-backup-format-code.patch} (100%) rename debian/patches/pve/{0029-PVE-Backup-add-backup-dump-block-driver.patch => 0028-PVE-Backup-add-backup-dump-block-driver.patch} (100%) rename debian/patches/pve/{0030-PVE-Add-sequential-job-transaction-support.patch => 0029-PVE-Add-sequential-job-transaction-support.patch} (100%) rename debian/patches/pve/{0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch => 0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch} (100%) rename debian/patches/pve/{0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch => 0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch} (100%) rename debian/patches/pve/{0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (99%) rename debian/patches/pve/{0034-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0033-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%) rename debian/patches/pve/{0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (100%) rename debian/patches/pve/{0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%) rename debian/patches/pve/{0037-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0036-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%) rename debian/patches/pve/{0038-PVE-block-stream-increase-chunk-size.patch => 0037-PVE-block-stream-increase-chunk-size.patch} (100%) rename debian/patches/pve/{0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch => 0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch} (100%) rename debian/patches/pve/{0040-block-add-alloc-track-driver.patch => 0039-block-add-alloc-track-driver.patch} (100%) rename debian/patches/pve/{0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch => 0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch} (100%) rename debian/patches/pve/{0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch => 0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch} (100%) rename debian/patches/pve/{0043-Revert-block-rbd-implement-bdrv_co_block_status.patch => 0042-Revert-block-rbd-implement-bdrv_co_block_status.patch} (100%) rename debian/patches/pve/{0044-alloc-track-fix-deadlock-during-drop.patch => 0043-alloc-track-fix-deadlock-during-drop.patch} (100%) rename debian/patches/pve/{0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch => 0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch} (100%) rename debian/patches/pve/{0046-savevm-async-don-t-hold-BQL-during-setup.patch => 0045-savevm-async-don-t-hold-BQL-during-setup.patch} (100%) diff --git a/debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch b/debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch similarity index 100% rename from debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch rename to debian/patches/pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch diff --git a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch b/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch deleted file mode 100644 index 50c66f4..0000000 --- a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bumiller <w.bumiller@proxmox.com> -Date: Mon, 6 Apr 2020 12:16:37 +0200 -Subject: [PATCH] PVE: [Up] qmp: add get_link_status - -Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> -[FE: add get_link_status to command name exceptions] -Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> ---- - net/net.c | 27 +++++++++++++++++++++++++++ - qapi/net.json | 15 +++++++++++++++ - qapi/pragma.json | 2 ++ - 3 files changed, 44 insertions(+) - -diff --git a/net/net.c b/net/net.c -index 6492ad530e..33e901cba8 100644 ---- a/net/net.c -+++ b/net/net.c -@@ -1397,6 +1397,33 @@ RxFilterInfoList *qmp_query_rx_filter(const char *name, Error **errp) - return filter_list; - } - -+int64_t qmp_get_link_status(const char *name, Error **errp) -+{ -+ NetClientState *ncs[MAX_QUEUE_NUM]; -+ NetClientState *nc; -+ int queues; -+ bool ret; -+ -+ queues = qemu_find_net_clients_except(name, ncs, -+ NET_CLIENT_DRIVER__MAX, -+ MAX_QUEUE_NUM); -+ -+ if (queues == 0) { -+ error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, -+ "Device '%s' not found", name); -+ return (int64_t) -1; -+ } -+ -+ nc = ncs[0]; -+ ret = ncs[0]->link_down; -+ -+ if (nc->peer->info->type == NET_CLIENT_DRIVER_NIC) { -+ ret = ncs[0]->peer->link_down; -+ } -+ -+ return (int64_t) ret ? 0 : 1; -+} -+ - void colo_notify_filters_event(int event, Error **errp) - { - NetClientState *nc; -diff --git a/qapi/net.json b/qapi/net.json -index d6eb30008b..4fe71b149d 100644 ---- a/qapi/net.json -+++ b/qapi/net.json -@@ -36,6 +36,21 @@ - ## - { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} } - -+## -+# @get_link_status: -+# -+# Get the current link state of the nics or nic. -+# -+# @name: name of the nic you get the state of -+# -+# Return: If link is up 1 -+# If link is down 0 -+# If an error occure an empty string. -+# -+# Notes: this is an Proxmox VE extension and not offical part of Qemu. -+## -+{ 'command': 'get_link_status', 'data': {'name': 'str'} , 'returns': 'int' } -+ - ## - # @netdev_add: - # -diff --git a/qapi/pragma.json b/qapi/pragma.json -index 7f810b0e97..29233db825 100644 ---- a/qapi/pragma.json -+++ b/qapi/pragma.json -@@ -15,6 +15,7 @@ - 'device_add', - 'device_del', - 'expire_password', -+ 'get_link_status', - 'migrate_cancel', - 'netdev_add', - 'netdev_del', -@@ -26,6 +27,7 @@ - 'system_wakeup' ], - # Commands allowed to return a non-dictionary - 'command-returns-exceptions': [ -+ 'get_link_status', - 'human-monitor-command', - 'qom-get', - 'query-tpm-models', diff --git a/debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch b/debian/patches/pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch similarity index 100% rename from debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch rename to debian/patches/pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch diff --git a/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch b/debian/patches/pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch similarity index 100% rename from debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch rename to debian/patches/pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch diff --git a/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch b/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch similarity index 100% rename from debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch rename to debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch diff --git a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch b/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch similarity index 100% rename from debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch rename to debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch diff --git a/debian/patches/pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch b/debian/patches/pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch similarity index 100% rename from debian/patches/pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch rename to debian/patches/pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch diff --git a/debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch similarity index 99% rename from debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch rename to debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch index 183c9dc..b465314 100644 --- a/debian/patches/pve/0014-PVE-virtio-balloon-improve-query-balloon.patch +++ b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch @@ -138,10 +138,10 @@ index 604b686e59..15f5f86683 100644 ## # @query-balloon: diff --git a/qapi/pragma.json b/qapi/pragma.json -index 29233db825..f2097b9020 100644 +index 7f810b0e97..325e684411 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json -@@ -37,6 +37,7 @@ +@@ -35,6 +35,7 @@ 'member-name-exceptions': [ # visible in: 'ACPISlotType', # query-acpi-ospm-status 'AcpiTableOptions', # -acpitable diff --git a/debian/patches/pve/0015-PVE-qapi-modify-query-machines.patch b/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch similarity index 100% rename from debian/patches/pve/0015-PVE-qapi-modify-query-machines.patch rename to debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch diff --git a/debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch b/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch similarity index 100% rename from debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch rename to debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch diff --git a/debian/patches/pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch b/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch similarity index 100% rename from debian/patches/pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch rename to debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch diff --git a/debian/patches/pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch similarity index 100% rename from debian/patches/pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch rename to debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch diff --git a/debian/patches/pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch similarity index 100% rename from debian/patches/pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch rename to debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch diff --git a/debian/patches/pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch similarity index 100% rename from debian/patches/pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch rename to debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch diff --git a/debian/patches/pve/0021-PVE-Add-dummy-id-command-line-parameter.patch b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch similarity index 100% rename from debian/patches/pve/0021-PVE-Add-dummy-id-command-line-parameter.patch rename to debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch diff --git a/debian/patches/pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch b/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch similarity index 100% rename from debian/patches/pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch rename to debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch diff --git a/debian/patches/pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch b/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch similarity index 100% rename from debian/patches/pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch rename to debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch diff --git a/debian/patches/pve/0024-PVE-monitor-disable-oob-capability.patch b/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch similarity index 100% rename from debian/patches/pve/0024-PVE-monitor-disable-oob-capability.patch rename to debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch diff --git a/debian/patches/pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch b/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch similarity index 100% rename from debian/patches/pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch rename to debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch diff --git a/debian/patches/pve/0026-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch similarity index 100% rename from debian/patches/pve/0026-PVE-Allow-version-code-in-machine-type.patch rename to debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch diff --git a/debian/patches/pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch b/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch similarity index 100% rename from debian/patches/pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch rename to debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch diff --git a/debian/patches/pve/0028-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch similarity index 100% rename from debian/patches/pve/0028-PVE-Backup-add-vma-backup-format-code.patch rename to debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch diff --git a/debian/patches/pve/0029-PVE-Backup-add-backup-dump-block-driver.patch b/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch similarity index 100% rename from debian/patches/pve/0029-PVE-Backup-add-backup-dump-block-driver.patch rename to debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch diff --git a/debian/patches/pve/0030-PVE-Add-sequential-job-transaction-support.patch b/debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch similarity index 100% rename from debian/patches/pve/0030-PVE-Add-sequential-job-transaction-support.patch rename to debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch diff --git a/debian/patches/pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch similarity index 100% rename from debian/patches/pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch rename to debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch diff --git a/debian/patches/pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch similarity index 100% rename from debian/patches/pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch rename to debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch diff --git a/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch similarity index 99% rename from debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch rename to debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch index 9c9dc26..63b4161 100644 --- a/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +++ b/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch @@ -441,10 +441,10 @@ index 4ec70acf95..47118bf83e 100644 'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring', 'if': 'CONFIG_BLKIO' }, diff --git a/qapi/pragma.json b/qapi/pragma.json -index f2097b9020..5ab1890519 100644 +index 325e684411..b6079f6a0e 100644 --- a/qapi/pragma.json +++ b/qapi/pragma.json -@@ -47,6 +47,7 @@ +@@ -45,6 +45,7 @@ 'BlockInfo', # query-block 'BlockdevAioOptions', # blockdev-add, -blockdev 'BlockdevDriver', # blockdev-add, query-blockstats, ... diff --git a/debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch similarity index 100% rename from debian/patches/pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch rename to debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch diff --git a/debian/patches/pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch similarity index 100% rename from debian/patches/pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch rename to debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch diff --git a/debian/patches/pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch b/debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch similarity index 100% rename from debian/patches/pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch rename to debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch diff --git a/debian/patches/pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch b/debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch similarity index 100% rename from debian/patches/pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch rename to debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch diff --git a/debian/patches/pve/0038-PVE-block-stream-increase-chunk-size.patch b/debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch similarity index 100% rename from debian/patches/pve/0038-PVE-block-stream-increase-chunk-size.patch rename to debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch diff --git a/debian/patches/pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch b/debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch similarity index 100% rename from debian/patches/pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch rename to debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch diff --git a/debian/patches/pve/0040-block-add-alloc-track-driver.patch b/debian/patches/pve/0039-block-add-alloc-track-driver.patch similarity index 100% rename from debian/patches/pve/0040-block-add-alloc-track-driver.patch rename to debian/patches/pve/0039-block-add-alloc-track-driver.patch diff --git a/debian/patches/pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch b/debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch similarity index 100% rename from debian/patches/pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch rename to debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch diff --git a/debian/patches/pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch b/debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch similarity index 100% rename from debian/patches/pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch rename to debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch diff --git a/debian/patches/pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch b/debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch similarity index 100% rename from debian/patches/pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch rename to debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch diff --git a/debian/patches/pve/0044-alloc-track-fix-deadlock-during-drop.patch b/debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch similarity index 100% rename from debian/patches/pve/0044-alloc-track-fix-deadlock-during-drop.patch rename to debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch diff --git a/debian/patches/pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch b/debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch similarity index 100% rename from debian/patches/pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch rename to debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch diff --git a/debian/patches/pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch b/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch similarity index 100% rename from debian/patches/pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch rename to debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch diff --git a/debian/patches/series b/debian/patches/series index 375b2db..db0586e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,43 +30,42 @@ pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch -pve/0007-PVE-Up-qmp-add-get_link_status.patch -pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch -pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch -pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch -pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch -pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch -pve/0013-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch -pve/0014-PVE-virtio-balloon-improve-query-balloon.patch -pve/0015-PVE-qapi-modify-query-machines.patch -pve/0016-PVE-qapi-modify-spice-query.patch -pve/0017-PVE-add-IOChannel-implementation-for-savevm-async.patch -pve/0018-PVE-add-savevm-async-for-background-state-snapshots.patch -pve/0019-PVE-add-optional-buffer-size-to-QEMUFile.patch -pve/0020-PVE-block-add-the-zeroinit-block-driver-filter.patch -pve/0021-PVE-Add-dummy-id-command-line-parameter.patch -pve/0022-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch -pve/0023-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch -pve/0024-PVE-monitor-disable-oob-capability.patch -pve/0025-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch -pve/0026-PVE-Allow-version-code-in-machine-type.patch -pve/0027-block-backup-move-bcs-bitmap-initialization-to-job-c.patch -pve/0028-PVE-Backup-add-vma-backup-format-code.patch -pve/0029-PVE-Backup-add-backup-dump-block-driver.patch -pve/0030-PVE-Add-sequential-job-transaction-support.patch -pve/0031-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch -pve/0032-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch -pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch -pve/0034-PVE-redirect-stderr-to-journal-when-daemonized.patch -pve/0035-PVE-Migrate-dirty-bitmap-state-via-savevm.patch -pve/0036-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch -pve/0037-PVE-fall-back-to-open-iscsi-initiatorname.patch -pve/0038-PVE-block-stream-increase-chunk-size.patch -pve/0039-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch -pve/0040-block-add-alloc-track-driver.patch -pve/0041-Revert-block-rbd-workaround-for-ceph-issue-53784.patch -pve/0042-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch -pve/0043-Revert-block-rbd-implement-bdrv_co_block_status.patch -pve/0044-alloc-track-fix-deadlock-during-drop.patch -pve/0045-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch -pve/0046-savevm-async-don-t-hold-BQL-during-setup.patch +pve/0007-PVE-Up-glusterfs-allow-partial-reads.patch +pve/0008-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch +pve/0009-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch +pve/0010-PVE-Up-qemu-img-dd-add-isize-parameter.patch +pve/0011-PVE-Up-qemu-img-dd-add-n-skip_create.patch +pve/0012-qemu-img-dd-add-l-option-for-loading-a-snapshot.patch +pve/0013-PVE-virtio-balloon-improve-query-balloon.patch +pve/0014-PVE-qapi-modify-query-machines.patch +pve/0015-PVE-qapi-modify-spice-query.patch +pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch +pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch +pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch +pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch +pve/0020-PVE-Add-dummy-id-command-line-parameter.patch +pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch +pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch +pve/0023-PVE-monitor-disable-oob-capability.patch +pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch +pve/0025-PVE-Allow-version-code-in-machine-type.patch +pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch +pve/0027-PVE-Backup-add-vma-backup-format-code.patch +pve/0028-PVE-Backup-add-backup-dump-block-driver.patch +pve/0029-PVE-Add-sequential-job-transaction-support.patch +pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch +pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch +pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch +pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch +pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch +pve/0037-PVE-block-stream-increase-chunk-size.patch +pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch +pve/0039-block-add-alloc-track-driver.patch +pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch +pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch +pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch +pve/0043-alloc-track-fix-deadlock-during-drop.patch +pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch +pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch -- 2.39.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [pve-devel] [RFC qemu 2/2] drop patch for custom dummy id CLI argument 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner ` (2 preceding siblings ...) 2023-05-24 10:54 ` [pve-devel] [PATCH qemu 1/2] drop patch for custom get_link_status QMP command Fiona Ebner @ 2023-05-24 10:54 ` Fiona Ebner 2023-05-24 13:42 ` [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner 4 siblings, 0 replies; 6+ messages in thread From: Fiona Ebner @ 2023-05-24 10:54 UTC (permalink / raw) To: pve-devel The last remaining user of this was qmeventd, but it isn't anymore, so the custom extension can be dropped. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com> --- Versioned breaks for qemu-server is needed. ...-Add-dummy-id-command-line-parameter.patch | 55 ------------------- ...-target-i386-disable-LINT0-after-re.patch} | 0 ...e-posix-make-locking-optiono-on-cre.patch} | 0 ...-PVE-monitor-disable-oob-capability.patch} | 0 ...ed-balloon-qemu-4-0-config-size-fal.patch} | 0 ...-Allow-version-code-in-machine-type.patch} | 4 +- ...-bcs-bitmap-initialization-to-job-c.patch} | 0 ...E-Backup-add-vma-backup-format-code.patch} | 0 ...Backup-add-backup-dump-block-driver.patch} | 0 ...-sequential-job-transaction-support.patch} | 0 ...kup-Proxmox-backup-patches-for-QEMU.patch} | 0 ...store-new-command-to-restore-from-p.patch} | 0 ...-driver-to-map-backup-archives-into.patch} | 0 ...t-stderr-to-journal-when-daemonized.patch} | 0 ...grate-dirty-bitmap-state-via-savevm.patch} | 0 ...irty-bitmap-migrate-other-bitmaps-e.patch} | 0 ...ll-back-to-open-iscsi-initiatorname.patch} | 0 ...VE-block-stream-increase-chunk-size.patch} | 0 ...ccept-NULL-qiov-in-bdrv_pad_request.patch} | 0 ...> 0038-block-add-alloc-track-driver.patch} | 0 ...rbd-workaround-for-ceph-issue-53784.patch} | 0 ...fix-handling-of-holes-in-.bdrv_co_b.patch} | 0 ...-rbd-implement-bdrv_co_block_status.patch} | 0 ...lloc-track-fix-deadlock-during-drop.patch} | 0 ...pshots-hold-the-BQL-during-setup-ca.patch} | 0 ...m-async-don-t-hold-BQL-during-setup.patch} | 0 debian/patches/series | 51 +++++++++-------- 27 files changed, 27 insertions(+), 83 deletions(-) delete mode 100644 debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch rename debian/patches/pve/{0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch => 0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch} (100%) rename debian/patches/pve/{0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch => 0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch} (100%) rename debian/patches/pve/{0023-PVE-monitor-disable-oob-capability.patch => 0022-PVE-monitor-disable-oob-capability.patch} (100%) rename debian/patches/pve/{0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch => 0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch} (100%) rename debian/patches/pve/{0025-PVE-Allow-version-code-in-machine-type.patch => 0024-PVE-Allow-version-code-in-machine-type.patch} (98%) rename debian/patches/pve/{0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch => 0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch} (100%) rename debian/patches/pve/{0027-PVE-Backup-add-vma-backup-format-code.patch => 0026-PVE-Backup-add-vma-backup-format-code.patch} (100%) rename debian/patches/pve/{0028-PVE-Backup-add-backup-dump-block-driver.patch => 0027-PVE-Backup-add-backup-dump-block-driver.patch} (100%) rename debian/patches/pve/{0029-PVE-Add-sequential-job-transaction-support.patch => 0028-PVE-Add-sequential-job-transaction-support.patch} (100%) rename debian/patches/pve/{0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch => 0029-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch} (100%) rename debian/patches/pve/{0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch => 0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch} (100%) rename debian/patches/pve/{0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch => 0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch} (100%) rename debian/patches/pve/{0033-PVE-redirect-stderr-to-journal-when-daemonized.patch => 0032-PVE-redirect-stderr-to-journal-when-daemonized.patch} (100%) rename debian/patches/pve/{0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch => 0033-PVE-Migrate-dirty-bitmap-state-via-savevm.patch} (100%) rename debian/patches/pve/{0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch => 0034-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch} (100%) rename debian/patches/pve/{0036-PVE-fall-back-to-open-iscsi-initiatorname.patch => 0035-PVE-fall-back-to-open-iscsi-initiatorname.patch} (100%) rename debian/patches/pve/{0037-PVE-block-stream-increase-chunk-size.patch => 0036-PVE-block-stream-increase-chunk-size.patch} (100%) rename debian/patches/pve/{0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch => 0037-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch} (100%) rename debian/patches/pve/{0039-block-add-alloc-track-driver.patch => 0038-block-add-alloc-track-driver.patch} (100%) rename debian/patches/pve/{0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch => 0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch} (100%) rename debian/patches/pve/{0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch => 0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch} (100%) rename debian/patches/pve/{0042-Revert-block-rbd-implement-bdrv_co_block_status.patch => 0041-Revert-block-rbd-implement-bdrv_co_block_status.patch} (100%) rename debian/patches/pve/{0043-alloc-track-fix-deadlock-during-drop.patch => 0042-alloc-track-fix-deadlock-during-drop.patch} (100%) rename debian/patches/pve/{0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch => 0043-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch} (100%) rename debian/patches/pve/{0045-savevm-async-don-t-hold-BQL-during-setup.patch => 0044-savevm-async-don-t-hold-BQL-during-setup.patch} (100%) diff --git a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch deleted file mode 100644 index 3b79a3a..0000000 --- a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bumiller <w.bumiller@proxmox.com> -Date: Mon, 6 Apr 2020 12:16:48 +0200 -Subject: [PATCH] PVE: Add dummy -id command line parameter - -This used to be part of the qemu-side PVE authentication for -VNC. Now this does nothing. - -Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> -Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> ---- - qemu-options.hx | 3 +++ - softmmu/vl.c | 8 ++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/qemu-options.hx b/qemu-options.hx -index fc6cb23dd9..3ccedf7c45 100644 ---- a/qemu-options.hx -+++ b/qemu-options.hx -@@ -1150,6 +1150,9 @@ backend describes how QEMU handles the data. - - ERST - -+DEF("id", HAS_ARG, QEMU_OPTION_id, -+ "-id n set the VMID", QEMU_ARCH_ALL) -+ - DEF("fda", HAS_ARG, QEMU_OPTION_fda, - "-fda/-fdb file use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL) - DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL) -diff --git a/softmmu/vl.c b/softmmu/vl.c -index 0eabc71b68..323f6a23d4 100644 ---- a/softmmu/vl.c -+++ b/softmmu/vl.c -@@ -2648,6 +2648,7 @@ void qemu_init(int argc, char **argv) - MachineClass *machine_class; - bool userconfig = true; - FILE *vmstate_dump_file = NULL; -+ long vm_id; - - qemu_add_opts(&qemu_drive_opts); - qemu_add_drive_opts(&qemu_legacy_drive_opts); -@@ -3271,6 +3272,13 @@ void qemu_init(int argc, char **argv) - machine_parse_property_opt(qemu_find_opts("smp-opts"), - "smp", optarg); - break; -+ case QEMU_OPTION_id: -+ vm_id = strtol(optarg, (char **)&optarg, 10); -+ if (*optarg != 0 || vm_id < 100 || vm_id > INT_MAX) { -+ error_report("invalid -id argument %s", optarg); -+ exit(1); -+ } -+ break; - case QEMU_OPTION_vnc: - vnc_parse(optarg); - break; diff --git a/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch b/debian/patches/pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch similarity index 100% rename from debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch rename to debian/patches/pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch diff --git a/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch b/debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch similarity index 100% rename from debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch rename to debian/patches/pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch diff --git a/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch b/debian/patches/pve/0022-PVE-monitor-disable-oob-capability.patch similarity index 100% rename from debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch rename to debian/patches/pve/0022-PVE-monitor-disable-oob-capability.patch diff --git a/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch b/debian/patches/pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch similarity index 100% rename from debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch rename to debian/patches/pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch diff --git a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch similarity index 98% rename from debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch rename to debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch index d88d1d0..7c621b3 100644 --- a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch +++ b/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch @@ -72,7 +72,7 @@ index c904280085..47f3facdb2 100644 ## # @query-machines: diff --git a/softmmu/vl.c b/softmmu/vl.c -index 323f6a23d4..25abdc9da7 100644 +index 0eabc71b68..b784bb7856 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1578,6 +1578,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv, @@ -95,7 +95,7 @@ index 323f6a23d4..25abdc9da7 100644 g_slist_free(machines); if (local_err) { error_append_hint(&local_err, "Use -machine help to list supported machines\n"); -@@ -3213,12 +3219,31 @@ void qemu_init(int argc, char **argv) +@@ -3212,12 +3218,31 @@ void qemu_init(int argc, char **argv) case QEMU_OPTION_machine: { bool help; diff --git a/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch b/debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch similarity index 100% rename from debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch rename to debian/patches/pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch diff --git a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch similarity index 100% rename from debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch rename to debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch diff --git a/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch b/debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch similarity index 100% rename from debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch rename to debian/patches/pve/0027-PVE-Backup-add-backup-dump-block-driver.patch diff --git a/debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch b/debian/patches/pve/0028-PVE-Add-sequential-job-transaction-support.patch similarity index 100% rename from debian/patches/pve/0029-PVE-Add-sequential-job-transaction-support.patch rename to debian/patches/pve/0028-PVE-Add-sequential-job-transaction-support.patch diff --git a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch b/debian/patches/pve/0029-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch similarity index 100% rename from debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch rename to debian/patches/pve/0029-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch diff --git a/debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch b/debian/patches/pve/0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch similarity index 100% rename from debian/patches/pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch rename to debian/patches/pve/0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch diff --git a/debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch b/debian/patches/pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch similarity index 100% rename from debian/patches/pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch rename to debian/patches/pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch diff --git a/debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0032-PVE-redirect-stderr-to-journal-when-daemonized.patch similarity index 100% rename from debian/patches/pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch rename to debian/patches/pve/0032-PVE-redirect-stderr-to-journal-when-daemonized.patch diff --git a/debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0033-PVE-Migrate-dirty-bitmap-state-via-savevm.patch similarity index 100% rename from debian/patches/pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch rename to debian/patches/pve/0033-PVE-Migrate-dirty-bitmap-state-via-savevm.patch diff --git a/debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch b/debian/patches/pve/0034-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch similarity index 100% rename from debian/patches/pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch rename to debian/patches/pve/0034-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch diff --git a/debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch b/debian/patches/pve/0035-PVE-fall-back-to-open-iscsi-initiatorname.patch similarity index 100% rename from debian/patches/pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch rename to debian/patches/pve/0035-PVE-fall-back-to-open-iscsi-initiatorname.patch diff --git a/debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch b/debian/patches/pve/0036-PVE-block-stream-increase-chunk-size.patch similarity index 100% rename from debian/patches/pve/0037-PVE-block-stream-increase-chunk-size.patch rename to debian/patches/pve/0036-PVE-block-stream-increase-chunk-size.patch diff --git a/debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch b/debian/patches/pve/0037-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch similarity index 100% rename from debian/patches/pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch rename to debian/patches/pve/0037-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch diff --git a/debian/patches/pve/0039-block-add-alloc-track-driver.patch b/debian/patches/pve/0038-block-add-alloc-track-driver.patch similarity index 100% rename from debian/patches/pve/0039-block-add-alloc-track-driver.patch rename to debian/patches/pve/0038-block-add-alloc-track-driver.patch diff --git a/debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch b/debian/patches/pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch similarity index 100% rename from debian/patches/pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch rename to debian/patches/pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch diff --git a/debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch b/debian/patches/pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch similarity index 100% rename from debian/patches/pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch rename to debian/patches/pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch diff --git a/debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch b/debian/patches/pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch similarity index 100% rename from debian/patches/pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch rename to debian/patches/pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch diff --git a/debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch b/debian/patches/pve/0042-alloc-track-fix-deadlock-during-drop.patch similarity index 100% rename from debian/patches/pve/0043-alloc-track-fix-deadlock-during-drop.patch rename to debian/patches/pve/0042-alloc-track-fix-deadlock-during-drop.patch diff --git a/debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch b/debian/patches/pve/0043-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch similarity index 100% rename from debian/patches/pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch rename to debian/patches/pve/0043-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch diff --git a/debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch b/debian/patches/pve/0044-savevm-async-don-t-hold-BQL-during-setup.patch similarity index 100% rename from debian/patches/pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch rename to debian/patches/pve/0044-savevm-async-don-t-hold-BQL-during-setup.patch diff --git a/debian/patches/series b/debian/patches/series index db0586e..010b005 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -43,29 +43,28 @@ pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch -pve/0020-PVE-Add-dummy-id-command-line-parameter.patch -pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch -pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch -pve/0023-PVE-monitor-disable-oob-capability.patch -pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch -pve/0025-PVE-Allow-version-code-in-machine-type.patch -pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch -pve/0027-PVE-Backup-add-vma-backup-format-code.patch -pve/0028-PVE-Backup-add-backup-dump-block-driver.patch -pve/0029-PVE-Add-sequential-job-transaction-support.patch -pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch -pve/0031-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch -pve/0032-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch -pve/0033-PVE-redirect-stderr-to-journal-when-daemonized.patch -pve/0034-PVE-Migrate-dirty-bitmap-state-via-savevm.patch -pve/0035-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch -pve/0036-PVE-fall-back-to-open-iscsi-initiatorname.patch -pve/0037-PVE-block-stream-increase-chunk-size.patch -pve/0038-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch -pve/0039-block-add-alloc-track-driver.patch -pve/0040-Revert-block-rbd-workaround-for-ceph-issue-53784.patch -pve/0041-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch -pve/0042-Revert-block-rbd-implement-bdrv_co_block_status.patch -pve/0043-alloc-track-fix-deadlock-during-drop.patch -pve/0044-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch -pve/0045-savevm-async-don-t-hold-BQL-during-setup.patch +pve/0020-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch +pve/0021-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch +pve/0022-PVE-monitor-disable-oob-capability.patch +pve/0023-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch +pve/0024-PVE-Allow-version-code-in-machine-type.patch +pve/0025-block-backup-move-bcs-bitmap-initialization-to-job-c.patch +pve/0026-PVE-Backup-add-vma-backup-format-code.patch +pve/0027-PVE-Backup-add-backup-dump-block-driver.patch +pve/0028-PVE-Add-sequential-job-transaction-support.patch +pve/0029-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch +pve/0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch +pve/0031-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch +pve/0032-PVE-redirect-stderr-to-journal-when-daemonized.patch +pve/0033-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +pve/0034-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch +pve/0035-PVE-fall-back-to-open-iscsi-initiatorname.patch +pve/0036-PVE-block-stream-increase-chunk-size.patch +pve/0037-block-io-accept-NULL-qiov-in-bdrv_pad_request.patch +pve/0038-block-add-alloc-track-driver.patch +pve/0039-Revert-block-rbd-workaround-for-ceph-issue-53784.patch +pve/0040-Revert-block-rbd-fix-handling-of-holes-in-.bdrv_co_b.patch +pve/0041-Revert-block-rbd-implement-bdrv_co_block_status.patch +pve/0042-alloc-track-fix-deadlock-during-drop.patch +pve/0043-migration-for-snapshots-hold-the-BQL-during-setup-ca.patch +pve/0044-savevm-async-don-t-hold-BQL-during-setup.patch -- 2.39.2 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner ` (3 preceding siblings ...) 2023-05-24 10:54 ` [pve-devel] [RFC qemu 2/2] drop patch for custom dummy id CLI argument Fiona Ebner @ 2023-05-24 13:42 ` Fiona Ebner 4 siblings, 0 replies; 6+ messages in thread From: Fiona Ebner @ 2023-05-24 13:42 UTC (permalink / raw) To: pve-devel Am 24.05.23 um 12:53 schrieb Fiona Ebner: > First one is dropping the custom get_link_status QMP command which I > could not find any users for. > > Second one is dropping the dummy id CLI parameter, where the only > remaining user I found is qmeventd, which is adapted to parse the VM > ID from the cgroup proc file instead. > > Of course, new pve-qemu-kvm will break old qemu-server, requiring a > versioned breaks. > I'll send a v2 of this, which also gets rid of two deprecated QMP commands we don't need anymore. Sorry for the noise. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-05-24 13:43 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-05-24 10:53 [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 1/2] qmeventd: extract vmid from cgroup file instead of cmdline Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu-server 2/2] cfg2cmd: drop custom id parameter Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [PATCH qemu 1/2] drop patch for custom get_link_status QMP command Fiona Ebner 2023-05-24 10:54 ` [pve-devel] [RFC qemu 2/2] drop patch for custom dummy id CLI argument Fiona Ebner 2023-05-24 13:42 ` [pve-devel] [PATCH-SERIES qemu-server/qemu] two breaking changes Fiona Ebner
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox