File tree Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Expand file tree Collapse file tree 4 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 29
29
#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED ) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200 /* __MAC_10_12 */
30
30
#include <os/lock.h>
31
31
#define xhyve_lock_t os_unfair_lock
32
- #define XHYVE_LOCK_INIT (V , LOCK ) (V)->LOCK = OS_UNFAIR_LOCK_INIT;
32
+ #define XHYVE_LOCK_INIT (V , LOCK ) (V)->LOCK = OS_UNFAIR_LOCK_INIT
33
33
#define XHYVE_LOCK (V , LOCK ) os_unfair_lock_lock(&(V)->LOCK)
34
34
#define XHYVE_UNLOCK (V , LOCK ) os_unfair_lock_unlock(&(V)->LOCK)
35
35
#else
36
36
#include <libkern/OSAtomic.h>
37
37
#define xhyve_lock_t OSSpinLock
38
- #define XHYVE_LOCK_INIT (V , LOCK ) (V)->LOCK = OS_SPINLOCK_INIT;
38
+ #define XHYVE_LOCK_INIT (V , LOCK ) (V)->LOCK = OS_SPINLOCK_INIT
39
39
#define XHYVE_LOCK (V , LOCK ) OSSpinLockLock(&(V)->LOCK)
40
40
#define XHYVE_UNLOCK (V , LOCK ) OSSpinLockUnlock(&(V)->LOCK)
41
41
#endif
Original file line number Diff line number Diff line change @@ -423,9 +423,9 @@ vatpit_init(struct vm *vm)
423
423
bzero (vatpit , sizeof (struct vatpit ));
424
424
vatpit -> vm = vm ;
425
425
426
- VATPIT_LOCK_INIT (vatpit )
426
+ VATPIT_LOCK_INIT (vatpit );
427
427
428
- FREQ2BT (PIT_8254_FREQ , & bt );
428
+ FREQ2BT (PIT_8254_FREQ , & bt )
429
429
vatpit -> freq_sbt = bttosbt (bt );
430
430
431
431
for (i = 0 ; i < 3 ; i ++ ) {
Original file line number Diff line number Diff line change @@ -232,7 +232,7 @@ vlapic_dcr_write_handler(struct vlapic *vlapic)
232
232
* XXX changes to the frequency divider will not take effect until
233
233
* the timer is reloaded.
234
234
*/
235
- FREQ2BT (((unsigned ) (VLAPIC_BUS_FREQ / divisor )), & vlapic -> timer_freq_bt );
235
+ FREQ2BT (((unsigned ) (VLAPIC_BUS_FREQ / divisor )), & vlapic -> timer_freq_bt )
236
236
vlapic -> timer_period_bt = vlapic -> timer_freq_bt ;
237
237
bintime_mul (& vlapic -> timer_period_bt , lapic -> icr_timer );
238
238
@@ -312,7 +312,7 @@ vlapic_get_lvtptr(struct vlapic *vlapic, uint32_t offset)
312
312
case APIC_OFFSET_LINT1_LVT :
313
313
case APIC_OFFSET_ERROR_LVT :
314
314
i = (offset - APIC_OFFSET_TIMER_LVT ) >> 2 ;
315
- return ((& lapic -> lvt_timer ) + i );;
315
+ return ((& lapic -> lvt_timer ) + i );
316
316
default :
317
317
xhyve_abort ("vlapic_get_lvt: invalid LVT\n" );
318
318
}
Original file line number Diff line number Diff line change @@ -165,7 +165,7 @@ static void *callout_thread_func(UNUSED void *arg) {
165
165
/* wait for work */
166
166
while (!callout_queue ) {
167
167
pthread_cond_wait (& callout_cnd , & callout_mtx );
168
- };
168
+ }
169
169
170
170
/* get the callout with the nearest timout */
171
171
c = callout_queue ;
@@ -187,7 +187,7 @@ static void *callout_thread_func(UNUSED void *arg) {
187
187
delta = c -> timeout - mat ;
188
188
mat_to_ts (delta , & ts );
189
189
ret = pthread_cond_timedwait_relative_np (& callout_cnd , & callout_mtx , & ts );
190
- };
190
+ }
191
191
192
192
work = false;
193
193
You can’t perform that action at this time.
0 commit comments