mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-04 05:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge issues

Browse Source
This commit is contained in:
Alex Zenla
2024-05-14 02:43:53 -07:00
parent 620c3a1b2f
commit c3df396df0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/xen/xenclient/src/lib.rs
View File

@ -7,7 +7,7 @@ pub mod sys;
use crate::boot::{BootDomain, BootSetup}; use crate::boot::{BootDomain, BootSetup};
use crate::elfloader::ElfImageLoader; use crate::elfloader::ElfImageLoader;
use crate::error::{Error, Result}; use crate::error::{Error, Result};
use boot::BootState; use boot::BootSetupPlatform;
use indexmap::IndexMap; use indexmap::IndexMap;
use log::{debug, trace, warn}; use log::{debug, trace, warn};
use pci::{PciBdf, XenPciBackend}; use pci::{PciBdf, XenPciBackend};
@ -137,8 +137,8 @@ pub struct CreatedDomain {
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
impl XenClient { impl<P: BootSetupPlatform> XenClient<P> {
pub async fn open(current_domid: u32) -> Result<XenClient> { pub async fn new(current_domid: u32, platform: P) -> Result<XenClient<P>> {
let store = XsdClient::open().await?; let store = XsdClient::open().await?;
let call = XenCall::open(current_domid)?; let call = XenCall::open(current_domid)?;
Ok(XenClient { Ok(XenClient {
@ -351,6 +351,7 @@ impl XenClient {
let tx = self.store.transaction().await?; let tx = self.store.transaction().await?;
self.console_device_add( self.console_device_add(
&tx, &tx,
&mut domain,
&DomainChannel { &DomainChannel {
typ: config typ: config
.swap_console_backend .swap_console_backend
@ -372,6 +373,7 @@ impl XenClient {
let (Some(ring_ref), Some(evtchn)) = self let (Some(ring_ref), Some(evtchn)) = self
.console_device_add( .console_device_add(
&tx, &tx,
&mut domain,
channel, channel,
&dom_path, &dom_path,
&backend_dom_path, &backend_dom_path,
@ -515,6 +517,7 @@ impl XenClient {
async fn console_device_add( async fn console_device_add(
&self, &self,
tx: &XsdTransaction, tx: &XsdTransaction,
domain: &mut BootDomain,
channel: &DomainChannel, channel: &DomainChannel,
dom_path: &str, dom_path: &str,
backend_dom_path: &str, backend_dom_path: &str,