From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BB2011FF183 for ; Wed, 16 Jul 2025 18:34:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 806E017915; Wed, 16 Jul 2025 18:34:55 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Wed, 16 Jul 2025 18:34:12 +0200 In-Reply-To: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> References: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH v2 qemu-server 07/10] convert iothread to json Content-Type: multipart/mixed; boundary="===============0741206072668121643==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============0741206072668121643== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CB816C90F9 for ; Wed, 16 Jul 2025 18:34:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 76FCD174D1 for ; Wed, 16 Jul 2025 18:34:23 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 16 Jul 2025 18:34:20 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 0E050862E4D; Wed, 16 Jul 2025 18:34:18 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 0AD4311F6B0C; Wed, 16 Jul 2025 18:34:18 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v2 qemu-server 07/10] convert iothread to json Date: Wed, 16 Jul 2025 18:34:12 +0200 Message-Id: <20250716163415.1837210-8-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> References: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Signed-off-by: Alexandre Derumier --- src/PVE/QemuServer.pm | 8 ++++---- src/PVE/QemuServer/DriveDevice.pm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index f9c195a0..5590bfbe 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -73,7 +73,7 @@ use PVE::QemuServer::Drive qw( storage_allows_io_uring_default ); use PVE::QemuServer::DriveDevice - qw(print_drivedevice_controller get_drivedevice print_drivedevice_iothread scsihw_infos); + qw(print_drivedevice_controller get_drivedevice get_drivedevice_iothread scsihw_infos); use PVE::QemuServer::Machine; use PVE::QemuServer::Memory qw(get_current_memory); use PVE::QemuServer::MetaInfo; @@ -3467,8 +3467,8 @@ sub config_to_command { $drive->{bootindex} = $bootorder->{$ds} if $bootorder->{$ds}; - my $iothread = print_drivedevice_iothread($conf, $drive); - push @$cmd, '-object', $iothread if $iothread; + my $iothread = get_drivedevice_iothread($conf, $drive); + push @$cmd, '-object', to_json($iothread, { canonical => 1 }) if $iothread; my $controller = print_drivedevice_controller( $conf, $drive, $scsihw, $arch, $bridges, $used_controller, @@ -3747,7 +3747,7 @@ sub vm_deviceplug { } } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { my $scsihw = defined($conf->{scsihw}) ? $conf->{scsihw} : "lsi"; - my $iothread = print_drivedevice_iothread($conf, $device); + my $iothread = get_drivedevice_iothread($conf, $device); my $controller = print_drivedevice_controller($conf, $device, $scsihw, $arch); qemu_iothread_add($vmid, $deviceid, $device) if $iothread; diff --git a/src/PVE/QemuServer/DriveDevice.pm b/src/PVE/QemuServer/DriveDevice.pm index 34ebb335..c19f80d4 100644 --- a/src/PVE/QemuServer/DriveDevice.pm +++ b/src/PVE/QemuServer/DriveDevice.pm @@ -15,7 +15,7 @@ use base qw(Exporter); our @EXPORT_OK = qw( get_drivedevice print_drivedevice_controller - print_drivedevice_iothread + get_drivedevice_iothread scsihw_infos ); @@ -216,13 +216,13 @@ sub print_drivedevice_controller { } } -sub print_drivedevice_iothread { +sub get_drivedevice_iothread { my ($conf, $drive) = @_; my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive); if ($drive->{interface} eq 'virtio') { - return "iothread,id=iothread-$drive_id" if $drive->{iothread}; + return { 'qom-type' => 'iothread', id => "iothread-$drive_id" } if $drive->{iothread}; } if ($drive->{interface} eq 'scsi') { @@ -234,7 +234,7 @@ sub print_drivedevice_iothread { && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{iothread} ) { - return "iothread,id=iothread-$controller_prefix$controller"; + return { 'qom-type' => 'iothread', id => "iothread-$controller_prefix$controller" }; } elsif ($drive->{iothread}) { log_warn( "iothread is only valid with virtio disk or virtio-scsi-single controller, ignoring\n" -- 2.39.5 --===============0741206072668121643== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============0741206072668121643==--