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 C10FC1FF183 for ; Wed, 2 Jul 2025 16:48:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 782741DB9B; Wed, 2 Jul 2025 16:49:14 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Wed, 2 Jul 2025 16:48:58 +0200 In-Reply-To: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> References: <20250702144900.3963405-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 qemu-server 08/10] convert disk controller device to json format Content-Type: multipart/mixed; boundary="===============0568294698893776794==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============0568294698893776794== 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 DE163D3D0E for ; Wed, 2 Jul 2025 16:49:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6EAE41D9F7 for ; Wed, 2 Jul 2025 16:49:12 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [185.151.190.228]) (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, 2 Jul 2025 16:49:10 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 7327D862E4D; Wed, 2 Jul 2025 16:49:01 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 70D86112B90F; Wed, 2 Jul 2025 16:49:01 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 08/10] convert disk controller device to json format Date: Wed, 2 Jul 2025 16:48:58 +0200 Message-Id: <20250702144900.3963405-9-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> References: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.023 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.017 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 | 12 ++++++------ src/PVE/QemuServer/DriveDevice.pm | 22 ++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 75cf114c..66712672 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -73,7 +73,7 @@ use PVE::QemuServer::Drive qw( print_drive storage_allows_io_uring_default ); -use PVE::QemuServer::DriveDevice qw(print_drivedevice_controller get_drivedevice get_drivedevice_iothread scsihw_infos); +use PVE::QemuServer::DriveDevice qw(get_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; @@ -3469,8 +3469,8 @@ sub config_to_command { 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); - push @$devices, '-device', $controller if $controller; + my $drive_controller = get_drivedevice_controller($conf, $drive, $scsihw, $arch, $bridges, $used_controller); + push @$devices, '-device', to_json($drive_controller, { canonical => 1 }) if $drive_controller; my $live_restore = $live_restore_backing->{$ds}; @@ -3744,10 +3744,10 @@ sub vm_deviceplug { } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { my $scsihw = defined($conf->{scsihw}) ? $conf->{scsihw} : "lsi"; my $iothread = get_drivedevice_iothread($conf, $device); - my $controller = print_drivedevice_controller($conf, $device, $scsihw, $arch); + my $controller = get_drivedevice_controller($conf, $device, $scsihw, $arch); qemu_iothread_add($vmid, $deviceid, $device) if $iothread; - qemu_deviceadd($vmid, $controller); + qmp_deviceadd($vmid, $controller); qemu_deviceaddverify($vmid, $deviceid); } elsif ($deviceid =~ m/^(scsi)(\d+)$/) { qemu_findorcreatescsihw($storecfg, $conf, $vmid, $device, $arch, $machine_type); @@ -3829,7 +3829,7 @@ sub vm_deviceunplug { qemu_drivedel($vmid, $deviceid); qemu_iothread_del($vmid, $deviceid, $device); } elsif ($deviceid =~ m/^(virtioscsi|scsihw)(\d+)$/) { - qemu_devicedel($vmid, $deviceid); + qmp_devicedel($vmid, $deviceid); qemu_devicedelverify($vmid, $deviceid); } elsif ($deviceid =~ m/^(scsi)(\d+)$/) { my $device = parse_drive($deviceid, $conf->{$deviceid}); diff --git a/src/PVE/QemuServer/DriveDevice.pm b/src/PVE/QemuServer/DriveDevice.pm index a91cf86d..7ed06144 100644 --- a/src/PVE/QemuServer/DriveDevice.pm +++ b/src/PVE/QemuServer/DriveDevice.pm @@ -14,7 +14,7 @@ use base qw(Exporter); our @EXPORT_OK = qw( get_drivedevice - print_drivedevice_controller + get_drivedevice_controller get_drivedevice_iothread scsihw_infos ); @@ -162,7 +162,7 @@ sub get_drivedevice { return $device; } -sub print_drivedevice_controller { +sub get_drivedevice_controller { my ($conf, $drive, $scsihw, $arch, $bridges, $used_controller) = @_; if ($drive->{interface} eq 'scsi') { @@ -170,17 +170,19 @@ sub print_drivedevice_controller { my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive); return if $used_controller->{scsi}->{$controller}; - my $pciaddr = print_pci_addr("$controller_prefix$controller", $bridges, $arch); + my $controllerid = "$controller_prefix$controller"; + my $pciaddr = get_pci_addr($controllerid, $bridges, $arch); my $scsihw_type = $scsihw =~ m/^virtio-scsi-single/ ? "virtio-scsi-pci" : $scsihw; - my $iothread = ''; + my $device = { id => $controllerid, driver => $scsihw_type, addr => $pciaddr->{addr}, bus => $pciaddr->{bus} }; + if ( $conf->{scsihw} && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{iothread} ) { - $iothread .= ",iothread=iothread-$controller_prefix$controller"; + $device->{iothread} = "iothread-$controllerid"; } my $queues = ''; @@ -189,22 +191,22 @@ sub print_drivedevice_controller { && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{queues} ) { - $queues = ",num_queues=$drive->{queues}"; + $device->{'num_queues'} = int($drive->{queues}); } $used_controller->{scsi}->{$controller} = 1; - return "$scsihw_type,id=$controller_prefix$controller$pciaddr$iothread$queues"; + return $device; } if ($drive->{interface} eq 'sata') { my $controller = int($drive->{index} / $PVE::QemuServer::Drive::MAX_SATA_DISKS); return if $used_controller->{ahci}->{$controller}; - my $pciaddr = print_pci_addr("ahci$controller", $bridges, $arch); + my $controllerid = "ahci$controller"; + my $pciaddr = get_pci_addr($controllerid, $bridges, $arch); $used_controller->{ahci}->{$controller} = 1; - return "ahci,id=ahci$controller,multifunction=on$pciaddr"; - + return { driver => 'ahci', id => $controllerid, multifunction => 'on', addr => $pciaddr->{addr}, bus => $pciaddr->{bus} }; } } -- 2.39.5 --===============0568294698893776794== 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 --===============0568294698893776794==--