slirp: use bridge logger instead of global logger for slirp networks

machineware-gmbh · Feb 26, 2025 · ee84e9a · ee84e9a
1 parent 55c0c8e
commit ee84e9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/vcml/models/ethernet/backend_slirp.cpp b/src/vcml/models/ethernet/backend_slirp.cpp
@@ -169,14 +169,15 @@ void slirp_network::slirp_thread() {
     }
 }
 
-slirp_network::slirp_network(unsigned int id):
+slirp_network::slirp_network(unsigned int id, logger& l):
     m_id(id),
     m_config(),
     m_slirp(),
     m_clients(),
     m_mtx(),
     m_running(true),
-    m_thread() {
+    m_thread(),
+    log(l) {
     m_config.version = 1;
 
     m_config.in_enabled = true;
@@ -348,7 +349,7 @@ backend* backend_slirp::create(bridge* br, const string& type) {
     static unordered_map<unsigned int, shared_ptr<slirp_network>> networks;
     auto& network = networks[netid];
     if (network == nullptr)
-        network = std::make_shared<slirp_network>(netid);
+        network = std::make_shared<slirp_network>(netid, br->log);
 
     backend_slirp* slirp = new backend_slirp(br, network);
 

diff --git a/src/vcml/models/ethernet/backend_slirp.h b/src/vcml/models/ethernet/backend_slirp.h
@@ -49,7 +49,9 @@ class slirp_network
     vector<port_forwarding> m_forwardings;
 
 public:
-    slirp_network(unsigned int id);
+    logger& log;
+
+    slirp_network(unsigned int id, logger& log);
     virtual ~slirp_network();
 
     void send_packet(const u8* ptr, size_t len);