NetBSD fixes
cover NetBSD fixes
Hello,
here is a set of 24 patches, which are needed to build and run the tools on NetBSD. They are extracted from NetBSD's pkgsrc repository for Xen 4.13, and ported to 4.15.
Manuel Bouyer (24):
Fix lock directory path for NetBSD
NetBSD doens't need xenbackendd with xl toolstack
Fix lock directory path for NetBSD
Make it build on NetBSD
Introduce locking functions for block device setup on NetBSD Handle the case where vifname is not present in xenstore. Remove NetBSD's system headers. We'll use the system-provided ones,
which are up to date.
Make it build on NetBSD
Use xen/xenio.h on NetBSD
Make it build on NetBSD
Implement foreignmemory on NetBSD
Implement gnttab on NetBSD
Don't assume tv_sec is a unsigned long (for NetBSD)
Pass bridge name to qemu When starting qemu, set an environnement
variable XEN_DOMAIN_ID, to be used by qemu helper scripts
Make it build on NetBSD
Switch NetBSD to QEMU_XEN (!traditional)
Make it build on NetBSD
This doens't need xen/sys/evtchn.h (NetBSD fix)
errno may not be a gobal R/W variable, use a local variable instead
(fix build on NetBSD)
If FILENAME_MAX is defined, use it instead of arbitrary value (fix
format-truncation errors with GCC >= 7)
Fix unused functions/variables error
If PTHREAD_STACK_MIN is not defined, use DEFAULT_THREAD_STACKSIZE Use xen/xenio.h on NetBSD
Fix error: array subscript has type 'char' [-Werror=char-subscripts]
m4/paths.m4 | 2 +- tools/Makefile | 1 - tools/configure | 2 +- tools/debugger/gdbsx/xg/xg_main.c | 11 + tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/block | 5 +- tools/hotplug/NetBSD/locking.sh | 72 +++++ tools/hotplug/NetBSD/vif-bridge | 5 +- tools/hotplug/NetBSD/vif-ip | 4 + tools/include/Makefile | 2 +- tools/include/xen-sys/NetBSD/evtchn.h | 86 ------ tools/include/xen-sys/NetBSD/privcmd.h | 106 ------- tools/libs/call/netbsd.c | 18 +- tools/libs/call/private.h | 8 +- tools/libs/ctrl/xc_private.h | 4 + tools/libs/evtchn/netbsd.c | 8 +- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/foreignmemory/netbsd.c | 76 ++++- tools/libs/foreignmemory/private.h | 10 +- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 ++++++++++++++++++ tools/libs/light/libxl_create.c | 8 +- tools/libs/light/libxl_dm.c | 19 ++ tools/libs/light/libxl_netbsd.c | 2 +- tools/libs/light/libxl_qmp.c | 2 +- tools/libs/light/libxl_uuid.c | 4 +- tools/libs/stat/xenstat_netbsd.c | 11 - tools/libs/store/xs.c | 4 + tools/ocaml/libs/eventchn/xeneventchn_stubs.c | 1 - tools/xenpaging/xenpaging.c | 5 +- tools/xenpmd/xenpmd.c | 4 + tools/xentrace/xentrace.c | 2 +- xen/tools/symbols.c | 4 +- 33 files changed, 508 insertions(+), 250 deletions(-) create mode 100644 tools/hotplug/NetBSD/locking.sh delete mode 100644 tools/include/xen-sys/NetBSD/evtchn.h delete mode 100644 tools/include/xen-sys/NetBSD/privcmd.h create mode 100644 tools/libs/gnttab/netbsd.c
Signature · 1 line
2.28.0
PATCH 1/24 Fix lock directory path for NetBSD
--- m4/paths.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
m4/paths.m4 +1 -1
@@ -142,7 +142,7 @@ AC_SUBST(XEN_SCRIPT_DIR) case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$rundir_path ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac AC_SUBST(XEN_LOCK_DIR)
Signature · 1 line
2.28.0
PATCH 2/24 NetBSD doens't need xenbackendd with xl toolstack
In reply to Manuel Bouyer--- tools/Makefile | 1 - 1 file changed, 1 deletion(-)
tools/Makefile +0 -1
@@ -18,7 +18,6 @@ SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xentop -SUBDIRS-$(CONFIG_NetBSD) += xenbackendd SUBDIRS-y += libfsimage SUBDIRS-$(CONFIG_Linux) += vchan
Signature · 1 line
2.28.0
Re: [PATCH 02/24] NetBSD doens't need xenbackendd with xl toolstack
tools/Makefile SUBDIRS-$(CONFIG_X86) += firmware · line 21
Quoted 13 lines · Manuel Bouyer
--- tools/Makefile | 1 - 1 file changed, 1 deletion(-)tools/Makefile +0
-1@@ -18,7 +18,6 @@ SUBDIRS-$(CONFIG_X86) += firmware SUBDIRS-y += console SUBDIRS-y += xenmon SUBDIRS-y += xentop -SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
I think we also want to remove the directory itself, as it would be dead code at this point.
Thanks, Roger.
PATCH 3/24 Fix lock directory path for NetBSD
In reply to Manuel Bouyer--- tools/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/configure +1 -1
@@ -4030,7 +4030,7 @@ XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts case "$host_os" in *freebsd*) XEN_LOCK_DIR=$localstatedir/lib ;; -*netbsd*) XEN_LOCK_DIR=$localstatedir/lib ;; +*netbsd*) XEN_LOCK_DIR=$localstatedir/run ;; *) XEN_LOCK_DIR=$localstatedir/lock ;; esac
Signature · 1 line
2.28.0
PATCH 4/24 Make xg_main.c build on NetBSD
In reply to Manuel Bouyer--- tools/debugger/gdbsx/xg/xg_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
tools/debugger/gdbsx/xg/xg_main.c +11 -0
@@ -49,7 +49,11 @@#include "xg_public.h" #include <xen/version.h> #include <xen/domctl.h> +#ifdef __NetBSD__ +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #include <xen/foreign/x86_32.h> #include <xen/foreign/x86_64.h>
@@ -126,12 +130,19 @@ xg_init()int flags, saved_errno;XGTRC ("E\n" ); +#ifdef __NetBSD__ +if ((_dom0_fd=open ("/kern/xen/privcmd" ,O_RDWR )) ==-1 ) { +perror ("Failed to open /kern/xen/privcmd\n" ); +return -1 ; + } +#else if ((_dom0_fd=open ("/dev/xen/privcmd" ,O_RDWR )) ==-1 ) {if ((_dom0_fd=open ("/proc/xen/privcmd" ,O_RDWR )) ==-1 ) {perror ("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n" );return -1 ; } } +#endif /* Although we return the file handle as the 'xc handle' the API * does not specify / guarentee that this integer is in fact * a file handle. Thus we must take responsiblity to ensure
Signature · 1 line
2.28.0
Re: [PATCH 04/24] Make xg_main.c build on NetBSD
Quoted 27 lines · Manuel Bouyer
--- tools/debugger/gdbsx/xg/xg_main.c | 11 +++++++++++ 1 file changed, 11 insertions(+)tools/debugger/gdbsx/xg/xg_main.c +7
-0@@ -49,7 +49,11 @@#include "xg_public.h" #include <xen/version.h> #include <xen/domctl.h> +#ifdef __NetBSD__ +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #include <xen/foreign/x86_32.h> #include <xen/foreign/x86_64.h> @@ -126,12 +130,19 @@ xg_init()int flags, saved_errno;XGTRC ("E\n" ); +#ifdef __NetBSD__ +if ((_dom0_fd=open ("/kern/xen/privcmd" ,O_RDWR )) ==-1 ) { +perror ("Failed to open /kern/xen/privcmd\n" );
tools/debugger/gdbsx/xg/xg_main.c xg_init() · line 145
Quoted 10 lines
tools/debugger/gdbsx/xg/xg_main.c +4
-0+ return -1; + } +#else if ((_dom0_fd=open ("/dev/xen/privcmd" ,O_RDWR )) ==-1 ) {if ((_dom0_fd=open ("/proc/xen/privcmd" ,O_RDWR )) ==-1 ) {perror ("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n" );return -1 ; } } +#endif
I don't think you need to ifdef here, instead just add to the existing if, ie:
if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1 &&
(_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1 &&
(_dom0_fd=open("/kern/xen/privcmd", O_RDWR)) == -1) {
perror("Failed to open /dev/xen/privcmd, /proc/xen/privcmd or /kern/xen/privcmd\n");
return -1;
}Thanks, Roger.
PATCH 5/24 Introduce locking functions for block device setup on NetBSD
In reply to Manuel Bouyer--- tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/block | 5 ++- tools/hotplug/NetBSD/locking.sh | 72 +++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tools/hotplug/NetBSD/locking.sh
tools/hotplug/NetBSD/Makefile +1 -0
@@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # Xen script dir and scripts to go there. XEN_SCRIPTS = +XEN_SCRIPTS += locking.sh XEN_SCRIPTS += block XEN_SCRIPTS += vif-bridge XEN_SCRIPTS += vif-ip
tools/hotplug/NetBSD/block +4 -1
@@ -6,6 +6,7 @@ DIR=$(dirname "$0") . "${DIR}/hotplugpath.sh" +. "${DIR}/locking.sh" PATH=${bindir}:${sbindir}:${LIBEXEC_BIN}:/bin:/usr/bin:/sbin:/usr/sbin export PATH
@@ -62,6 +63,7 @@ case $xstatus in available_disks="$available_disks $disk" eval $disk=free done + claim_lock block # Mark the used vnd(4) devices as ``used''. for disk in `sysctl hw.disknames`; do case $disk in
@@ -77,6 +79,7 @@ case $xstatus in break fi done + release_lock block if [ x$device = x ] ; then error "no available vnd device" fi
@@ -86,7 +89,7 @@ case $xstatus in device=$xparams ;; esac - physical_device=$(stat -f '%r' "$device") + physical_device=$(stat -L -f '%r' "$device") xenstore-write $xpath/physical-device $physical_device xenstore-write $xpath/hotplug-status connected exit 0
tools/hotplug/NetBSD/locking.sh new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
I think you want tot CC the tools dev on this one, specially Ian who knows how the Linux one is implemented and can likely give valuable input.
Quoted 4 lines · Manuel Bouyer
--- tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/block | 5 ++- tools/hotplug/NetBSD/locking.sh | 72 +++++++++++++++++++++++++++++++++
Seeing the file itself, I don't think there's any NetBSD specific stuff, so we might want to consider putting it in BSD/ instead, so it can be used by FreeBSD also?
I'm also not sure if it would be useful to Linux folks?
Thanks, Roger.
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Quoted 5 lines · Roger Pau Monné
I think you want tot CC the tools dev on this one, specially Ian who knows how the Linux one is implemented and can likely give valuable input.
On Mon, Dec 14, 2020 at 05:36:04PM +0100, Manuel Bouyer wrote:
Quoted 8 lines
Quoted 4 lines
--- tools/hotplug/NetBSD/Makefile | 1 + tools/hotplug/NetBSD/block | 5 ++- tools/hotplug/NetBSD/locking.sh | 72 +++++++++++++++++++++++++++++++++Seeing the file itself, I don't think there's any NetBSD specific stuff, so we might want to consider putting it in BSD/ instead, so it can be used by FreeBSD also?
I'm not sure if FreeBSD needs the locking stuff.
Also, there are certainly differences in block device handling between FreeBSD and NetBSD. Both OSes have diverged in this area.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Manuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 4 lines · Roger Pau Monné
Quoted 3 lines
I think you want tot CC the tools dev on this one, specially Ian who knows how the Linux one is implemented and can likely give valuable input.
...
Quoted 7 lines
Quoted 3 lines
Seeing the file itself, I don't think there's any NetBSD specific stuff, so we might want to consider putting it in BSD/ instead, so it can be used by FreeBSD also?
I'm not sure if FreeBSD needs the locking stuff.
Also, there are certainly differences in block device handling between FreeBSD and NetBSD. Both OSes have diverged in this area.
I think most operating systems will want some kind of locking here.
I loooked at the code in the new tools/hotplug/NetBSD/locking.sh. Unfortunately this area is complex and the available APIs and tools are awkard, and the field is troubled by broken "traditional" approaches involving O_EXCL or the moral equivalent, which cannot be made reliable (if you think reliability implies never being broken due to stale lock).
I doubt that the code in this patch is correct. It uses shlock(1) which is based on link(2) and kill(2) and so on, which I think is basically an O_EXCL-based approach as I discuss above. (I don't have a formal proof of this contention.) The presence of an invocation of the "trap" shell builtin in the new NetBSD script is a bad sign - a reliable locking protocol would need that.
I see from https://man.netbsd.org that NetBSD has flock(1) and stat(1). I think this means we could reuse the code in tools/hotplug/Linux/locking.sh. Maybe it will need to be lightly adapted, to NetBSD's flock(1) and stat(1). Perhaps via some kind of substitution to avoid all the clone-and-hack.
Regards,
Ian.
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Quoted 23 lines · Ian Jackson
Manuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 4 lines · Roger Pau Monné
Quoted 3 lines
I think you want tot CC the tools dev on this one, specially Ian who knows how the Linux one is implemented and can likely give valuable input.
...
Quoted 7 lines
Quoted 3 lines
Seeing the file itself, I don't think there's any NetBSD specific stuff, so we might want to consider putting it in BSD/ instead, so it can be used by FreeBSD also?
I'm not sure if FreeBSD needs the locking stuff.
Also, there are certainly differences in block device handling between FreeBSD and NetBSD. Both OSes have diverged in this area.I think most operating systems will want some kind of locking here.
I loooked at the code in the new
tools/hotplug/NetBSD/locking.sh. Unfortunately this area is complex and the available APIs and tools are awkard, and the field is troubled by broken "traditional" approaches involvingO_EXCLor the moral equivalent, which cannot be made reliable (if you think reliability implies never being broken due to stale lock).
Quoted 6 lines
I doubt that the code in this patch is correct. It uses shlock(1) which is based on link(2) and kill(2) and so on, which I think is basically an O_EXCL-based approach as I discuss above. (I don't have a formal proof of this contention.) The presence of an invocation of the "trap" shell builtin in the new NetBSD script is a bad sign - a reliable locking protocol would need that.
Actually this patch is old - since Xen 4.8 at last.
Quoted 6 lines
I see from https://man.netbsd.org that NetBSD has flock(1) and stat(1). I think this means we could reuse the code in
tools/hotplug/Linux/locking.sh. Maybe it will need to be lightly adapted, to NetBSD's flock(1) and stat(1). Perhaps via some kind of substitution to avoid all the clone-and-hack.
Yes, at last the stat call will need to be patched. But it seems to rely on a linux-specific behavoir, which is that /dev/stdin points to the real file on redirection:
Quoted 1 line
ls -l
/dev/stdin/proc/self/fd/0</etc/passwd
lrwxrwxrwx 1 root root 15 Apr 30 2019 /dev/stdin -> /proc/self/fd/0
lr-x------ 1 bouyer ita-iatos 64 Jan 20 16:54 /proc/self/fd/0 -> /etc/passwd
On NetBSD (and I guess other BSDs) this won't work, as /dev/stdin is a specific device:
Quoted 1 line
ls -l
/dev/stdin
crw-rw-rw- 1 root wheel 22, 0 Nov 15 2007 /dev/stdin
so stat -L will always return the same data. We can't use the same protocol.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Manuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 7 lines
Yes, at last the stat call will need to be patched. But it seems to rely on a linux-specific behavoir, which is that
/dev/stdinpoints to the real file on redirection:Quoted 1 line
ls -l
/dev/stdin/proc/self/fd/0</etc/passwdlrwxrwxrwx 1 root root 15 Apr 30 2019
/dev/stdin->/proc/self/fd/0
lr-x------ 1 bouyer ita-iatos 64 Jan 20 16:54/proc/self/fd/0->/etc/passwd
Quoted 7 lines
On NetBSD (and I guess other BSDs) this won't work, as
/dev/stdinis a specific device:Quoted 1 line
ls -l
/dev/stdincrw-rw-rw- 1 root wheel 22, 0 Nov 15 2007
/dev/stdinso stat -L will always return the same data. We can't use the same protocol.
Ah.
The manpage I am looking at says:
If no argument is given, stat displays information about the file descriptor for standard input.
Here NetBSD has a better command line API than Linux - Linux requires pratting about with /dev/stdin and NetBSD doesn't. So I think where on Linux we have
stat .... /dev/stdin
on NetBsd we can simply have
stat ....
with no filename argument.
I think NetBSD's stat(1) also takes different argumnts to specify the format. NetBSD uses -f, whereas Linux uses -c. So the exact rune will have to be different.
Ian.
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Quoted 23 lines · Ian Jackson
Manuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 7 lines
Yes, at last the stat call will need to be patched. But it seems to rely on a linux-specific behavoir, which is that
/dev/stdinpoints to the real file on redirection:Quoted 1 line
ls -l
/dev/stdin/proc/self/fd/0</etc/passwdlrwxrwxrwx 1 root root 15 Apr 30 2019
/dev/stdin->/proc/self/fd/0
lr-x------ 1 bouyer ita-iatos 64 Jan 20 16:54/proc/self/fd/0->/etc/passwdQuoted 7 lines
On NetBSD (and I guess other BSDs) this won't work, as
/dev/stdinis a specific device:Quoted 1 line
ls -l
/dev/stdincrw-rw-rw- 1 root wheel 22, 0 Nov 15 2007
/dev/stdinso stat -L will always return the same data. We can't use the same protocol.
Ah.
The manpage I am looking at says:
If no argument is given, stat displays information about the file descriptor for standard input.
Quoted 7 lines
Here NetBSD has a better command line API than Linux - Linux requires pratting about with
/dev/stdinand NetBSD doesn't. So I think where on Linux we have
stat ..../dev/stdin
on NetBsd we can simply have
stat ....
with no filename argument.
Right, thanks. Then it would need to be done with 2 different calls but I don't think that's a problem (even with the linux version it would not be atomic anyway).
Quoted 4 lines
I think NetBSD's stat(1) also takes different argumnts to specify the format. NetBSD uses -f, whereas Linux uses -c. So the exact rune will have to be different.
Yes, and NetBSD doens't have %D (only %d)
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
Manuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 6 lines · Ian Jackson
Quoted 3 lines
I think NetBSD's stat(1) also takes different argumnts to specify the format. NetBSD uses -f, whereas Linux uses -c. So the exact rune will have to be different.
Yes, and NetBSD doens't have %D (only %d)
What's really important here is the inode number. But %d will do nicely. I only used %D on Linux since device numbers are two-element bitfields so displaying them in hex makes more sense to humans who might be debugging this.
Ian.
Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD
In reply to Manuel BouyerManuel Bouyer writes ("Re: [PATCH 05/24] Introduce locking functions for block device setup on NetBSD"):
Quoted 3 lines
Right, thanks. Then it would need to be done with 2 different calls but I don't think that's a problem (even with the linux version it would not be atomic anyway).
Sorry, I forgot to reply to this. Yes, it would need to invocations of stat(1). You are correct that the Linux version is not atomic in that sense.
Ian.
PATCH 6/24 Handle the case where vifname is not present in xenstore.
In reply to Manuel Bouyer--- tools/hotplug/NetBSD/vif-bridge | 5 ++++- tools/hotplug/NetBSD/vif-ip | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
tools/hotplug/NetBSD/vif-bridge +4 -1
@@ -23,7 +23,10 @@ case $xstatus in xbridge=$(xenstore-read "$xpath/bridge") xfid=$(xenstore-read "$xpath/frontend-id") xhandle=$(xenstore-read "$xpath/handle") - iface=$(xenstore-read "$xpath/vifname") + iface=$(xenstore-read "$xpath/vifname") || true + if [ x${iface} = "x" ] ; then + iface=xvif$xfid.$xhandle + fi ifconfig $iface up brconfig $xbridge add $iface xenstore-write $xpath/hotplug-status connected
tools/hotplug/NetBSD/vif-ip +4 -0
@@ -24,6 +24,10 @@ case $xstatus in xfid=$(xenstore-read "$xpath/frontend-id") xhandle=$(xenstore-read "$xpath/handle") iface=$(xenstore-read "$xpath/vifname") + iface=$(xenstore-read "$xpath/vifname") || true + if [ x${iface} = "x" ] ; then + iface=xvif$xfid.$xhandle + fi ifconfig $iface $xip up xenstore-write $xpath/hotplug-status connected exit 0
Signature · 1 line
2.28.0
Re: [PATCH 06/24] Handle the case where vifname is not present in xenstore.
Maybe it would be easier to just fix libxl to always set the vifname in xenstore?
FWIW, on FreeBSD I'm passing the vifname as an environment parameter to the script.
Thanks, Roger.
Re: [PATCH 06/24] Handle the case where vifname is not present in xenstore.
Quoted 5 lines · Roger Pau Monné
Maybe it would be easier to just fix libxl to always set the vifname in xenstore?
FWIW, on FreeBSD I'm passing the vifname as an environment parameter to the script.
Actually I don't know why the vifname is not always set. It may depend on the Xen version ...
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 7/24 Remove NetBSD's system headers. We'll use the system-provided ones, which are up to date.
In reply to Manuel Bouyer--- tools/include/Makefile | 2 +- tools/include/xen-sys/NetBSD/evtchn.h | 86 -------------------- tools/include/xen-sys/NetBSD/privcmd.h | 106 ------------------------- 3 files changed, 1 insertion(+), 193 deletions(-) delete mode 100644 tools/include/xen-sys/NetBSD/evtchn.h delete mode 100644 tools/include/xen-sys/NetBSD/privcmd.h
tools/include/Makefile +1 -1
@@ -68,7 +68,7 @@ install: all $(INSTALL_DATA) xen/foreign/*.h $(DESTDIR)$(includedir)/xen/foreign $(INSTALL_DATA) xen/hvm/*.h $(DESTDIR)$(includedir)/xen/hvm $(INSTALL_DATA) xen/io/*.h $(DESTDIR)$(includedir)/xen/io - $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys + $(INSTALL_DATA) xen/sys/*.h $(DESTDIR)$(includedir)/xen/sys || true $(INSTALL_DATA) xen/xsm/*.h $(DESTDIR)$(includedir)/xen/xsm .PHONY: uninstall
tools/include/xen-sys/NetBSD/evtchn.h deleted +0 -86
86 lines not on this page · raw message
tools/include/xen-sys/NetBSD/privcmd.h deleted +0 -106
106 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH 07/24] Remove NetBSD's system headers. We'll use the system-provided ones, which are up to date.
What would happen when a new device (or ioctl to and existing one) is added?
You would then run into issues of newer versions of Xen not building on older NetBSD systems, or would have to appropriately gate the newly added code to only be built when the headers are available.
Thanks, Roger.
Re: [PATCH 07/24] Remove NetBSD's system headers. We'll use the system-provided ones, which are up to date.
Quoted 6 lines · Roger Pau Monné
What would happen when a new device (or ioctl to and existing one) is added?
You would then run into issues of newer versions of Xen not building on older NetBSD systems, or would have to appropriately gate the newly added code to only be built when the headers are available.
I prefer to have the build fail if the system isn't new enough, than have it build and then fail to run. We already have version requirements for e.g. bug fixes.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 07/24] Remove NetBSD's system headers. We'll use the system-provided ones, which are up to date.
Quoted 11 lines · Manuel Bouyer
Quoted 6 lines · Roger Pau Monné
What would happen when a new device (or ioctl to and existing one) is added?
You would then run into issues of newer versions of Xen not building on older NetBSD systems, or would have to appropriately gate the newly added code to only be built when the headers are available.
I prefer to have the build fail if the system isn't new enough, than have it build and then fail to run. We already have version requirements for e.g. bug fixes.
We usually take a different approach for Linux and FreeBSD in order to support all kernels: test if the new ioctl is available, or else fallback to the old implementation. But this requires having the new header even on old systems in order to have the ioctl definition for the build, even if it's not implemented on the currently running kernel.
I guess you would have to use preprocessor conditionals in order to keep the build on older versions when adding the new features.
Roger.
Re: [PATCH 07/24] Remove NetBSD's system headers. We'll use the system-provided ones, which are up to date.
Quoted 9 lines · Roger Pau Monné
We usually take a different approach for Linux and FreeBSD in order to support all kernels: test if the new ioctl is available, or else fallback to the old implementation. But this requires having the new header even on old systems in order to have the ioctl definition for the build, even if it's not implemented on the currently running kernel.
I guess you would have to use preprocessor conditionals in order to keep the build on older versions when adding the new features.
Or just assume that version X of Xen needs version Y of NetBSD. This is already the case, because of bug fixes.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 8/24 Make libs/call build on NetBSD
In reply to Manuel Bouyer--- tools/libs/call/netbsd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
tools/libs/call/netbsd.c +10 -8
@@ -19,12 +19,14 @@* Split from xc_netbsd.c */ -#include "xc_private.h" #include <unistd.h> #include <fcntl.h> #include <malloc.h> +#include <errno.h> #include <sys/mman.h> +#include <sys/ioctl.h> +#include "private.h" int osdep_xencall_open (xencall_handle *xcall) {
@@ -69,12 +71,13 @@ int osdep_xencall_close(xencall_handle *xcall)return close (fd); } -void *osdep_alloc_hypercall_buffer (xencall_handle *xcall,size_t npages) +void *osdep_alloc_pages (xencall_handle *xcall,size_t npages) { -size_t size = npages *XC_PAGE_SIZE ; +size_t size = npages *PAGE_SIZE ;void *p; +int ret; - ret =posix_memalign (&p,XC_PAGE_SIZE , size); + ret =posix_memalign (&p,PAGE_SIZE , size);if ( ret !=0 || !p )return NULL ;
@@ -86,14 +89,13 @@ void *osdep_alloc_hypercall_buffer(xencall_handle *xcall, size_t npages)return p; } -void osdep_free_hypercall_buffer (xencall_handle *xcall,void *ptr, -size_t npages) +void osdep_free_pages (xencall_handle *xcall,void *ptr,size_t npages) { - (void )munlock (ptr, npages *XC_PAGE_SIZE ); + (void )munlock (ptr, npages *PAGE_SIZE );free (ptr); } -int do_xen_hypercall (xencall_handle *xcall,privcmd_hypercall_t *hypercall) +int osdep_hypercall (xencall_handle *xcall,privcmd_hypercall_t *hypercall) {int fd = xcall->fd;int error =ioctl (fd,IOCTL_PRIVCMD_HYPERCALL , hypercall);
Signature · 1 line
2.28.0
Re: [PATCH 08/24] Make libs/call build on NetBSD
LGTM.
Quoted 11 lines · Manuel Bouyer
--- tools/libs/call/netbsd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)tools/libs/call/netbsd.c +0
-0@@ -19,12 +19,14 @@* Split from xc_netbsd.c */
tools/libs/call/netbsd.c line 29
Quoted 10 lines
tools/libs/call/netbsd.c +3
-1-#include "xc_private.h" #include <unistd.h> #include <fcntl.h> #include <malloc.h> +#include <errno.h> #include <sys/mman.h> +#include <sys/ioctl.h> +#include "private.h"
Please leave a newline before including private.h.
Quoted 21 lines
tools/libs/call/netbsd.c +4
-3int osdep_xencall_open (xencall_handle *xcall) {@@ -69,12 +71,13 @@ int osdep_xencall_close(xencall_handle *xcall)return close (fd); } -void *osdep_alloc_hypercall_buffer (xencall_handle *xcall,size_t npages) +void *osdep_alloc_pages (xencall_handle *xcall,size_t npages) { -size_t size = npages *XC_PAGE_SIZE ; +size_t size = npages *PAGE_SIZE ;void *p; +int ret; - ret =posix_memalign (&p,XC_PAGE_SIZE , size); + ret =posix_memalign (&p,PAGE_SIZE , size);if ( ret !=0 || !p )return NULL ;
tools/libs/call/netbsd.c void *osdep_alloc_hypercall_buffer(xencall_handle *xcall, size_t npages) · line 94
Quoted 9 lines
tools/libs/call/netbsd.c +2
-3@@ -86,14 +89,13 @@ void *osdep_alloc_hypercall_buffer(xencall_handle *xcall, size_t npages)return p; } -void osdep_free_hypercall_buffer (xencall_handle *xcall,void *ptr, -size_t npages) +void osdep_free_pages (xencall_handle *xcall,void *ptr,size_t npages) { - (void )munlock (ptr, npages *XC_PAGE_SIZE ); + (void )munlock (ptr, npages *PAGE_SIZE );
I think you can drop the (void) cast here.
Thanks, Roger.
PATCH 9/24 Use xen/xenio.h on NetBSD
In reply to Manuel Bouyer--- tools/libs/call/private.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/libs/call/private.h +7 -1
@@ -7,13 +7,19 @@#include <xencall.h> #include <xen/xen.h> +#ifdef __NetBSD__ +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #ifndef PAGE_SHIFT /* Mini-os, Yukk */ #define PAGE_SHIFT 12#endif -#ifndef __MINIOS__/* Yukk */ +#ifndef PAGE_SIZE #define PAGE_SIZE (1UL << PAGE_SHIFT) +#endif +#ifndef PAGE_MASK #define PAGE_MASK (~(PAGE_SIZE-1))#endif
Signature · 1 line
2.28.0
PATCH 10/24 Make libs/evtchn build on NetBSD
In reply to Manuel Bouyer--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/libs/evtchn/netbsd.c +4 -4
@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)
@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;return port;
@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port)); }/*
Signature · 1 line
2.28.0
Re: [PATCH 10/24] Make libs/evtchn build on NetBSD
Quoted 31 lines · Manuel Bouyer
--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/evtchn/netbsd.c +3
-3@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;return port;
tools/libs/evtchn/netbsd.c xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) · line 143
Quoted 5 lines
tools/libs/evtchn/netbsd.c +1
-1@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port));
I'm afraid we will need some context as to why {read/write}_exact doesn't work here.
Thanks, Roger.
Re: [PATCH 10/24] Make libs/evtchn build on NetBSD
Quoted 30 lines · Roger Pau Monné
Quoted 29 lines · Manuel Bouyer
--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/evtchn/netbsd.c +3
-3@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;
Quoted 10 lines
tools/libs/evtchn/netbsd.c xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) · line 143
Quoted 7 lines
tools/libs/evtchn/netbsd.c +1
-1return port;@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port));I'm afraid we will need some context as to why {read/write}_exact doesn't work here.
It just doesn't exists on NetBSD
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 10/24] Make libs/evtchn build on NetBSD
Quoted 42 lines · Manuel Bouyer
Quoted 30 lines · Roger Pau Monné
Quoted 29 lines · Manuel Bouyer
--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/evtchn/netbsd.c +3
-3@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;Quoted 10 lines
tools/libs/evtchn/netbsd.c xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) · line 143
Quoted 7 lines
tools/libs/evtchn/netbsd.c +1
-1return port;@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port));I'm afraid we will need some context as to why {read/write}_exact doesn't work here.
Quoted 1 line
It just doesn't exists on NetBSD
But those are not part of libc or any external library, they are implemented in tools/libs/ctrl/xc_private.c and should be available to the NetBSD build AFAICT.
They are just helpers build on top of the standard read/write calls.
Roger.
Re: [PATCH 10/24] Make libs/evtchn build on NetBSD
Quoted 43 lines · Roger Pau Monné
Quoted 42 lines · Manuel Bouyer
Quoted 40 lines · Roger Pau Monné
Quoted 31 lines · Manuel Bouyer
--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/evtchn/netbsd.c +3
-3@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;return port;tools/libs/evtchn/netbsd.c xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) · line 143
Quoted 5 lines
tools/libs/evtchn/netbsd.c +1
-1@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port));I'm afraid we will need some context as to why {read/write}_exact doesn't work here.
Quoted 7 lines
Quoted 1 line
It just doesn't exists on NetBSD
But those are not part of libc or any external library, they are implemented in
tools/libs/ctrl/xc_private.cand should be available to the NetBSD build AFAICT.They are just helpers build on top of the standard read/write calls.
Yes, I misremembered (I have this patch for a long time, since 4.11 at last,
maybe even older).
Anyway the build fails with:netbsd.c: In function 'xenevtchn_pending':
netbsd.c:134:10: error: implicit declaration of function 'read_exact'; did you mean 'readlinkat'? [-Werror=implicit-function-declaration]
The only header where I see this function defined is tools/libs/ctrl/xc_private.h, so I would need something like #include "../../ctrl/xc_private.h"
but this doesn't look right.
I didn't find where other OSes are getting the prototype from (or maybe they just have this -Werror turned off ?)
Anyway I think NetBSD doesn't need this read_exact/write_exact thing, the underlying pseudo-device won't to partial read/write.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Roger Pau Monné
Reviewed-byRe: [PATCH 10/24] Make libs/evtchn build on NetBSD
Quoted 63 lines · Manuel Bouyer
Quoted 43 lines · Roger Pau Monné
Quoted 42 lines · Manuel Bouyer
Quoted 40 lines · Roger Pau Monné
Quoted 31 lines · Manuel Bouyer
--- tools/libs/evtchn/netbsd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/evtchn/netbsd.c +3
-3@@ -25,10 +25,10 @@#include <sys/ioctl.h> -#include <xen/sys/evtchn.h> -#include "private.h" +#include <xen/xenio3.h> +#define EVTCHN_DEV_NAME "/dev/xenevt"int osdep_evtchn_open (xenevtchn_handle *xce)@@ -131,7 +131,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int fd = xce->fd;evtchn_port_t port; -if (read_exact (fd, (char *)&port,sizeof (port)) ==-1 ) +if (read (fd, (char *)&port,sizeof (port)) ==-1 )return -1 ;return port;tools/libs/evtchn/netbsd.c xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce) · line 143
Quoted 5 lines
tools/libs/evtchn/netbsd.c +1
-1@@ -140,7 +140,7 @@ xenevtchn_port_or_error_t xenevtchn_pending(xenevtchn_handle *xce)int xenevtchn_unmask (xenevtchn_handle *xce,evtchn_port_t port) {int fd = xce->fd; -return write_exact (fd, (char *)&port,sizeof (port)); +return write (fd, (char *)&port,sizeof (port));I'm afraid we will need some context as to why {read/write}_exact doesn't work here.
Quoted 7 lines
Quoted 1 line
It just doesn't exists on NetBSD
But those are not part of libc or any external library, they are implemented in
tools/libs/ctrl/xc_private.cand should be available to the NetBSD build AFAICT.They are just helpers build on top of the standard read/write calls.
Yes, I misremembered (I have this patch for a long time, since 4.11 at last,
maybe even older).
Anyway the build fails with:netbsd.c: In function 'xenevtchn_pending':
netbsd.c:134:10: error: implicit declaration of function 'read_exact'; did you mean 'readlinkat'? [-Werror=implicit-function-declaration]The only header where I see this function defined is
tools/libs/ctrl/xc_private.h, so I would need something like #include "../../ctrl/xc_private.h"
but this doesn't look right.
Quoted 5 lines
I didn't find where other OSes are getting the prototype from (or maybe they just have this -Werror turned off ?)
Anyway I think NetBSD doesn't need this read_exact/write_exact thing, the underlying pseudo-device won't to partial read/write.
The usage of {read/write}_exact there is indeed a mistake, when the evtchn library was split from libxc no one realized that the {read/write}_exact where no longer available to that code.
Could you please add:
To the commit message?
And also:
Thanks, Roger.
PATCH 11/24 Implement foreignmemory on NetBSD
In reply to Manuel Bouyer--- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/foreignmemory/netbsd.c | 76 ++++++++++++++++++++++++++---- tools/libs/foreignmemory/private.h | 10 +++- 3 files changed, 75 insertions(+), 13 deletions(-)
tools/libs/foreignmemory/Makefile +1 -1
@@ -8,7 +8,7 @@ SRCS-y += core.c SRCS-$(CONFIG_Linux) += linux.c SRCS-$(CONFIG_FreeBSD) += freebsd.c SRCS-$(CONFIG_SunOS) += compat.c solaris.c -SRCS-$(CONFIG_NetBSD) += compat.c netbsd.c +SRCS-$(CONFIG_NetBSD) += netbsd.c SRCS-$(CONFIG_MiniOS) += minios.c include $(XEN_ROOT)/tools/libs/libs.mk
tools/libs/foreignmemory/netbsd.c +66 -10
106 lines not on this page · raw message
tools/libs/foreignmemory/private.h +8 -2
@@ -8,7 +8,13 @@#include <xentoolcore_internal.h> #include <xen/xen.h> + +#ifdef __NetBSD__ +#include <xen/xen.h> +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #ifndef PAGE_SHIFT /* Mini-os, Yukk */ #define PAGE_SHIFT 12
@@ -38,7 +44,7 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,#if defined(__NetBSD__) || defined(__sun__)/* Strictly compat for those two only only */ -void *compat_mapforeign_batch (xenforeignmem_handle *fmem,uint32_t dom, +void *osdep_map_foreign_batch (xenforeignmemory_handle *fmem,uint32_t dom,void *addr,int prot,int flags,xen_pfn_t *arr,int num);#endif
@@ -54,7 +60,7 @@ struct xenforeignmemory_resource_handle {int flags; }; -#ifndef __linux__ +#if !defined(__linux__) && !defined(__NetBSD__)static inline int osdep_xenforeignmemory_restrict (xenforeignmemory_handle *fmem,domid_t domid) {
Signature · 1 line
2.28.0
Re: [PATCH 11/24] Implement foreignmemory on NetBSD
Quoted 75 lines · Manuel Bouyer
--- tools/libs/foreignmemory/Makefile | 2 +- tools/libs/foreignmemory/netbsd.c | 76 ++++++++++++++++++++++++++---- tools/libs/foreignmemory/private.h | 10 +++- 3 files changed, 75 insertions(+), 13 deletions(-)tools/libs/foreignmemory/Makefile +1
-1@@ -8,7 +8,7 @@ SRCS-y += core.c SRCS-$(CONFIG_Linux) += linux.c SRCS-$(CONFIG_FreeBSD) += freebsd.c SRCS-$(CONFIG_SunOS) += compat.c solaris.c -SRCS-$(CONFIG_NetBSD) += compat.c netbsd.c +SRCS-$(CONFIG_NetBSD) += netbsd.c SRCS-$(CONFIG_MiniOS) += minios.c include $(XEN_ROOT)/tools/libs/libs.mktools/libs/foreignmemory/netbsd.c +14
-9@@ -19,7 +19,9 @@#include <unistd.h> #include <fcntl.h> +#include <errno.h> #include <sys/mman.h> +#include <sys/ioctl.h> #include "private.h" @@ -66,15 +68,17 @@ int osdep_xenforeignmemory_close(xenforeignmemory_handle *fmem)return close (fd); } -void *osdep_map_foreign_batch (xenforeignmem_handle *fmem,uint32_t dom, -void *addr,int prot,int flags, -xen_pfn_t *arr,int num) +void *osdep_xenforeignmemory_map (xenforeignmemory_handle *fmem, +uint32_t dom,void *addr, +int prot,int flags,size_t num, +const xen_pfn_t arr[/*num*/ ],int err[/*num*/ ]) + {int fd = fmem->fd; -privcmd_mmapbatch_t ioctlx; - addr =mmap (addr, num*XC_PAGE_SIZE , prot, flags |MAP_ANON |MAP_SHARED ,-1 ,0 ); +privcmd_mmapbatch_v2_t ioctlx; + addr =mmap (addr, num*PAGE_SIZE , prot, flags |MAP_ANON |MAP_SHARED ,-1 ,0 );if ( addr ==MAP_FAILED ) { -PERROR ("osdep_map_foreign_batch: mmap failed" ); +PERROR ("osdep_xenforeignmemory_map: mmap failed" );return NULL ; }@@ -82,11 +86,12 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, ioctlx.dom=dom; ioctlx.addr=(unsigned long )addr; ioctlx.arr=arr; -if (ioctl (fd,IOCTL_PRIVCMD_MMAPBATCH , &ioctlx) <0 ) + ioctlx.err=err; +if (ioctl (fd,IOCTL_PRIVCMD_MMAPBATCH_V2 , &ioctlx) <0 ) {int saved_errno = errno; -PERROR ("osdep_map_foreign_batch: ioctl failed" ); - (void )munmap (addr, num*XC_PAGE_SIZE ); +PERROR ("osdep_xenforeignmemory_map: ioctl failed" ); + (void )munmap (addr, num*PAGE_SIZE ); errno = saved_errno;return NULL ; }@@ -97,7 +102,58 @@ void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
tools/libs/foreignmemory/netbsd.c void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, · line 111
Quoted 10 lines
tools/libs/foreignmemory/netbsd.c +7
-1void *addr, size_t num) { -return munmap (addr, num*XC_PAGE_SIZE ); +return munmap (addr, num*PAGE_SIZE ); +} + +int osdep_xenforeignmemory_restrict (xenforeignmemory_handle *fmem, +domid_t domid) +{ +return 0 ;
Returning 0 here is wrong, since you are not implementing it. You should return -1 and set errno to EOPNOTSUPP.
Quoted 23 lines
tools/libs/foreignmemory/netbsd.c +23
-0+} + +int osdep_xenforeignmemory_unmap_resource ( +xenforeignmemory_handle *fmem,xenforeignmemory_resource_handle *fres) +{ +return fres ?munmap (fres->addr, fres->nr_frames <<PAGE_SHIFT ) :0 ; +} + +int osdep_xenforeignmemory_map_resource ( +xenforeignmemory_handle *fmem,xenforeignmemory_resource_handle *fres) +{ +privcmd_mmap_resource_t mr = { + .dom = fres->domid, + .type = fres->type, + .id = fres->id, + .idx = fres->frame, + .num = fres->nr_frames, + }; +int rc; + + fres->addr =mmap (fres->addr, fres->nr_frames <<PAGE_SHIFT , + fres->prot, fres->flags |MAP_ANON |MAP_SHARED ,-1 ,0 ); +if ( fres->addr ==MAP_FAILED )
tools/libs/foreignmemory/netbsd.c void *osdep_map_foreign_batch(xenforeignmem_handle *fmem, uint32_t dom, · line 144
Quoted 10 lines
tools/libs/foreignmemory/netbsd.c +10
-0+return -1 ; + + mr.addr = (uintptr_t )fres->addr; + + rc =ioctl (fmem->fd,IOCTL_PRIVCMD_MMAP_RESOURCE , &mr); +if ( rc ) + { +int saved_errno; + +if ( errno != fmem->unimpl_errno && errno !=EOPNOTSUPP )
Maybe this is set in another patch, but I don't seem to spot where fmem->unimpl_errno is set on NetBSD (seems to be set only for Linux AFAICT).
Quoted 34 lines
tools/libs/foreignmemory/netbsd.c +12
-0+PERROR ("ioctl failed" ); + else + errno =EOPNOTSUPP ; + + saved_errno = errno; + (void )osdep_xenforeignmemory_unmap_resource (fmem, fres); + errno = saved_errno; + +return -1 ; + } + +return 0 ; }/* tools/libs/foreignmemory/private.h +6
-0@@ -8,7 +8,13 @@#include <xentoolcore_internal.h> #include <xen/xen.h> + +#ifdef __NetBSD__ +#include <xen/xen.h> +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #ifndef PAGE_SHIFT /* Mini-os, Yukk */ #define PAGE_SHIFT 12
tools/libs/foreignmemory/private.h int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, · line 49
Quoted 7 lines
tools/libs/foreignmemory/private.h +1
-1@@ -38,7 +44,7 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,#if defined(__NetBSD__) || defined(__sun__)/* Strictly compat for those two only only */ -void *compat_mapforeign_batch (xenforeignmem_handle *fmem,uint32_t dom, +void *osdep_map_foreign_batch (xenforeignmemory_handle *fmem,uint32_t dom,void *addr,int prot,int flags,xen_pfn_t *arr,int num);
You will have to split this into NetBSD and Solaris variants now if this is really required, but AFAICT you replace osdep_map_foreign_batch with osdep_xenforeignmemory_map, so this prototype is stale?
Also a little bit below these prototypes are the dummy implementations of osdep_xenforeignmemory_restrict, osdep_xenforeignmemory_map_resource and osdep_xenforeignmemory_unmap_resource. I think you at least need to modify the condition below so that on NetBSD the dummy inlines are not used?
Thanks, Roger.
Re: [PATCH 11/24] Implement foreignmemory on NetBSD
Quoted 21 lines · Roger Pau Monné
[...]
Quoted 20 lines
tools/libs/foreignmemory/private.h +6
-0@@ -8,7 +8,13 @@#include <xentoolcore_internal.h> #include <xen/xen.h> + +#ifdef __NetBSD__ +#include <xen/xen.h> +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #ifndef PAGE_SHIFT /* Mini-os, Yukk */ #define PAGE_SHIFT 12@@ -38,7 +44,7 @@ int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem,
Quoted 11 lines
tools/libs/foreignmemory/private.h int osdep_xenforeignmemory_unmap(xenforeignmemory_handle *fmem, · line 49
Quoted 6 lines
tools/libs/foreignmemory/private.h +1
-1#if defined(__NetBSD__) || defined(__sun__)/* Strictly compat for those two only only */ -void *compat_mapforeign_batch (xenforeignmem_handle *fmem,uint32_t dom, +void *osdep_map_foreign_batch (xenforeignmemory_handle *fmem,uint32_t dom,void *addr,int prot,int flags,xen_pfn_t *arr,int num);You will have to split this into NetBSD and Solaris variants now if this is really required, but AFAICT you replace
osdep_map_foreign_batchwithosdep_xenforeignmemory_map, so this prototype is stale?
I think on solaris too, compat_mapforeign_batch() has to be changed to osdep_map_foreign_batch() as compat.c and solaris.c has something called osdep_map_foreign_batch(), but nothing defines compat_mapforeign_batch(). Looks like a rename that missed private.h
Indeed osdep_map_foreign_batch() should not be needed on NetBSD now
Quoted 7 lines
Also a little bit below these prototypes are the dummy implementations of
osdep_xenforeignmemory_restrict,osdep_xenforeignmemory_map_resourceandosdep_xenforeignmemory_unmap_resource. I think you at least need to modify the condition below so that on NetBSD the dummy inlines are not used?
This is !defined(__NetBSD__) so it should not be used ?
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 11/24] Implement foreignmemory on NetBSD
Quoted 9 lines · Manuel Bouyer
Quoted 6 lines · Roger Pau Monné
Also a little bit below these prototypes are the dummy implementations of
osdep_xenforeignmemory_restrict,osdep_xenforeignmemory_map_resourceandosdep_xenforeignmemory_unmap_resource. I think you at least need to modify the condition below so that on NetBSD the dummy inlines are not used?This is !defined(__NetBSD__) so it should not be used ?
Right, I think I somehow overlooked that part of the patch. You are indeed tweaking the define so it should be fine.
Thanks, Roger.
PATCH 12/24 Implement gnttab on NetBSD
In reply to Manuel Bouyer--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.c
tools/libs/gnttab/Makefile +1 -1
@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.c include $(XEN_ROOT)/tools/libs/libs.mk
tools/libs/gnttab/netbsd.c new file +267 -0
267 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH 12/24] Implement gnttab on NetBSD
Might need some kind of log message, and will also required your Signed-off-by (or from the original author of the patch).
tools/libs/gnttab/netbsd.c
Quoted 24 lines · Manuel Bouyer
--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.ctools/libs/gnttab/Makefile +1
-1@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.c include $(XEN_ROOT)/tools/libs/libs.mktools/libs/gnttab/netbsd.c new file +0
-0
I think this is mostly (if not equal) to the FreeBSD version, in which case we could rename freebsd.c to plain bsd.c and use it for both FreeBSD and NetBSD?
Thanks, Roger.
Re: [PATCH 12/24] Implement gnttab on NetBSD
Quoted 22 lines · Roger Pau Monné
Might need some kind of log message, and will also required your Signed-off-by (or from the original author of the patch).
Quoted 18 lines · Manuel Bouyer
--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.ctools/libs/gnttab/Makefile +1
-1@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.c
Quoted 10 lines
tools/libs/gnttab/netbsd.c
Quoted 6 lines
tools/libs/gnttab/Makefile +0
-0include $(XEN_ROOT)/tools/libs/libs.mktools/libs/gnttab/netbsd.c new file +0
-0I think this is mostly (if not equal) to the FreeBSD version, in which case we could rename
freebsd.cto plainbsd.cand use it for both FreeBSD and NetBSD?
I can't see why they won't diverge in the future ... I prefer to keep them separate.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 12/24] Implement gnttab on NetBSD
Quoted 34 lines · Manuel Bouyer
Quoted 22 lines · Roger Pau Monné
Might need some kind of log message, and will also required your Signed-off-by (or from the original author of the patch).
Quoted 18 lines · Manuel Bouyer
--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.ctools/libs/gnttab/Makefile +1
-1@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.cQuoted 10 lines
tools/libs/gnttab/netbsd.c
Quoted 6 lines
tools/libs/gnttab/Makefile +0
-0include $(XEN_ROOT)/tools/libs/libs.mktools/libs/gnttab/netbsd.c new file +0
-0I think this is mostly (if not equal) to the FreeBSD version, in which case we could rename
freebsd.cto plainbsd.cand use it for both FreeBSD and NetBSD?
Quoted 1 line
I can't see why they won't diverge in the future ...
True, but then let's diverge when we have to cross that bridge I would say.
There's IMO no point in having two verbatim copies of the same code in different places, it's just more churn to maintain and to remember to apply duplicate fixes.
Roger.
Re: [PATCH 12/24] Implement gnttab on NetBSD
Quoted 35 lines · Roger Pau Monné
Quoted 34 lines · Manuel Bouyer
Quoted 32 lines · Roger Pau Monné
Might need some kind of log message, and will also required your Signed-off-by (or from the original author of the patch).
tools/libs/gnttab/netbsd.c
Quoted 24 lines · Manuel Bouyer
--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.ctools/libs/gnttab/Makefile +1
-1@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.c include $(XEN_ROOT)/tools/libs/libs.mktools/libs/gnttab/netbsd.c new file +0
-0I think this is mostly (if not equal) to the FreeBSD version, in which case we could rename
freebsd.cto plainbsd.cand use it for both FreeBSD and NetBSD?
Quoted 8 lines
Quoted 1 line
I can't see why they won't diverge in the future ...
True, but then let's diverge when we have to cross that bridge I would say.
There's IMO no point in having two verbatim copies of the same code in different places, it's just more churn to maintain and to remember to apply duplicate fixes.
Actually I just checked, the files are quite different, because the GNTTAB ioctls are not the same, and it seems they don't work the same way either. FreeBSD does mmap against the gnttab device; this is not supported on NetBSD. Merging the two would cause an #ifdef maze.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 12/24] Implement gnttab on NetBSD
Quoted 41 lines · Manuel Bouyer
Quoted 40 lines · Roger Pau Monné
Quoted 34 lines · Manuel Bouyer
Quoted 22 lines · Roger Pau Monné
Might need some kind of log message, and will also required your Signed-off-by (or from the original author of the patch).
Quoted 18 lines · Manuel Bouyer
--- tools/libs/gnttab/Makefile | 2 +- tools/libs/gnttab/netbsd.c | 267 +++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 tools/libs/gnttab/netbsd.ctools/libs/gnttab/Makefile +1
-1@@ -10,7 +10,7 @@ SRCS-GNTSHR += gntshr_core.c SRCS-$(CONFIG_Linux) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) linux.c SRCS-$(CONFIG_MiniOS) += $(SRCS-GNTTAB) gntshr_unimp.c minios.c SRCS-$(CONFIG_FreeBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) freebsd.c +SRCS-$(CONFIG_NetBSD) += $(SRCS-GNTTAB) $(SRCS-GNTSHR) netbsd.c SRCS-$(CONFIG_SunOS) += gnttab_unimp.c gntshr_unimp.c -SRCS-$(CONFIG_NetBSD) += gnttab_unimp.c gntshr_unimp.cQuoted 10 lines
tools/libs/gnttab/netbsd.c
Quoted 6 lines
tools/libs/gnttab/Makefile +0
-0include $(XEN_ROOT)/tools/libs/libs.mktools/libs/gnttab/netbsd.c new file +0
-0I think this is mostly (if not equal) to the FreeBSD version, in which case we could rename
freebsd.cto plainbsd.cand use it for both FreeBSD and NetBSD?Quoted 1 line
I can't see why they won't diverge in the future ...
True, but then let's diverge when we have to cross that bridge I would say.
Quoted 8 lines
Quoted 3 lines
There's IMO no point in having two verbatim copies of the same code in different places, it's just more churn to maintain and to remember to apply duplicate fixes.
Actually I just checked, the files are quite different, because the GNTTAB ioctls are not the same, and it seems they don't work the same way either. FreeBSD does mmap against the gnttab device; this is not supported on NetBSD. Merging the two would cause an #ifdef maze.
Ack, my bad. Then it's fine. I got to think they where the same by the copyright message.
Thanks, Roger.
PATCH 13/24 Don't assume tv_sec is a unsigned long (for NetBSD)
In reply to Manuel Bouyer--- tools/libs/light/libxl_create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tools/libs/light/libxl_create.c +4 -4
@@ -496,7 +496,7 @@ int libxl__domain_build(libxl__gc *gc, vments[2 ] ="image/ostype" ; vments[3 ] ="hvm" ; vments[4 ] ="start_time" ; - vments[5 ] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[5 ] =GCSPRINTF ("%jd.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); localents =libxl__calloc (gc,13 ,sizeof (char *)); i =0 ;
@@ -535,7 +535,7 @@ int libxl__domain_build(libxl__gc *gc, vments[i++] ="image/kernel" ; vments[i++] = (char *) state->pv_kernel.path; vments[i++] ="start_time" ; - vments[i++] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[i++] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );if (state->pv_ramdisk.path) { vments[i++] ="image/ramdisk" ; vments[i++] = (char *) state->pv_ramdisk.path;
@@ -1502,7 +1502,7 @@ static void domcreate_stream_done(libxl__egc *egc, vments[2 ] ="image/ostype" ; vments[3 ] ="hvm" ; vments[4 ] ="start_time" ; - vments[5 ] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[5 ] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );break ;case LIBXL_DOMAIN_TYPE_PV : vments =libxl__calloc (gc,11 ,sizeof (char *));
@@ -1512,7 +1512,7 @@ static void domcreate_stream_done(libxl__egc *egc, vments[i++] ="image/kernel" ; vments[i++] = (char *) state->pv_kernel.path; vments[i++] ="start_time" ; - vments[i++] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[i++] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );if (state->pv_ramdisk.path) { vments[i++] ="image/ramdisk" ; vments[i++] = (char *) state->pv_ramdisk.path;
Signature · 1 line
2.28.0
Re: [PATCH 13/24] Don't assume tv_sec is a unsigned long (for NetBSD)
Quoted 9 lines · Manuel Bouyer
--- tools/libs/light/libxl_create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/light/libxl_create.c +0
-0
tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 499
Quoted 5 lines
tools/libs/light/libxl_create.c +1
-1@@ -496,7 +496,7 @@ int libxl__domain_build(libxl__gc *gc, vments[2 ] ="image/ostype" ; vments[3 ] ="hvm" ; vments[4 ] ="start_time" ; - vments[5 ] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[5 ] =GCSPRINTF ("%jd.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 );
You don't cast tv_sec to intmax_t here...
tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 538
Quoted 9 lines
tools/libs/light/libxl_create.c +1
-1localents =libxl__calloc (gc,13 ,sizeof (char *)); i =0 ;@@ -535,7 +535,7 @@ int libxl__domain_build(libxl__gc *gc, vments[i++] ="image/kernel" ; vments[i++] = (char *) state->pv_kernel.path; vments[i++] ="start_time" ; - vments[i++] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[i++] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );
... yet you do it here. I think the first occurrence is missing the cast?
Thanks, Roger.
Re: [PATCH 13/24] Don't assume tv_sec is a unsigned long (for NetBSD)
Quoted 19 lines · Roger Pau Monné
Quoted 9 lines · Manuel Bouyer
--- tools/libs/light/libxl_create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/light/libxl_create.c +0
-0tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 499
Quoted 5 lines
tools/libs/light/libxl_create.c +1
-1@@ -496,7 +496,7 @@ int libxl__domain_build(libxl__gc *gc, vments[2 ] ="image/ostype" ; vments[3 ] ="hvm" ; vments[4 ] ="start_time" ; - vments[5 ] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[5 ] =GCSPRINTF ("%jd.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 );You don't cast
tv_sectointmax_there...Quoted 1 line
Quoted 11 lines
tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 538
Quoted 8 lines
localents = libxl__calloc(gc, 13, sizeof(char *)); i = 0;tools/libs/light/libxl_create.c +1
-1@@ -535,7 +535,7 @@ int libxl__domain_build(libxl__gc *gc, vments[i++] ="image/kernel" ; vments[i++] = (char *) state->pv_kernel.path; vments[i++] ="start_time" ; - vments[i++] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[i++] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );... yet you do it here. I think the first occurrence is missing the cast?
thanks, fixed.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Roger Pau Monné
Reviewed-byRe: [PATCH 13/24] Don't assume tv_sec is a unsigned long (for NetBSD)
Quoted 32 lines · Manuel Bouyer
Quoted 19 lines · Roger Pau Monné
Quoted 9 lines · Manuel Bouyer
--- tools/libs/light/libxl_create.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)tools/libs/light/libxl_create.c +0
-0tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 499
Quoted 5 lines
tools/libs/light/libxl_create.c +1
-1@@ -496,7 +496,7 @@ int libxl__domain_build(libxl__gc *gc, vments[2 ] ="image/ostype" ; vments[3 ] ="hvm" ; vments[4 ] ="start_time" ; - vments[5 ] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[5 ] =GCSPRINTF ("%jd.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 );You don't cast
tv_sectointmax_there...Quoted 1 line
Quoted 11 lines
tools/libs/light/libxl_create.c int libxl__domain_build(libxl__gc *gc, · line 538
Quoted 8 lines
localents = libxl__calloc(gc, 13, sizeof(char *)); i = 0;tools/libs/light/libxl_create.c +1
-1@@ -535,7 +535,7 @@ int libxl__domain_build(libxl__gc *gc, vments[i++] ="image/kernel" ; vments[i++] = (char *) state->pv_kernel.path; vments[i++] ="start_time" ; - vments[i++] =GCSPRINTF ("%lu.%02d" , start_time.tv_sec,(int )start_time.tv_usec/10000 ); + vments[i++] =GCSPRINTF ("%jd.%02d" , (intmax_t )start_time.tv_sec,(int )start_time.tv_usec/10000 );... yet you do it here. I think the first occurrence is missing the cast?
Quoted 1 line
thanks, fixed.
Add my:
Then.
Thanks, Roger.
PATCH 14/24 Pass bridge name to qemu and set XEN_DOMAIN_ID
In reply to Manuel BouyerPass bridge name to qemu
When starting qemu, set an environnement variable XEN_DOMAIN_ID, to be used by qemu helper scripts
--- tools/libs/light/libxl_dm.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
tools/libs/light/libxl_dm.c +10 -0
@@ -761,6 +761,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,int nr_set_cpus =0 ;char *s; +static char buf[12 ]; +snprintf (buf,sizeof (buf),"%d" , domid); +flexarray_append_pair (dm_envs,"XEN_DOMAIN_ID" , buf); +if (b_info->kernel) {LOGD (ERROR , domid,"HVM direct kernel boot is not supported by " "qemu-xen-traditional" );
@@ -1547,8 +1551,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,flexarray_append (dm_args,"-netdev" );flexarray_append (dm_args,GCSPRINTF ("type=tap,id=net%d,ifname=%s," +"br=%s," "script=%s,downscript=%s" , nics[i].devid, ifname, + nics[i].bridge,libxl_tapif_script (gc),libxl_tapif_script (gc)));
@@ -1825,6 +1831,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc,flexarray_append (dm_args,GCSPRINTF ("%" PRId64, ram_size));if (b_info->type ==LIBXL_DOMAIN_TYPE_HVM ) { +static char buf[12 ]; +snprintf (buf,sizeof (buf),"%d" , guest_domid); +flexarray_append_pair (dm_envs,"XEN_DOMAIN_ID" , buf); +if (b_info->u.hvm.hdtype ==LIBXL_HDTYPE_AHCI )flexarray_append_pair (dm_args,"-device" ,"ahci,id=ahci0" );for (i =0 ; i < num_disks; i++) {
Signature · 1 line
2.28.0
Re: [PATCH 14/24] Pass bridge name to qemu and set XEN_DOMAIN_ID
Quoted 3 lines · Manuel Bouyer
Pass bridge name to qemu
When starting qemu, set an environnement variableXEN_DOMAIN_ID, to be used by qemu helper scripts
This one is not NetBSD related, I should have sent is as a separate git mail ... I guess (i'm not familiar with git, sorry).
But I think it can be usefull for the comunity.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 14/24] Pass bridge name to qemu and set XEN_DOMAIN_ID
In reply to Manuel BouyerQuoted 3 lines · Manuel Bouyer
Pass bridge name to qemu
When starting qemu, set an environnement variableXEN_DOMAIN_ID, to be used by qemu helper scripts
NetBSD is the only one to use QEMU nic scripts, both FreeBSD and Linux don't use up/down scripts with QEMU.
Quoted 9 lines
--- tools/libs/light/libxl_dm.c | 10 ++++++++++ 1 file changed, 10 insertions(+)tools/libs/light/libxl_dm.c +0
-0
tools/libs/light/libxl_dm.c static int libxl__build_device_model_args_old(libxl__gc *gc, · line 766
Quoted 6 lines
tools/libs/light/libxl_dm.c +3
-0@@ -761,6 +761,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,int nr_set_cpus =0 ;char *s; +static char buf[12 ]; +snprintf (buf,sizeof (buf),"%d" , domid); +flexarray_append_pair (dm_envs,"XEN_DOMAIN_ID" , buf);
Indentation, here and below.
Also just use:
flexarray_append_pair(dm_envs, "XEN_DOMAIN_ID",
GCSPRINTF("%d", domid);Here and below.
Thanks, Roger.
Re: [PATCH 14/24] Pass bridge name to qemu and set XEN_DOMAIN_ID
Quoted 7 lines · Roger Pau Monné
Quoted 3 lines · Manuel Bouyer
Pass bridge name to qemu
When starting qemu, set an environnement variableXEN_DOMAIN_ID, to be used by qemu helper scriptsNetBSD is the only one to use QEMU nic scripts, both FreeBSD and Linux don't use up/down scripts with QEMU.
I think the scripts are more flexible though; they can be hacked for local needs ...
Quoted 19 lines
Quoted 10 lines
--- tools/libs/light/libxl_dm.c | 10 ++++++++++ 1 file changed, 10 insertions(+)tools/libs/light/libxl_dm.c +0
-0tools/libs/light/libxl_dm.c static int libxl__build_device_model_args_old(libxl__gc *gc, · line 766
Quoted 6 lines
tools/libs/light/libxl_dm.c +3
-0@@ -761,6 +761,10 @@ static int libxl__build_device_model_args_old(libxl__gc *gc,int nr_set_cpus =0 ;char *s; +static char buf[12 ]; +snprintf (buf,sizeof (buf),"%d" , domid); +flexarray_append_pair (dm_envs,"XEN_DOMAIN_ID" , buf);Indentation, here and below.
Quoted 6 lines
Also just use:
flexarray_append_pair(dm_envs, "
XEN_DOMAIN_ID",GCSPRINTF("%d", domid);Here and below.
fixed, thanks
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 15/24 Make libs/light build on NetBSD
In reply to Manuel Bouyer--- tools/libs/light/libxl_dm.c | 9 +++++++++ 1 file changed, 9 insertions(+)
tools/libs/light/libxl_dm.c +9 -0
@@ -3659,6 +3659,14 @@ static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms,LOGD (DEBUG , domid,"DM reaper: calling setresuid(%d, %d, 0)" , reaper_uid, dm_kill_uid); +#ifdef __NetBSD__ + r =setuid (dm_kill_uid); +if (r) { +LOGED (ERROR , domid,"setuid to %d" , dm_kill_uid); + rc = rc ?:ERROR_FAIL ; + goto out; + } +#else /* __NetBSD__ */ r =setresuid (reaper_uid, dm_kill_uid,0 );if (r) { LOGED(ERROR, domid, "setresuid to (%d, %d, 0)",
@@ -3666,6 +3674,7 @@ static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms, rc = rc ?:ERROR_FAIL ; goto out; } +#endif /* __NetBSD__ */ /* * And kill everyone but me.
Signature · 1 line
2.28.0
Re: [PATCH 15/24] Make libs/light build on NetBSD
tools/libs/light/libxl_dm.c static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms, · line 3660
Quoted 11 lines · Manuel Bouyer
--- tools/libs/light/libxl_dm.c | 9 +++++++++ 1 file changed, 9 insertions(+)tools/libs/light/libxl_dm.c +0
-0@@ -3659,6 +3659,14 @@ static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms, LOGD(DEBUG, domid, "DM reaper: calling setresuid(%d, %d, 0)",
For correctness you should change this log message also on NetBSD.
Quoted 13 lines
tools/libs/light/libxl_dm.c +8
-0reaper_uid, dm_kill_uid); +#ifdef __NetBSD__ + r =setuid (dm_kill_uid); +if (r) { +LOGED (ERROR , domid,"setuid to %d" , dm_kill_uid); + rc = rc ?:ERROR_FAIL ; + goto out; + } +#else /* __NetBSD__ */ r =setresuid (reaper_uid, dm_kill_uid,0 );if (r) { LOGED(ERROR, domid, "setresuid to (%d, %d, 0)",
tools/libs/light/libxl_dm.c static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms, · line 3677
Quoted 4 lines
tools/libs/light/libxl_dm.c +1
-0@@ -3666,6 +3674,7 @@ static int kill_device_model_uid_child(libxl__destroy_devicemodel_state *ddms, rc = rc ?:ERROR_FAIL ; goto out; } +#endif /* __NetBSD__ */
Instead of adding this NetBSD specific bodge here I would add a test for setresuid in tools/configure.ac using AC_CHECK_FUNCS and use the result from that. Then if/when NetBSD implements setresuid the switch will be done transparently.
Thanks, Roger.
PATCH 16/24 Switch NetBSD to QEMU_XEN (!traditional)
In reply to Manuel Bouyer--- tools/libs/light/libxl_netbsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/libs/light/libxl_netbsd.c +1 -1
@@ -110,7 +110,7 @@ out:libxl_device_model_version libxl__default_device_model (libxl__gc *gc) { -return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL ; +return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN ; }int libxl__pci_numdevs (libxl__gc *gc)
Signature · 1 line
2.28.0
Re: [PATCH 16/24] Switch NetBSD to QEMU_XEN (!traditional)
Quoted 9 lines · Manuel Bouyer
--- tools/libs/light/libxl_netbsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/libs/light/libxl_netbsd.c +0
-0
tools/libs/light/libxl_netbsd.c out: · line 114
Quoted 6 lines
tools/libs/light/libxl_netbsd.c +1
-1@@ -110,7 +110,7 @@ out:libxl_device_model_version libxl__default_device_model (libxl__gc *gc) { -return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL ; +return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN ; }
All libxl supported OSes will now be using upstream QEMU as default, maybe it's best to just move libxl__default_device_model into libxl_dm.c instead of having 3 equal copies in OS specific files.
Thanks, Roger.
Re: [PATCH 16/24] Switch NetBSD to QEMU_XEN (!traditional)
Quoted 11 lines · Roger Pau Monné
Quoted 10 lines · Manuel Bouyer
--- tools/libs/light/libxl_netbsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/libs/light/libxl_netbsd.c +0
-0@@ -110,7 +110,7 @@ out:
Quoted 9 lines
tools/libs/light/libxl_netbsd.c out: · line 114
Quoted 5 lines
tools/libs/light/libxl_netbsd.c +1
-1libxl_device_model_version libxl__default_device_model (libxl__gc *gc) { -return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL ; +return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN ; }All libxl supported OSes will now be using upstream QEMU as default, maybe it's best to just move
libxl__default_device_modelintolibxl_dm.cinstead of having 3 equal copies in OS specific files.
I guess it would be better, yes. But I'll let the Xen developpers decide :)
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 17/24 Make libs/light build on NetBSD
In reply to Manuel Bouyer--- tools/libs/light/libxl_uuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/libs/light/libxl_uuid.c +2 -2
@@ -82,7 +82,7 @@ void libxl_uuid_generate(libxl_uuid *uuid)uuid_enc_be (uuid->uuid, &nat_uuid); } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__)int libxl_uuid_from_string (libxl_uuid *uuid,const char *in) {uint32_t status;
@@ -120,7 +120,7 @@ void libxl_uuid_clear(libxl_uuid *uuid)memset (&uuid->uuid,0 ,sizeof (uuid->uuid)); } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__)int libxl_uuid_compare (const libxl_uuid *uuid1,const libxl_uuid *uuid2) {uuid_t nat_uuid1, nat_uuid2;
Signature · 1 line
2.28.0
Re: [PATCH 17/24] Make libs/light build on NetBSD
There's already a patch with the same subject in the series. I would recommend to be a bit more specific with the fixes, specally if there's no log message. This for example would better be:
tools/libxl: fix uuid build on NetBSD
Quoted 18 lines · Manuel Bouyer
--- tools/libs/light/libxl_uuid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)tools/libs/light/libxl_uuid.c +1
-1@@ -82,7 +82,7 @@ void libxl_uuid_generate(libxl_uuid *uuid)uuid_enc_be (uuid->uuid, &nat_uuid); } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__)int libxl_uuid_from_string (libxl_uuid *uuid,const char *in) {uint32_t status;
tools/libs/light/libxl_uuid.c void libxl_uuid_clear(libxl_uuid *uuid) · line 123
Quoted 5 lines
tools/libs/light/libxl_uuid.c +1
-1@@ -120,7 +120,7 @@ void libxl_uuid_clear(libxl_uuid *uuid)memset (&uuid->uuid,0 ,sizeof (uuid->uuid)); } -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__)
There's no need to add NetBSD here, just remove the #ifdef altogether and the content of the #else branch, since this section is already only for FreeBSD and NetBSD (the #else variant was only used by NetBSD, see the #elif defined(__FreeBSD__) || defined(__NetBSD__) up on the file).
Thanks, Roger.
PATCH 18/24 xeneventchn_stubs.c doens't need xen/sys/evtchn.h (NetBSD fix)
In reply to Manuel Bouyer--- tools/ocaml/libs/eventchn/xeneventchn_stubs.c | 1 - 1 file changed, 1 deletion(-)
tools/ocaml/libs/eventchn/xeneventchn_stubs.c +0 -1
@@ -22,7 +22,6 @@#include <stdint.h> #include <sys/ioctl.h> #include <xen/xen.h> -#include <xen/sys/evtchn.h> #include <xenevtchn.h> #define CAML_NAME_SPACE
Signature · 1 line
2.28.0
Re: [PATCH 18/24] xeneventchn_stubs.c doens't need xen/sys/evtchn.h (NetBSD fix)
If it builds on other OSes:
Subject would better be:
tools/evtchn: remove unneeded evtchn.h include
Thanks, Roger.
PATCH 19/24 errno may not be a gobal R/W variable, use a local variable instead (fix build on NetBSD)
In reply to Manuel Bouyer--- tools/xenpaging/xenpaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/xenpaging/xenpaging.c +3 -2
@@ -180,10 +180,11 @@ static int xenpaging_get_tot_pages(struct xenpaging *paging)static void *init_page (void ) {void *buffer; +int rc;/* Allocated page memory */ - errno =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); -if ( errno !=0 ) + rc =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); +if ( rc !=0 )return NULL ;/* Lock buffer in memory so it can't be paged out */
Signature · 1 line
2.28.0
Re: [PATCH 19/24] errno may not be a gobal R/W variable, use a local variable instead (fix build on NetBSD)
Quoted 9 lines · Manuel Bouyer
--- tools/xenpaging/xenpaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)tools/xenpaging/xenpaging.c +0
-0
tools/xenpaging/xenpaging.c static int xenpaging_get_tot_pages(struct xenpaging *paging) · line 187
Quoted 10 lines
tools/xenpaging/xenpaging.c +3
-2@@ -180,10 +180,11 @@ static int xenpaging_get_tot_pages(struct xenpaging *paging)static void *init_page (void ) {void *buffer; +int rc;/* Allocated page memory */ - errno =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); -if ( errno !=0 ) + rc =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); +if ( rc !=0 )
I think the point of setting errno here is because posix_memalign doesn't set it and instead returns an error code. The caller of init_page uses PERROR in order to print the error which his expected to be in errno.
I don't think this is the only place in Xen code that errno is set, why are the others fine but not this instance?
Thanks, Roger.
Re: [PATCH 19/24] errno may not be a gobal R/W variable, use a local variable instead (fix build on NetBSD)
Quoted 15 lines · Roger Pau Monné
Quoted 14 lines · Manuel Bouyer
--- tools/xenpaging/xenpaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)tools/xenpaging/xenpaging.c +1
-0@@ -180,10 +180,11 @@ static int xenpaging_get_tot_pages(struct xenpaging *paging)static void *init_page (void ) {void *buffer; +int rc;
Quoted 10 lines
tools/xenpaging/xenpaging.c static int xenpaging_get_tot_pages(struct xenpaging *paging) · line 187
Quoted 5 lines
tools/xenpaging/xenpaging.c +2
-2/* Allocated page memory */ - errno =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); -if ( errno !=0 ) + rc =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); +if ( rc !=0 )I think the point of setting errno here is because
posix_memaligndoesn't set it and instead returns an error code. The caller ofinit_pageuses PERROR in order to print the error which his expected to be in errno.
I understand this. But on NetBSD, errno is:
#define errno (*__errno())
(I think this is related to thread-safety).
Quoted 3 lines
I don't think this is the only place in Xen code that errno is set, why are the others fine but not this instance?
probably this code is not used on NetBSD ?
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
Re: [PATCH 19/24] errno may not be a gobal R/W variable, use a local variable instead (fix build on NetBSD)
Quoted 30 lines · Manuel Bouyer
Quoted 15 lines · Roger Pau Monné
Quoted 14 lines · Manuel Bouyer
--- tools/xenpaging/xenpaging.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)tools/xenpaging/xenpaging.c +1
-0@@ -180,10 +180,11 @@ static int xenpaging_get_tot_pages(struct xenpaging *paging)static void *init_page (void ) {void *buffer; +int rc;Quoted 10 lines
tools/xenpaging/xenpaging.c static int xenpaging_get_tot_pages(struct xenpaging *paging) · line 187
Quoted 5 lines
tools/xenpaging/xenpaging.c +2
-2/* Allocated page memory */ - errno =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); -if ( errno !=0 ) + rc =posix_memalign (&buffer,XC_PAGE_SIZE ,XC_PAGE_SIZE ); +if ( rc !=0 )I think the point of setting errno here is because
posix_memaligndoesn't set it and instead returns an error code. The caller ofinit_pageuses PERROR in order to print the error which his expected to be in errno.I understand this. But on NetBSD, errno is:
#define errno (*__errno())
Quoted 7 lines
(I think this is related to thread-safety).
Quoted 3 lines
I don't think this is the only place in Xen code that errno is set, why are the others fine but not this instance?
probably this code is not used on NetBSD ?
I was wrong, errno is writable but it needs #include <errno.h> I reverted this a fixed it the right way
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 20/24 If FILENAME_MAX is defined, use it instead of arbitrary value (fix format-truncation errors with GCC >= 7)
In reply to Manuel Bouyer--- tools/xenpmd/xenpmd.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/xenpmd/xenpmd.c +4 -0
@@ -101,7 +101,11 @@ FILE *get_next_battery_file(DIR *battery_dir, {FILE *file =0 ;struct dirent *dir_entries; +#ifdef FILENAME_MAX +char file_name[FILENAME_MAX ]; +#else char file_name[284 ]; +#endif int ret; do
Signature · 1 line
2.28.0
Re: [PATCH 20/24] If FILENAME_MAX is defined, use it instead of arbitrary value (fix format-truncation errors with GCC >= 7)
Quoted 9 lines · Manuel Bouyer
--- tools/xenpmd/xenpmd.c | 4 ++++ 1 file changed, 4 insertions(+)tools/xenpmd/xenpmd.c +0
-0
tools/xenpmd/xenpmd.c FILE *get_next_battery_file(DIR *battery_dir, · line 109
Quoted 9 lines
tools/xenpmd/xenpmd.c +4
-0@@ -101,7 +101,11 @@ FILE *get_next_battery_file(DIR *battery_dir, {FILE *file =0 ;struct dirent *dir_entries; +#ifdef FILENAME_MAX +char file_name[FILENAME_MAX ]; +#else char file_name[284 ]; +#endif int ret;
I think it's dangerous to do this, specially on the stack, GNU libc manual states:
Usage Note: Don’t use FILENAME_MAX as the size of an array in which to store a file name! You can’t possibly make an array that big! Use dynamic allocation (see Memory Allocation) instead.
I think it would be better to replace the snprintf calls with asprintf and free the buffer afterwards. Setting file_name to 284 should be fine however, as d_name is 256 max and the paths above are 26 maximum I think (27 with the nul character).
Thanks, Roger.
Re: [PATCH 20/24] If FILENAME_MAX is defined, use it instead of arbitrary value (fix format-truncation errors with GCC >= 7)
Quoted 9 lines · Roger Pau Monné
I think it's dangerous to do this, specially on the stack, GNU libc manual states:
Usage Note: Don?t use
FILENAME_MAXas the size of an array in which to store a file name! You can?t possibly make an array that big! Use dynamic allocation (see Memory Allocation) instead.I think it would be better to replace the snprintf calls with asprintf and free the buffer afterwards.
I went this route, thanks
Quoted 3 lines
Setting
file_nameto 284 should be
fine however, asd_nameis 256 max and the paths above are 26 maximum I think (27 with the nul character).
On NetBSD d_name is 512 ... I guess this is why gcc complains.
Signature · 3 lines
Manuel Bouyer <[email protected]> NetBSD: 26 ans d'experience feront toujours la difference --
PATCH 21/24 Fix unused functions/variables error
In reply to Manuel Bouyer--- tools/libs/stat/xenstat_netbsd.c | 11 ----------- 1 file changed, 11 deletions(-)
tools/libs/stat/xenstat_netbsd.c +0 -11
@@ -55,11 +55,6 @@ get_priv_data(xenstat_handle *handle) }/* Expected format of /proc/net/dev */ -static const char PROCNETDEV_HEADER [] = -"Inter-| Receive |" -" Transmit\n" -" face |bytes packets errs drop fifo frame compressed multicast|" -"bytes packets errs drop fifo colls carrier compressed\n" ;/* Collect information about networks */ int xenstat_collect_networks (xenstat_node * node)
@@ -76,12 +71,6 @@ void xenstat_uninit_networks(xenstat_handle * handle)fclose (priv->procnetdev); } -static int read_attributes_vbd (const char *vbd_directory,const char *what,char *ret,int cap) -{ -/* XXX implement */ -return 0 ; -} -/* Collect information about VBDs */ int xenstat_collect_vbds (xenstat_node * node) {
Signature · 1 line
2.28.0
PATCH 22/24 If PTHREAD_STACK_MIN is not defined, use DEFAULT_THREAD_STACKSIZE
In reply to Manuel Bouyer--- tools/libs/store/xs.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/libs/store/xs.c +4 -0
@@ -811,9 +811,13 @@ bool xs_watch(struct xs_handle *h, const char *path, const char *token)#ifdef USE_PTHREAD #define DEFAULT_THREAD_STACKSIZE (16 * 1024) +#ifndef PTHREAD_STACK_MIN +#define READ_THREAD_STACKSIZE DEFAULT_THREAD_STACKSIZE +#else #define READ_THREAD_STACKSIZE \ ((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? \ PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE) +#endif /* We dynamically create a reader thread on demand. */ mutex_lock (&h->request_mutex);
Signature · 1 line
2.28.0
Re: [PATCH 22/24] If PTHREAD_STACK_MIN is not defined, use DEFAULT_THREAD_STACKSIZE
I've been told that PTHREAD_STACK_MIN is not designed to be used like this anyway, and that what we do could be dangerous:
https://lists.freebsd.org/pipermail/freebsd-current/2014-March/048885.html
Please adjust the subject line to mention this applies to tools/xenstore and a bit of commit message saying it's not available on NetBSD.
Thanks.
PATCH 23/24 Use xen/xenio.h on NetBSD
In reply to Manuel Bouyer--- tools/libs/ctrl/xc_private.h | 4 ++++ 1 file changed, 4 insertions(+)
tools/libs/ctrl/xc_private.h +4 -0
@@ -39,7 +39,11 @@#include <xenforeignmemory.h> #include <xendevicemodel.h> +#ifdef __NetBSD__ +#include <xen/xenio.h> +#else #include <xen/sys/privcmd.h> +#endif #include <xen-tools/libs.h>
Signature · 1 line
2.28.0
PATCH 24/24 Fix error: array subscript has type 'char' [-Werror=char-subscripts]
In reply to Manuel Bouyer--- tools/libs/light/libxl_qmp.c | 2 +- tools/xentrace/xentrace.c | 2 +- xen/tools/symbols.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
tools/libs/light/libxl_qmp.c +1 -1
@@ -1249,7 +1249,7 @@ static int qmp_error_class_to_libxl_error_code(libxl__gc *gc, se++;continue ; } -if (tolower (*s) !=tolower (*se)) +if (tolower ((unsigned char )*s) !=tolower ((unsigned char )*se))break ; s++, se++; }
tools/xentrace/xentrace.c +1 -1
@@ -957,7 +957,7 @@ static int parse_cpumask_range(const char *mask_str, xc_cpumap_t map) {unsigned int a, b;int nmaskbits; -char c; +unsigned char c;int in_range;const char *s;
xen/tools/symbols.c +2 -2
@@ -173,11 +173,11 @@ static int read_symbol(FILE *in, struct sym_entry *s)/* include the type field in the symbol name, so that it gets * compressed together */ s->len =strlen (str) +1 ; -if (islower (stype) && filename) +if (islower ((unsigned char )stype) && filename) s->len +=strlen (filename) +1 ; s->sym =malloc (s->len +1 ); sym =SYMBOL_NAME (s); -if (islower (stype) && filename) { +if (islower ((unsigned char )stype) && filename) { sym =stpcpy (sym, filename); *sym++ ='#' ; }
Signature · 1 line
2.28.0
Quoted 4 lines · Manuel Bouyer
Hello,
here is a set of 24 patches, which are needed to build and run the tools on NetBSD. They are extracted from NetBSD's pkgsrc repository for Xen 4.13, and ported to 4.15.
Thanks! I think they are mostly fine. All of them are however missing a Signed-off-by tag, which is mandatory for getting them accepted. Also you should Cc the maintainers on patches, so they can review them. There's a script in tree to do that, you can use it against the patch files and it will append the appropriate Cc's:
% ./scripts/add_maintainers.pl -d patch/directory
Optionally use the --reroll-count when sending new versions of the series (2,3...)
Thanks, Roger.