diff options
| author | Frederick Mayle <fmayle@google.com> | 2024-04-16 22:44:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-16 22:44:01 +0000 |
| commit | 61c9a84871f705327e37883d4a637b7297766c43 (patch) | |
| tree | 717f3c1a4923e084a4cfde51ca9162b4a75f2994 /arch/src/lib.rs | |
| parent | efb7605ac161ba257b8e442e1421e2ce4e161460 (diff) | |
| parent | 2a9a3407346fd09aa3ddf89d320e4700211cee5a (diff) | |
| download | crosvm-61c9a84871f705327e37883d4a637b7297766c43.tar.gz | |
Merge changes from topic "fmayle-crosvm-merge-04122024" into main
* changes:
UPSTREAM: base: fix musl build
Merge remote-tracking branch 'aosp/upstream-main'
Diffstat (limited to 'arch/src/lib.rs')
| -rw-r--r-- | arch/src/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/src/lib.rs b/arch/src/lib.rs index 5c26e3b9d..de7a19320 100644 --- a/arch/src/lib.rs +++ b/arch/src/lib.rs @@ -740,6 +740,7 @@ pub fn configure_pci_device<V: VmArch, Vcpu: VcpuArch>( let mut keep_rds = device.keep_rds(); syslog::push_descriptors(&mut keep_rds); cros_tracing::push_descriptors!(&mut keep_rds); + metrics::push_descriptors(&mut keep_rds); device .register_device_capabilities() @@ -821,6 +822,7 @@ pub fn generate_virtio_mmio_bus( let mut keep_rds = device.keep_rds(); syslog::push_descriptors(&mut keep_rds); cros_tracing::push_descriptors!(&mut keep_rds); + metrics::push_descriptors(&mut keep_rds); let irq_num = resources .allocate_irq() @@ -1148,6 +1150,7 @@ pub fn generate_pci_root( let mut keep_rds = device.keep_rds(); syslog::push_descriptors(&mut keep_rds); cros_tracing::push_descriptors!(&mut keep_rds); + metrics::push_descriptors(&mut keep_rds); keep_rds.append(&mut vm.get_memory().as_raw_descriptors()); let ranges = io_ranges.remove(&dev_idx).unwrap_or_default(); |