diff --git a/crates/daemon/src/control.rs b/crates/daemon/src/control.rs index ed7c379..5f3c980 100644 --- a/crates/daemon/src/control.rs +++ b/crates/daemon/src/control.rs @@ -28,7 +28,7 @@ use krata::{ ReadZoneMetricsReply, ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest, SnoopIdmReply, SnoopIdmRequest, UpdateZoneResourcesReply, UpdateZoneResourcesRequest, WatchEventsReply, WatchEventsRequest, ZoneConsoleReply, ZoneConsoleRequest, - ReadHypervisorConsoleRingRequest, ReadHypervisorConsoleRingReply, + ReadHypervisorConsoleRequest, ReadHypervisorConsoleReply, }, }, }; @@ -712,14 +712,13 @@ impl ControlService for DaemonControlService { Ok(Response::new(UpdateZoneResourcesReply {})) } - async fn read_hypervisor_console_ring( + async fn read_hypervisor_console( &self, - request: Request, - ) -> Result, Status> { - let request = request.into_inner(); - let data = self.runtime.read_hypervisor_console(request.clear).await.map_err(|error| ApiError { + _request: Request, + ) -> Result, Status> { + let data = self.runtime.read_hypervisor_console(false).await.map_err(|error| ApiError { message: error.to_string(), })?; - Ok(Response::new(ReadHypervisorConsoleRingReply { data: data.to_string() })) + Ok(Response::new(ReadHypervisorConsoleReply { data: data.to_string() })) } } diff --git a/crates/krata/proto/krata/v1/control.proto b/crates/krata/proto/krata/v1/control.proto index 7bddd47..863bf2d 100644 --- a/crates/krata/proto/krata/v1/control.proto +++ b/crates/krata/proto/krata/v1/control.proto @@ -36,7 +36,7 @@ service ControlService { rpc WatchEvents(WatchEventsRequest) returns (stream WatchEventsReply); - rpc ReadHypervisorConsoleRing(ReadHypervisorConsoleRingRequest) returns (ReadHypervisorConsoleRingReply); + rpc ReadHypervisorConsole(ReadHypervisorConsoleRequest) returns (ReadHypervisorConsoleReply); } message HostStatusRequest {} @@ -255,10 +255,8 @@ message UpdateZoneResourcesRequest { message UpdateZoneResourcesReply {} -message ReadHypervisorConsoleRingRequest { - bool clear = 1; -} +message ReadHypervisorConsoleRequest {} -message ReadHypervisorConsoleRingReply { +message ReadHypervisorConsoleReply { string data = 1; }