diff options
| author |   mlarkin <mlarkin@openbsd.org> | 2016-10-26 05:26:36 +0000 |
|---|---|---|
| committer | mlarkin <mlarkin@openbsd.org> | 2016-10-26 05:26:36 +0000 |
| commit | 9dae6e67d5a95415e853d31576527c783cec07a2 (patch) | |
| tree | 1dd6c7105a77610f33a1048ffc07d85d38e5b8dc /usr.sbin/vmd/mc146818.c | |
| parent | Fix a few misc bugs in i386 vmm: (diff) | |
| download | wireguard-openbsd-9dae6e67d5a95415e853d31576527c783cec07a2.tar.xz wireguard-openbsd-9dae6e67d5a95415e853d31576527c783cec07a2.zip | |
vmd(8)/vmctl(8) for i386. Some ugliness in #ifdef __i386__ areas will be
fixed in tree, but the changes required were pretty minimal.
Note that i386 hosts are still presently limited to running i386 guests.
ok deraadt, stefan, jca
Diffstat (limited to 'usr.sbin/vmd/mc146818.c')
| -rw-r--r-- | usr.sbin/vmd/mc146818.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/vmd/mc146818.c b/usr.sbin/vmd/mc146818.c index 3962b531e7c..b77c1617be0 100644 --- a/usr.sbin/vmd/mc146818.c +++ b/usr.sbin/vmd/mc146818.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mc146818.c,v 1.3 2016/10/03 06:00:17 mlarkin Exp $ */ +/* $OpenBSD: mc146818.c,v 1.4 2016/10/26 05:26:36 mlarkin Exp $ */ /* * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org> * @@ -142,7 +142,7 @@ mc146818_init(uint32_t vm_id) evtimer_set(&rtc.sec, rtc_fire1, NULL); evtimer_add(&rtc.sec, &rtc.sec_tv); - evtimer_set(&rtc.per, rtc_fireper, (void *)(uint64_t)rtc.vm_id); + evtimer_set(&rtc.per, rtc_fireper, (void *)(intptr_t)rtc.vm_id); } /* |