Deleted Added
full compact
userboot.h (302408) userboot.h (329114)
1/*-
2 * Copyright (c) 2011 Doug Rabson
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) 2011 Doug Rabson
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: stable/11/sys/boot/userboot/userboot.h 296099 2016-02-26 16:00:16Z marcel $
26 * $FreeBSD: stable/11/sys/boot/userboot/userboot.h 329114 2018-02-11 02:27:50Z kevans $
27 */
28
29/*
30 * USERBOOT interface versions
31 */
32#define USERBOOT_VERSION_1 1
33#define USERBOOT_VERSION_2 2
34#define USERBOOT_VERSION_3 3

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

197 *
198 * If there are no more variables that need to be set in the
199 * loader environment then return NULL.
200 *
201 * 'num' is used as a handle for the callback to identify which
202 * environment variable to return next. It will begin at 0 and
203 * each invocation will add 1 to the previous value of 'num'.
204 */
27 */
28
29/*
30 * USERBOOT interface versions
31 */
32#define USERBOOT_VERSION_1 1
33#define USERBOOT_VERSION_2 2
34#define USERBOOT_VERSION_3 3

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

197 *
198 * If there are no more variables that need to be set in the
199 * loader environment then return NULL.
200 *
201 * 'num' is used as a handle for the callback to identify which
202 * environment variable to return next. It will begin at 0 and
203 * each invocation will add 1 to the previous value of 'num'.
204 */
205 const char * (*getenv)(void *arg, int num);
205 char * (*getenv)(void *arg, int num);
206
207 /*
208 * Version 4 additions.
209 */
210 int (*vm_set_register)(void *arg, int vcpu, int reg, uint64_t val);
211 int (*vm_set_desc)(void *arg, int vcpu, int reg, uint64_t base,
212 u_int limit, u_int access);
213};
206
207 /*
208 * Version 4 additions.
209 */
210 int (*vm_set_register)(void *arg, int vcpu, int reg, uint64_t val);
211 int (*vm_set_desc)(void *arg, int vcpu, int reg, uint64_t base,
212 u_int limit, u_int access);
213};