--- nono/vm/virtio_net.h 2026/04/29 17:05:38 1.1.1.4 +++ nono/vm/virtio_net.h 2026/04/29 17:06:00 1.1.1.7 @@ -11,7 +11,6 @@ #pragma once #include "virtio_base.h" -#include "event.h" #include "hostnet.h" #include "message.h" @@ -28,7 +27,7 @@ class VirtIONetDevice : public VirtIODev int HWAddrFilter(const MacAddr& dstaddr) const override; private: - DECLARE_MONITOR_CALLBACK(MonitorUpdate); + DECLARE_MONITOR_SCREEN(MonitorScreen); void QueueReadyChanged(VirtQueue *) override; void ProcessDesc(VirtIOReq&) override; @@ -36,9 +35,9 @@ class VirtIONetDevice : public VirtIODev const char *GetFeatureName(uint feature) const override; // 受信 - void HostRxCallback(); + void HostRxCallback(uint32); void RxMessage(MessageID, uint32); - void RxEvent(Event&); + void RxEvent(Event *); void Rx(VirtQueue *); MacAddr macaddr {}; @@ -48,5 +47,5 @@ class VirtIONetDevice : public VirtIODev std::unique_ptr hostnet /*{}*/; - Event event { this }; + Event *event {}; };