add debug log event

oxidecomputer · Jan 10, 2024 · 65580e1 · 65580e1
1 parent 747bbe2
commit 65580e1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/bin/propolis-server/src/lib/initializer.rs b/bin/propolis-server/src/lib/initializer.rs
@@ -283,7 +283,9 @@ impl<'a> MachineInitializer<'a> {
     ) -> Result<(), anyhow::Error> {
         if let Some(ref spec) = self.spec.devices.qemu_pvpanic {
             if spec.enable_isa {
-                let pvpanic = QemuPvpanic::create();
+                let pvpanic = QemuPvpanic::create(
+                    self.log.new(slog::o!("dev" => "qemu-pvpanic")),
+                );
                 pvpanic.attach_pio(&self.machine.bus_pio);
                 self.inv.register(&pvpanic)?;
 

diff --git a/lib/propolis/src/hw/qemu/pvpanic.rs b/lib/propolis/src/hw/qemu/pvpanic.rs
@@ -19,6 +19,7 @@ use crate::pio::{PioBus, PioFn};
 #[derive(Debug)]
 pub struct QemuPvpanic {
     counts: Mutex<Counts>,
+    log: slog::Logger,
 }
 
 #[derive(Debug)]
@@ -45,9 +46,10 @@ mod probes {
 impl QemuPvpanic {
     const IOPORT: u16 = 0x505;
 
-    pub fn create() -> Arc<Self> {
+    pub fn create(log: slog::Logger) -> Arc<Self> {
         Arc::new(Self {
             counts: Mutex::new(Counts { host_handled: 0, guest_handled: 0 }),
+            log,
         })
     }
 
@@ -75,12 +77,22 @@ impl QemuPvpanic {
             RWOp::Write(wo) => {
                 let value = wo.read_u8();
                 probes::pvpanic_pio_write!(|| value);
+                let host_handled = value & HOST_HANDLED != 0;
+                let guest_handled = value & GUEST_HANDLED != 0;
+                slog::debug!(
+                    self.log,
+                    "guest kernel panic";
+                    "host_handled" => host_handled,
+                    "guest_handled" => guest_handled,
+                );
+
                 let mut counts = self.counts.lock().unwrap();
-                if value & HOST_HANDLED != 0 {
+
+                if host_handled {
                     counts.host_handled += 1;
                 }
 
-                if value & GUEST_HANDLED != 0 {
+                if guest_handled {
                     counts.guest_handled += 1;
                 }
             }