Skip to content

Commit 5bbc400

Browse files
committed
Undo testing changes
Signed-off-by: Ludvig Liljenberg <[email protected]>
1 parent d7bc96c commit 5bbc400

File tree

4 files changed

+4
-26
lines changed

4 files changed

+4
-26
lines changed

.github/workflows/dep_rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
build:
3535
if: ${{ inputs.docs_only == 'false' }}
3636
strategy:
37-
fail-fast: false
37+
fail-fast: true
3838
matrix:
3939
hypervisor: [hyperv, mshv, mshv3, kvm] # hyperv is windows, mshv and kvm are linux
4040
cpu: [amd, intel]

Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ test target=default-target features="": (test-unit target features) (test-isolat
7777

7878
# runs unit tests
7979
test-unit target=default-target features="":
80-
cargo test {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }} --lib -- --nocapture --test-threads=1
80+
cargo test {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" { "dev" } else { target } }} --lib
8181

8282
# runs tests that requires being run separately, for example due to global state
8383
test-isolated target=default-target features="":

src/hyperlight_host/src/hypervisor/gdb/arch.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ pub(crate) fn vcpu_stop_reason(
6767
// Check page 19-4 Vol. 3B of Intel 64 and IA-32
6868
// Architectures Software Developer's Manual
6969
if dr6 & DR6_BS_FLAG_MASK != 0 {
70-
log::info!("Done Step stop reason");
7170
return Ok(VcpuStopReason::DoneStep);
7271
}
7372

@@ -77,17 +76,14 @@ pub(crate) fn vcpu_stop_reason(
7776
// Architectures Software Developer's Manual
7877
if DR6_HW_BP_FLAGS_MASK & dr6 != 0 {
7978
if rip == entrypoint {
80-
log::info!("EntryPoint stop reason");
8179
vm.remove_hw_breakpoint(entrypoint)?;
8280
return Ok(VcpuStopReason::EntryPointBp);
8381
}
84-
log::info!("Hardware breakpoint stop reason");
8582
return Ok(VcpuStopReason::HwBp);
8683
}
8784
}
8885

8986
if BP_EX_ID == exception {
90-
log::info!("Software breakpoint stop reason");
9187
return Ok(VcpuStopReason::SwBp);
9288
}
9389

src/hyperlight_host/src/hypervisor/whp.rs

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -170,20 +170,8 @@ impl Vm for WhpVm {
170170
}
171171

172172
fn get_sregs(&self) -> Result<CommonSpecialRegisters> {
173-
println!("whp get_sregs");
174173
let mut whp_sregs_values: [WHV_REGISTER_VALUE; WHP_SREGS_NAMES_LEN] =
175174
unsafe { std::mem::zeroed() };
176-
println!("whp get_sregs2");
177-
178-
// println!("partition: {:?}", self.partition);
179-
// println!("whp_sregs_names: {:?}", WHP_SREGS_NAMES);
180-
// println!("ptr : {:?}", WHP_SREGS_NAMES.as_ptr());
181-
// println!("first value: {:?}", unsafe {
182-
// WHP_SREGS_NAMES.as_ptr().read()
183-
// });
184-
// println!("last value: {:?}", unsafe {
185-
// WHP_SREGS_NAMES.as_ptr().add(WHP_SREGS_NAMES_LEN - 1).read()
186-
// });
187175

188176
unsafe {
189177
WHvGetVirtualProcessorRegisters(
@@ -194,9 +182,8 @@ impl Vm for WhpVm {
194182
whp_sregs_values.as_mut_ptr(),
195183
)?;
196184
}
197-
println!("whp get_sregs3");
198185

199-
let res = WHP_SREGS_NAMES
186+
WHP_SREGS_NAMES
200187
.into_iter()
201188
.zip(whp_sregs_values)
202189
.collect::<Vec<(WHV_REGISTER_NAME, WHV_REGISTER_VALUE)>>()
@@ -207,10 +194,7 @@ impl Vm for WhpVm {
207194
"Failed to convert WHP registers to CommonSpecialRegisters: {:?}",
208195
e
209196
)
210-
});
211-
212-
println!("whp get_sregs");
213-
res
197+
})
214198
}
215199

216200
fn set_sregs(&self, sregs: &CommonSpecialRegisters) -> Result<()> {
@@ -348,8 +332,6 @@ impl Vm for WhpVm {
348332
WHvRunVpExitReasonMemoryAccess => {
349333
let gpa = unsafe { exit_context.Anonymous.MemoryAccess.Gpa };
350334
let rip = exit_context.VpContext.Rip;
351-
println!("MemoryAccess: gpa: {:#x}", gpa);
352-
println!("MemoryAccess: rip: {:#x}", rip);
353335
let access_info = unsafe {
354336
WHV_MEMORY_ACCESS_TYPE(
355337
// 2 first bits are the access type, see https://learn.microsoft.com/en-us/virtualization/api/hypervisor-platform/funcs/memoryaccess#syntax

0 commit comments

Comments
 (0)