From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0E5231FF15C for <inbox@lore.proxmox.com>; Fri, 27 Jun 2025 14:42:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BFE1D144F8; Fri, 27 Jun 2025 14:43:04 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Fri, 27 Jun 2025 14:42:27 +0200 In-Reply-To: <20250627124228.1542397-1-alexandre.derumier@groupe-cyllene.com> References: <20250627124228.1542397-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: <mailman.694.1751028184.395.pve-devel@lists.proxmox.com> List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Post: <mailto:pve-devel@lists.proxmox.com> From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com> Precedence: list Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> Subject: [pve-devel] [PATCH qemu-server 5/6] convert disk controller device to json format Content-Type: multipart/mixed; boundary="===============4895169953711906638==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> --===============4895169953711906638== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: <root@formationkvm1.odiso.net> 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 E380CD1FCE for <pve-devel@lists.proxmox.com>; Fri, 27 Jun 2025 14:43:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C091B14291 for <pve-devel@lists.proxmox.com>; Fri, 27 Jun 2025 14:42:32 +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 <pve-devel@lists.proxmox.com>; Fri, 27 Jun 2025 14:42:31 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id D8E93862E4E; Fri, 27 Jun 2025 14:42:29 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id D6559115F576; Fri, 27 Jun 2025 14:42:29 +0200 (CEST) From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com> To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 5/6] convert disk controller device to json format Date: Fri, 27 Jun 2025 14:42:27 +0200 Message-Id: <20250627124228.1542397-6-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250627124228.1542397-1-alexandre.derumier@groupe-cyllene.com> References: <20250627124228.1542397-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 <alexandre.derumier@groupe-cyllene.com> --- src/PVE/QemuServer.pm | 12 ++++++------ src/PVE/QemuServer/DriveDevice.pm | 23 +++++++++++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 6ee156e2..e43cf41f 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -72,7 +72,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; @@ -3467,8 +3467,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, $iothread, $scsihw, $arch, $bridges, $used_controller); - push @$devices, '-device', $controller if $controller; + my $drive_controller = get_drivedevice_controller($conf, $drive, $iothread, $scsihw, $arch, $bridges, $used_controller); + push @$devices, '-device', to_json($drive_controller, { canonical => 1 }) if $drive_controller; my $live_restore = $live_restore_backing->{$ds}; my $live_blockdev_name = undef; @@ -3747,10 +3747,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, $iothread, $scsihw, $arch); + my $controller = get_drivedevice_controller($conf, $device, $iothread, $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); @@ -3832,7 +3832,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 ab62c4ff..6c478ca6 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 ); @@ -170,7 +170,7 @@ sub get_drivedevice { return $device; } -sub print_drivedevice_controller { +sub get_drivedevice_controller { my ($conf, $drive, $iothread_enabled, $scsihw, $arch, $bridges, $used_controller) = @_; if ($drive->{interface} eq 'scsi') { @@ -178,36 +178,35 @@ 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 $device = { id => $controllerid, driver => $scsihw_type, addr => $pciaddr->{addr}, bus => $pciaddr->{bus} }; + $device->{iothread} = "iothread-$controllerid" if $iothread_enabled; - my $iothread = $iothread_enabled ? ",iothread=iothread-$controller_prefix$controller" : ""; - - my $queues = ''; if ( $conf->{scsihw} && $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 --===============4895169953711906638== 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 --===============4895169953711906638==--