From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D13E2815CF for ; Wed, 24 Nov 2021 09:18:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1FF21BA68 for ; Wed, 24 Nov 2021 09:18:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 832891BA5A for ; Wed, 24 Nov 2021 09:18:25 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 665924434B for ; Wed, 24 Nov 2021 09:18:19 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 24 Nov 2021 09:18:12 +0100 Message-Id: <20211124081813.1559447-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211105121909.2957236-1-dietmar@proxmox.com> References: <20211105121909.2957236-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.119 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-backup-qemu 1/2] update deps to pbs 2.1.1 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2021 08:18:26 -0000 Signed-off-by: Fabian Grünbichler --- on top of the patch by dietmar Cargo.toml | 14 +++++++------- src/backup.rs | 2 +- src/lib.rs | 2 +- src/restore.rs | 3 ++- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d9a7de1..b98e8ae 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,15 +28,15 @@ libc = "0.2" once_cell = "1.5" openssl = "0.10" proxmox = { version = "0.15.0", features = [ "sortable-macro"] } -proxmox-schema = { version = "1", features = [ "api-macro" ] } +proxmox-async = "0.2" proxmox-lang = "1" +proxmox-schema = { version = "1", features = [ "api-macro" ] } -pbs-runtime = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } -pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } -pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } -pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } -pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } -pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git" , rev = "2bc1250c28de0ecf595b9933af9f900cbee52fdc" } +pbs-api-types = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "064497756e6212792d38ebddf6c1d4419638deec" } +pbs-tools = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "064497756e6212792d38ebddf6c1d4419638deec" } +pbs-config = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "064497756e6212792d38ebddf6c1d4419638deec" } +pbs-datastore = { git = "git://git.proxmox.com/git/proxmox-backup.git", rev = "064497756e6212792d38ebddf6c1d4419638deec" } +pbs-client = { git = "git://git.proxmox.com/git/proxmox-backup.git" , rev = "064497756e6212792d38ebddf6c1d4419638deec" } serde_json = "1.0" tokio = { version = "1.6", features = [ "fs", "io-util", "macros", "net", "rt-multi-thread", "signal", "time" ] } diff --git a/src/backup.rs b/src/backup.rs index 186730f..b3ca21d 100644 --- a/src/backup.rs +++ b/src/backup.rs @@ -8,8 +8,8 @@ use futures::future::{Future, Either, FutureExt}; use tokio::runtime::Runtime; use proxmox::tools::fs::file_get_contents; +use proxmox_async::runtime::get_runtime_with_builder; -use pbs_runtime::get_runtime_with_builder; use pbs_api_types::CryptMode; use pbs_tools::crypt_config::CryptConfig; use pbs_config::key_config::{KeyConfig, load_and_decrypt_key, rsa_encrypt_key_config}; diff --git a/src/lib.rs b/src/lib.rs index 436a592..bfc379d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -842,7 +842,7 @@ pub extern "C" fn proxmox_restore_image( callback(callback_data, offset, std::ptr::null(), len) }; - pbs_runtime::block_on( + proxmox_async::runtime::block_on( restore_task.restore_image(archive_name, write_data_callback, write_zero_callback, verbose) )?; diff --git a/src/restore.rs b/src/restore.rs index e034aa2..2bc86c9 100644 --- a/src/restore.rs +++ b/src/restore.rs @@ -5,7 +5,8 @@ use anyhow::{format_err, bail, Error}; use once_cell::sync::OnceCell; use tokio::runtime::Runtime; -use pbs_runtime::get_runtime_with_builder; +use proxmox_async::runtime::get_runtime_with_builder; + use pbs_tools::crypt_config::CryptConfig; use pbs_config::key_config::load_and_decrypt_key; use pbs_datastore::BackupManifest; -- 2.30.2