Skip to content

Commit 362534a

Browse files
rth7680rth7680
committed
Merge remote-tracking branch 'remotes/bsdimp/tags/pull-bsd-user-20211018-pull-request' into staging
bsd-user pull request: merge dependencies for next architectures Merge the dependencies for arm, aarch64, and riscv64 architectures. This joins together two patch series: [PATCH v2 00/15] bsd-user: misc cleanup for aarch64 import Prepare for aarch64 support (the next architecture to be upstreamed). As the aarch64 emulation is more complete, it relies on a number of different items. In some cases, I've pulled in the full support from bsd-user fork. In other cases I've created a simple stub (as is the case for signals, which have independent changes pending, so I wanted to be as minimal as possible. Since all pre-12.2 support was purged from the bsd-user fork, go ahead and remove it here. FreeBSD 11.x goes ouft of support at the end of the month. Remove what little multi-version support that's in upstream. and [PATCH v3 0/9] bsd-user mmap fixes This series synchronizes mmap.c with the bsd-user fork. This is a mix of old bug fixes pulled in from linux-user, as well as some newer fixes to adress bugs found in check-tcg and recent FreeBSD developments. There are also a couple of style commits. Updated to migrate debugging to qemu_log. as well as a couple of minor rebase tweaks. In addition, the next two architectures I plan on upstreaming (arm and riscv64) also have their prereqs satisfied with this request. v2: Remove accidental module regression in patch 7 and try again. # gpg: Signature made Mon 18 Oct 2021 12:00:28 PM PDT # gpg: using RSA key 2035F894B00AA3CF7CCDE1B76C1CD1287DB01100 # gpg: Good signature from "Warner Losh <[email protected]>" [unknown] # gpg: aka "Warner Losh <[email protected]>" [unknown] # gpg: aka "Warner Losh <[email protected]>" [unknown] # gpg: aka "Warner Losh <[email protected]>" [unknown] # gpg: aka "Warner Losh <[email protected]>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 2035 F894 B00A A3CF 7CCD E1B7 6C1C D128 7DB0 1100 * remotes/bsdimp/tags/pull-bsd-user-20211018-pull-request: (23 commits) bsd-user/signal: Create a dummy signal queueing function bsd-user: Rename sigqueue to qemu_sigqueue bsd-user/sysarch: Move to using do_freebsd_arch_sysarch interface bsd-user: Add stop_all_tasks bsd-user: Remove used from TaskState bsd-user/target_os_elf: If ELF_HWCAP2 is defined, publish it bsd-user/target_os_elf.h: Remove fallback ELF_HWCAP and reorder bsd-user: move TARGET_MC_GET_CLEAR_RET to target_os_signal.h bsd-user/errno_defs.h: Add internal error numbers bsd-user: export get_errno and is_error from syscall.c bsd-user: TARGET_RESET define is unused, remove it bsd-user/strace.list: Remove support for FreeBSD versions older than 12.0 bsd-user/target_os-user.h: Remove support for FreeBSD older than 12.0 meson: *-user: only descend into *-user when configured bsd-user/mmap.c: assert that target_mprotect cannot fail bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging bsd-user/mmap.c: mmap prefer MAP_ANON for BSD bsd-user/mmap.c: mmap return ENOMEM on overflow ... Signed-off-by: Richard Henderson <[email protected]>
2 parents 9c050b6 + 5abfac2 commit 362534a

19 files changed

+187
-263
lines changed

‎bsd-user/errno_defs.h‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
/* $OpenBSD: errno.h,v 1.20 2007/09/03 14:37:52 millert Exp $ */
2-
/* $NetBSD: errno.h,v 1.10 1996/01/20 01:33:53 jtc Exp $ */
3-
41
/*
52
* Copyright (c) 1982, 1986, 1989, 1993
63
* The Regents of the University of California. All rights reserved.
@@ -37,6 +34,9 @@
3734
* @(#)errno.h 8.5 (Berkeley) 1/21/94
3835
*/
3936

37+
#ifndef _ERRNO_DEFS_H_
38+
#define _ERRNO_DEFS_H_
39+
4040
#define TARGET_EPERM 1 /* Operation not permitted */
4141
#define TARGET_ENOENT 2 /* No such file or directory */
4242
#define TARGET_ESRCH 3 /* No such process */
@@ -147,3 +147,10 @@
147147
#define TARGET_EIDRM 89 /* Identifier removed */
148148
#define TARGET_ENOMSG 90 /* No message of desired type */
149149
#define TARGET_ELAST 90 /* Must be equal largest errno */
150+
151+
/* Internal errors: */
152+
#define TARGET_EJUSTRETURN 254 /* Just return without modifing regs */
153+
#define TARGET_ERESTART 255 /* Restart syscall */
154+
#define TARGET_ERESTARTSYS TARGET_ERESTART /* Linux compat */
155+
156+
#endif /* ! _ERRNO_DEFS_H_ */

‎bsd-user/freebsd/meson.build‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
bsd_user_ss.add(files(
2+
'os-sys.c',
3+
))

‎bsd-user/freebsd/os-sys.c‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* FreeBSD sysctl() and sysarch() system call emulation
3+
*
4+
* Copyright (c) 2013-15 Stacey D. Son
5+
*
6+
* This program is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
20+
#include "qemu.h"
21+
#include "target_arch_sysarch.h"
22+
23+
/* sysarch() is architecture dependent. */
24+
abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2)
25+
{
26+
return do_freebsd_arch_sysarch(cpu_env, arg1, arg2);
27+
}

