misc: Manual beta clippy fixes (boolean to int conversion using if)

Signed-off-by: Rob Bradford <robert.bradford@intel.com>

hypervisor/src/arch/x86/emulator/instructions/cmp.rs

@@ -38,11 +38,7 @@ fn calc_rflags_cpazso(op0: u64, op1: u64, op_size: usize) -> u64 {
     // AF cares about the lowest 4 bits (nibble). msb_shift is 3 in this case.
     let af = ((cout >> 3) & 0x1) << AF_SHIFT;
 
-    let zf = if result & (!0u64 >> (63 - msb_shift)) == 0 {
-        1
-    } else {
-        0
-    } << ZF_SHIFT;
+    let zf = u64::from(result & (!0u64 >> (63 - msb_shift)) == 0) << ZF_SHIFT;
 
     let sf = ((result >> msb_shift) & 0x1) << SF_SHIFT;
 

hypervisor/src/kvm/aarch64/gic/redist_regs.rs

@@ -200,13 +200,7 @@ pub fn construct_gicr_typers(vcpu_states: &[CpuState]) -> Vec<u64> {
     let mut gicr_typers: Vec<u64> = Vec::new();
     for (index, state) in vcpu_states.iter().enumerate() {
         let state: VcpuKvmState = state.clone().into();
-        let last = {
-            if index == vcpu_states.len() - 1 {
-                1
-            } else {
-                0
-            }
-        };
+        let last = (index == vcpu_states.len() - 1) as u64;
         // state.sys_regs is a big collection of system registers, including MIPDR_EL1
         let mpidr: Vec<Register> = state
             .sys_regs

hypervisor/src/kvm/mod.rs

@@ -822,7 +822,7 @@ impl vm::Vm for KvmVm {
         tdx_command(
             &self.fd.as_raw_fd(),
             TdxCommand::InitMemRegion,
-            if measure { 1 } else { 0 },
+            u32::from(measure),
             &data as *const _ as u64,
         )
         .map_err(vm::HypervisorVmError::InitMemRegionTdx)