[PATCH qemu-server 08/10] convert disk controller device to json format

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <alexandre.derumier at groupe-cyllene.com>
---
 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