‎bsd-user/freebsd/strace.list‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
{ TARGET_FREEBSD_NR___syscall, "__syscall", NULL, NULL, NULL },
3434
{ TARGET_FREEBSD_NR___sysctl, "__sysctl", NULL, print_sysctl, NULL },
3535
{ TARGET_FREEBSD_NR__umtx_op, "_umtx_op", "%s(%#x, %d, %d, %#x, %#x)", NULL, NULL },
36-
#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000
37-
{ TARGET_FREEBSD_NR__umtx_lock, "__umtx_lock", NULL, NULL, NULL },
38-
{ TARGET_FREEBSD_NR__umtx_unlock, "__umtx_unlock", NULL, NULL, NULL },
39-
#endif
4036
{ TARGET_FREEBSD_NR_accept, "accept", "%s(%d,%#x,%#x)", NULL, NULL },
4137
{ TARGET_FREEBSD_NR_accept4, "accept4", "%s(%d,%d,%#x,%#x)", NULL, NULL },
4238
{ TARGET_FREEBSD_NR_access, "access", "%s(\"%s\",%#o)", NULL, NULL },
@@ -49,10 +45,6 @@
4945
{ TARGET_FREEBSD_NR_cap_fcntls_get, "cap_fcntls_get", NULL, NULL, NULL },
5046
{ TARGET_FREEBSD_NR_cap_fcntls_limit, "cap_fcntls_limit", NULL, NULL, NULL },
5147
{ TARGET_FREEBSD_NR_cap_getmode, "cap_getmode", NULL, NULL, NULL },
52-
#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000
53-
{ TARGET_FREEBSD_NR_cap_getrights, "cap_getrights", NULL, NULL, NULL },
54-
{ TARGET_FREEBSD_NR_cap_new, "cap_new", NULL, NULL, NULL },
55-
#endif
5648
{ TARGET_FREEBSD_NR_cap_ioctls_get, "cap_ioctls_get", NULL, NULL, NULL },
5749
{ TARGET_FREEBSD_NR_cap_ioctls_limit, "cap_ioctls_limit", NULL, NULL, NULL },
5850
{ TARGET_FREEBSD_NR_cap_rights_limit, "cap_rights_limit", NULL, NULL, NULL },
@@ -146,9 +138,6 @@
146138
{ TARGET_FREEBSD_NR_freebsd11_kevent, "freebsd11_kevent", NULL, NULL, NULL },
147139
{ TARGET_FREEBSD_NR_kevent, "kevent", NULL, NULL, NULL },
148140
{ TARGET_FREEBSD_NR_kill, "kill", NULL, NULL, NULL },
149-
#if defined(__FreeBSD_version) && __FreeBSD_version < 1000000
150-
{ TARGET_FREEBSD_NR_killpg, "killpg", NULL, NULL, NULL },
151-
#endif
152141
{ TARGET_FREEBSD_NR_kqueue, "kqueue", NULL, NULL, NULL },
153142
{ TARGET_FREEBSD_NR_ktrace, "ktrace", NULL, NULL, NULL },
154143
{ TARGET_FREEBSD_NR_lchown, "lchown", NULL, NULL, NULL },

