fix: adapt x86-qemu-q35 to new axplat

Author: AsakuraMizu

platform/x86-qemu-q35/src/apic.rs

@@ -147,12 +147,13 @@ mod irq_impl {
         /// It is called by the common interrupt handler. It should look up in the
         /// IRQ handler table and calls the corresponding handler. If necessary, it
         /// also acknowledges the interrupt controller after handling.
-        fn handle(vector: usize) {
+        fn handle(vector: usize) -> Option<usize> {
             trace!("IRQ {}", vector);
             if !IRQ_HANDLER_TABLE.handle(vector) {
                 warn!("Unhandled IRQ {vector}");
             }
             unsafe { super::local_apic().end_of_interrupt() };
+            Some(vector)
         }
 
         /// Sends an inter-processor interrupt (IPI) to the specified target CPU or all CPUs.

platform/x86-qemu-q35/src/console.rs

@@ -46,4 +46,12 @@ impl ConsoleIf for ConsoleIfImpl {
         }
         read_len
     }
+
+    /// Returns the IRQ number for the console input interrupt.
+    ///
+    /// Returns `None` if input interrupt is not supported.
+    #[cfg(feature = "irq")]
+    fn irq_num() -> Option<usize> {
+        None
+    }
 }

platform/x86-qemu-q35/src/time.rs

@@ -77,11 +77,6 @@ struct TimeIfImpl;
 
 #[impl_plat_interface]
 impl TimeIf for TimeIfImpl {
-    /// Returns the IRQ number for the timer interrupt.
-    fn irq_num() -> usize {
-        0xf0
-    }
-
     /// Returns the current clock time in hardware ticks.
     fn current_ticks() -> u64 {
         unsafe { core::arch::x86_64::_rdtsc() - INIT_TICK }
@@ -103,6 +98,12 @@ impl TimeIf for TimeIfImpl {
         unsafe { RTC_EPOCHOFFSET_NANOS }
     }
 
+    /// Returns the IRQ number for the timer interrupt.
+    #[cfg(feature = "irq")]
+    fn irq_num() -> usize {
+        0xf0
+    }
+
     /// Set a one-shot timer.
     ///
     /// A timer interrupt will be triggered at the specified monotonic time