From: Wei Liu Date: Fri, 19 Oct 2018 14:28:31 +0000 (+0100) Subject: x86/pv: make guest_io_{read,write} local functions X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3120 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6f407dc4fc943286d4843ce7aba265b94e2eb9c9;p=xen.git x86/pv: make guest_io_{read,write} local functions Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 6422f91632..b85c65f556 100644 --- 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 bed25290d7..b88f2a4f2f 100644 --- 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 */