‎bsd-user/freebsd/target_os_elf.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
#define ELF_PLATFORM (NULL)
3939
#endif
4040

41-
#ifndef ELF_HWCAP
42-
#define ELF_HWCAP 0
43-
#endif
44-
4541
/* XXX Look at the other conflicting AT_* values. */
4642
#define FREEBSD_AT_NCPUS 19
4743
#define FREEBSD_AT_HWCAP 25
@@ -114,12 +110,16 @@ static abi_ulong target_create_elf_tables(abi_ulong p, int argc, int envc,
114110
NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0);
115111
NEW_AUX_ENT(FREEBSD_AT_NCPUS, (abi_ulong)bsd_get_ncpu());
116112
NEW_AUX_ENT(AT_ENTRY, load_bias + exec->e_entry);
113+
features = ELF_HWCAP;
114+
NEW_AUX_ENT(FREEBSD_AT_HWCAP, features);
115+
#ifdef ELF_HWCAP2
116+
features = ELF_HWCAP2;
117+
NEW_AUX_ENT(FREEBSD_AT_HWCAP2, features);
118+
#endif
117119
NEW_AUX_ENT(AT_UID, (abi_ulong)getuid());
118120
NEW_AUX_ENT(AT_EUID, (abi_ulong)geteuid());
119121
NEW_AUX_ENT(AT_GID, (abi_ulong)getgid());
120122
NEW_AUX_ENT(AT_EGID, (abi_ulong)getegid());
121-
features = ELF_HWCAP;
122-
NEW_AUX_ENT(FREEBSD_AT_HWCAP, features);
123123
target_auxents = sp; /* Note where the aux entries are in the target */
124124
#ifdef ARCH_DLINFO
125125
/*

‎bsd-user/freebsd/target_os_signal.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#ifndef _TARGET_OS_SIGNAL_H_
22
#define _TARGET_OS_SIGNAL_H_
33

4+
/* FreeBSD's sys/ucontext.h defines this */
5+
#define TARGET_MC_GET_CLEAR_RET 0x0001
6+
47
#include "target_os_siginfo.h"
58
#include "target_arch_signal.h"
69

‎bsd-user/freebsd/target_os_user.h‎

