From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH container v3 01/11] migration: prepare: factor out common read-only variables
Date: Tue, 15 Apr 2025 15:50:35 +0200 [thread overview]
Message-ID: <20250415135045.255272-18-d.kral@proxmox.com> (raw)
In-Reply-To: <20250415135045.255272-1-d.kral@proxmox.com>
Factor out the common read-only variables to allow the second call to
`storage_check_enabled` to be below 100 characters.
Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes since v2:
* none
src/PVE/LXC/Migrate.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index e1e6cab..f06a10a 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -71,7 +71,8 @@ sub prepare {
die "can't determine assigned storage for mount point '$ms'\n" if !$storage;
# check if storage is available on both nodes
- my $scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $storage);
+ my ($storecfg, $node) = $self->@{qw(storecfg node)};
+ my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage);
my $targetsid = $storage;
@@ -92,7 +93,7 @@ sub prepare {
}
if (!$remote) {
- my $target_scfg = PVE::Storage::storage_check_enabled($self->{storecfg}, $targetsid, $self->{node});
+ my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $node);
die "$volid: content type 'rootdir' is not available on storage '$targetsid'\n"
if !$target_scfg->{content}->{rootdir};
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-04-15 13:53 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-15 13:50 [pve-devel] [PATCH storage/qemu-server/container v3 00/27] consistent assertions for volume's content types Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH storage v3 1/4] introduce helpers for content type assertions of storages and volumes Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH storage v3 2/4] tree-wide: make use of content type assertion helper Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH storage v3 3/4] vdisk_alloc: factor out optional parameters in options hash argument Daniel Kral
2025-05-05 14:51 ` Wolfgang Bumiller
2025-05-06 7:33 ` Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH storage v3 4/4] vdisk_alloc: add assertion for volume's content type Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 01/12] fix #5284: cli: importovf: assert content type support for target storage Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 02/12] api: remove unusable default storage parameter in check_storage_access Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 03/12] fix #5284: api: update-vm: assert content type support for cloudinit images Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 04/12] tree-wide: update vdisk_alloc optional arguments signature Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 05/12] tree-wide: update vdisk_alloc vtype argument signature Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 06/12] cfg2cmd: improve error message for invalid volume content type Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 07/12] api: {clone, move}_vm: use volume content type assertion helpers Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 08/12] api: {create, update}_vm: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 09/12] api: import{disk, ovf}: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 10/12] api: qmrestore: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 11/12] api: migrate_vm: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH qemu-server v3 12/12] tree-wide: add todos for breaking content type assertions Daniel Kral
2025-04-15 13:50 ` Daniel Kral [this message]
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 02/11] tests: add tests for expected behavior of alloc_disk wrapper Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 03/11] alloc disk: fix content type check for ZFS storages Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 04/11] alloc_disk: factor out common arguments for call to vdisk_alloc Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 05/11] alloc_disk: simplify storage-specific logic for vdisk_alloc arguments Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 06/11] alloc_disk: update vdisk_alloc optional arguments signature Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 07/11] alloc_disk: use volume content type assertion helpers Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 08/11] api: create: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 09/11] migration: prepare: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 10/11] api: update_vm: " Daniel Kral
2025-04-15 13:50 ` [pve-devel] [PATCH container v3 11/11] mount: raw/iso: " Daniel Kral
2025-05-06 8:33 ` [pve-devel] [PATCH storage/qemu-server/container v3 00/27] consistent assertions for volume's content types Wolfgang Bumiller
2025-05-09 8:11 ` Fabian Grünbichler
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=20250415135045.255272-18-d.kral@proxmox.com \
--to=d.kral@proxmox.com \
--cc=pve-devel@lists.proxmox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal