From c8a1d7a858a6a43f7cd4358a6404db86b8f5f2be Mon Sep 17 00:00:00 2001 From: "Gudaram, Meghana" Date: Wed, 24 Jun 2026 15:14:49 -0700 Subject: [PATCH] clean up GetTdMigTD API --- src/migtd/src/bin/migtd/cvmemu.rs | 34 ++---------------------------- src/migtd/src/bin/migtd/main.rs | 21 ------------------ src/migtd/src/migration/data.rs | 2 -- src/migtd/src/migration/session.rs | 25 +--------------------- 4 files changed, 3 insertions(+), 79 deletions(-) diff --git a/src/migtd/src/bin/migtd/cvmemu.rs b/src/migtd/src/bin/migtd/cvmemu.rs index 2af259c9..9ffb5b14 100644 --- a/src/migtd/src/bin/migtd/cvmemu.rs +++ b/src/migtd/src/bin/migtd/cvmemu.rs @@ -391,7 +391,7 @@ fn parse_commandline_args() { } "rebind-prepare" => { log::info!( - "Setting up rebind-prepare flow (EnableLogArea → GetMigtdData → StartRebinding)\n" + "Setting up rebind-prepare flow (EnableLogArea → GetTDReport → StartRebinding)\n" ); set_emulated_start_rebinding( mig_request_id, @@ -403,7 +403,7 @@ fn parse_commandline_args() { } "rebind-finalize" => { log::info!( - "Setting up rebind-finalize flow (EnableLogArea → GetMigtdData → StartRebinding)\n" + "Setting up rebind-finalize flow (EnableLogArea → GetTDReport → StartRebinding)\n" ); set_emulated_start_rebinding( mig_request_id, @@ -642,36 +642,6 @@ fn handle_pre_mig_emu() -> i32 { return status_code; } } - #[cfg(all(feature = "policy_v2"))] - WaitForRequestResponse::GetMigtdData(wfr_info) => { - use migtd::migration::session::get_migtd_data; - - log::info!(migration_request_id = wfr_info.mig_request_id; "Processing GetMigtdData request\n"); - let mut data = Vec::new(); - let status = get_migtd_data( - &wfr_info.reportdata, - &mut data, - wfr_info.mig_request_id, - ) - .await - .map(|_| MigrationResult::Success) - .unwrap_or_else(|e| e); - - let status_code_u8 = status as u8; - let _ = report_status( - status_code_u8, - wfr_info.mig_request_id, - &data, - ) - .await; - if status_code_u8 == MigrationResult::Success as u8 { - log::trace!(migration_request_id = wfr_info.mig_request_id; "Successfully completed get migtd data\n"); - } else { - log::error!(migration_request_id = wfr_info.mig_request_id; - "Failure during get migtd data status code: {:x}\n", status_code_u8); - } - // Continue to process next request - } } } Err(e) => { diff --git a/src/migtd/src/bin/migtd/main.rs b/src/migtd/src/bin/migtd/main.rs index c4660aaa..a234f032 100644 --- a/src/migtd/src/bin/migtd/main.rs +++ b/src/migtd/src/bin/migtd/main.rs @@ -588,27 +588,6 @@ fn handle_pre_mig() { log::trace!(migration_request_id = wfr_info.mig_request_id; "ReportStatus for Enable LogArea completed\n"); REQUESTS.lock().remove(&wfr_info.mig_request_id); } - #[cfg(feature = "policy_v2")] - WaitForRequestResponse::GetMigtdData(wfr_info) => { - log::trace!(migration_request_id = wfr_info.mig_request_id; "Processing GetMigtdData request\n"); - let status = get_migtd_data( - &wfr_info.reportdata, - &mut data, - wfr_info.mig_request_id, - ) - .await - .map(|_| MigrationResult::Success) - .unwrap_or_else(|e| e); - if status == MigrationResult::Success { - log::trace!(migration_request_id = wfr_info.mig_request_id; "Successfully completed get migtd data\n"); - } else { - log::error!(migration_request_id = wfr_info.mig_request_id; "Failure during get migtd data status code: {:x}\n", status.clone() as u8); - } - let _ = - report_status(status as u8, wfr_info.mig_request_id, &data).await; - log::trace!(migration_request_id = wfr_info.mig_request_id; "ReportStatus for get migtd data completed.\n"); - REQUESTS.lock().remove(&wfr_info.mig_request_id); - } } } #[cfg(any(feature = "test_stack_size", feature = "test_heap_size"))] diff --git a/src/migtd/src/migration/data.rs b/src/migtd/src/migration/data.rs index 61d2c5ca..9154b539 100644 --- a/src/migtd/src/migration/data.rs +++ b/src/migtd/src/migration/data.rs @@ -258,8 +258,6 @@ pub enum WaitForRequestResponse { StartRebinding(MigtdMigrationInformation), GetTdReport(ReportInfo), EnableLogArea(EnableLogAreaInfo), - #[cfg(feature = "policy_v2")] - GetMigtdData(MigtdDataInfo), } pub struct MigrationInformation { diff --git a/src/migtd/src/migration/session.rs b/src/migtd/src/migration/session.rs index c7629f73..58aa2197 100644 --- a/src/migtd/src/migration/session.rs +++ b/src/migtd/src/migration/session.rs @@ -72,7 +72,6 @@ pub enum DataStatusOperation { StartRebinding = 2, GetTDReport = 3, EnableLogArea = 4, - GetMigtdData = 5, } #[cfg(feature = "vmcall-raw")] @@ -84,7 +83,6 @@ impl TryFrom for DataStatusOperation { 2 => Ok(Self::StartRebinding), 3 => Ok(Self::GetTDReport), 4 => Ok(Self::EnableLogArea), - 5 => Ok(Self::GetMigtdData), unknown => Err(unknown), } } @@ -232,7 +230,7 @@ fn process_buffer(buffer: &[u8]) -> RequestDataBufferHeader { #[cfg(feature = "vmcall-raw")] fn calculate_shared_page_nums(reqbufferhdrlen: usize) -> Result { - // The response payload for GetMigtdData is just the raw 512-byte TDINFO_STRUCT. + // The response payload for GetTDReport is just the raw 512-byte TDINFO_STRUCT. let policy_size = crate::config::get_policy() .ok_or(MigrationResult::InvalidParameter)? .len(); @@ -434,27 +432,6 @@ fn parse_request( WaitForRequestResponse::EnableLogArea(info) }) } - DataStatusOperation::GetMigtdData => { - #[cfg(all(feature = "vmcall-raw", feature = "policy_v2"))] - { - decode_and_dispatch!(MigtdDataInfo, |info| WaitForRequestResponse::GetMigtdData( - info - )) - } - #[cfg(not(all(feature = "vmcall-raw", feature = "policy_v2")))] - { - log_request_error!( - request_id, - "wait_for_request: unsupported operation {:?} received\n", - op - ); - reject_request( - pending_error_report, - request_id, - MigrationResult::UnsupportedOperationError, - ) - } - } } }