diff --git a/vhost-device-gpu/README.md b/vhost-device-gpu/README.md index de116b4..2d33899 100644 --- a/vhost-device-gpu/README.md +++ b/vhost-device-gpu/README.md @@ -68,7 +68,7 @@ crate has been built with the `gfxstream` feature, which is the default. ## Limitations -This device links native libaries (because of the usage of Rutabaga) compiled +This device links native libraries (because of the usage of Rutabaga) compiled with GNU libc, so the CI is setup to not build this device for musl targets. It might be possible to build those libraries using musl and then build the gpu device, but this is not tested. diff --git a/vhost-device-gpu/src/device.rs b/vhost-device-gpu/src/device.rs index 3bf6179..95f8dcc 100644 --- a/vhost-device-gpu/src/device.rs +++ b/vhost-device-gpu/src/device.rs @@ -1001,7 +1001,7 @@ mod tests { let mem_handle = mem.memory(); mem.memory() .check_address(queue_addr_start) - .expect("Invalid start adress"); + .expect("Invalid start address"); let mut output_bufs = Vec::new(); let vq = MockSplitQueue::create(&*mem_handle, queue_addr_start, queue_size); @@ -1027,17 +1027,17 @@ mod tests { descriptors.push(desc); next_addr += buf.len() as u64; } - let mut writable_descriptor_adresses = Vec::new(); + let mut writable_descriptor_addresses = Vec::new(); for desc_len in chain.writable_desc_lengths.iter().copied() { mem.memory() .check_address(GuestAddress(next_addr)) .expect("Writable descriptor's buffer address is not valid!"); let desc = SplitDescriptor::new(next_addr, desc_len, VRING_DESC_F_WRITE as u16, 0); - writable_descriptor_adresses.push(desc.addr()); + writable_descriptor_addresses.push(desc.addr()); descriptors.push(desc); next_addr += u64::from(desc_len); } - output_bufs.push(writable_descriptor_adresses); + output_bufs.push(writable_descriptor_addresses); make_descriptors_into_a_chain( chain_index_start as u16, &mut descriptors[chain_index_start..], diff --git a/vhost-device-gpu/src/lib.rs b/vhost-device-gpu/src/lib.rs index 484f8c1..60e9d74 100644 --- a/vhost-device-gpu/src/lib.rs +++ b/vhost-device-gpu/src/lib.rs @@ -159,7 +159,7 @@ impl Default for GpuFlags { #[derive(Debug, ThisError)] pub enum GpuConfigError { #[error("The mode {0} does not support {1} capset")] - CapsetUnsuportedByMode(GpuMode, GpuCapset), + CapsetUnsupportedByMode(GpuMode, GpuCapset), #[error("Requested gfxstream-gles capset, but gles is disabled")] GlesRequiredByGfxstream, } @@ -186,7 +186,7 @@ impl GpuConfig { }; for capset in capset.iter() { if !supported_capset_mask.contains(capset) { - return Err(GpuConfigError::CapsetUnsuportedByMode(gpu_mode, capset)); + return Err(GpuConfigError::CapsetUnsupportedByMode(gpu_mode, capset)); } } @@ -285,7 +285,7 @@ mod tests { let result = GpuConfig::new(mode, Some(capset), GpuFlags::new_default()); assert_matches!( result, - Err(GpuConfigError::CapsetUnsuportedByMode( + Err(GpuConfigError::CapsetUnsupportedByMode( requested_mode, unsupported_capset )) if unsupported_capset == expected_capset && requested_mode == mode