External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-09-19 21:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: ch-remote: replace deprecated zbus macros with new equivalents

Browse Source 
Fixes deprecation related warnings introduced in #6400.

Signed-off-by: Omer Faruk Bayram <omer.faruk@sartura.hr>
This commit is contained in:
Omer Faruk Bayram 2024-05-22 21:41:43 +03:00 committed by Rob Bradford
parent 5a811af099
commit 036e7e3797
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/ch-remote.rs
View File

@ -15,7 +15,7 @@ use std::marker::PhantomData;
use std::os::unix::net::UnixStream; use std::os::unix::net::UnixStream;
use std::process; use std::process;
#[cfg(feature = "dbus_api")] #[cfg(feature = "dbus_api")]
use zbus::{dbus_proxy, zvariant::Optional}; use zbus::{proxy, zvariant::Optional};
type ApiResult = Result<(), Error>; type ApiResult = Result<(), Error>;
@ -72,7 +72,7 @@ enum TargetApi<'a> {
} }
#[cfg(feature = "dbus_api")] #[cfg(feature = "dbus_api")]
#[dbus_proxy(name = "org.cloudhypervisor.DBusApi1", assume_defaults = false)] #[proxy(name = "org.cloudhypervisor.DBusApi1", assume_defaults = false)]
trait DBusApi1 { trait DBusApi1 {
fn vmm_ping(&self) -> zbus::Result<String>; fn vmm_ping(&self) -> zbus::Result<String>;
fn vmm_shutdown(&self) -> zbus::Result<()>; fn vmm_shutdown(&self) -> zbus::Result<()>;

8
vmm/src/api/dbus/mod.rs
View File

@ -25,7 +25,7 @@ use std::thread;
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
use zbus::fdo::{self, Result}; use zbus::fdo::{self, Result};
use zbus::zvariant::Optional; use zbus::zvariant::Optional;
use zbus::{dbus_interface, ConnectionBuilder}; use zbus::{interface, ConnectionBuilder};
pub type DBusApiShutdownChannels = (oneshot::Sender<()>, oneshot::Receiver<()>); pub type DBusApiShutdownChannels = (oneshot::Sender<()>, oneshot::Receiver<()>);
@ -105,7 +105,7 @@ impl DBusApi {
} }
} }
#[dbus_interface(name = "org.cloudhypervisor.DBusApi1")] #[interface(name = "org.cloudhypervisor.DBusApi1")]
impl DBusApi { impl DBusApi {
async fn vmm_ping(&self) -> Result<String> { async fn vmm_ping(&self) -> Result<String> {
let api_sender = self.clone_api_sender().await; let api_sender = self.clone_api_sender().await;
@ -301,8 +301,8 @@ impl DBusApi {
.map(|_| ()) .map(|_| ())
} }
// implementation of this function is provided by the `dbus_interface` macro // implementation of this function is provided by the `#[zbus(signal)]` macro call
#[dbus_interface(signal)] #[zbus(signal)]
async fn event(ctxt: &zbus::SignalContext<'_>, event: Arc<String>) -> zbus::Result<()>; async fn event(ctxt: &zbus::SignalContext<'_>, event: Arc<String>) -> zbus::Result<()>;
} }