Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ddce3a authored by Laurent Vivier's avatar Laurent Vivier Committed by Avi Kivity
Browse files

KVM: x86 emulator: remove unused functions 



Remove #ifdef functions never used

Signed-off-by: default avatarLaurent Vivier <Laurent.Vivier@bull.net>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 7aa81cc0

drivers/kvm/x86_emulate.c

+0 −39
Original line number Diff line number Diff line
@@ -1639,42 +1639,3 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	DPRINTF("Cannot emulate %02x\n", b);

	return -1;

}
 


#ifdef __XEN__



#include <asm/mm.h>

#include <asm/uaccess.h>



int

x86_emulate_read_std(unsigned long addr,

		     unsigned long *val,

		     unsigned int bytes, struct x86_emulate_ctxt *ctxt)

{

	unsigned int rc;



	*val = 0;



	if ((rc = copy_from_user((void *)val, (void *)addr, bytes)) != 0) {

		propagate_page_fault(addr + bytes - rc, 0);	/* read fault */

		return X86EMUL_PROPAGATE_FAULT;

	}



	return X86EMUL_CONTINUE;

}



int

x86_emulate_write_std(unsigned long addr,

		      unsigned long val,

		      unsigned int bytes, struct x86_emulate_ctxt *ctxt)

{

	unsigned int rc;



	if ((rc = copy_to_user((void *)addr, (void *)&val, bytes)) != 0) {

		propagate_page_fault(addr + bytes - rc, PGERR_write_access);

		return X86EMUL_PROPAGATE_FAULT;

	}



	return X86EMUL_CONTINUE;

}



#endif