From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
Subject: [pve-devel] [PATCH qemu-server 01/10] introduce DriveDevice module
Date: Wed, 2 Jul 2025 16:48:51 +0200 [thread overview]
Message-ID: <mailman.801.1751467752.395.pve-devel@lists.proxmox.com> (raw)
In-Reply-To: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com>
[-- Attachment #1: Type: message/rfc822, Size: 15784 bytes --]
From: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH qemu-server 01/10] introduce DriveDevice module
Date: Wed, 2 Jul 2025 16:48:51 +0200
Message-ID: <20250702144900.3963405-2-alexandre.derumier@groupe-cyllene.com>
and move print_drivedevice_full
Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
---
src/PVE/QemuServer.pm | 144 +-------------------------
src/PVE/QemuServer/DriveDevice.pm | 163 ++++++++++++++++++++++++++++++
src/PVE/QemuServer/Makefile | 1 +
3 files changed, 165 insertions(+), 143 deletions(-)
create mode 100644 src/PVE/QemuServer/DriveDevice.pm
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 50352e82..eed56b0d 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -73,6 +73,7 @@ use PVE::QemuServer::Drive qw(
print_drive
storage_allows_io_uring_default
);
+use PVE::QemuServer::DriveDevice qw(print_drivedevice_full scsihw_infos);
use PVE::QemuServer::Machine;
use PVE::QemuServer::Memory qw(get_current_memory);
use PVE::QemuServer::MetaInfo;
@@ -1197,127 +1198,6 @@ sub print_keyboarddevice_full {
return "usb-kbd,id=keyboard,bus=ehci.0,port=2";
}
-sub print_drivedevice_full {
- my ($storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type) = @_;
-
- my $device = '';
- my $maxdev = 0;
-
- my $machine_version = 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';
- # 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 .= ",id=${drive_id}${pciaddr}";
- $device .= ",iothread=iothread-$drive_id" if $drive->{iothread};
- } elsif ($drive->{interface} eq 'scsi') {
-
- my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive);
- my $unit = $drive->{index} % $maxdev;
-
- my $device_type =
- PVE::QemuServer::Drive::get_scsi_device_type($drive, $storecfg, $machine_version);
-
- if (!$conf->{scsihw} || $conf->{scsihw} =~ m/^lsi/ || $conf->{scsihw} eq 'pvscsi') {
- $device = "scsi-$device_type,bus=$controller_prefix$controller.0,scsi-id=$unit";
- } else {
- $device = "scsi-$device_type,bus=$controller_prefix$controller.0,channel=0,scsi-id=0"
- . ",lun=$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 .= ",id=$drive_id";
-
- if ($drive->{ssd} && ($device_type eq 'block' || $device_type eq 'hd')) {
- $device .= ",rotation_rate=1";
- }
- $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";
- }
- if (my $product = $drive->{product}) {
- $device .= ",product=$product";
- }
- }
-
- } elsif ($drive->{interface} eq 'ide' || $drive->{interface} eq 'sata') {
- my $maxdev = ($drive->{interface} eq 'sata') ? $PVE::QemuServer::Drive::MAX_SATA_DISKS : 2;
- my $controller = int($drive->{index} / $maxdev);
- my $unit = $drive->{index} % $maxdev;
-
- # machine type q35 only supports unit=0 for IDE rather than 2 units. This wasn't handled
- # correctly before, so e.g. index=2 was mapped to controller=1,unit=0 rather than
- # controller=2,unit=0. Note that odd indices never worked, as they would be mapped to
- # unit=1, so to keep backwards compat for migration, it suffices to keep even ones as they
- # were before. Move odd ones up by 2 where they don't clash.
- if (PVE::QemuServer::Machine::machine_type_is_q35($conf) && $drive->{interface} eq 'ide') {
- $controller += 2 * ($unit % 2);
- $unit = 0;
- }
-
- my $device_type = ($drive->{media} && $drive->{media} eq 'cdrom') ? "cd" : "hd";
-
- $device = "ide-$device_type";
- if ($drive->{interface} eq 'ide') {
- $device .= ",bus=ide.$controller,unit=$unit";
- } else {
- $device .= ",bus=ahci$controller.$unit";
- }
- if (!min_version($machine_version, 10, 0) || $drive->{file} ne 'none') {
- $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";
- }
- if ($drive->{ssd}) {
- $device .= ",rotation_rate=1";
- }
- }
- $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
- } else {
- die "unsupported interface type";
- }
-
- $device .= ",bootindex=$drive->{bootindex}" if $drive->{bootindex};
-
- if (my $serial = $drive->{serial}) {
- $serial = URI::Escape::uri_unescape($serial);
- $device .= ",serial=$serial";
- }
-
- if (min_version($machine_version, 10, 0)) { # for the switch to -blockdev
- if (!drive_is_cdrom($drive)) {
- my $write_cache = 'on';
- if (my $cache = $drive->{cache}) {
- $write_cache = 'off' if $cache eq 'writethrough' || $cache eq 'directsync';
- }
- $device .= ",write-cache=$write_cache";
- }
- for my $o (qw(rerror werror)) {
- $device .= ",$o=$drive->{$o}" if defined($drive->{$o});
- }
- }
-
- return $device;
-}
-
sub print_drive_commandline_full {
my ($storecfg, $vmid, $drive, $live_restore_name) = @_;
@@ -7875,28 +7755,6 @@ sub vm_iothreads_list {
return $iothreads;
}
-sub scsihw_infos {
- my ($conf, $drive) = @_;
-
- my $maxdev = 0;
-
- if (!$conf->{scsihw} || ($conf->{scsihw} =~ m/^lsi/)) {
- $maxdev = 7;
- } elsif ($conf->{scsihw} && ($conf->{scsihw} eq 'virtio-scsi-single')) {
- $maxdev = 1;
- } else {
- $maxdev = 256;
- }
-
- my $controller = int($drive->{index} / $maxdev);
- my $controller_prefix =
- ($conf->{scsihw} && $conf->{scsihw} eq 'virtio-scsi-single')
- ? "virtioscsi"
- : "scsihw";
-
- return ($maxdev, $controller, $controller_prefix);
-}
-
sub resolve_dst_disk_format {
my ($storecfg, $storeid, $src_volid, $format) = @_;
diff --git a/src/PVE/QemuServer/DriveDevice.pm b/src/PVE/QemuServer/DriveDevice.pm
new file mode 100644
index 00000000..764afc93
--- /dev/null
+++ b/src/PVE/QemuServer/DriveDevice.pm
@@ -0,0 +1,163 @@
+package PVE::QemuServer::DriveDevice;
+
+use strict;
+use warnings;
+
+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 base qw(Exporter);
+
+our @EXPORT_OK = qw(
+ print_drivedevice_full
+ scsihw_infos
+);
+
+sub scsihw_infos {
+ my ($conf, $drive) = @_;
+
+ my $maxdev = 0;
+
+ if (!$conf->{scsihw} || ($conf->{scsihw} =~ m/^lsi/)) {
+ $maxdev = 7;
+ } elsif ($conf->{scsihw} && ($conf->{scsihw} eq 'virtio-scsi-single')) {
+ $maxdev = 1;
+ } else {
+ $maxdev = 256;
+ }
+
+ my $controller = int($drive->{index} / $maxdev);
+ my $controller_prefix =
+ ($conf->{scsihw} && $conf->{scsihw} eq 'virtio-scsi-single')
+ ? "virtioscsi"
+ : "scsihw";
+
+ return ($maxdev, $controller, $controller_prefix);
+}
+
+sub print_drivedevice_full {
+ my ($storecfg, $conf, $vmid, $drive, $bridges, $arch, $machine_type) = @_;
+
+ 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';
+ # 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 .= ",id=${drive_id}${pciaddr}";
+ $device .= ",iothread=iothread-$drive_id" if $drive->{iothread};
+ } elsif ($drive->{interface} eq 'scsi') {
+
+ my ($maxdev, $controller, $controller_prefix) = scsihw_infos($conf, $drive);
+ my $unit = $drive->{index} % $maxdev;
+
+ my $device_type =
+ PVE::QemuServer::Drive::get_scsi_device_type($drive, $storecfg, $machine_version);
+
+ if (!$conf->{scsihw} || $conf->{scsihw} =~ m/^lsi/ || $conf->{scsihw} eq 'pvscsi') {
+ $device = "scsi-$device_type,bus=$controller_prefix$controller.0,scsi-id=$unit";
+ } else {
+ $device = "scsi-$device_type,bus=$controller_prefix$controller.0,channel=0,scsi-id=0"
+ . ",lun=$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 .= ",id=$drive_id";
+
+ if ($drive->{ssd} && ($device_type eq 'block' || $device_type eq 'hd')) {
+ $device .= ",rotation_rate=1";
+ }
+ $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";
+ }
+ if (my $product = $drive->{product}) {
+ $device .= ",product=$product";
+ }
+ }
+
+ } elsif ($drive->{interface} eq 'ide' || $drive->{interface} eq 'sata') {
+ my $maxdev = ($drive->{interface} eq 'sata') ? $PVE::QemuServer::Drive::MAX_SATA_DISKS : 2;
+ my $controller = int($drive->{index} / $maxdev);
+ my $unit = $drive->{index} % $maxdev;
+
+ # machine type q35 only supports unit=0 for IDE rather than 2 units. This wasn't handled
+ # correctly before, so e.g. index=2 was mapped to controller=1,unit=0 rather than
+ # controller=2,unit=0. Note that odd indices never worked, as they would be mapped to
+ # unit=1, so to keep backwards compat for migration, it suffices to keep even ones as they
+ # were before. Move odd ones up by 2 where they don't clash.
+ if (PVE::QemuServer::Machine::machine_type_is_q35($conf) && $drive->{interface} eq 'ide') {
+ $controller += 2 * ($unit % 2);
+ $unit = 0;
+ }
+
+ my $device_type = ($drive->{media} && $drive->{media} eq 'cdrom') ? "cd" : "hd";
+
+ $device = "ide-$device_type";
+ if ($drive->{interface} eq 'ide') {
+ $device .= ",bus=ide.$controller,unit=$unit";
+ } else {
+ $device .= ",bus=ahci$controller.$unit";
+ }
+ if (!min_version($machine_version, 10, 0) || $drive->{file} ne 'none') {
+ $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";
+ }
+ if ($drive->{ssd}) {
+ $device .= ",rotation_rate=1";
+ }
+ }
+ $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
+ } else {
+ die "unsupported interface type";
+ }
+
+ $device .= ",bootindex=$drive->{bootindex}" if $drive->{bootindex};
+
+ if (my $serial = $drive->{serial}) {
+ $serial = URI::Escape::uri_unescape($serial);
+ $device .= ",serial=$serial";
+ }
+
+ if (min_version($machine_version, 10, 0)) { # for the switch to -blockdev
+ if (!drive_is_cdrom($drive)) {
+ my $write_cache = 'on';
+ if (my $cache = $drive->{cache}) {
+ $write_cache = 'off' if $cache eq 'writethrough' || $cache eq 'directsync';
+ }
+ $device .= ",write-cache=$write_cache";
+ }
+ for my $o (qw(rerror werror)) {
+ $device .= ",$o=$drive->{$o}" if defined($drive->{$o});
+ }
+ }
+
+ return $device;
+}
+
+1;
diff --git a/src/PVE/QemuServer/Makefile b/src/PVE/QemuServer/Makefile
index ca30a0ad..150f2229 100644
--- a/src/PVE/QemuServer/Makefile
+++ b/src/PVE/QemuServer/Makefile
@@ -9,6 +9,7 @@ SOURCES=Agent.pm \
Cloudinit.pm \
CPUConfig.pm \
Drive.pm \
+ DriveDevice.pm \
Helpers.pm \
ImportDisk.pm \
Machine.pm \
--
2.39.5
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next parent reply other threads:[~2025-07-02 14:48 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com>
2025-07-02 14:48 ` Alexandre Derumier via pve-devel [this message]
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 02/10] add print_drivedevice_controller && print_drivedevice_iothread Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 03/10] hotplug: drive controller : use print_drivedevice_iothread && print_drivedevice_controller Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 04/10] pci: add get_pci_addr Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 05/10] qmphelpers: add qmp_deviceadd && qmp_devicedel Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 06/10] convert drive device to json format Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 07/10] convert iothread to json Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 08/10] convert disk controller device to json format Alexandre Derumier via pve-devel
2025-07-02 14:48 ` [pve-devel] [PATCH qemu-server 09/10] tests: cfg2cmd: convert drive devices " Alexandre Derumier via pve-devel
2025-07-02 14:49 ` [pve-devel] [PATCH qemu-server 10/10] RFC: add multiple iothreads support Alexandre Derumier via pve-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=mailman.801.1751467752.395.pve-devel@lists.proxmox.com \
--to=pve-devel@lists.proxmox.com \
--cc=alexandre.derumier@groupe-cyllene.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal