From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id DFA7F1FF0AF for ; Thu, 10 Sep 2026 13:29:08 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 55B7F215F4; Thu, 10 Sep 2026 13:29:00 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 6/7] monitor: use new QOM syntax on the QEMU commandline for monitor objects Date: Thu, 10 Sep 2026 13:21:45 +0200 Message-ID: <20260910112207.162329-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260910112207.162329-1-f.ebner@proxmox.com> References: <20260910112207.162329-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1789039321800 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.646 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record X-MailFrom: f.ebner@proxmox.com X-Mailman-Rule-Hits: max-size X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; news-moderation; no-subject; digests; suspicious-header Message-ID-Hash: ZHVW7NS62TIZMK65HFWK4VWNUMQR5XDY X-Message-ID-Hash: ZHVW7NS62TIZMK65HFWK4VWNUMQR5XDY X-Mailman-Approved-At: Thu, 10 Sep 2026 13:28:45 +0200 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: To avoid a deprecation warning, use the new QEMU object model syntax when specifying a monitor object on the QEMU commandline. Note that 'mode=control' is what made it a QMP monitor rather than an HMP monitor before, so that parameter is gone now. Additionally an ID is required, where "monitor-$chardev_id" is chosen. Signed-off-by: Fiona Ebner --- Changes in v3: * Rebase on current master. src/PVE/QemuServer.pm | 8 ++++---- src/PVE/QemuServer/Monitor.pm | 11 +++++++++++ src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd | 5 +++-- src/test/cfg2cmd/aarch64/simple-arm.conf.cmd | 5 +++-- .../cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd | 5 +++-- src/test/cfg2cmd/aio.conf.cmd | 5 +++-- src/test/cfg2cmd/bootorder-empty.conf.cmd | 5 +++-- src/test/cfg2cmd/bootorder-legacy.conf.cmd | 5 +++-- src/test/cfg2cmd/bootorder.conf.cmd | 5 +++-- src/test/cfg2cmd/cpu-level.conf.cmd | 4 ++-- .../cputype-icelake-client-deprecation.conf.cmd | 5 +++-- src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd | 5 +++-- .../cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd | 4 ++-- src/test/cfg2cmd/custom-cpu-model.conf.cmd | 4 ++-- src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd | 5 +++-- src/test/cfg2cmd/efi-raw-template.conf.cmd | 5 +++-- src/test/cfg2cmd/efi-raw.conf.cmd | 5 +++-- src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 5 +++-- src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd | 5 +++-- src/test/cfg2cmd/efidisk-on-rbd.conf.cmd | 5 +++-- src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd | 5 +++-- src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd | 4 ++-- src/test/cfg2cmd/ide.conf.cmd | 5 +++-- src/test/cfg2cmd/linux-bridges-qemu-11.1.conf.cmd | 4 ++-- src/test/cfg2cmd/linux-hostpci-legacy-igd.conf.cmd | 5 +++-- src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd | 5 +++-- src/test/cfg2cmd/memory-hotplug.conf.cmd | 5 +++-- src/test/cfg2cmd/memory-hugepages-1g.conf.cmd | 5 +++-- src/test/cfg2cmd/memory-hugepages-2m.conf.cmd | 5 +++-- src/test/cfg2cmd/minimal-defaults.conf.cmd | 5 +++-- src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd | 4 ++-- src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd | 5 +++-- src/test/cfg2cmd/netdev-7.1.conf.cmd | 5 +++-- src/test/cfg2cmd/netdev.conf.cmd | 4 ++-- src/test/cfg2cmd/netdev_vxlan.conf.cmd | 5 +++-- src/test/cfg2cmd/os-l24.conf.cmd | 5 +++-- src/test/cfg2cmd/os-other.conf.cmd | 5 +++-- src/test/cfg2cmd/os-solaris.conf.cmd | 5 +++-- src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd | 4 ++-- src/test/cfg2cmd/pinned-version-pxe.conf.cmd | 4 ++-- src/test/cfg2cmd/pinned-version.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-ide.conf.cmd | 5 +++-- .../cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd | 5 +++-- .../cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd | 5 +++-- .../q35-linux-hostpci-x-pci-overrides.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-linux-hostpci.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-scsihw2.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-simple-6.0.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-simple-7.0.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-simple.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-usb2.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-usb3.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd | 5 +++-- .../cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-viommu-intel.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-viommu-virtio.conf.cmd | 5 +++-- src/test/cfg2cmd/q35-win10-hostpci.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-win7-hostpci.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-windows-pinning.conf.cmd | 4 ++-- src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd | 4 ++-- src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd | 4 ++-- src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd | 5 +++-- src/test/cfg2cmd/qga-fs-freeze.conf.cmd | 5 +++-- src/test/cfg2cmd/qga-minimal.conf.cmd | 5 +++-- src/test/cfg2cmd/scsiblk.conf.cmd | 5 +++-- src/test/cfg2cmd/scsihw-lsi.conf.cmd | 4 ++-- src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd | 4 ++-- src/test/cfg2cmd/scsihw-megasas.conf.cmd | 5 +++-- src/test/cfg2cmd/scsihw-pvscsi.conf.cmd | 5 +++-- src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd | 5 +++-- src/test/cfg2cmd/seabios_serial.conf.cmd | 5 +++-- src/test/cfg2cmd/sev-es.conf.cmd | 5 +++-- src/test/cfg2cmd/sev-snp.conf.cmd | 5 +++-- src/test/cfg2cmd/sev-std.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-backingchain.conf.cmd | 5 +++-- .../simple-balloon-free-page-reporting.conf.cmd | 4 ++-- src/test/cfg2cmd/simple-btrfs.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-cifs.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-disk-passthrough.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-lvm.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-lvmthin.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-rbd.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-virtio-blk.conf.cmd | 5 +++-- src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd | 5 +++-- src/test/cfg2cmd/simple1-template.conf.cmd | 5 +++-- src/test/cfg2cmd/simple1.conf.cmd | 5 +++-- src/test/cfg2cmd/spice-enhancments.conf.cmd | 4 ++-- src/test/cfg2cmd/spice-linux-5.0.conf.cmd | 4 ++-- src/test/cfg2cmd/spice-usb3.conf.cmd | 4 ++-- src/test/cfg2cmd/spice-win.conf.cmd | 4 ++-- src/test/cfg2cmd/startdate-l26.conf.cmd | 5 +++-- src/test/cfg2cmd/startdate-win11.conf.cmd | 4 ++-- src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd | 5 +++-- src/test/cfg2cmd/vnc-clipboard-std.conf.cmd | 5 +++-- src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd | 4 ++-- src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd | 4 ++-- 101 files changed, 281 insertions(+), 202 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index cf46f635..759f7db2 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -2988,6 +2988,7 @@ sub query_supported_cpu_flags { my $kvm_supported = defined(kvm_version()) && $arch eq $host_arch; my $qemu_cmd = PVE::QemuServer::Helpers::get_command_for_arch($arch); + my $qemu_binary_version = kvm_user_version($qemu_cmd); my $fakevmid = -1; my $pidfile = PVE::QemuServer::Helpers::vm_pidfile_name($fakevmid); @@ -3004,8 +3005,7 @@ sub query_supported_cpu_flags { 'none', '-chardev', "socket,id=qmp,path=/var/run/qemu-server/$fakevmid.qmp,server=on,wait=off", - '-mon', - 'chardev=qmp,mode=control', + PVE::QemuServer::Monitor::object_commandline($qemu_binary_version, 'qmp')->@*, '-pidfile', $pidfile, '-S', @@ -3225,7 +3225,7 @@ sub config_to_command { my $qmpsocket = PVE::QemuServer::Helpers::qmp_socket(vm_qmp_peer($vmid)); push @$cmd, '-chardev', "socket,id=qmp,path=$qmpsocket,server=on,wait=off"; - push @$cmd, '-mon', "chardev=qmp,mode=control"; + push @$cmd, PVE::QemuServer::Monitor::object_commandline($kvmver, 'qmp')->@*; if (min_version($machine_version, 2, 12)) { # QEMU 9.2 introduced a new 'reconnect-ms' option while deprecating the 'reconnect' option @@ -3234,7 +3234,7 @@ sub config_to_command { $reconnect_param = "reconnect-ms=5000"; } push @$cmd, '-chardev', "socket,id=qmp-event,path=/var/run/qmeventd.sock,$reconnect_param"; - push @$cmd, '-mon', "chardev=qmp-event,mode=control"; + push @$cmd, PVE::QemuServer::Monitor::object_commandline($kvmver, 'qmp-event')->@*; } push @$cmd, '-pidfile', PVE::QemuServer::Helpers::vm_pidfile_name($vmid); diff --git a/src/PVE/QemuServer/Monitor.pm b/src/PVE/QemuServer/Monitor.pm index c6e7193c..d8735c92 100644 --- a/src/PVE/QemuServer/Monitor.pm +++ b/src/PVE/QemuServer/Monitor.pm @@ -140,4 +140,15 @@ sub hmp_cmd { ); } +sub object_commandline { + my ($qemu_binary_version, $chardev) = @_; + + if (PVE::QemuServer::Helpers::min_version($qemu_binary_version, 11, 1)) { + # use new style to avoid deprecation warning + return ['-object', "monitor-qmp,chardev=${chardev},id=monitor-${chardev}"]; + } + + return ['-mon', "chardev=${chardev},mode=control"]; +} + 1; diff --git a/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd b/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd index fd4f58e2..c2981f36 100644 --- a/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd +++ b/src/test/cfg2cmd/aarch64/simple-arm-host.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -21,6 +21,7 @@ -object '{"id":"throttle-drive-scsi0","limits":{},"qom-type":"throttle-group"}' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pcie.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pcie.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'usb-ehci,id=ehci,bus=pcie.0,addr=0x1' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ diff --git a/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd b/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd index 67bbe72a..244fe007 100644 --- a/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd +++ b/src/test/cfg2cmd/aarch64/simple-arm.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -21,6 +21,7 @@ -object '{"id":"throttle-drive-scsi0","limits":{},"qom-type":"throttle-group"}' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pcie.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pcie.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'usb-ehci,id=ehci,bus=pcie.0,addr=0x1' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ diff --git a/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd b/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd index 9e932d6b..ab88e7d1 100644 --- a/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd +++ b/src/test/cfg2cmd/aarch64/simple-x86-on-arm-host.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/aio.conf.cmd b/src/test/cfg2cmd/aio.conf.cmd index 2e275f6d..c6594e12 100644 --- a/src/test/cfg2cmd/aio.conf.cmd +++ b/src/test/cfg2cmd/aio.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -32,6 +32,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/bootorder-empty.conf.cmd b/src/test/cfg2cmd/bootorder-empty.conf.cmd index d6a56e79..c234bf2b 100644 --- a/src/test/cfg2cmd/bootorder-empty.conf.cmd +++ b/src/test/cfg2cmd/bootorder-empty.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -24,6 +24,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/bootorder-legacy.conf.cmd b/src/test/cfg2cmd/bootorder-legacy.conf.cmd index b03e1193..13c5ecbf 100644 --- a/src/test/cfg2cmd/bootorder-legacy.conf.cmd +++ b/src/test/cfg2cmd/bootorder-legacy.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -24,6 +24,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/bootorder.conf.cmd b/src/test/cfg2cmd/bootorder.conf.cmd index 70203ff9..fa849370 100644 --- a/src/test/cfg2cmd/bootorder.conf.cmd +++ b/src/test/cfg2cmd/bootorder.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -24,6 +24,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/cpu-level.conf.cmd b/src/test/cfg2cmd/cpu-level.conf.cmd index 5d5f760d..5e824135 100644 --- a/src/test/cfg2cmd/cpu-level.conf.cmd +++ b/src/test/cfg2cmd/cpu-level.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd index c223929e..b48a2d95 100644 --- a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd +++ b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd index 7b43d8e0..36a14110 100644 --- a/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd +++ b/src/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd @@ -3,9 +3,9 @@ -name customcpu-defaults \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fce' \ @@ -19,6 +19,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd index 665e05d7..8a193572 100644 --- a/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd +++ b/src/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd @@ -3,9 +3,9 @@ -name customcpu \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fcf' \ diff --git a/src/test/cfg2cmd/custom-cpu-model.conf.cmd b/src/test/cfg2cmd/custom-cpu-model.conf.cmd index 40c7787e..2035f54a 100644 --- a/src/test/cfg2cmd/custom-cpu-model.conf.cmd +++ b/src/test/cfg2cmd/custom-cpu-model.conf.cmd @@ -3,9 +3,9 @@ -name customcpu \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=2ea3f676-dfa5-11e9-ae82-c721e12f3fcf' \ diff --git a/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd b/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd index bab304dc..d9f1e8ce 100644 --- a/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd +++ b/src/test/cfg2cmd/efi-ovmf-without-efidisk.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/efi-raw-template.conf.cmd b/src/test/cfg2cmd/efi-raw-template.conf.cmd index 34d509cb..cbf9670f 100644 --- a/src/test/cfg2cmd/efi-raw-template.conf.cmd +++ b/src/test/cfg2cmd/efi-raw-template.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/efi-raw.conf.cmd b/src/test/cfg2cmd/efi-raw.conf.cmd index bf35f1d6..92d4bdaf 100644 --- a/src/test/cfg2cmd/efi-raw.conf.cmd +++ b/src/test/cfg2cmd/efi-raw.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd index 4d12b034..ab8e323c 100644 --- a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd +++ b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -21,6 +21,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -chardev 'socket,id=tpmchar,path=/var/run/qemu-server/8006.swtpm' \ -tpmdev 'emulator,id=tpmdev,chardev=tpmchar' \ diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd index 84721318..3d48724b 100644 --- a/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd +++ b/src/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -chardev 'socket,id=tpmchar,path=/var/run/qemu-server/8006.swtpm' \ diff --git a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd index 6a1cae98..43168d56 100644 --- a/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd +++ b/src/test/cfg2cmd/efidisk-on-rbd.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e688' \ @@ -24,6 +24,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13a' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd b/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd index d90c7ad6..4343fe2f 100644 --- a/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd +++ b/src/test/cfg2cmd/i440fx-viommu-virtio.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd index 2c19c1c7..78d5223e 100644 --- a/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd +++ b/src/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/ide.conf.cmd b/src/test/cfg2cmd/ide.conf.cmd index 4354d427..aa6890b7 100644 --- a/src/test/cfg2cmd/ide.conf.cmd +++ b/src/test/cfg2cmd/ide.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -24,6 +24,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/linux-bridges-qemu-11.1.conf.cmd b/src/test/cfg2cmd/linux-bridges-qemu-11.1.conf.cmd index 2aebdffa..5624a7ef 100644 --- a/src/test/cfg2cmd/linux-bridges-qemu-11.1.conf.cmd +++ b/src/test/cfg2cmd/linux-bridges-qemu-11.1.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/linux-hostpci-legacy-igd.conf.cmd b/src/test/cfg2cmd/linux-hostpci-legacy-igd.conf.cmd index 21dd22ef..8a146adc 100644 --- a/src/test/cfg2cmd/linux-hostpci-legacy-igd.conf.cmd +++ b/src/test/cfg2cmd/linux-hostpci-legacy-igd.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -27,6 +27,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.1,addr=0x1e' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd b/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd index af56796a..f2884abf 100644 --- a/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd +++ b/src/test/cfg2cmd/memory-hotplug-hugepages.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -55,6 +55,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/memory-hotplug.conf.cmd b/src/test/cfg2cmd/memory-hotplug.conf.cmd index adb1531a..35da3456 100644 --- a/src/test/cfg2cmd/memory-hotplug.conf.cmd +++ b/src/test/cfg2cmd/memory-hotplug.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -167,6 +167,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd b/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd index 34aa09ea..07e3fa77 100644 --- a/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd +++ b/src/test/cfg2cmd/memory-hugepages-1g.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd b/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd index 98a3b26b..dee967e2 100644 --- a/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd +++ b/src/test/cfg2cmd/memory-hugepages-2m.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/minimal-defaults.conf.cmd b/src/test/cfg2cmd/minimal-defaults.conf.cmd index f10276ba..6992a09b 100644 --- a/src/test/cfg2cmd/minimal-defaults.conf.cmd +++ b/src/test/cfg2cmd/minimal-defaults.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=6cf17dc3-8341-4ecc-aebd-7503f2583fb3' \ @@ -19,6 +19,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd index 89226c72..53f00fd3 100644 --- a/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd +++ b/src/test/cfg2cmd/netdev-7.0-multiqueues.conf.cmd @@ -3,9 +3,9 @@ -name netdev-multiq \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd index f803b0d5..b4007730 100644 --- a/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd +++ b/src/test/cfg2cmd/netdev-7.1-multiqueues.conf.cmd @@ -3,9 +3,9 @@ -name netdev \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '3,sockets=1,cores=3,maxcpus=3' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/netdev-7.1.conf.cmd b/src/test/cfg2cmd/netdev-7.1.conf.cmd index 99d72f28..59fcf690 100644 --- a/src/test/cfg2cmd/netdev-7.1.conf.cmd +++ b/src/test/cfg2cmd/netdev-7.1.conf.cmd @@ -3,9 +3,9 @@ -name netdev \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '3,sockets=1,cores=3,maxcpus=3' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/netdev.conf.cmd b/src/test/cfg2cmd/netdev.conf.cmd index 2a35d7e8..2b3e2d2f 100644 --- a/src/test/cfg2cmd/netdev.conf.cmd +++ b/src/test/cfg2cmd/netdev.conf.cmd @@ -3,9 +3,9 @@ -name netdev \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '3,sockets=1,cores=3,maxcpus=3' \ diff --git a/src/test/cfg2cmd/netdev_vxlan.conf.cmd b/src/test/cfg2cmd/netdev_vxlan.conf.cmd index 7d353f3d..e0560ccc 100644 --- a/src/test/cfg2cmd/netdev_vxlan.conf.cmd +++ b/src/test/cfg2cmd/netdev_vxlan.conf.cmd @@ -3,9 +3,9 @@ -name netdev \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '3,sockets=1,cores=3,maxcpus=3' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/os-l24.conf.cmd b/src/test/cfg2cmd/os-l24.conf.cmd index 3f299166..c4ad49ca 100644 --- a/src/test/cfg2cmd/os-l24.conf.cmd +++ b/src/test/cfg2cmd/os-l24.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ diff --git a/src/test/cfg2cmd/os-other.conf.cmd b/src/test/cfg2cmd/os-other.conf.cmd index 6ca9f464..fea1cd84 100644 --- a/src/test/cfg2cmd/os-other.conf.cmd +++ b/src/test/cfg2cmd/os-other.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/os-solaris.conf.cmd b/src/test/cfg2cmd/os-solaris.conf.cmd index a7174ec3..6c8d7ddb 100644 --- a/src/test/cfg2cmd/os-solaris.conf.cmd +++ b/src/test/cfg2cmd/os-solaris.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd index fe7f1a2e..69e72f3c 100644 --- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd +++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd @@ -3,9 +3,9 @@ -name pinned \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \ diff --git a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd index 098b12fa..416cc243 100644 --- a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd +++ b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd @@ -3,9 +3,9 @@ -name pinned \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \ diff --git a/src/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pinned-version.conf.cmd index 3353da19..6333f1b7 100644 --- a/src/test/cfg2cmd/pinned-version.conf.cmd +++ b/src/test/cfg2cmd/pinned-version.conf.cmd @@ -3,9 +3,9 @@ -name pinned \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=c7fdd046-fefc-11e9-832e-770e1d5636a0' \ diff --git a/src/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.conf.cmd index ef818519..242ccf62 100644 --- a/src/test/cfg2cmd/q35-ide.conf.cmd +++ b/src/test/cfg2cmd/q35-ide.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -24,6 +24,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd index 3039662f..9adc2e9e 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -26,6 +26,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'vfio-pci,host=0000:00:ff.1,id=hostpci0,bus=pci.0,addr=0x10' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd index 81aa6cff..b50827d2 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -26,6 +26,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'vfio-pci,host=0000:07:10.0,id=hostpci0,bus=pci.0,addr=0x10' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd index 255f2b01..630f2a9b 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -26,6 +26,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'vfio-pci,host=0000:f0:43.0,id=hostpci0.0,bus=pci.0,addr=0x10.0,multifunction=on' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd index 021dd2a3..497519af 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd index d0e25609..e1a02dce 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -26,6 +26,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'vfio-pci,host=0000:00:ff.1,id=hostpci0,bus=pci.0,addr=0x10,x-pci-vendor-id=0x1234,x-pci-device-id=0x5678,x-pci-sub-vendor-id=0x2233,x-pci-sub-device-id=0x0000' \ diff --git a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd index 3039662f..9adc2e9e 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -26,6 +26,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'vfio-pci,host=0000:00:ff.1,id=hostpci0,bus=pci.0,addr=0x10' \ diff --git a/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd b/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd index b4fb7f08..11ebc6bf 100644 --- a/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -23,6 +23,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ diff --git a/src/test/cfg2cmd/q35-scsihw2.conf.cmd b/src/test/cfg2cmd/q35-scsihw2.conf.cmd index 169539a1..da1a251a 100644 --- a/src/test/cfg2cmd/q35-scsihw2.conf.cmd +++ b/src/test/cfg2cmd/q35-scsihw2.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd index a362c005..fe6a7fcc 100644 --- a/src/test/cfg2cmd/q35-simple-6.0.conf.cmd +++ b/src/test/cfg2cmd/q35-simple-6.0.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd index 04fe0e67..739b911d 100644 --- a/src/test/cfg2cmd/q35-simple-7.0.conf.cmd +++ b/src/test/cfg2cmd/q35-simple-7.0.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd index 78bbbe30..8f48a63a 100644 --- a/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd +++ b/src/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-simple.conf.cmd b/src/test/cfg2cmd/q35-simple.conf.cmd index 7a3bc4d6..c01f9e98 100644 --- a/src/test/cfg2cmd/q35-simple.conf.cmd +++ b/src/test/cfg2cmd/q35-simple.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ @@ -22,6 +22,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ diff --git a/src/test/cfg2cmd/q35-usb2.conf.cmd b/src/test/cfg2cmd/q35-usb2.conf.cmd index 6e082646..73d2d7aa 100644 --- a/src/test/cfg2cmd/q35-usb2.conf.cmd +++ b/src/test/cfg2cmd/q35-usb2.conf.cmd @@ -3,9 +3,9 @@ -name q35-usb2 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/q35-usb3.conf.cmd b/src/test/cfg2cmd/q35-usb3.conf.cmd index b2b319d5..95fc0000 100644 --- a/src/test/cfg2cmd/q35-usb3.conf.cmd +++ b/src/test/cfg2cmd/q35-usb3.conf.cmd @@ -3,9 +3,9 @@ -name q35-usb3 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd index c4b5de15..f7c44beb 100644 --- a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on,aw-bits=39' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd index dc8c45b9..dab8c958 100644 --- a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd index f2a9201a..fd77a3c5 100644 --- a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd index e85b27e4..51630e2c 100644 --- a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -17,6 +17,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd index 367ce692..400d3247 100644 --- a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -17,6 +17,7 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd index ccc0fb7e..bc7d1120 100644 --- a/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd +++ b/src/test/cfg2cmd/q35-win10-hostpci.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-win7-hostpci.conf.cmd b/src/test/cfg2cmd/q35-win7-hostpci.conf.cmd index 66f8aec5..2685d8ce 100644 --- a/src/test/cfg2cmd/q35-win7-hostpci.conf.cmd +++ b/src/test/cfg2cmd/q35-win7-hostpci.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ diff --git a/src/test/cfg2cmd/q35-windows-pinning.conf.cmd b/src/test/cfg2cmd/q35-windows-pinning.conf.cmd index f51f51a9..d8394a01 100644 --- a/src/test/cfg2cmd/q35-windows-pinning.conf.cmd +++ b/src/test/cfg2cmd/q35-windows-pinning.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd index d51256f8..a4ad9cd5 100644 --- a/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd +++ b/src/test/cfg2cmd/qemu-xhci-7.1.conf.cmd @@ -3,9 +3,9 @@ -name spiceusb3 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd index 60ae074c..453d2dbd 100644 --- a/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd +++ b/src/test/cfg2cmd/qemu-xhci-q35-7.1.conf.cmd @@ -3,9 +3,9 @@ -name q35-qemu-xhci \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd b/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd index a53511b4..bce6f14e 100644 --- a/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd +++ b/src/test/cfg2cmd/qga-fs-freeze-backup-legacy.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/qga-fs-freeze.conf.cmd b/src/test/cfg2cmd/qga-fs-freeze.conf.cmd index a53511b4..bce6f14e 100644 --- a/src/test/cfg2cmd/qga-fs-freeze.conf.cmd +++ b/src/test/cfg2cmd/qga-fs-freeze.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/qga-minimal.conf.cmd b/src/test/cfg2cmd/qga-minimal.conf.cmd index a53511b4..bce6f14e 100644 --- a/src/test/cfg2cmd/qga-minimal.conf.cmd +++ b/src/test/cfg2cmd/qga-minimal.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/scsiblk.conf.cmd b/src/test/cfg2cmd/scsiblk.conf.cmd index 74c2d868..127b45cb 100644 --- a/src/test/cfg2cmd/scsiblk.conf.cmd +++ b/src/test/cfg2cmd/scsiblk.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=d47e2d5c-7068-46d4-9733-ff94083e28f6' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=0a212e2f-0d9a-4006-971e-17be9fcf3efe' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/scsihw-lsi.conf.cmd b/src/test/cfg2cmd/scsihw-lsi.conf.cmd index 5adb5d32..da715368 100644 --- a/src/test/cfg2cmd/scsihw-lsi.conf.cmd +++ b/src/test/cfg2cmd/scsihw-lsi.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd b/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd index c5204eed..e712a5c5 100644 --- a/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd +++ b/src/test/cfg2cmd/scsihw-lsi53c810.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/scsihw-megasas.conf.cmd b/src/test/cfg2cmd/scsihw-megasas.conf.cmd index abb14167..a09fd7a8 100644 --- a/src/test/cfg2cmd/scsihw-megasas.conf.cmd +++ b/src/test/cfg2cmd/scsihw-megasas.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd b/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd index 68afe634..da1da47c 100644 --- a/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd +++ b/src/test/cfg2cmd/scsihw-pvscsi.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd b/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd index 3e01028c..eb426225 100644 --- a/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd +++ b/src/test/cfg2cmd/scsihw-virtio-scsi-single.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -24,6 +24,7 @@ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'pci-bridge,id=pci.3,chassis_nr=3,bus=pci.0,addr=0x5' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/seabios_serial.conf.cmd b/src/test/cfg2cmd/seabios_serial.conf.cmd index 7a7df5bb..e0406e25 100644 --- a/src/test/cfg2cmd/seabios_serial.conf.cmd +++ b/src/test/cfg2cmd/seabios_serial.conf.cmd @@ -3,9 +3,9 @@ -name seabiosserial \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -chardev 'socket,id=serial0,path=/var/run/qemu-server/8006.serial0,server=on,wait=off' \ diff --git a/src/test/cfg2cmd/sev-es.conf.cmd b/src/test/cfg2cmd/sev-es.conf.cmd index d41619ec..5059f814 100644 --- a/src/test/cfg2cmd/sev-es.conf.cmd +++ b/src/test/cfg2cmd/sev-es.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/sev-snp.conf.cmd b/src/test/cfg2cmd/sev-snp.conf.cmd index 045ec5ce..3abbc9e2 100644 --- a/src/test/cfg2cmd/sev-snp.conf.cmd +++ b/src/test/cfg2cmd/sev-snp.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/sev-std.conf.cmd b/src/test/cfg2cmd/sev-std.conf.cmd index 277b61fc..b157199f 100644 --- a/src/test/cfg2cmd/sev-std.conf.cmd +++ b/src/test/cfg2cmd/sev-std.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/simple-backingchain.conf.cmd b/src/test/cfg2cmd/simple-backingchain.conf.cmd index c2cec31b..1d748a53 100644 --- a/src/test/cfg2cmd/simple-backingchain.conf.cmd +++ b/src/test/cfg2cmd/simple-backingchain.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd index 4a9e65cb..36aa6d21 100644 --- a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd +++ b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/simple-btrfs.conf.cmd b/src/test/cfg2cmd/simple-btrfs.conf.cmd index ab2e2567..1b1d6870 100644 --- a/src/test/cfg2cmd/simple-btrfs.conf.cmd +++ b/src/test/cfg2cmd/simple-btrfs.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-1010-1010add53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/simple-cifs.conf.cmd b/src/test/cfg2cmd/simple-cifs.conf.cmd index ea9cd98f..f24328d8 100644 --- a/src/test/cfg2cmd/simple-cifs.conf.cmd +++ b/src/test/cfg2cmd/simple-cifs.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd index e294a576..8e6f46fc 100644 --- a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd +++ b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/simple-lvm.conf.cmd b/src/test/cfg2cmd/simple-lvm.conf.cmd index c4ae13b8..1bb3bfed 100644 --- a/src/test/cfg2cmd/simple-lvm.conf.cmd +++ b/src/test/cfg2cmd/simple-lvm.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/simple-lvmthin.conf.cmd b/src/test/cfg2cmd/simple-lvmthin.conf.cmd index 64c56a5b..e1ec957d 100644 --- a/src/test/cfg2cmd/simple-lvmthin.conf.cmd +++ b/src/test/cfg2cmd/simple-lvmthin.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -22,6 +22,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/simple-rbd.conf.cmd b/src/test/cfg2cmd/simple-rbd.conf.cmd index 57d8a881..235904ac 100644 --- a/src/test/cfg2cmd/simple-rbd.conf.cmd +++ b/src/test/cfg2cmd/simple-rbd.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -27,6 +27,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-1010-1010add53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd index f0370bdb..2b8a8aa5 100644 --- a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd +++ b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -21,6 +21,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd index 04a20eda..5aa18b64 100644 --- a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd +++ b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -23,6 +23,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-1010-1010add53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/simple1-template.conf.cmd b/src/test/cfg2cmd/simple1-template.conf.cmd index ff5d75d6..3b7932ab 100644 --- a/src/test/cfg2cmd/simple1-template.conf.cmd +++ b/src/test/cfg2cmd/simple1-template.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -21,6 +21,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ diff --git a/src/test/cfg2cmd/simple1.conf.cmd b/src/test/cfg2cmd/simple1.conf.cmd index 924d8041..053dcaa6 100644 --- a/src/test/cfg2cmd/simple1.conf.cmd +++ b/src/test/cfg2cmd/simple1.conf.cmd @@ -3,9 +3,9 @@ -name simple \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ @@ -20,6 +20,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ diff --git a/src/test/cfg2cmd/spice-enhancments.conf.cmd b/src/test/cfg2cmd/spice-enhancments.conf.cmd index 20049ca2..44d0534c 100644 --- a/src/test/cfg2cmd/spice-enhancments.conf.cmd +++ b/src/test/cfg2cmd/spice-enhancments.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=363a6126-5f48-43e1-811f-013294a946a0' \ diff --git a/src/test/cfg2cmd/spice-linux-5.0.conf.cmd b/src/test/cfg2cmd/spice-linux-5.0.conf.cmd index 5f3a8a92..59993ce5 100644 --- a/src/test/cfg2cmd/spice-linux-5.0.conf.cmd +++ b/src/test/cfg2cmd/spice-linux-5.0.conf.cmd @@ -3,9 +3,9 @@ -name spicelinux \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/spice-usb3.conf.cmd b/src/test/cfg2cmd/spice-usb3.conf.cmd index 9c7bafd0..6cc8a7c4 100644 --- a/src/test/cfg2cmd/spice-usb3.conf.cmd +++ b/src/test/cfg2cmd/spice-usb3.conf.cmd @@ -3,9 +3,9 @@ -name spiceusb3 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ diff --git a/src/test/cfg2cmd/spice-win.conf.cmd b/src/test/cfg2cmd/spice-win.conf.cmd index 50aa6b69..b22f7a57 100644 --- a/src/test/cfg2cmd/spice-win.conf.cmd +++ b/src/test/cfg2cmd/spice-win.conf.cmd @@ -3,9 +3,9 @@ -name spiceusb3 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec461' \ diff --git a/src/test/cfg2cmd/startdate-l26.conf.cmd b/src/test/cfg2cmd/startdate-l26.conf.cmd index 6897de3c..2e2ee787 100644 --- a/src/test/cfg2cmd/startdate-l26.conf.cmd +++ b/src/test/cfg2cmd/startdate-l26.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/startdate-win11.conf.cmd b/src/test/cfg2cmd/startdate-win11.conf.cmd index 93efeeae..74b1c9e1 100644 --- a/src/test/cfg2cmd/startdate-win11.conf.cmd +++ b/src/test/cfg2cmd/startdate-win11.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd index 7ae3d722..1ef320a5 100644 --- a/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd +++ b/src/test/cfg2cmd/vnc-clipboard-spice.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ diff --git a/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd b/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd index bfb40655..54f3595f 100644 --- a/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd +++ b/src/test/cfg2cmd/vnc-clipboard-std.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ @@ -18,6 +18,7 @@ -global 'PIIX4_PM.disable_s4=1' \ -device 'pci-bridge,id=pci.1,chassis_nr=1,bus=pci.0,addr=0x1e' \ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ -device 'usb-tablet,id=tablet,bus=uhci.0,port=1' \ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ diff --git a/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd b/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd index c2b6657f..d67862de 100644 --- a/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd +++ b/src/test/cfg2cmd/win11-amd-host-11.0+pve2.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ diff --git a/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd b/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd index b1949836..43eb4e94 100644 --- a/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd +++ b/src/test/cfg2cmd/win11-host-11.0+pve2.conf.cmd @@ -3,9 +3,9 @@ -name vm8006 \ -no-shutdown \ -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ - -mon 'chardev=qmp,mode=control' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ - -mon 'chardev=qmp-event,mode=control' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ -pidfile /var/run/qemu-server/8006.pid \ -daemonize \ -smp '1,sockets=1,cores=1,maxcpus=1' \ -- 2.47.3