kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emulators/open-vm-tools: change sysctl_add_oid use to SYSCTL_ADD_OID

Browse source 
sysctl_add_oid was changed in base/head@r310051 to take a label parameter,
and open-vm-tools doesn't supply it as it depends on the old KPI signature.
SYSCTL_ADD_OID doesn't require the label parameter since its inception
though, thus it's a backwards compatible solution for adding sysctl oids.

PR:		215353
Reported by:	dim
Submitted by:	ed
Reviewed by:	ed, lwhsu
Approved by:	lwhsu
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D9698
This commit is contained in:
Enji Cooper 2017-02-21 19:20:47 +00:00
parent e9098d3f97
commit c2f3d4d0d9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=434550
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emulators/open-vm-tools/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
PORTREVISION= 16
PORTREVISION= 17
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/stable-9.4.x

29
emulators/open-vm-tools/files/patch-vmmemctl-os.c
View file

@ -1,5 +1,5 @@
--- modules/freebsd/vmmemctl/os.c.orig 2013-09-23 10:51:10.000000000 -0500
+++ modules/freebsd/vmmemctl/os.c 2014-04-23 15:51:43.823041178 -0500
--- modules/freebsd/vmmemctl/os.c.orig 2013-09-23 08:51:10.000000000 -0700
+++ modules/freebsd/vmmemctl/os.c 2017-02-20 21:19:02.000000000 -0800
@@ -37,9 +37,11 @@
#include <sys/param.h>
#include <sys/systm.h>
@ -12,7 +12,7 @@
#include <sys/sysctl.h>
#include <vm/vm.h>
@@ -223,7 +225,11 @@ static __inline__ unsigned long os_ffz(u
@@ -223,7 +225,11 @@
unsigned long
OS_ReservedPageGetLimit(void)
{
@ -24,7 +24,7 @@
}
@@ -295,7 +301,13 @@ OS_ReservedPageGetHandle(PA64 pa) //
@@ -295,7 +301,13 @@
Mapping
OS_MapPageHandle(PageHandle handle) // IN
{
@ -38,7 +38,7 @@
vm_page_t page = (vm_page_t)handle;
if (!res) {
@@ -352,7 +364,11 @@ void
@@ -352,7 +364,11 @@
OS_UnmapPage(Mapping mapping) // IN
{
pmap_qremove((vm_offset_t)mapping, 1);
@ -50,7 +50,7 @@
}
@@ -360,7 +376,11 @@ static void
@@ -360,7 +376,11 @@
os_pmap_alloc(os_pmap *p) // IN
{
/* number of pages (div. 8) */
@ -62,7 +62,7 @@
/*
* expand to nearest word boundary
@@ -369,14 +389,23 @@ os_pmap_alloc(os_pmap *p) // IN
@@ -369,14 +389,23 @@
p->size = (p->size + sizeof(unsigned long) - 1) &
~(sizeof(unsigned long) - 1);
@ -86,7 +86,7 @@
p->size = 0;
p->bitmap = NULL;
}
@@ -449,12 +478,31 @@ os_kmem_free(vm_page_t page) // IN
@@ -449,12 +478,31 @@
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
@ -123,7 +123,7 @@
}
@@ -466,8 +514,19 @@ os_kmem_alloc(int alloc_normal_failed) /
@@ -466,8 +514,19 @@
os_state *state = &global_state;
os_pmap *pmap = &state->pmap;
@ -143,7 +143,7 @@
return NULL;
}
@@ -488,6 +547,11 @@ os_kmem_alloc(int alloc_normal_failed) /
@@ -488,6 +547,11 @@
if (!page) {
os_pmap_putindex(pmap, pindex);
}
@ -155,3 +155,12 @@
return page;
}
@@ -824,7 +888,7 @@
static void
vmmemctl_init_sysctl(void)
{
- oid = sysctl_add_oid(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO,
+ oid = SYSCTL_ADD_OID(NULL, SYSCTL_STATIC_CHILDREN(_vm), OID_AUTO,
BALLOON_NAME, CTLTYPE_STRING | CTLFLAG_RD,
0, 0, vmmemctl_sysctl, "A",
BALLOON_NAME_VERBOSE);