Merge branch 'main' into remove-tryfrom-use

This commit is contained in:
Viresh Kumar 2022-08-31 08:36:52 +05:30 committed by GitHub
commit c2a97d5edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions

View File

@ -929,10 +929,13 @@ mod tests {
backend.process_events(desc_chains.clone(), &vring).unwrap();
while backend.handles.read().unwrap()[GPIO as usize].is_some()
|| backend.handles.read().unwrap()[(GPIO + 1) as usize].is_some()
|| backend.handles.read().unwrap()[(GPIO + 2) as usize].is_some()
{}
while {
let h = backend.handles.read().unwrap();
h[GPIO as usize].is_some()
|| h[(GPIO + 1) as usize].is_some()
|| h[(GPIO + 2) as usize].is_some()
} {}
validate_desc_chains(desc_chains, VIRTIO_GPIO_IRQ_STATUS_VALID, None);
}

@ -1 +1 @@
Subproject commit 99fe2eb2e05d1b2cbeed6fb00b754e8f1c5b2f81
Subproject commit 258161e88af86e1fb1fb188de25fd0e1f9d26d0a