virtio: uninline _vp_{read,write}

Next patch makes it larger, and I don't think it makes sense to
continue inlining it.  Uninline and move from header to c file.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/src/hw/virtio-pci.c b/src/hw/virtio-pci.c
index ce15672279741e218e21983f90f78e23a7fa4989..f37f71d581198c9afffcb089763e6ac22d58f5a6 100644 (file)
--- a/src/hw/virtio-pci.c
+++ b/src/hw/virtio-pci.c
@@ -25,6 +25,85 @@
 #include "virtio-pci.h"
 #include "virtio-ring.h"
 
+u64 _vp_read(struct vp_cap *cap, u32 offset, u8 size)
+{
+    u64 var;
+
+    if (cap->is_io) {
+        u32 addr = cap->ioaddr + offset;
+        switch (size) {
+        case 8:
+            var = inl(addr);
+            var |= (u64)inl(addr+4) << 32;
+            break;
+        case 4:
+            var = inl(addr);
+            break;
+        case 2:
+            var = inw(addr);
+            break;
+        case 1:
+            var = inb(addr);
+            break;
+        default:
+            var = 0;
+        }
+    } else {
+        void *addr = cap->memaddr + offset;
+        switch (size) {
+        case 8:
+            var = readl(addr);
+            var |= (u64)readl(addr+4) << 32;
+            break;
+        case 4:
+            var = readl(addr);
+            break;
+        case 2:
+            var = readw(addr);
+            break;
+        case 1:
+            var = readb(addr);
+            break;
+        default:
+            var = 0;
+        }
+    }
+    dprintf(9, "vp read   %x (%d) -> 0x%llx\n", cap->ioaddr + offset, size, var);
+    return var;
+}
+
+void _vp_write(struct vp_cap *cap, u32 offset, u8 size, u64 var)
+{
+    dprintf(9, "vp write  %x (%d) <- 0x%llx\n", cap->ioaddr + offset, size, var);
+    if (cap->is_io) {
+        u32 addr = cap->ioaddr + offset;
+        switch (size) {
+        case 4:
+            outl(var, addr);
+            break;
+        case 2:
+            outw(var, addr);
+            break;
+        case 1:
+            outb(var, addr);
+            break;
+        }
+    } else {
+        void *addr = cap->memaddr + offset;
+        switch (size) {
+        case 4:
+            writel(addr, var);
+            break;
+        case 2:
+            writew(addr, var);
+            break;
+        case 1:
+            writeb(addr, var);
+            break;
+        }
+    }
+}
+
 u64 vp_get_features(struct vp_device *vp)
 {
     u32 f0, f1;

diff --git a/src/hw/virtio-pci.h b/src/hw/virtio-pci.h
index ff8454e89659624949f101321e1b16dc0df5ff24..70b40f72424e47ce1e98af4d1323c7fa8c654654 100644 (file)
--- a/src/hw/virtio-pci.h
+++ b/src/hw/virtio-pci.h
@@ -101,84 +101,8 @@ struct vp_device {
     u8 use_modern;
 };
 
-static inline u64 _vp_read(struct vp_cap *cap, u32 offset, u8 size)
-{
-    u64 var;
-
-    if (cap->is_io) {
-        u32 addr = cap->ioaddr + offset;
-        switch (size) {
-        case 8:
-            var = inl(addr);
-            var |= (u64)inl(addr+4) << 32;
-            break;
-        case 4:
-            var = inl(addr);
-            break;
-        case 2:
-            var = inw(addr);
-            break;
-        case 1:
-            var = inb(addr);
-            break;
-        default:
-            var = 0;
-        }
-    } else {
-        void *addr = cap->memaddr + offset;
-        switch (size) {
-        case 8:
-            var = readl(addr);
-            var |= (u64)readl(addr+4) << 32;
-            break;
-        case 4:
-            var = readl(addr);
-            break;
-        case 2:
-            var = readw(addr);
-            break;
-        case 1:
-            var = readb(addr);
-            break;
-        default:
-            var = 0;
-        }
-    }
-    dprintf(9, "vp read   %x (%d) -> 0x%llx\n", cap->ioaddr + offset, size, var);
-    return var;
-}
-
-static inline void _vp_write(struct vp_cap *cap, u32 offset, u8 size, u64 var)
-{
-    dprintf(9, "vp write  %x (%d) <- 0x%llx\n", cap->ioaddr + offset, size, var);
-    if (cap->is_io) {
-        u32 addr = cap->ioaddr + offset;
-        switch (size) {
-        case 4:
-            outl(var, addr);
-            break;
-        case 2:
-            outw(var, addr);
-            break;
-        case 1:
-            outb(var, addr);
-            break;
-        }
-    } else {
-        void *addr = cap->memaddr + offset;
-        switch (size) {
-        case 4:
-            writel(addr, var);
-            break;
-        case 2:
-            writew(addr, var);
-            break;
-        case 1:
-            writeb(addr, var);
-            break;
-        }
-    }
-}
+u64 _vp_read(struct vp_cap *cap, u32 offset, u8 size);
+void _vp_write(struct vp_cap *cap, u32 offset, u8 size, u64 var);
 
 #define vp_read(_cap, _struct, _field)        \
     _vp_read(_cap, offsetof(_struct, _field), \