From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH storage 09/26] plugins: add new content types to all plugindata
Date: Wed, 30 Jul 2025 10:38:10 +0200 [thread overview]
Message-ID: <1753861054.nw1j359kan.astroid@yuna.none> (raw)
In-Reply-To: <20250729111557.136012-10-w.bumiller@proxmox.com>
question - do we also want to add them to existing configs on updates?
or on RMW cycles, always implying that as long as images is set vm-vol
is also set, and same for rootdir ct-vol (but obviously not the other
way round ;))?
that might allow us to get rid of some of the extra compat mapping in
code..
On July 29, 2025 1:15 pm, Wolfgang Bumiller wrote:
> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
> ---
> src/PVE/Storage/BTRFSPlugin.pm | 4 +++-
> src/PVE/Storage/CIFSPlugin.pm | 4 +++-
> src/PVE/Storage/DirPlugin.pm | 4 +++-
> src/PVE/Storage/ISCSIDirectPlugin.pm | 2 +-
> src/PVE/Storage/ISCSIPlugin.pm | 2 +-
> src/PVE/Storage/LVMPlugin.pm | 10 +++++++++-
> src/PVE/Storage/LvmThinPlugin.pm | 15 ++++++++++++++-
> src/PVE/Storage/NFSPlugin.pm | 4 +++-
> src/PVE/Storage/RBDPlugin.pm | 10 +++++++++-
> src/PVE/Storage/ZFSPlugin.pm | 2 +-
> src/PVE/Storage/ZFSPoolPlugin.pm | 15 ++++++++++++++-
> 11 files changed, 61 insertions(+), 11 deletions(-)
>
> diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm
> index bd2c0bf..d1c0cf9 100644
> --- a/src/PVE/Storage/BTRFSPlugin.pm
> +++ b/src/PVE/Storage/BTRFSPlugin.pm
> @@ -35,6 +35,8 @@ sub plugindata {
> {
> images => 1,
> rootdir => 1,
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> vztmpl => 1,
> iso => 1,
> backup => 1,
> @@ -42,7 +44,7 @@ sub plugindata {
> none => 1,
> import => 1,
> },
> - { images => 1, rootdir => 1 },
> + { 'vm-vol' => 1, 'ct-vol' => 1, images => 1, rootdir => 1 },
> ],
> format => [{ raw => 1, subvol => 1 }, 'raw'],
> 'sensitive-properties' => {},
> diff --git a/src/PVE/Storage/CIFSPlugin.pm b/src/PVE/Storage/CIFSPlugin.pm
> index 75d89c1..5d59c7c 100644
> --- a/src/PVE/Storage/CIFSPlugin.pm
> +++ b/src/PVE/Storage/CIFSPlugin.pm
> @@ -102,13 +102,15 @@ sub plugindata {
> {
> images => 1,
> rootdir => 1,
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> vztmpl => 1,
> iso => 1,
> backup => 1,
> snippets => 1,
> import => 1,
> },
> - { images => 1 },
> + { 'vm-vol' => 1, images => 1 },
> ],
> format => [{ raw => 1, qcow2 => 1, vmdk => 1 }, 'raw'],
> 'sensitive-properties' => { password => 1 },
> diff --git a/src/PVE/Storage/DirPlugin.pm b/src/PVE/Storage/DirPlugin.pm
> index 9d15f33..53aded3 100644
> --- a/src/PVE/Storage/DirPlugin.pm
> +++ b/src/PVE/Storage/DirPlugin.pm
> @@ -28,6 +28,8 @@ sub plugindata {
> {
> images => 1,
> rootdir => 1,
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> vztmpl => 1,
> iso => 1,
> backup => 1,
> @@ -35,7 +37,7 @@ sub plugindata {
> none => 1,
> import => 1,
> },
> - { images => 1, rootdir => 1 },
> + { 'vm-vol' => 1, 'ct-vol' => 1, images => 1, rootdir => 1 },
> ],
> format => [{ raw => 1, qcow2 => 1, vmdk => 1, subvol => 1 }, 'raw'],
> 'sensitive-properties' => {},
> diff --git a/src/PVE/Storage/ISCSIDirectPlugin.pm b/src/PVE/Storage/ISCSIDirectPlugin.pm
> index 62e9026..069a41f 100644
> --- a/src/PVE/Storage/ISCSIDirectPlugin.pm
> +++ b/src/PVE/Storage/ISCSIDirectPlugin.pm
> @@ -64,7 +64,7 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, none => 1 }, { images => 1 }],
> + content => [{ 'vm-vol' => 1, images => 1, none => 1 }, { 'vm-vol' => 1, images => 1 }],
> select_existing => 1,
> 'sensitive-properties' => {},
> };
> diff --git a/src/PVE/Storage/ISCSIPlugin.pm b/src/PVE/Storage/ISCSIPlugin.pm
> index 7691ec6..7b30955 100644
> --- a/src/PVE/Storage/ISCSIPlugin.pm
> +++ b/src/PVE/Storage/ISCSIPlugin.pm
> @@ -334,7 +334,7 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, none => 1 }, { images => 1 }],
> + content => [{ 'vm-vol' => 1, images => 1, none => 1 }, { 'vm-vol' => 1, images => 1 }],
> select_existing => 1,
> 'sensitive-properties' => {},
> };
> diff --git a/src/PVE/Storage/LVMPlugin.pm b/src/PVE/Storage/LVMPlugin.pm
> index c1f5474..6694cf2 100644
> --- a/src/PVE/Storage/LVMPlugin.pm
> +++ b/src/PVE/Storage/LVMPlugin.pm
> @@ -354,7 +354,15 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, rootdir => 1 }, { images => 1 }],
> + content => [
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + { 'vm-vol' => 1, images => 1 },
> + ],
> format => [{ raw => 1, qcow2 => 1 }, 'raw'],
> 'sensitive-properties' => {},
> };
> diff --git a/src/PVE/Storage/LvmThinPlugin.pm b/src/PVE/Storage/LvmThinPlugin.pm
> index ccefd0e..cdf0fd0 100644
> --- a/src/PVE/Storage/LvmThinPlugin.pm
> +++ b/src/PVE/Storage/LvmThinPlugin.pm
> @@ -30,7 +30,20 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, rootdir => 1 }, { images => 1, rootdir => 1 }],
> + content => [
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + ],
> 'sensitive-properties' => {},
> };
> }
> diff --git a/src/PVE/Storage/NFSPlugin.pm b/src/PVE/Storage/NFSPlugin.pm
> index a8339ef..4c23cd5 100644
> --- a/src/PVE/Storage/NFSPlugin.pm
> +++ b/src/PVE/Storage/NFSPlugin.pm
> @@ -57,13 +57,15 @@ sub plugindata {
> {
> images => 1,
> rootdir => 1,
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> vztmpl => 1,
> iso => 1,
> backup => 1,
> snippets => 1,
> import => 1,
> },
> - { images => 1 },
> + { 'vm-vol' => 1, images => 1 },
> ],
> format => [{ raw => 1, qcow2 => 1, vmdk => 1 }, 'raw'],
> 'sensitive-properties' => {},
> diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
> index cf371c7..9f95c73 100644
> --- a/src/PVE/Storage/RBDPlugin.pm
> +++ b/src/PVE/Storage/RBDPlugin.pm
> @@ -392,7 +392,15 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, rootdir => 1 }, { images => 1 }],
> + content => [
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + { 'vm-vol' => 1, images => 1 },
> + ],
> 'sensitive-properties' => { keyring => 1 },
> };
> }
> diff --git a/src/PVE/Storage/ZFSPlugin.pm b/src/PVE/Storage/ZFSPlugin.pm
> index 99d8c8f..a05f521 100644
> --- a/src/PVE/Storage/ZFSPlugin.pm
> +++ b/src/PVE/Storage/ZFSPlugin.pm
> @@ -175,7 +175,7 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1 }, { images => 1 }],
> + content => [{ 'vm-vol' => 1, images => 1 }, { 'vm-vol' => 1, images => 1 }],
> 'sensitive-properties' => {},
> };
> }
> diff --git a/src/PVE/Storage/ZFSPoolPlugin.pm b/src/PVE/Storage/ZFSPoolPlugin.pm
> index cdf5868..0152c89 100644
> --- a/src/PVE/Storage/ZFSPoolPlugin.pm
> +++ b/src/PVE/Storage/ZFSPoolPlugin.pm
> @@ -20,7 +20,20 @@ sub type {
>
> sub plugindata {
> return {
> - content => [{ images => 1, rootdir => 1 }, { images => 1, rootdir => 1 }],
> + content => [
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + {
> + 'vm-vol' => 1,
> + 'ct-vol' => 1,
> + images => 1,
> + rootdir => 1,
> + },
> + ],
> format => [{ raw => 1, subvol => 1 }, 'raw'],
> 'sensitive-properties' => {},
> };
> --
> 2.47.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
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-07-30 8:36 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 11:15 [pve-devel] [RFC storage 00/26+10+3] unify vtype and content-type and Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 01/26] btrfs: remove unnecessary mkpath call Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 02/26] parse_volname: remove openvz 'rootdir' case Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 03/26] drop rootdir case in path_to_volume_id Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 04/26] escape dirs in path_to_volume_id regexes Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 05/26] tests: drop rootdir/ tests Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 06/26] common: use v5.36 Wolfgang Bumiller
2025-07-29 13:59 ` Fiona Ebner
2025-07-29 14:42 ` Thomas Lamprecht
2025-07-29 11:15 ` [pve-devel] [PATCH storage 07/26] common: add pve-storage-vtype standard option with new types Wolfgang Bumiller
2025-07-29 13:50 ` Fiona Ebner
2025-07-29 11:15 ` [pve-devel] [PATCH storage 08/26] prepare for vm-vol and ct-vol content and vtypes Wolfgang Bumiller
2025-07-30 8:38 ` Fabian Grünbichler
2025-08-08 12:01 ` Wolfgang Bumiller
2025-07-30 9:14 ` Fabian Grünbichler
2025-08-08 12:05 ` Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 09/26] plugins: add new content types to all plugindata Wolfgang Bumiller
2025-07-30 8:38 ` Fabian Grünbichler [this message]
2025-08-08 12:10 ` Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 10/26] plugins: update volname parsing for new naming convention Wolfgang Bumiller
2025-07-30 8:37 ` Fabian Grünbichler
2025-07-30 8:53 ` Wolfgang Bumiller
2025-07-30 8:58 ` Fabian Grünbichler
2025-07-29 11:15 ` [pve-devel] [PATCH storage 11/26] plugin: add vm/ct-vol to 'local' storage default content types Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 12/26] plugin: support new vtypes in activate_storage checks Wolfgang Bumiller
2025-07-30 8:36 ` Fabian Grünbichler
2025-08-08 13:16 ` Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 13/26] plugin, btrfs: update list_images and list_volumes Wolfgang Bumiller
2025-07-30 8:36 ` Fabian Grünbichler
2025-07-30 8:41 ` Fiona Ebner
2025-07-29 11:15 ` [pve-devel] [PATCH storage 14/26] plugins: update image/volume listing to support new types Wolfgang Bumiller
2025-07-30 8:36 ` Fabian Grünbichler
2025-07-29 11:15 ` [pve-devel] [PATCH storage 15/26] common: add is_volume_type and is_type_change_allowed helpers Wolfgang Bumiller
2025-07-30 9:01 ` Fabian Grünbichler
2025-07-29 11:15 ` [pve-devel] [PATCH storage 16/26] common: add volume_type_from_name convenience helper Wolfgang Bumiller
2025-07-30 8:36 ` Fabian Grünbichler
2025-07-30 9:09 ` Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 17/26] plugins: add vtype parameter to alloc_image Wolfgang Bumiller
2025-07-30 9:24 ` Fabian Grünbichler
2025-07-30 14:00 ` Max R. Carrara
2025-07-30 14:05 ` Max R. Carrara
2025-07-30 14:26 ` Fabian Grünbichler
2025-07-30 14:49 ` Max R. Carrara
2025-07-30 15:01 ` Fabian Grünbichler
2025-07-29 11:15 ` [pve-devel] [PATCH storage 18/26] plugins: update create_base methods Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 19/26] plugins: update clone_image methods Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 20/26] plugins: update rename_volumes methods Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 21/26] plugins: update volume_import methods Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 22/26] zfs: update 'path' method for new naming scheme Wolfgang Bumiller
2025-07-30 9:31 ` Fabian Grünbichler
2025-07-29 11:15 ` [pve-devel] [PATCH storage 23/26] pvesm: add vtype parameter to import command Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 24/26] api: add vtype parameter to create call Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH storage 25/26] update tests Wolfgang Bumiller
2025-07-29 16:33 ` Max R. Carrara
2025-07-29 11:15 ` [pve-devel] [PATCH storage 26/26] update ApiChangeLog Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH container 1/3] add vtype to vdisk_alloc and vdisk_clone calls Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH container 2/3] expect 'vm-vol' vtype in get_replicatable_volumes Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH container 3/3] add vtype to rename_volume call Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 01/10] add vtype to vdisk_alloc and vdisk_clone calls Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 02/10] add vtype parameter to rename_volume call Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 03/10] expect 'vm-vol' vtype in get_replicatable_volumes Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 04/10] expect 'vm-vol' vtype wherever 'images' was expected Wolfgang Bumiller
2025-07-30 8:40 ` Fabian Grünbichler
2025-07-30 9:17 ` Fiona Ebner
2025-07-30 9:33 ` Fiona Ebner
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 05/10] tests: update QmMock to support vtypes Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 06/10] tests: scripted: update tests to new vtypes and paths Wolfgang Bumiller
2025-07-29 14:13 ` Max R. Carrara
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 07/10] make tidy Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 08/10] tests: fixup restore test to use new volume naming scheme Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 09/10] tests: update remaining tests to new snapshot paths Wolfgang Bumiller
2025-07-29 11:15 ` [pve-devel] [PATCH qemu-server 10/10] tests: regenerate cfg2cmd files Wolfgang Bumiller
2025-07-29 14:19 ` Max R. Carrara
2025-07-29 15:34 ` [pve-devel] partially-applied: [RFC storage 00/26+10+3] unify vtype and content-type and Fiona Ebner
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=1753861054.nw1j359kan.astroid@yuna.none \
--to=f.gruenbichler@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