Deleted Added
full compact
mem.h (249321) mem.h (269008)
1/*-
2 * Copyright (c) 2012 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2012 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.sbin/bhyve/mem.h 249321 2013-04-10 02:12:39Z neel $
26 * $FreeBSD: head/usr.sbin/bhyve/mem.h 269008 2014-07-23 04:28:51Z neel $
27 */
28
29#ifndef _MEM_H_
30#define _MEM_H_
31
32#include <sys/linker_set.h>
33
34struct vmctx;

--- 10 unchanged lines hidden (view full) ---

45 uint64_t base;
46 uint64_t size;
47};
48#define MEM_F_READ 0x1
49#define MEM_F_WRITE 0x2
50#define MEM_F_RW 0x3
51
52void init_mem(void);
27 */
28
29#ifndef _MEM_H_
30#define _MEM_H_
31
32#include <sys/linker_set.h>
33
34struct vmctx;

--- 10 unchanged lines hidden (view full) ---

45 uint64_t base;
46 uint64_t size;
47};
48#define MEM_F_READ 0x1
49#define MEM_F_WRITE 0x2
50#define MEM_F_RW 0x3
51
52void init_mem(void);
53int emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie);
53int emulate_mem(struct vmctx *, int vcpu, uint64_t paddr, struct vie *vie,
54 struct vm_guest_paging *paging);
54
55int register_mem(struct mem_range *memp);
56int register_mem_fallback(struct mem_range *memp);
57int unregister_mem(struct mem_range *memp);
58
59#endif /* _MEM_H_ */
55
56int register_mem(struct mem_range *memp);
57int register_mem_fallback(struct mem_range *memp);
58int unregister_mem(struct mem_range *memp);
59
60#endif /* _MEM_H_ */