bump proxmox-backup to 3.3.2-2

Author: jiangcuo

packages/proxmox-backup/patches/002-fix-qemu-cmdline.patch

@@ -1,5 +1,5 @@
 diff --git a/pbs-buildcfg/src/lib.rs b/pbs-buildcfg/src/lib.rs
-index 3d087015b..ba3b5702a 100644
+index 3d087015..ba3b5702 100644
 --- a/pbs-buildcfg/src/lib.rs
 +++ b/pbs-buildcfg/src/lib.rs
 @@ -53,8 +53,9 @@ macro_rules! PROXMOX_BACKUP_CACHE_DIR_M {
@@ -34,7 +34,7 @@ index 3d087015b..ba3b5702a 100644
  pub const PROXMOX_BACKUP_SUBSCRIPTION_FN: &str = configdir!("/subscription");
 
 diff --git a/proxmox-file-restore/src/qemu_helper.rs b/proxmox-file-restore/src/qemu_helper.rs
-index 471010aa1..adea944d2 100644
+index e0e16911..b9ae95b5 100644
 --- a/proxmox-file-restore/src/qemu_helper.rs
 +++ b/proxmox-file-restore/src/qemu_helper.rs
 @@ -4,6 +4,7 @@ use std::io::prelude::*;
@@ -54,19 +54,17 @@ index 471010aa1..adea944d2 100644
      let initramfs = PathBuf::from(if debug {
          pbs_buildcfg::PROXMOX_BACKUP_INITRAMFS_DBG_FN
      } else {
-@@ -253,9 +254,8 @@ pub async fn start_vm(
-         "chardev:log",
-         "-vnc",
+@@ -255,7 +256,7 @@ pub async fn start_vm(
          "none",
--        "-enable-kvm",
+         "-enable-kvm",
          "-kernel",
 -        pbs_buildcfg::PROXMOX_BACKUP_KERNEL_FN,
 +        &pbs_buildcfg::PROXMOX_BACKUP_KERNEL_FN(),
          "-initrd",
          &ramfs_path,
          "-append",
-@@ -294,38 +294,56 @@ pub async fn start_vm(
-             "file=pbs:repository={}{},,snapshot={},,archive={}{},read-only=on,if=none,id=drive{}",
+@@ -294,38 +295,64 @@ pub async fn start_vm(
+             "driver=pbs,repository={}{},snapshot={},archive={}{},read-only=on,node-name=drive{}",
              details.repo, namespace, details.snapshot, file, keyfile, id
          ));
 -
@@ -124,6 +122,14 @@ index 471010aa1..adea944d2 100644
 +    if arch == "loongarch64" {
 +        ram = 1024;
 +    }
++
++    let edk2_path = match arch  {
++        "loongarch64" => "/usr/share/pve-edk2-firmware/LOONGARCH64_VIRT_CODE.fd",
++        "aarch64" => "/usr/share/pve-edk2-firmware/AAVMF_CODE.fd",
++	"riscv64" => "/usr/share/pve-edk2-firmware/RISCV_VIRT_CODE.fd",
++	_ =>  "/usr/share/pve-edk2-firmware/bios.fd",
++     };
++
 +
      // Try starting QEMU in a loop to retry if we fail because of a bad 'cid' value
 +    let qemu_bin = format!("qemu-system-{}", arch);
@@ -134,25 +140,20 @@ index 471010aa1..adea944d2 100644
          qemu_cmd.args(base_args.iter());
          qemu_cmd.arg("-m");
          qemu_cmd.arg(format!(
-@@ -346,6 +364,21 @@ pub async fn start_vm(
+@@ -346,6 +373,16 @@ pub async fn start_vm(
          qemu_cmd.arg("-mon");
          qemu_cmd.arg("chardev=qmp,mode=control");
 
 +        // Use virt and tcg to start file-restore.
-+        // If pve run in neasted env ,this will be ok.
-+        // If you make sure that pve run on host,  -accel kvm will be better! 
 +        if arch != "x86_64" {
 +            qemu_cmd.arg("-M");
 +            qemu_cmd.arg("virt");
-+            qemu_cmd.arg("-accel");
-+            qemu_cmd.arg("tcg");
 +            qemu_cmd.arg("-cpu");
 +            qemu_cmd.arg("max");
-+        } else {
-+            qemu_cmd.arg("-accel");
-+            qemu_cmd.arg("kvm");
++	    qemu_cmd.arg("-bios");
++	    qemu_cmd.arg(format!("{}",edk2_path));
 +        }
-+    
++
          if debug {
              let debug_args = [
                  "-chardev",

packages/proxmox-backup/patches/004-Optimize-the-qemu-command-line.patch

@@ -0,0 +1,41 @@
+diff --git a/proxmox-file-restore/src/qemu_helper.rs b/proxmox-file-restore/src/qemu_helper.rs
+index b9ae95b5..3c6bea60 100644
+--- a/proxmox-file-restore/src/qemu_helper.rs
++++ b/proxmox-file-restore/src/qemu_helper.rs
+@@ -254,7 +254,6 @@ pub async fn start_vm(
+         "chardev:log",
+         "-vnc",
+         "none",
+-        "-enable-kvm",
+         "-kernel",
+         &pbs_buildcfg::PROXMOX_BACKUP_KERNEL_FN(),
+         "-initrd",
+@@ -308,16 +307,9 @@ pub async fn start_vm(
+         drives.push("-device".to_owned());
+         // drive serial is used by VM to map .fidx files to /dev paths
+         let serial = file.strip_suffix(".img.fidx").unwrap_or(&file);
+-        if arch == "x86_64" {
+-            drives.push(format!(
+-                "virtio-blk-pci,drive=drive{id},serial={serial},bus=bridge{bus}"
+-            ));
+-        } else {
+-            drives.push(format!(
+-                // We use virtio-blk-device because QEMU will automatically assigns PCI addresses.
+-                "virtio-blk-device,drive=drive{id},serial={serial}"
+-            ));
+-        }
++        drives.push(format!(
++ 	       "virtio-blk-pci,drive=drive{id},serial={serial}"
++        ));
+         id += 1;
+     }
+ 
+@@ -382,6 +374,8 @@ pub async fn start_vm(
+ 	    qemu_cmd.arg("-bios");
+ 	    qemu_cmd.arg(format!("{}",edk2_path));
+         }
++	qemu_cmd.arg("-accel");
++	qemu_cmd.arg("kvm");
+ 
+         if debug {
+             let debug_args = [

packages/proxmox-backup/proxmox-backup

@@ -1 +1,2 @@
 patches/002-fix-qemu-cmdline.patch
+patches/004-Optimize-the-qemu-command-line.patch