Date: Thu, 23 Jul 2015 17:54:42 GMT From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r288697 - soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm Message-ID: <201507231754.t6NHsgxx035750@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mihai Date: Thu Jul 23 17:54:41 2015 New Revision: 288697 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288697 Log: soc2015: mihai: bhyve: sys: arm: vmm: mem.c: call vmm_instruction_emul when emulate a memory access Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.c soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.h Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.c Thu Jul 23 17:53:55 2015 (r288696) +++ soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.c Thu Jul 23 17:54:41 2015 (r288697) @@ -39,6 +39,7 @@ #include <sys/tree.h> #include <sys/errno.h> #include <machine/vmm.h> +#include <machine/vmm_instruction_emul.h> #include <stdio.h> #include <stdlib.h> @@ -184,10 +185,11 @@ assert(entry != NULL); assert(NULL == NULL); -// err = vmm_emulate_instruction(ctx, vcpu, paddr, vie, -// mem_read, mem_write, &entry->mr_param); + err = vmm_emulate_instruction(ctx, vcpu, paddr, vie, + mem_read, mem_write, &entry->mr_param); + pthread_rwlock_unlock(&mmio_rwlock); - + return (err); } Modified: soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.h ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.h Thu Jul 23 17:53:55 2015 (r288696) +++ soc2015/mihai/bhyve-on-arm-head/usr.sbin/bhyvearm/mem.h Thu Jul 23 17:54:41 2015 (r288697) @@ -56,4 +56,5 @@ int register_mem_fallback(struct mem_range *memp); int unregister_mem(struct mem_range *memp); +void init_bvmcons(void); #endif /* _MEM_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507231754.t6NHsgxx035750>