proxmox-mirrors/vma-to-pbs
1
0
Fork 0
mirror of https://git.proxmox.com/git/vma-to-pbs synced 2025-08-06 17:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove hard coded values

Browse Source 
Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
This commit is contained in:
Filip Schauer 2024-10-30 14:55:35 +01:00 committed by Fabian Grünbichler
parent f48dd30f86
commit 8dafa525f6
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vma.rs
View File

@ -22,7 +22,7 @@ const VMA_MAX_CONFIGS: usize = 256;
/// Maximum number of block devices /// Maximum number of block devices
/// See VMA Header in pve-qemu.git/vma_spec.txt /// See VMA Header in pve-qemu.git/vma_spec.txt
const VMA_MAX_DEVICES: usize = 256; pub const VMA_MAX_DEVICES: usize = 256;
/// VMA magic string /// VMA magic string
/// See VMA Header in pve-qemu.git/vma_spec.txt /// See VMA Header in pve-qemu.git/vma_spec.txt

23
src/vma2pbs.rs
View File

@ -24,7 +24,7 @@ use proxmox_time::epoch_to_rfc3339;
use scopeguard::defer; use scopeguard::defer;
use serde_json::Value; use serde_json::Value;
use crate::vma::VmaReader; use crate::vma::{VmaReader, VMA_MAX_DEVICES};
const VMA_CLUSTER_SIZE: usize = 65536; const VMA_CLUSTER_SIZE: usize = 65536;
@ -165,20 +165,21 @@ where
fn register_block_devices<T>( fn register_block_devices<T>(
vma_reader: &VmaReader<T>, vma_reader: &VmaReader<T>,
pbs: *mut ProxmoxBackupHandle, pbs: *mut ProxmoxBackupHandle,
) -> Result<[Option<BlockDeviceInfo>; 256], Error> ) -> Result<[Option<BlockDeviceInfo>; VMA_MAX_DEVICES], Error>
where where
T: Read, T: Read,
{ {
let mut block_device_infos: [Option<BlockDeviceInfo>; 256] = [None; 256]; let mut block_device_infos: [Option<BlockDeviceInfo>; VMA_MAX_DEVICES] =
[None; VMA_MAX_DEVICES];
let mut pbs_err: *mut c_char = ptr::null_mut(); let mut pbs_err: *mut c_char = ptr::null_mut();
for device_id in 0..255 { for (device_id, block_device_info) in block_device_infos.iter_mut().enumerate() {
if !vma_reader.contains_device(device_id) { if !vma_reader.contains_device(device_id.try_into()?) {
continue; continue;
} }
let device_name = vma_reader.get_device_name(device_id)?; let device_name = vma_reader.get_device_name(device_id.try_into()?)?;
let device_size = vma_reader.get_device_size(device_id)?; let device_size = vma_reader.get_device_size(device_id.try_into()?)?;
println!( println!(
"DEV: dev_id={} size: {} devname: {}", "DEV: dev_id={} size: {} devname: {}",
@ -198,12 +199,10 @@ where
handle_pbs_error(pbs_err, "proxmox_backup_register_image")?; handle_pbs_error(pbs_err, "proxmox_backup_register_image")?;
} }
let block_device_info = BlockDeviceInfo { *block_device_info = Some(BlockDeviceInfo {
pbs_device_id: pbs_device_id as u8, pbs_device_id: pbs_device_id as u8,
device_size, device_size,
}; });
block_device_infos[device_id as usize] = Some(block_device_info);
} }
Ok(block_device_infos) Ok(block_device_infos)
@ -351,7 +350,7 @@ where
let mut pbs_err: *mut c_char = ptr::null_mut(); let mut pbs_err: *mut c_char = ptr::null_mut();
for block_device_info in block_device_infos.iter().take(255) { for block_device_info in block_device_infos {
let block_device_info = match block_device_info { let block_device_info = match block_device_info {
Some(block_device_info) => block_device_info, Some(block_device_info) => block_device_info,
None => continue, None => continue,