--- nono/vm/virtio_net.h 2026/04/29 17:05:25 1.1.1.1 +++ nono/vm/virtio_net.h 2026/04/29 17:05:33 1.1.1.3 @@ -14,15 +14,12 @@ #include "event.h" #include "hostnet.h" #include "message.h" -#include "monitor.h" - -class HostNetDevice; class VirtIONetDevice : public VirtIODevice { using inherited = VirtIODevice; public: - VirtIONetDevice(int slot_); + explicit VirtIONetDevice(uint slot_); ~VirtIONetDevice() override; bool Create() override; @@ -31,10 +28,10 @@ class VirtIONetDevice : public VirtIODev private: DECLARE_MONITOR_CALLBACK(MonitorUpdate); - void QueueReady() override; - void ProcessDesc(VirtQueue *) override; + void QueueReadyChanged(VirtQueue *) override; + void ProcessDesc(VirtIOReq&) override; - const char *GetFeatureName(int feature) const override; + const char *GetFeatureName(uint feature) const override; // 受信 void HostRxCallback(); @@ -50,6 +47,4 @@ class VirtIONetDevice : public VirtIODev std::unique_ptr hostnet /*{}*/; Event event { this }; - - Monitor monitor { this }; };