--- Begin Message ---
Signed-off-by: Alexandre Derumier <alexandre.derum...@groupe-cyllene.com>
---
src/PVE/QemuServer.pm | 28 ++++++------
src/PVE/QemuServer/DriveDevice.pm | 76 +++++++++++++++++--------------
2 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index cd9e568f..f9c195a0 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 print_drivedevice_full
print_drivedevice_iothread scsihw_infos);
+ qw(print_drivedevice_controller get_drivedevice print_drivedevice_iothread
scsihw_infos);
use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory qw(get_current_memory);
use PVE::QemuServer::MetaInfo;
@@ -82,7 +82,8 @@ use PVE::QemuServer::Network;
use PVE::QemuServer::OVMF;
use PVE::QemuServer::PCI qw(print_pci_addr print_pcie_addr
print_pcie_root_port parse_hostpci);
use PVE::QemuServer::QemuImage;
-use PVE::QemuServer::QMPHelpers qw(qemu_deviceadd qemu_devicedel
qemu_objectadd qemu_objectdel);
+use PVE::QemuServer::QMPHelpers
+ qw(qemu_deviceadd qemu_devicedel qemu_objectadd qemu_objectdel
qmp_deviceadd qmp_devicedel);
use PVE::QemuServer::RNG qw(parse_rng print_rng_device_commandline
print_rng_object_commandline);
use PVE::QemuServer::RunState;
use PVE::QemuServer::StateFile;
@@ -3509,10 +3510,9 @@ sub config_to_command {
push @$devices, '-drive', $drive_cmd;
}
- push @$devices, '-device',
- print_drivedevice_full(
- $storecfg, $conf, $vmid, $drive, $bridges, $arch,
$machine_type,
- );
+ my $drive_device =
+ get_drivedevice($storecfg, $conf, $vmid, $drive, $bridges,
$arch, $machine_type);
+ push @$devices, '-device', to_json($drive_device, { canonical => 1
});
},
);
@@ -3735,10 +3735,10 @@ sub vm_deviceplug {
qemu_iothread_add($vmid, $deviceid, $device);
qemu_driveadd($storecfg, $vmid, $device);
- my $devicefull =
- print_drivedevice_full($storecfg, $conf, $vmid, $device, undef,
$arch, $machine_type);
+ my $drive_device =
+ get_drivedevice($storecfg, $conf, $vmid, $device, undef, $arch,
$machine_type);
- qemu_deviceadd($vmid, $devicefull);
+ qmp_deviceadd($vmid, $drive_device);
eval { qemu_deviceaddverify($vmid, $deviceid); };
if (my $err = $@) {
eval { qemu_drivedel($vmid, $deviceid); };
@@ -3757,9 +3757,9 @@ sub vm_deviceplug {
qemu_findorcreatescsihw($storecfg, $conf, $vmid, $device, $arch,
$machine_type);
qemu_driveadd($storecfg, $vmid, $device);
- my $devicefull =
- print_drivedevice_full($storecfg, $conf, $vmid, $device, undef,
$arch, $machine_type);
- eval { qemu_deviceadd($vmid, $devicefull); };
+ my $drive_device =
+ get_drivedevice($storecfg, $conf, $vmid, $device, undef, $arch,
$machine_type);
+ eval { qmp_deviceadd($vmid, $drive_device); };
if (my $err = $@) {
eval { qemu_drivedel($vmid, $deviceid); };
warn $@ if $@;
@@ -3828,7 +3828,7 @@ sub vm_deviceunplug {
} elsif ($deviceid =~ m/^(virtio)(\d+)$/) {
my $device = parse_drive($deviceid, $conf->{$deviceid});
- qemu_devicedel($vmid, $deviceid);
+ qmp_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid);
qemu_iothread_del($vmid, $deviceid, $device);
@@ -3838,7 +3838,7 @@ sub vm_deviceunplug {
} elsif ($deviceid =~ m/^(scsi)(\d+)$/) {
my $device = parse_drive($deviceid, $conf->{$deviceid});
- qemu_devicedel($vmid, $deviceid);
+ qmp_devicedel($vmid, $deviceid);
qemu_devicedelverify($vmid, $deviceid);
qemu_drivedel($vmid, $deviceid);
qemu_deletescsihw($conf, $vmid, $deviceid);
diff --git a/src/PVE/QemuServer/DriveDevice.pm
b/src/PVE/QemuServer/DriveDevice.pm
index 15c80f00..34ebb335 100644
--- a/src/PVE/QemuServer/DriveDevice.pm
+++ b/src/PVE/QemuServer/DriveDevice.pm
@@ -8,12 +8,12 @@ use URI::Escape;
use PVE::QemuServer::Drive qw (drive_is_cdrom);
use PVE::QemuServer::Helpers qw(kvm_user_version min_version);
use PVE::QemuServer::Machine;
-use PVE::QemuServer::PCI qw(print_pci_addr);
+use PVE::QemuServer::PCI qw(get_pci_addr print_pci_addr);
use base qw(Exporter);
our @EXPORT_OK = qw(
- print_drivedevice_full
+ get_drivedevice
print_drivedevice_controller
print_drivedevice_iothread
scsihw_infos
@@ -41,25 +41,31 @@ sub scsihw_infos {
return ($maxdev, $controller, $controller_prefix);
}
-sub print_drivedevice_full {
+sub get_drivedevice {
my ($storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type) = @_;
- my $device = '';
+ my $device = {};
+
my $maxdev = 0;
my $machine_version =
PVE::QemuServer::Machine::extract_version($machine_type,
kvm_user_version());
my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
+
if ($drive->{interface} eq 'virtio') {
- my $pciaddr = print_pci_addr("$drive_id", $bridges, $arch);
- $device = 'virtio-blk-pci';
+ my $pciaddr = get_pci_addr("$drive_id", $bridges, $arch);
+ $device = {
+ id => $drive_id,
+ driver => 'virtio-blk-pci',
+ bus => $pciaddr->{bus},
+ addr => $pciaddr->{addr},
+ };
# for the switch to -blockdev, there is no blockdev for 'none'
if (!min_version($machine_version, 10, 0) || $drive->{file} ne 'none')
{
- $device .= ",drive=drive-$drive_id";
+ $device->{drive} = "drive-$drive_id";
}
- $device .= ",id=${drive_id}${pciaddr}";
- $device .= ",iothread=iothread-$drive_id" if $drive->{iothread};
+ $device->{iothread} = "iothread-$drive_id" if $drive->{iothread};
} elsif ($drive->{interface} eq 'scsi') {
my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf,
$drive);
@@ -68,30 +74,35 @@ sub print_drivedevice_full {
my $device_type =
PVE::QemuServer::Drive::get_scsi_device_type($drive, $storecfg,
$machine_version);
+ $device = {
+ id => $drive_id,
+ driver => "scsi-$device_type",
+ bus => "$controller_prefix$controller.0",
+ };
+
if (!$conf->{scsihw} || $conf->{scsihw} =~ m/^lsi/ || $conf->{scsihw}
eq 'pvscsi') {
- $device =
"scsi-$device_type,bus=$controller_prefix$controller.0,scsi-id=$unit";
+ $device->{'scsi-id'} = $unit;
} else {
- $device =
"scsi-$device_type,bus=$controller_prefix$controller.0,channel=0,scsi-id=0"
- . ",lun=$drive->{index}";
+ $device->{'scsi-id'} = 0;
+ $device->{channel} = 0;
+ $device->{lun} = int($drive->{index});
}
# for the switch to -blockdev, there is no blockdev for 'none'
if (!min_version($machine_version, 10, 0) || $drive->{file} ne 'none')
{
- $device .= ",drive=drive-$drive_id";
+ $device->{drive} = "drive-$drive_id";
}
- $device .= ",id=$drive_id";
if ($drive->{ssd} && ($device_type eq 'block' || $device_type eq
'hd')) {
- $device .= ",rotation_rate=1";
+ $device->{'rotation-rate'} = 1;
}
- $device .= ",wwn=$drive->{wwn}" if $drive->{wwn};
-
+ $device->{wwn} = $drive->{wwn} if $drive->{wwn};
# only scsi-hd and scsi-cd support passing vendor and product
information
if ($device_type eq 'hd' || $device_type eq 'cd') {
if (my $vendor = $drive->{vendor}) {
- $device .= ",vendor=$vendor";
+ $device->{vendor} = $vendor;
}
if (my $product = $drive->{product}) {
- $device .= ",product=$product";
+ $device->{product} = $product;
}
}
@@ -111,28 +122,26 @@ sub print_drivedevice_full {
}
my $device_type = ($drive->{media} && $drive->{media} eq 'cdrom') ?
"cd" : "hd";
-
- $device = "ide-$device_type";
+ $device = { id => $drive_id, driver => "ide-$device_type" };
if ($drive->{interface} eq 'ide') {
- $device .= ",bus=ide.$controller,unit=$unit";
+ $device->{bus} = "ide.$controller";
+ $device->{unit} = $unit;
} else {
- $device .= ",bus=ahci$controller.$unit";
+ $device->{bus} = "ahci$controller.$unit";
}
if (!min_version($machine_version, 10, 0) || $drive->{file} ne 'none')
{
- $device .= ",drive=drive-$drive_id";
+ $device->{drive} = "drive-$drive_id";
}
- $device .= ",id=$drive_id";
if ($device_type eq 'hd') {
if (my $model = $drive->{model}) {
- $model = URI::Escape::uri_unescape($model);
- $device .= ",model=$model";
+ $device->{model} = URI::Escape::uri_unescape($model);
}
if ($drive->{ssd}) {
- $device .= ",rotation_rate=1";
+ $device->{'rotation-rate'} = 1;
}
}
- $device .= ",wwn=$drive->{wwn}" if $drive->{wwn};
+ $device->{wwn} = $drive->{wwn} if $drive->{wwn};
} elsif ($drive->{interface} eq 'usb') {
die "implement me";
# -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
@@ -140,11 +149,10 @@ sub print_drivedevice_full {
die "unsupported interface type";
}
- $device .= ",bootindex=$drive->{bootindex}" if $drive->{bootindex};
+ $device->{bootindex} = $drive->{bootindex} if $drive->{bootindex};
if (my $serial = $drive->{serial}) {
- $serial = URI::Escape::uri_unescape($serial);
- $device .= ",serial=$serial";
+ $device->{serial} = URI::Escape::uri_unescape($serial);
}
if (min_version($machine_version, 10, 0)) { # for the switch to -blockdev
@@ -153,10 +161,10 @@ sub print_drivedevice_full {
if (my $cache = $drive->{cache}) {
$write_cache = 'off' if $cache eq 'writethrough' || $cache eq
'directsync';
}
- $device .= ",write-cache=$write_cache";
+ $device->{'write-cache'} = $write_cache;
}
for my $o (qw(rerror werror)) {
- $device .= ",$o=$drive->{$o}" if defined($drive->{$o});
+ $device->{$o} = $drive->{$o} if defined($drive->{$o});
}
}
--
2.39.5
--- End Message ---
