[pve-devel] [PATCH qemu-server 1/6] blockdev: helper to add common options

[Fiona Ebner]

Certain options like read-only need to be set on all nodes in the
throttle->fmt->file chain to apply correctly and consistently.

Signed-off-by: Fiona Ebner <f.ebner at proxmox.com>
---
 src/PVE/QemuServer/Blockdev.pm | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm
index 28453b48..822543cd 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -186,6 +186,13 @@ my sub read_only_json_option {
     return json_bool($drive->{ro} || drive_is_cdrom($drive) || $options->{'read-only'});
 }
 
+# Common blockdev options that need to be set across the whole throttle->fmt->file chain.
+my sub add_common_options {
+    my ($blockdev, $drive, $options) = @_;
+
+    $blockdev->{'read-only'} = read_only_json_option($drive, $options);
+}
+
 my sub throttle_group_id {
     my ($drive_id) = @_;
 
@@ -314,7 +321,7 @@ my sub generate_file_blockdev {
 
     $blockdev->{'node-name'} = get_node_name('file', $drive_id, $drive->{file}, $options);
 
-    $blockdev->{'read-only'} = read_only_json_option($drive, $options);
+    add_common_options($blockdev, $drive, $options);
 
     return $blockdev;
 }
@@ -356,9 +363,10 @@ my sub generate_format_blockdev {
         driver => "$format",
         file => $child,
         cache => $child->{cache}, # define cache option on both format && file node like libvirt
-        'read-only' => read_only_json_option($drive, $options),
     };
 
+    add_common_options($blockdev, $drive, $options);
+
     if (defined($options->{size})) {
         die "blockdev: 'size' is only supported for 'raw' format" if $format ne 'raw';
         $blockdev->{size} = int($options->{size});
@@ -411,13 +419,16 @@ sub generate_throttle_blockdev {
 
     my $drive_id = PVE::QemuServer::Drive::get_drive_id($drive);
 
-    return {
+    my $blockdev = {
         driver => "throttle",
         'node-name' => top_node_name($drive_id),
         'throttle-group' => throttle_group_id($drive_id),
         file => $child,
-        'read-only' => read_only_json_option($drive, $options),
     };
+
+    add_common_options($blockdev, $drive, $options);
+
+    return $blockdev;
 }
 
 sub generate_drive_blockdev {
-- 
2.47.2