feature(hypervisor-dmesg): proto: change ReadHypervisorConsoleRing to ReadHypervisorConsole

This commit is contained in:
Ariadne Conill
2024-08-19 16:39:33 -07:00
parent 7e26f68bf9
commit 290b8fa754
2 changed files with 9 additions and 12 deletions

View File

@ -28,7 +28,7 @@ use krata::{
ReadZoneMetricsReply, ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest, ReadZoneMetricsReply, ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest,
SnoopIdmReply, SnoopIdmRequest, UpdateZoneResourcesReply, UpdateZoneResourcesRequest, SnoopIdmReply, SnoopIdmRequest, UpdateZoneResourcesReply, UpdateZoneResourcesRequest,
WatchEventsReply, WatchEventsRequest, ZoneConsoleReply, ZoneConsoleRequest, WatchEventsReply, WatchEventsRequest, ZoneConsoleReply, ZoneConsoleRequest,
ReadHypervisorConsoleRingRequest, ReadHypervisorConsoleRingReply, ReadHypervisorConsoleRequest, ReadHypervisorConsoleReply,
}, },
}, },
}; };
@ -712,14 +712,13 @@ impl ControlService for DaemonControlService {
Ok(Response::new(UpdateZoneResourcesReply {})) Ok(Response::new(UpdateZoneResourcesReply {}))
} }
async fn read_hypervisor_console_ring( async fn read_hypervisor_console(
&self, &self,
request: Request<ReadHypervisorConsoleRingRequest>, _request: Request<ReadHypervisorConsoleRequest>,
) -> Result<Response<ReadHypervisorConsoleRingReply>, Status> { ) -> Result<Response<ReadHypervisorConsoleReply>, Status> {
let request = request.into_inner(); let data = self.runtime.read_hypervisor_console(false).await.map_err(|error| ApiError {
let data = self.runtime.read_hypervisor_console(request.clear).await.map_err(|error| ApiError {
message: error.to_string(), message: error.to_string(),
})?; })?;
Ok(Response::new(ReadHypervisorConsoleRingReply { data: data.to_string() })) Ok(Response::new(ReadHypervisorConsoleReply { data: data.to_string() }))
} }
} }

View File

@ -36,7 +36,7 @@ service ControlService {
rpc WatchEvents(WatchEventsRequest) returns (stream WatchEventsReply); rpc WatchEvents(WatchEventsRequest) returns (stream WatchEventsReply);
rpc ReadHypervisorConsoleRing(ReadHypervisorConsoleRingRequest) returns (ReadHypervisorConsoleRingReply); rpc ReadHypervisorConsole(ReadHypervisorConsoleRequest) returns (ReadHypervisorConsoleReply);
} }
message HostStatusRequest {} message HostStatusRequest {}
@ -255,10 +255,8 @@ message UpdateZoneResourcesRequest {
message UpdateZoneResourcesReply {} message UpdateZoneResourcesReply {}
message ReadHypervisorConsoleRingRequest { message ReadHypervisorConsoleRequest {}
bool clear = 1;
}
message ReadHypervisorConsoleRingReply { message ReadHypervisorConsoleReply {
string data = 1; string data = 1;
} }