svn commit: r334531 - head/usr.bin/top
Author: novel (ports committer) Date: Sat Jun 2 15:52:18 2018 New Revision: 334531 URL: https://svnweb.freebsd.org/changeset/base/334531 Log: top: add -p option and p command to only show a single process Allow to show only a single process specified by PID. This could be done either by running top like 'top -p PID' or using the 'p' command inside top. Reviewed by: eadler Approved by: eadler Obtained from:OpenBSD Differential Revision:https://reviews.freebsd.org/D15501 Modified: head/usr.bin/top/commands.c head/usr.bin/top/machine.c head/usr.bin/top/machine.h head/usr.bin/top/top.1 head/usr.bin/top/top.c head/usr.bin/top/top.h head/usr.bin/top/utils.c head/usr.bin/top/utils.h Modified: head/usr.bin/top/commands.c == --- head/usr.bin/top/commands.c Sat Jun 2 14:07:27 2018(r334530) +++ head/usr.bin/top/commands.c Sat Jun 2 15:52:18 2018(r334531) @@ -92,6 +92,7 @@ o - specify sort order (pri, size, res, cpu, tim o - specify sort order (vcsw, ivcsw, read, write, fault, total, jid, pid)\n", stdout); fputs("\ +p - display one process (+ selects all processes)\n\ P - toggle the displaying of per-CPU statistics\n\ r - renice a process\n\ s - change number of seconds to delay between updates\n\ Modified: head/usr.bin/top/machine.c == --- head/usr.bin/top/machine.c Sat Jun 2 14:07:27 2018(r334530) +++ head/usr.bin/top/machine.c Sat Jun 2 15:52:18 2018(r334531) @@ -764,6 +764,7 @@ get_process_info(struct system_info *si, struct proces int show_self; int show_system; int show_uid; + int show_pid; int show_kidle; /* @@ -783,7 +784,7 @@ get_process_info(struct system_info *si, struct proces previous_pref = malloc(nproc * sizeof(*previous_pref)); if (previous_procs == NULL || previous_pref == NULL) { (void) fprintf(stderr, "top: Out of memory.\n"); - quit(23); + quit(TOP_EX_SYS_ERROR); } previous_proc_count_max = nproc; } @@ -822,7 +823,7 @@ get_process_info(struct system_info *si, struct proces } if (pref == NULL || pbase == NULL || pcpu == NULL) { (void) fprintf(stderr, "top: Out of memory.\n"); - quit(23); + quit(TOP_EX_SYS_ERROR); } /* get a pointer to the states summary array */ si->procstates = process_states; @@ -833,6 +834,7 @@ get_process_info(struct system_info *si, struct proces show_self = sel->self == -1; show_system = sel->system; show_uid = sel->uid[0] != -1; + show_pid = sel->pid != -1; show_kidle = sel->kidle; /* count up process states and get pointers to interesting procs */ @@ -894,6 +896,9 @@ get_process_info(struct system_info *si, struct proces /* skip proc. that don't belong to the selected UID */ continue; + if (show_pid && pp->ki_pid != sel->pid) + continue; + *prefp++ = pp; active_procs++; } @@ -1177,12 +1182,12 @@ getsysctl(const char *name, void *ptr, size_t len) if (sysctlbyname(name, ptr, &nlen, NULL, 0) == -1) { fprintf(stderr, "top: sysctl(%s...) failed: %s\n", name, strerror(errno)); - quit(23); + quit(TOP_EX_SYS_ERROR); } if (nlen != len) { fprintf(stderr, "top: sysctl(%s...) expected %lu, got %lu\n", name, (unsigned long)len, (unsigned long)nlen); - quit(23); + quit(TOP_EX_SYS_ERROR); } } Modified: head/usr.bin/top/machine.h == --- head/usr.bin/top/machine.h Sat Jun 2 14:07:27 2018(r334530) +++ head/usr.bin/top/machine.h Sat Jun 2 15:52:18 2018(r334531) @@ -69,6 +69,7 @@ struct process_select int jail; /* show jail ID */ int swap; /* show swap usage */ int kidle; /* show per-CPU idle threads */ +pid_t pid; /* only this pid (unless pid == -1) */ char *command; /* only this command (unless == NULL) */ }; Modified: head/usr.bin/top/top.1 == --- head/usr.bin/top/top.1 Sat Jun 2 14:07:27 2018(r334530) +++ head/usr.bin/top/top.1 Sat Jun 2 15:52:18 2018(r334531) @@ -15,6 +15,11 @@ top \- display and update information about the top cp .BI \-m io | cpu ] [ .BI \-o field +] +.br +.ti +4 +[ +.BI \-p pid ] [ .BI \-s time ] [
Re: svn commit: r364791 - head/usr.sbin/jail
Jamie Gritton wrote: > Author: jamie > Date: Wed Aug 26 00:42:59 2020 > New Revision: 364791 > URL: https://svnweb.freebsd.org/changeset/base/364791 > > Log: > Handle jail.conf variables that have the same names as parameters. > > PR: 248444 > Submitted by: Akos Somfai > Reported by:Markus Stoff > > Modified: > head/usr.sbin/jail/config.c > > Modified: head/usr.sbin/jail/config.c > == > --- head/usr.sbin/jail/config.c Wed Aug 26 00:31:59 2020 > (r364790) > +++ head/usr.sbin/jail/config.c Wed Aug 26 00:42:59 2020 > (r364791) > @@ -393,7 +393,8 @@ add_param(struct cfjail *j, const struct cfparam *p, e > else > for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++) > if (!(intparams[ipnum].flags & PF_CONV) && > - equalopts(name, intparams[ipnum].name)) { > + equalopts(name, intparams[ipnum].name) && > + !(p->flags & PF_VAR)) { > j->intparams[ipnum] = np; > np->flags |= intparams[ipnum].flags; > break; Looks like it's causing jail(8) to segfault, at least when using with poudriere: $ [00:00:00] Creating the reference jail... done [00:00:07] Mounting system devices for current-local [00:00:07] Mounting ports/packages/distfiles [00:00:07] Using packages from previously failed build: /usr/local/poudriere/data/packages/current-local/.building [00:00:07] Mounting ccache from: /var/cache/ccache [00:00:07] Mounting packages from: /usr/local/poudriere/data/packages/current-local [00:00:07] Copying /var/db/ports from: /usr/local/etc/poudriere.d/current-local-options [00:00:07] Appending to make.conf: /usr/local/etc/poudriere.d/current-make.conf /etc/resolv.conf -> /usr/local/poudriere/data/.m/current-local/ref/etc/resolv.conf [00:00:07] Starting jail current-local Segmentation fault (core dumped) [00:00:08] Cleaning up [00:00:08] Unmounting file systems $ $ lldb /usr/sbin/jail --core /tmp/jail.core (lldb) target create "/usr/sbin/jail" --core "/tmp/jail.core" Core file '/tmp/jail.core' (x86_64) was loaded. (lldb) bt all * thread #1, name = 'jail', stop reason = signal SIGSEGV * frame #0: 0x0020c3fb jail`add_param(j=0x000800a09000, p=, ipnum=, value=) at config.c:399:16 frame #1: 0x00207e08 jail`main(argc=8, argv=0x7fffe8f0) at jail.c:0 frame #2: 0x00206e10 jail`_start(ap=, cleanup=) at crt1_c.c:75:7 (lldb) This works fine when I back out this change. Roman Bogorodskiy signature.asc Description: PGP signature
Re: svn commit: r226449 - in head: etc/devd share/man/man4/man4.powerpc sys/conf sys/dev/adb
Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Sun Oct 16 21:01:42 2011 > New Revision: 226449 > URL: http://svn.freebsd.org/changeset/base/226449 > > Log: > Add support for special keys (volume/brightness/eject) on Apple laptops with > ADB keyboards. > > Submitted by: Justin Hibbits > MFC after: 9.0-RELEASE Thanks for committing this! There's a tiny in a abtn.4, see below. > Added: > head/etc/devd/apple.conf (contents, props changed) > head/share/man/man4/man4.powerpc/abtn.4 (contents, props changed) > head/sys/dev/adb/adb_buttons.c (contents, props changed) > Modified: > head/etc/devd/Makefile > head/share/man/man4/man4.powerpc/Makefile > head/share/man/man4/man4.powerpc/akbd.4 > head/sys/conf/files.powerpc > head/sys/dev/adb/adb_kbd.c ... > Added: head/share/man/man4/man4.powerpc/abtn.4 > == > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/share/man/man4/man4.powerpc/abtn.4 Sun Oct 16 21:01:42 2011 > (r226449) ... > +Examples are included in /etc/devd/apple.conf. > +.Sh SEE ALSO > +.Xr adb 4 , > +.Xr akbd 4 , > +.Xr cuda 4 , > +.Xr pmu 4, ^ Space missing before the comma, as a result "SEE ALSO" looks like this: adb(4), akbd(4), cuda(4), pmu(4,) devd(8) ^^^ > +.Xr devd 8 > +.Sh HISTORY > +The > +.Nm > +device driver first appeared in > +.Nx 5.0 > +and was ported to > +.Fx 10.0 . > +.Sh AUTHORS > +.An -nosplit > +The > +.Nm > +driver was written by > +.An Tsubai Masanari > +for > +.Nx > +and ported to > +.Fx > +by > +.An Justin Hibbits . Roman Bogorodskiy ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r316357 - head/usr.sbin/bhyve
Author: novel (ports committer) Date: Sat Apr 1 15:01:10 2017 New Revision: 316357 URL: https://svnweb.freebsd.org/changeset/base/316357 Log: Minor style improvements in bhyve.8 Replace "as of now" with "at present". As the change is a really minor one, don't bump .Dd. Suggested by: wblock Approved by: wblock (implicit) Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Sat Apr 1 12:27:02 2017(r316356) +++ head/usr.sbin/bhyve/bhyve.8 Sat Apr 1 15:01:10 2017(r316357) @@ -294,9 +294,9 @@ sockets on the filesystem must be cleane exits. .It There is no way to use the "console port" feature, nor the console port -resize as of now. +resize at present. .It -Emergency write is advertised, but no-op as of now. +Emergency write is advertised, but no-op at present. .El .El .El ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r317545 - head/usr.sbin/bhyve
Gleb Smirnoff wrote: > Author: glebius > Date: Fri Apr 28 05:43:27 2017 > New Revision: 317545 > URL: https://svnweb.freebsd.org/changeset/base/317545 > > Log: > Document raw framebuffer device and XHCI device configurations. Thanks for abandoning my work https://reviews.freebsd.org/D10014 (a link they I gave when you were talking about manpage stuff on #bhyve). You might want to pull some additional bits from that patch though. > Modified: > head/usr.sbin/bhyve/bhyve.8 > > Modified: head/usr.sbin/bhyve/bhyve.8 > == > --- head/usr.sbin/bhyve/bhyve.8 Fri Apr 28 05:32:26 2017 > (r317544) > +++ head/usr.sbin/bhyve/bhyve.8 Fri Apr 28 05:43:27 2017 > (r317545) > @@ -24,7 +24,7 @@ > .\" > .\" $FreeBSD$ > .\" > -.Dd February 27, 2017 > +.Dd April 27, 2017 > .Dt BHYVE 8 > .Os > .Sh NAME > @@ -188,6 +188,10 @@ PCI 16550 serial device. > .It Li lpc > LPC PCI-ISA bridge with COM1 and COM2 16550 serial ports and a boot ROM. > The LPC bridge emulation can only be configured on bus 0. > +.It Li fbuf > +Raw framebuffer device attached to VNC server. > +.It Li xhci > +XHCI USB controller. > .El > .It Op Ar conf > This optional parameter describes the backend for device emulations. > @@ -299,6 +303,40 @@ resize at present. > Emergency write is advertised, but no-op at present. > .El > .El > +.Pp > +Raw framebuffer device: > +.Pp > +.Oo wait Oc Ns Oo ,vga= Ns Ar Oc Oo ,rfb= Ns Oo Ar IP: Oc Ns Ar > port Oc Ns Oo ,w= Ns Ar w Oc Ns Oo ,h= Ns Ar h Oc > +.Bl -tag -width [vga=on|io|off] > +.It wait > +Wait for a VNC client connection before booting the virtual machine. > +The default is not to wait. > +.It vga= Ns Ar on|io|off > +Enable VGA emulation. > +The default is > +.Va io > +mode: VGA is enabled, but only I/O ports are available, > +no VGA memory is provided. > +.It rfb= Ns Oo Ar IP: Oc Ns Ar port > +Set the VNC server to listen at > +.Va IP:port . > +The default is to listen on localhost IPv4 address and default VNC port 5900. > +Listening on a IPv6 address is not supported. > +.It w= Ns Ar width > +Set framebuffer width to > +.Ar width . > +The default width is 1920. > +.It h= Ns Ar height > +Set framebuffer height to > +.Ar height . > +The default height is 1080. > +.El > +.Pp > +XHCI USB controller device: > +.Bl -tag > +.It Ar tablet > +Emulate USB tablet mouse. > +.El > .El > .It Fl S > Wire guest memory. > ___ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" Roman Bogorodskiy signature.asc Description: PGP signature
Re: svn commit: r317777 - head/usr.sbin/bhyve
Gleb Smirnoff wrote: > Author: glebius > Date: Wed May 3 21:44:04 2017 > New Revision: 31 > URL: https://svnweb.freebsd.org/changeset/base/31 > > Log: > Improve documentation of fbuf device. > > Submitted by: novel > Reviewed by:grehan, bcr > Differential Revision: https://reviews.freebsd.org/D10014 > > Modified: > head/usr.sbin/bhyve/bhyve.8 Thanks! Roman Bogorodskiy signature.asc Description: PGP signature
svn commit: r314342 - head/usr.sbin/bhyve
Author: novel (ports committer) Date: Mon Feb 27 15:37:38 2017 New Revision: 314342 URL: https://svnweb.freebsd.org/changeset/base/314342 Log: bhyve: document virtio-console in the manpage Reviewed by: bcr, wblock, jceel Approved by: grehan Differential Revision:https://reviews.freebsd.org/D9564 Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Mon Feb 27 15:32:56 2017(r314341) +++ head/usr.sbin/bhyve/bhyve.8 Mon Feb 27 15:37:38 2017(r314342) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2016 +.Dd February 27, 2017 .Dt BHYVE 8 .Os .Sh NAME @@ -171,6 +171,10 @@ Virtio network interface. Virtio block storage interface. .It Li virtio-rnd Virtio RNG interface. +.It Li virtio-console +Virtio console interface, which exposes multiple ports +to the guest in the form of simple char devices for simple IO +between the guest and host userspaces. .It Li ahci AHCI controller attached to arbitrary devices. .It Li ahci-cd @@ -270,6 +274,31 @@ The host device must have been reserved .Va pptdev loader variable as described in .Xr vmm 4 . +.Pp +Virtio console devices: +.Bl -tag -width 10n +.It Li port1= Ns Pa /path/to/port1.sock Ns ,anotherport= Ns Pa ... +A maximum of 16 ports per device can be created. +Every port is named and corresponds to a Unix domain socket created by +.Nm . +.Nm +accepts at most one connection per port at a time. +.Pp +Limitations: +.Bl -bullet -offset 2n +.It +Due to lack of destructors in +.Nm , +sockets on the filesystem must be cleaned up manually after +.Nm +exits. +.It +There is no way to use the "console port" feature, nor the console port +resize as of now. +.It +Emergency write is advertised, but no-op as of now. +.El +.El .El .It Fl S Wire guest memory. ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r302211 - in head/usr.sbin: bhyve bhyveload
Author: novel (ports committer) Date: Sun Jun 26 14:44:01 2016 New Revision: 302211 URL: https://svnweb.freebsd.org/changeset/base/302211 Log: bhyve: improve memory size documentation A couple of minor memory size option related nits: - use common name 'memsize' (instead of 'max-size' or just 'size') - bhyve: update usage with memsize unit suffix, drop legacy "MB" unit - bhyveload: update usage with memsize unit suffix - bhyve(8): document default size - bhyveload(8): use memsize formatting like it's done in bhyve(8) Reviewed by:wblock, grehan Approved by:re (kib), wblock, grehan Differential Revision: https://reviews.freebsd.org/D6952 Modified: head/usr.sbin/bhyve/bhyve.8 head/usr.sbin/bhyve/bhyverun.c head/usr.sbin/bhyveload/bhyveload.8 head/usr.sbin/bhyveload/bhyveload.c Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Sun Jun 26 14:18:28 2016(r302210) +++ head/usr.sbin/bhyve/bhyve.8 Sun Jun 26 14:44:01 2016(r302211) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 18, 2016 +.Dd June 24, 2016 .Dt BHYVE 8 .Os .Sh NAME @@ -36,7 +36,7 @@ .Op Fl c Ar numcpus .Op Fl g Ar gdbport .Op Fl l Ar lpcdev Ns Op , Ns Ar conf -.Op Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t +.Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t .Op Fl p Ar vcpu:hostcpu .Op Fl s Ar slot,emulation Ns Op , Ns Ar conf .Op Fl U Ar uuid @@ -105,7 +105,7 @@ and .Ar com2 and the boot ROM device .Ar bootrom . -.It Fl m Ar size Ns Op Ar K|k|M|m|G|g|T|t +.It Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t Guest physical memory size in bytes. This must be the same size that was given to .Xr bhyveload 8 . @@ -114,6 +114,9 @@ The size argument may be suffixed with o or lower case) to indicate a multiple of kilobytes, megabytes, gigabytes, or terabytes. If no suffix is given, the value is assumed to be in megabytes. +.Pp +.Ar memsize +defaults to 256M. .It Fl p Ar vcpu:hostcpu Pin guest's virtual CPU .Em vcpu Modified: head/usr.sbin/bhyve/bhyverun.c == --- head/usr.sbin/bhyve/bhyverun.c Sun Jun 26 14:18:28 2016 (r302210) +++ head/usr.sbin/bhyve/bhyverun.c Sun Jun 26 14:44:01 2016 (r302211) @@ -125,7 +125,7 @@ usage(int code) fprintf(stderr, "Usage: %s [-abehuwxACHPSWY] [-c vcpus] [-g ] [-l ]\n" - " %*s [-m mem] [-p vcpu:hostcpu] [-s ] [-U uuid] \n" + " %*s [-m memsize[K|k|M|m|G|g|T|t]] [-p vcpu:hostcpu] [-s ] [-U uuid] \n" " -a: local apic is in xAPIC mode (deprecated)\n" " -A: create ACPI tables\n" " -c: # cpus (default 1)\n" @@ -135,7 +135,7 @@ usage(int code) " -h: help\n" " -H: vmexit from the guest on hlt\n" " -l: LPC device configuration\n" - " -m: memory size in MB\n" + " -m: memory size\n" " -p: pin 'vcpu' to 'hostcpu'\n" " -P: vmexit from the guest on pause\n" " -s: PCI slot config\n" Modified: head/usr.sbin/bhyveload/bhyveload.8 == --- head/usr.sbin/bhyveload/bhyveload.8 Sun Jun 26 14:18:28 2016 (r302210) +++ head/usr.sbin/bhyveload/bhyveload.8 Sun Jun 26 14:44:01 2016 (r302211) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 26, 2016 +.Dd June 24, 2016 .Dt BHYVELOAD 8 .Os .Sh NAME @@ -42,7 +42,7 @@ guest inside a bhyve virtual machine .Op Fl e Ar name=value .Op Fl h Ar host-path .Op Fl l Ar os-loader -.Op Fl m Ar mem-size +.Op Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t .Ar vmname .Sh DESCRIPTION .Nm @@ -103,16 +103,12 @@ will use which presents a standard .Fx loader. -.It Fl m Ar mem-size Xo -.Sm off -.Op Cm K | k | M | m | G | g | T | t -.Xc -.Sm on -.Ar mem-size +.It Fl m Ar memsize Ns Op Ar K|k|M|m|G|g|T|t +.Ar memsize is the amount of memory allocated to the guest. .Pp The -.Ar mem-size +.Ar memsize argument may be suffixed with one of .Cm K , .Cm M , @@ -123,9 +119,8 @@ or Kilobytes, Megabytes, Gigabytes or Terabytes respectively. .Pp -The default value of -.Ar mem-size -is 256M. +.Ar memsize +defaults to 256M. .It Fl C Include guest memory in the core file when .Nm Modified: head/usr.sbin/bhyveload/bhyveload.c == --- head/usr.sbin/bhyveload/bhyveload.c Sun Jun 26 14:18:28 2016 (r302210) +++ head/usr.sbin/bhyveload/bhyveload.c Sun Jun 26 14:44:01 2016 (r302211) @@ -648,7 +648,7 @@ usage(void) fprintf(stderr, "usage: %s [-S][-c ] [-d ] [-e ]\n" - " %*s [-h ] [-m mem-size] \n", +
svn commit: r298341 - head/usr.sbin/bhyve
Author: novel (ports committer) Date: Wed Apr 20 06:29:03 2016 New Revision: 298341 URL: https://svnweb.freebsd.org/changeset/base/298341 Log: Update the bhyve(8) man page: - Document powering off by sending SIGTERM signal - Document exit codes Reviewed by: wblock, neel Approved by: wblock Differential Revision:D5982 Modified: head/usr.sbin/bhyve/bhyve.8 Modified: head/usr.sbin/bhyve/bhyve.8 == --- head/usr.sbin/bhyve/bhyve.8 Wed Apr 20 05:13:36 2016(r298340) +++ head/usr.sbin/bhyve/bhyve.8 Wed Apr 20 06:29:03 2016(r298341) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 7, 2015 +.Dd April 18, 2016 .Dt BHYVE 8 .Os .Sh NAME @@ -289,6 +289,27 @@ Alphanumeric name of the guest. This should be the same as that created by .Xr bhyveload 8 . .El +.Sh SIGNAL HANDLING +.Nm +deals with the following signals: +.Pp +.Bl -tag -width indent -compact +.It SIGTERM +Trigger ACPI poweroff for a VM +.El +.Sh EXIT STATUS +Exit status indicates how the VM was terminated: +.Pp +.Bl -tag -width indent -compact +.It 0 +rebooted +.It 1 +powered off +.It 2 +halted +.It 3 +triple fault +.El .Sh EXAMPLES The guest operating system must have been loaded with .Xr bhyveload 8 ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"