From 165568e98b6f262afa68565b4bcda8c196b8deb0 Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Fri, 12 Jun 2020 15:19:34 +0800 Subject: [PATCH] virtio-mem: Update VirtioMemConfig according to Linux kernel Types of block_size and padding is updated in https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=544fc7dbbf920a3e64d109c416ee229e8e1763c5. Update VirtioMemConfig according to it. Signed-off-by: Hui Zhu --- virtio-devices/src/mem.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/virtio-devices/src/mem.rs b/virtio-devices/src/mem.rs index dc95fbf27..c05241d4a 100644 --- a/virtio-devices/src/mem.rs +++ b/virtio-devices/src/mem.rs @@ -159,10 +159,10 @@ unsafe impl ByteValued for VirtioMemResp {} #[derive(Copy, Clone, Debug, Default)] struct VirtioMemConfig { // Block size and alignment. Cannot change. - block_size: u32, + block_size: u64, // Valid with VIRTIO_MEM_F_ACPI_PXM. Cannot change. node_id: u16, - padding: u16, + padding: [u8; 6], // Start address of the memory region. Cannot change. addr: u64, // Region size (maximum). Cannot change. @@ -803,7 +803,7 @@ impl Mem { let avail_features = 1u64 << VIRTIO_F_VERSION_1; let mut config = VirtioMemConfig::default(); - config.block_size = VIRTIO_MEM_DEFAULT_BLOCK_SIZE as u32; + config.block_size = VIRTIO_MEM_DEFAULT_BLOCK_SIZE; config.addr = region.start_addr().raw_value(); config.region_size = region.len(); config.usable_region_size = cmp::min(