FreeBSD Bugzilla – Attachment 210077 Details for
Bug 242679
emulators/open-vm-tools-nox11: fails to build after r355732
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Replace deprecated timeout(9) interface with callout(9) (v0)
patch-modules_freebsd_vmmemctl_os.c (text/plain), 1.43 KB, created by
Ruslan Garipov
on 2019-12-20 08:09:03 UTC
(
hide
)
Description:
Replace deprecated timeout(9) interface with callout(9) (v0)
Filename:
MIME Type:
Creator:
Ruslan Garipov
Created:
2019-12-20 08:09:03 UTC
Size:
1.43 KB
patch
obsolete
>--- modules/freebsd/vmmemctl/os.c.orig 2019-12-18 06:48:42 UTC >+++ modules/freebsd/vmmemctl/os.c >@@ -64,7 +64,7 @@ > > typedef struct { > /* system structures */ >- struct callout_handle callout_handle; >+ struct callout callout_handle; > > /* termination flag */ > volatile int stop; >@@ -678,7 +678,8 @@ vmmemctl_poll(void *data) // IN > if (!t->stop) { > /* invoke registered handler, rearm timer */ > Balloon_QueryAndExecute(); >- t->callout_handle = timeout(vmmemctl_poll, t, BALLOON_POLL_PERIOD * hz); >+ callout_reset(&t->callout_handle, BALLOON_POLL_PERIOD * hz, vmmemctl_poll, >+ t); > } > } > >@@ -712,15 +713,16 @@ vmmemctl_init(void) > } > > /* initialize timer state */ >- callout_handle_init(&state->timer.callout_handle); >+ callout_init(&state->timer.callout_handle, 0); > > os_pmap_init(pmap); > os_balloonobject_create(); > > /* Set up and start polling */ >- callout_handle_init(&t->callout_handle); >+ callout_init(&t->callout_handle, 0); > t->stop = FALSE; >- t->callout_handle = timeout(vmmemctl_poll, t, BALLOON_POLL_PERIOD * hz); >+ callout_reset(&t->callout_handle, BALLOON_POLL_PERIOD * hz, vmmemctl_poll, >+ t); > > vmmemctl_init_sysctl(); > >@@ -759,7 +761,7 @@ vmmemctl_cleanup(void) > > /* Stop polling */ > t->stop = TRUE; >- untimeout(vmmemctl_poll, t, t->callout_handle); >+ callout_stop(&t->callout_handle); > > os_balloonobject_delete(); > os_pmap_free(pmap);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 242679
:
210077
|
210588
|
210600