x86/pv: make guest_io_{read,write} local functions

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c
index 6422f91632be1d90f67c1b6a3db42a061b7b86f8..b85c65f5568488efd80e3da7c35e651e5b1d300c 100644 (file)
--- a/xen/arch/x86/pv/emul-priv-op.c
+++ b/xen/arch/x86/pv/emul-priv-op.c
@@ -214,8 +214,8 @@ static bool pci_cfg_ok(struct domain *currd, unsigned int start,
            pci_conf_write_intercept(0, machine_bdf, start, size, write) >= 0;
 }
 
-uint32_t guest_io_read(unsigned int port, unsigned int bytes,
-                       struct domain *currd)
+static uint32_t guest_io_read(unsigned int port, unsigned int bytes,
+                              struct domain *currd)
 {
     uint32_t data = 0;
     unsigned int shift = 0;
@@ -343,8 +343,8 @@ static int read_io(unsigned int port, unsigned int bytes,
     return X86EMUL_OKAY;
 }
 
-void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data,
-                    struct domain *currd)
+static void guest_io_write(unsigned int port, unsigned int bytes,
+                           uint32_t data, struct domain *currd)
 {
     if ( admin_io_okay(port, bytes, currd) )
     {

diff --git a/xen/include/asm-x86/traps.h b/xen/include/asm-x86/traps.h
index bed25290d7775921789b49d2198d332ed976a661..b88f2a4f2fe875319fadc0f0c6c34ab2008cbe02 100644 (file)
--- a/xen/include/asm-x86/traps.h
+++ b/xen/include/asm-x86/traps.h
@@ -21,11 +21,6 @@
 
 void async_exception_cleanup(struct vcpu *);
 
-uint32_t guest_io_read(unsigned int port, unsigned int bytes,
-                       struct domain *);
-void guest_io_write(unsigned int port, unsigned int bytes, uint32_t data,
-                    struct domain *);
-
 const char *trapstr(unsigned int trapnr);
 
 #endif /* ASM_TRAP_H */