Lines changed: 1 addition & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,7 @@ struct target_sockaddr_storage {
6161
/*
6262
* from sys/user.h
6363
*/
64-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
6564
#define TARGET_KI_NSPARE_INT 2
66-
#elif defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
67-
#define TARGET_KI_NSPARE_INT 4
68-
#elif defined(__FreeBSD_version) && __FreeBSD_version >= 1000000
69-
#define TARGET_KI_NSPARE_INT 7
70-
#else
71-
#define TARGET_KI_NSPARE_INT 9
72-
#endif /* ! __FreeBSD_version >= 1000000 */
7365
#define TARGET_KI_NSPARE_LONG 12
7466
#define TARGET_KI_NSPARE_PTR 6
7567

@@ -116,11 +108,7 @@ struct target_kinfo_proc {
116108
int32_t ki_tsid; /* Terminal session ID */
117109
int16_t ki_jobc; /* job control counter */
118110
int16_t ki_spare_short1; /* unused (just here for alignment) */
119-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
120111
int32_t ki_tdev__freebsd11; /* controlling tty dev */
121-
#else
122-
int32_t ki_tdev; /* controlling tty dev */
123-
#endif
124112
target_sigset_t ki_siglist; /* Signals arrived but not delivered */
125113
target_sigset_t ki_sigmask; /* Current signal mask */
126114
target_sigset_t ki_sigignore; /* Signals being ignored */
@@ -164,45 +152,24 @@ struct target_kinfo_proc {
164152
int8_t ki_nice; /* Process "nice" value */
165153
char ki_lock; /* Process lock (prevent swap) count */
166154
char ki_rqindex; /* Run queue index */
167-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
168155
u_char ki_oncpu_old; /* Which cpu we are on (legacy) */
169156
u_char ki_lastcpu_old; /* Last cpu we were on (legacy) */
170-
#else
171-
u_char ki_oncpu; /* Which cpu we are on */
172-
u_char ki_lastcpu; /* Last cpu we were on */
173-
#endif /* ! __FreeBSD_version >= 1100000 */
174-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
175157
char ki_tdname[TARGET_TDNAMLEN + 1]; /* thread name */
176-
#else
177-
char ki_ocomm[TARGET_TDNAMLEN + 1]; /* thread name */
178-
#endif /* ! __FreeBSD_version >= 900000 */
179158
char ki_wmesg[TARGET_WMESGLEN + 1]; /* wchan message */
180159
char ki_login[TARGET_LOGNAMELEN + 1]; /* setlogin name */
181160
char ki_lockname[TARGET_LOCKNAMELEN + 1]; /* lock name */
182161
char ki_comm[TARGET_COMMLEN + 1]; /* command name */
183162
char ki_emul[TARGET_KI_EMULNAMELEN + 1]; /* emulation name */
184-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
185163
char ki_loginclass[TARGET_LOGINCLASSLEN + 1]; /* login class */
186-
#endif /* ! __FreeBSD_version >= 900000 */
187164

188-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
189165
char ki_sparestrings[50]; /* spare string space */
190-
#else
191-
char ki_sparestrings[68]; /* spare string space */
192-
#endif /* ! __FreeBSD_version >= 900000 */
193166
int32_t ki_spareints[TARGET_KI_NSPARE_INT]; /* spare room for growth */
194-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
195-
uint64_t ki_tdev; /* controlling tty dev */
196-
#endif
197-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1100000
167+
uint64_t ki_tdev; /* controlling tty dev */
198168
int32_t ki_oncpu; /* Which cpu we are on */
199169
int32_t ki_lastcpu; /* Last cpu we were on */
200170
int32_t ki_tracer; /* Pid of tracing process */
201-
#endif /* __FreeBSD_version >= 1100000 */
202-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
203171
int32_t ki_flag2; /* P2_* flags */
204172
int32_t ki_fibnum; /* Default FIB number */
205-
#endif /* ! __FreeBSD_version >= 900000 */
206173
uint32_t ki_cr_flags; /* Credential flags */
207174
int32_t ki_jid; /* Process jail ID */
208175
int32_t ki_numthreads; /* XXXKSE number of threads in total */
@@ -234,18 +201,8 @@ struct target_kinfo_file {
234201
int32_t kf_flags; /* Flags. */
235202
int32_t kf_pad0; /* Round to 64 bit alignment. */
236203
int64_t kf_offset; /* Seek location. */
237-
#if defined(__FreeBSD_version) && __FreeBSD_version < 1200031
238-
int32_t kf_vnode_type; /* Vnode type. */
239-
int32_t kf_sock_domain; /* Socket domain. */
240-
int32_t kf_sock_type; /* Socket type. */
241-
int32_t kf_sock_protocol; /* Socket protocol. */
242-
struct target_sockaddr_storage kf_sa_local; /* Socket address. */
243-
struct target_sockaddr_storage kf_sa_peer; /* Peer address. */
244-
#endif
245-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
246204
union {
247205
struct {
248-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
249206
uint32_t kf_spareint;
250207
/* Socket domain. */
251208
int kf_sock_domain0;
@@ -257,7 +214,6 @@ struct target_kinfo_file {
257214
struct sockaddr_storage kf_sa_local;
258215
/* Peer address. */
259216
struct sockaddr_storage kf_sa_peer;
260-
#endif
261217
/* Address of so_pcb. */
262218
uint64_t kf_sock_pcb;
263219
/* Address of inp_ppcb. */
@@ -272,7 +228,6 @@ struct target_kinfo_file {
272228
uint32_t kf_sock_pad0;
273229
} kf_sock;
274230
struct {
275-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
276231
/* Vnode type. */
277232
int kf_file_type;
278233
/* Space for future use */
@@ -290,78 +245,47 @@ struct target_kinfo_file {
290245
uint32_t kf_file_fsid_freebsd11;
291246
/* File device, FreeBSD 11 compat. */
292247
uint32_t kf_file_rdev_freebsd11;
293-
#else
294-
/* Global file id. */
295-
uint64_t kf_file_fileid;
296-
/* File size. */
297-
uint64_t kf_file_size;
298-
/* Vnode filesystem id. */
299-
uint32_t kf_file_fsid;
300-
/* File device. */
301-
uint32_t kf_file_rdev;
302-
#endif
303248
/* File mode. */
304249
uint16_t kf_file_mode;
305250
/* Round to 64 bit alignment. */
306251
uint16_t kf_file_pad0;
307252
uint32_t kf_file_pad1;
308253
} kf_file;
309254
struct {
310-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
311255
uint32_t kf_spareint[4];
312256
uint64_t kf_spareint64[32];
313-
#endif
314257
uint32_t kf_sem_value;
315258
uint16_t kf_sem_mode;
316259
} kf_sem;
317260
struct {
318-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
319261
uint32_t kf_spareint[4];
320262
uint64_t kf_spareint64[32];
321-
#endif
322263
uint64_t kf_pipe_addr;
323264
uint64_t kf_pipe_peer;
324265
uint32_t kf_pipe_buffer_cnt;
325266
/* Round to 64 bit alignment. */
326267
uint32_t kf_pipe_pad0[3];
327268
} kf_pipe;
328269
struct {
329-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
330270
uint32_t kf_spareint[4];
331271
uint64_t kf_spareint64[32];
332272
uint32_t kf_pts_dev_freebsd11;
333273
uint32_t kf_pts_pad0;
334274
uint64_t kf_pts_dev;
335275
/* Round to 64 bit alignment. */
336276
uint32_t kf_pts_pad1[4];
337-
#else
338-
uint32_t kf_pts_dev;
339-
/* Round to 64 bit alignment. */
340-
uint32_t kf_pts_pad0[7];
341-
#endif
342277
} kf_pts;
343278
struct {
344-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
345279
uint32_t kf_spareint[4];
346280
uint64_t kf_spareint64[32];
347-
#endif
348281
int32_t kf_pid;
349282
} kf_proc;
350283
} kf_un;
351284
uint16_t kf_status; /* Status flags. */
352285
uint16_t kf_pad1; /* Round to 32 bit alignment. */
353286
int32_t _kf_ispare0; /* Space for more stuff. */
354-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1000000
355287
target_cap_rights_t kf_cap_rights; /* Capability rights. */
356288
uint64_t _kf_cap_spare; /* Space for future cap_rights_t. */
357-
#else /* ! __FreeBSD_version >= 1000000 */
358-
uint64_t kf_cap_rights;
359-
int _kf_ispare[4];
360-
#endif /* ! __FreeBSD_version >= 1000000 */
361-
362-
#else /* ! __FreeBSD_version >= 900000 */
363-
int _kf_ispare[16];
364-
#endif /* ! __FreeBSD_version >= 900000 */
365289
/* Truncated before copyout in sysctl */
366290
char kf_path[PATH_MAX]; /* Path to file, if any. */
367291
};
@@ -372,34 +296,19 @@ struct target_kinfo_vmentry {
372296
uint64_t kve_start; /* Starting address. */
373297
uint64_t kve_end; /* Finishing address. */
374298
uint64_t kve_offset; /* Mapping offset in object */
375-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
376299
uint64_t kve_vn_fileid; /* inode number if vnode */
377-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
378300
uint32_t kve_vn_fsid_freebsd11; /* dev_t of vnode location */
379-
#else
380-
uint32_t kve_vn_fsid; /* dev_t of vnode location */
381-
#endif
382-
#else /* ! __FreeBSD_version >= 900000 */
383-
uint64_t kve_fileid; /* inode number if vnode */
384-
uint32_t kve_fsid; /* dev_t of vnode location */
385-
#endif /* ! __FreeBSD_version >= 900000 */
386301
int32_t kve_flags; /* Flags on map entry. */
387302
int32_t kve_resident; /* Number of resident pages. */
388303
int32_t kve_private_resident; /* Number of private pages. */
389304
int32_t kve_protection; /* Protection bitmask. */
390305
int32_t kve_ref_count; /* VM obj ref count. */
391306
int32_t kve_shadow_count; /* VM obj shadow count. */
392-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 900000
393307
int32_t kve_vn_type; /* Vnode type. */
394308
uint64_t kve_vn_size; /* File size. */
395-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
396309
uint32_t kve_vn_rdev_freebsd11; /* Device id if device. */
397-
#else
398-
uint32_t kve_vn_rdev; /* Device id if device. */
399-
#endif
400310
uint16_t kve_vn_mode; /* File mode. */
401311
uint16_t kve_status; /* Status flags. */
402-
#if defined(__FreeBSD_version) && __FreeBSD_version >= 1200031
403312
#if (__FreeBSD_version >= 1300501 && __FreeBSD_version < 1400000) || \
404313
__FreeBSD_version >= 1400009
405314
union {
@@ -413,13 +322,6 @@ struct target_kinfo_vmentry {
413322
#endif
414323
uint64_t kve_vn_rdev; /* Device id if device. */
415324
int _kve_ispare[8]; /* Space for more stuff. */
416-
#else
417-
int32_t _kve_ispare[12]; /* Space for more stuff. */
418-
#endif
419-
#else /* ! __FreeBSD_version >= 900000 */
420-
int _kve_pad0;
421-
int32_t _kve_ispare[16]; /* Space for more stuff. */
422-
#endif /* ! __FreeBSD_version >= 900000 */
423325
/* Truncated before copyout in sysctl */
424326
char kve_path[PATH_MAX]; /* Path to VM obj, if any. */
425327
};

‎bsd-user/i386/target_arch_cpu.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
#define TARGET_DEFAULT_CPU_MODEL "qemu32"
2525

26-
#define TARGET_CPU_RESET(cpu)
27-
2826
static inline void target_cpu_init(CPUX86State *env,
2927
struct target_pt_regs *regs)
3028
{

‎bsd-user/i386/target_arch_signal.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#define TARGET_MINSIGSTKSZ (512 * 4) /* min sig stack size */
2828
#define TARGET_SIGSTKSZ (MINSIGSTKSZ + 32768) /* recommended size */
2929

30-
#define TARGET_MC_GET_CLEAR_RET 0x0001
31-
3230
struct target_sigcontext {
3331
/* to be added */
3432
};

0 commit comments

Comments
 (0)