pkgsrc/sysutils/xentools415/patches/patch-tools_qemu-xen-traditional_net.c
wiz ffc838cb77 xentools415: update for pciutils 3.8.0
Untested because of

python3.10 ./scripts/ldnoexec.py out/rom16.o.strip.o out/rom16.noexec.o
Traceback (most recent call last):
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 32, in <module>
    main()
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 20, in main
    f = open(infilename, "rb")
FileNotFoundError: [Errno 2] No such file or directory: 'out/rom32seg.o.strip.o'
gmake[6]: *** [Makefile:133: out/rom32seg.noexec.o] Error 1
gmake[6]: *** Waiting for unfinished jobs....
Traceback (most recent call last):
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 32, in <module>
    main()
  File "/scratch/sysutils/xentools415/work/seabios-rel-1.14.0/./scripts/ldnoexec.py", line 20, in main
    f = open(infilename, "rb")
FileNotFoundError: [Errno 2] No such file or directory: 'out/rom16.o.strip.o'
gmake[6]: *** [Makefile:133: out/rom16.noexec.o] Error 1

on -current/amd64.

Run pkglint -F while here.
2022-05-13 16:04:23 +00:00

48 lines
1.4 KiB
C

$NetBSD: patch-tools_qemu-xen-traditional_net.c,v 1.2 2022/05/13 16:04:23 wiz Exp $
--- tools/qemu-xen-traditional/net.c.orig 2016-11-29 17:36:38.000000000 +0100
+++ tools/qemu-xen-traditional/net.c 2017-03-29 18:16:54.000000000 +0200
@@ -990,6 +990,7 @@
#define DEFAULT_NETWORK_DOWN_SCRIPT ""
#endif
+#if !defined(CONFIG_STUBDOM)
static int launch_script(const char *setup_script, const char *ifname,
const char *script_arg, int fd)
{
@@ -1028,6 +1029,7 @@
}
return 0;
}
+#endif
static int net_tap_init(VLANState *vlan, const char *model,
const char *name, const char *ifname1,
@@ -1048,12 +1050,14 @@
if (!setup_script || !strcmp(setup_script, "no"))
setup_script = "";
+#if !defined(CONFIG_STUBDOM)
if (setup_script[0] != '\0') {
if (launch_script(setup_script, ifname, script_arg, fd)) {
close(fd);
return -1;
}
}
+#endif
s = net_tap_fd_init(vlan, model, name, fd);
if (!s)
return -1;
@@ -1965,9 +1969,11 @@
if (vc->fd_read == tap_receive) {
TAPState *s = vc->opaque;
+#ifndef CONFIG_STUBDOM
if (s->down_script[0])
launch_script(s->down_script, s->down_script_arg,
s->script_arg, s->fd);
+#endif
}
#if defined(CONFIG_VDE)
if (vc->fd_read == vde_from_qemu) {