xen/events: move notify_remote_via_evtchn to minios namespace

Signed-off-by: Wei Liu <liuw@liuw.name>

diff --git a/platform/xen/xen/blkfront.c b/platform/xen/xen/blkfront.c
index e72d5803c84323a80e10428005c9834d1d415891..86236401531ba5a7cdbdb50f9deb73448200babc 100644 (file)
--- a/platform/xen/xen/blkfront.c
+++ b/platform/xen/xen/blkfront.c
@@ -364,7 +364,7 @@ void blkfront_aio(struct blkfront_aiocb *aiocbp, int write)
     wmb();
     RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&dev->ring, notify);
 
-    if(notify) notify_remote_via_evtchn(dev->evtchn);
+    if(notify) minios_notify_remote_via_evtchn(dev->evtchn);
 }
 
 static void blkfront_aio_cb(struct blkfront_aiocb *aiocbp, int ret)
@@ -415,7 +415,7 @@ static void blkfront_push_operation(struct blkfront_dev *dev, uint8_t op, uint64
     dev->ring.req_prod_pvt = i + 1;
     wmb();
     RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&dev->ring, notify);
-    if (notify) notify_remote_via_evtchn(dev->evtchn);
+    if (notify) minios_notify_remote_via_evtchn(dev->evtchn);
 }
 
 void blkfront_aio_push_operation(struct blkfront_aiocb *aiocbp, uint8_t op)

diff --git a/platform/xen/xen/console/xencons_ring.c b/platform/xen/xen/console/xencons_ring.c
index 5d604de356b3fcfec87b7a50d5019b8a37a3243b..e15b215380715babf0d961d16760bb52dd1b2856 100644 (file)
--- a/platform/xen/xen/console/xencons_ring.c
+++ b/platform/xen/xen/console/xencons_ring.c
@@ -22,9 +22,9 @@ static inline void notify_daemon(struct consfront_dev *dev)
 
        /* Use evtchn: this is called early, before irq is set up. */
        if (!dev)
-               notify_remote_via_evtchn(start_info.console.domU.evtchn);
+               minios_notify_remote_via_evtchn(start_info.console.domU.evtchn);
        else
-               notify_remote_via_evtchn(dev->evtchn);
+               minios_notify_remote_via_evtchn(dev->evtchn);
 }
 
 static inline struct xencons_interface *xencons_interface(void)

diff --git a/platform/xen/xen/events.c b/platform/xen/xen/events.c
index 43236d35280b56eefdfd249d6688789d4cbc2644..96ddb4dd06944a793dfd05395434f86ba7e1c175 100644 (file)
--- a/platform/xen/xen/events.c
+++ b/platform/xen/xen/events.c
@@ -258,7 +258,7 @@ int minios_evtchn_bind_interdomain(domid_t pal, evtchn_port_t remote_port,
     return rc;
 }
 
-int notify_remote_via_evtchn(evtchn_port_t port)
+int minios_notify_remote_via_evtchn(evtchn_port_t port)
 {
     evtchn_send_t op;
     op.port = port;

diff --git a/platform/xen/xen/include/mini-os/events.h b/platform/xen/xen/include/mini-os/events.h
index e24113c13cc248360f7baf17814de825c7c3300c..53d7475fb4ed428ed69f029fe6b1601e06c540c9 100644 (file)
--- a/platform/xen/xen/include/mini-os/events.h
+++ b/platform/xen/xen/include/mini-os/events.h
@@ -39,7 +39,7 @@ int minios_evtchn_bind_interdomain(domid_t pal, evtchn_port_t remote_port,
                                                        evtchn_port_t *local_port);
 void unbind_all_ports(void);
 
-int notify_remote_via_evtchn(evtchn_port_t port);
+int minios_notify_remote_via_evtchn(evtchn_port_t port);
 
 void fini_events(void);
 

diff --git a/platform/xen/xen/netfront.c b/platform/xen/xen/netfront.c
index 070f0320b3f1632f542c696494bff5f5ec8fae87..07cd5d3333475c8cca4f80de9f3421190de8a6a3 100644 (file)
--- a/platform/xen/xen/netfront.c
+++ b/platform/xen/xen/netfront.c
@@ -136,7 +136,7 @@ moretodo:
     
     RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&dev->rx, notify);
     if (notify)
-        notify_remote_via_evtchn(dev->evtchn);
+        minios_notify_remote_via_evtchn(dev->evtchn);
 
 }
 
@@ -515,7 +515,7 @@ void init_rx_buffers(struct netfront_dev *dev)
     RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&dev->rx, notify);
 
     if (notify) 
-        notify_remote_via_evtchn(dev->evtchn);
+        minios_notify_remote_via_evtchn(dev->evtchn);
 
     dev->rx.sring->rsp_event = dev->rx.rsp_cons + 1;
 }
@@ -562,7 +562,7 @@ void netfront_xmit(struct netfront_dev *dev, unsigned char* data,int len)
 
     RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&dev->tx, notify);
 
-    if(notify) notify_remote_via_evtchn(dev->evtchn);
+    if(notify) minios_notify_remote_via_evtchn(dev->evtchn);
 
     local_irq_save(flags);
     network_tx_buf_gc(dev);

diff --git a/platform/xen/xen/pcifront.c b/platform/xen/xen/pcifront.c
index eb0831b0dff778cbd8c528809c6f397ad929334e..f1eb5bffefc7e3f69b4453f9c0719357ec11f566 100644 (file)
--- a/platform/xen/xen/pcifront.c
+++ b/platform/xen/xen/pcifront.c
@@ -465,7 +465,7 @@ void pcifront_op(struct pcifront_dev *dev, struct xen_pci_op *op)
     /* Make sure info is written before the flag */
     wmb();
     set_bit(_XEN_PCIF_active, (void*) &dev->info->flags);
-    notify_remote_via_evtchn(dev->evtchn);
+    minios_notify_remote_via_evtchn(dev->evtchn);
 
     minios_wait_event(pcifront_queue, !test_bit(_XEN_PCIF_active, (void*) &dev->info->flags));
 

diff --git a/platform/xen/xen/xenbus/xenbus.c b/platform/xen/xen/xenbus/xenbus.c
index 7cb955d85ea643782be6c95c0d6a1d98a6d2ddef..66b3ad6b4e261f6f06acf19d56b6d687cec7595e 100644 (file)
--- a/platform/xen/xen/xenbus/xenbus.c
+++ b/platform/xen/xen/xenbus/xenbus.c
@@ -511,7 +511,7 @@ void xenbus_xb_write(int type, int req_id, xenbus_transaction_t trans_id,
     spin_unlock(&xb_lock);
 
     /* Send evtchn to notify remote */
-    notify_remote_via_evtchn(start_info.store_evtchn);
+    minios_notify_remote_via_evtchn(start_info.store_evtchn);
 }
 
 /* Send a mesasge to xenbus, in the same fashion as xb_write, and