summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/vmd/i8253.c7
-rw-r--r--usr.sbin/vmd/mc146818.c8
-rw-r--r--usr.sbin/vmd/ns8250.c9
-rw-r--r--usr.sbin/vmd/virtio.c6
-rw-r--r--usr.sbin/vmd/vm.c8
5 files changed, 7 insertions, 31 deletions
diff --git a/usr.sbin/vmd/i8253.c b/usr.sbin/vmd/i8253.c
index 0f4307d9681..4cc5bc01819 100644
--- a/usr.sbin/vmd/i8253.c
+++ b/usr.sbin/vmd/i8253.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i8253.c,v 1.30 2019/11/29 00:51:27 mlarkin Exp $ */
+/* $OpenBSD: i8253.c,v 1.31 2019/11/30 00:51:29 mlarkin Exp $ */
/*
* Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
*
@@ -34,7 +34,6 @@
#include "atomicio.h"
extern char *__progname;
-extern struct event_base *evbase;
/*
* Channel 0 is used to generate the legacy hardclock interrupt (HZ).
@@ -76,11 +75,8 @@ i8253_init(uint32_t vm_id)
i8253_channel[2].state = 0;
evtimer_set(&i8253_channel[0].timer, i8253_fire, &i8253_channel[0]);
- event_base_set(evbase, &i8253_channel[0].timer);
evtimer_set(&i8253_channel[1].timer, i8253_fire, &i8253_channel[1]);
- event_base_set(evbase, &i8253_channel[1].timer);
evtimer_set(&i8253_channel[2].timer, i8253_fire, &i8253_channel[2]);
- event_base_set(evbase, &i8253_channel[2].timer);
}
/*
@@ -381,7 +377,6 @@ i8253_restore(int fd, uint32_t vm_id)
i8253_channel[i].vm_id = vm_id;
evtimer_set(&i8253_channel[i].timer, i8253_fire,
&i8253_channel[i]);
- event_base_set(evbase, &i8253_channel[i].timer);
i8253_reset(i);
}
return (0);
diff --git a/usr.sbin/vmd/mc146818.c b/usr.sbin/vmd/mc146818.c
index a400fe7718d..8526e20f4d6 100644
--- a/usr.sbin/vmd/mc146818.c
+++ b/usr.sbin/vmd/mc146818.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mc146818.c,v 1.20 2019/11/29 00:51:27 mlarkin Exp $ */
+/* $OpenBSD: mc146818.c,v 1.21 2019/11/30 00:51:29 mlarkin Exp $ */
/*
* Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
*
@@ -35,8 +35,6 @@
#include "vmm.h"
#include "atomicio.h"
-extern struct event_base *evbase;
-
#define MC_DIVIDER_MASK 0xe0
#define MC_RATE_MASK 0xf
@@ -174,11 +172,9 @@ mc146818_init(uint32_t vm_id, uint64_t memlo, uint64_t memhi)
timerclear(&rtc.per_tv);
evtimer_set(&rtc.sec, rtc_fire1, NULL);
- event_base_set(evbase, &rtc.sec);
evtimer_add(&rtc.sec, &rtc.sec_tv);
evtimer_set(&rtc.per, rtc_fireper, (void *)(intptr_t)rtc.vm_id);
- event_base_set(evbase, &rtc.per);
}
/*
@@ -345,9 +341,7 @@ mc146818_restore(int fd, uint32_t vm_id)
memset(&rtc.sec, 0, sizeof(struct event));
memset(&rtc.per, 0, sizeof(struct event));
evtimer_set(&rtc.sec, rtc_fire1, NULL);
- event_base_set(evbase, &rtc.sec);
evtimer_set(&rtc.per, rtc_fireper, (void *)(intptr_t)rtc.vm_id);
- event_base_set(evbase, &rtc.per);
return (0);
}
diff --git a/usr.sbin/vmd/ns8250.c b/usr.sbin/vmd/ns8250.c
index 8aa88985623..8899767467c 100644
--- a/usr.sbin/vmd/ns8250.c
+++ b/usr.sbin/vmd/ns8250.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns8250.c,v 1.22 2019/11/29 00:51:27 mlarkin Exp $ */
+/* $OpenBSD: ns8250.c,v 1.23 2019/11/30 00:51:29 mlarkin Exp $ */
/*
* Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
*
@@ -35,7 +35,6 @@
#include "atomicio.h"
extern char *__progname;
-extern struct event_base *evbase;
struct ns8250_dev com1_dev;
static void com_rcv_event(int, short, void *);
@@ -99,7 +98,6 @@ ns8250_init(int fd, uint32_t vmid)
event_set(&com1_dev.event, com1_dev.fd, EV_READ | EV_PERSIST,
com_rcv_event, (void *)(intptr_t)vmid);
- event_base_set(evbase, &com1_dev.event);
/*
* Whenever fd is writable implies that the pty slave is connected.
@@ -108,14 +106,12 @@ ns8250_init(int fd, uint32_t vmid)
*/
event_set(&com1_dev.wake, com1_dev.fd, EV_WRITE,
com_rcv_event, (void *)(intptr_t)vmid);
- event_base_set(evbase, &com1_dev.wake);
event_add(&com1_dev.wake, NULL);
/* Rate limiter for simulating baud rate */
timerclear(&com1_dev.rate_tv);
com1_dev.rate_tv.tv_usec = 10000;
evtimer_set(&com1_dev.rate, ratelimit, NULL);
- event_base_set(evbase, &com1_dev.rate);
}
static void
@@ -673,15 +669,12 @@ ns8250_restore(int fd, int con_fd, uint32_t vmid)
com1_dev.rate_tv.tv_usec = 10000;
com1_dev.pause_ct = (com1_dev.baudrate / 8) / 1000 * 10;
evtimer_set(&com1_dev.rate, ratelimit, NULL);
- event_base_set(evbase, &com1_dev.rate);
event_set(&com1_dev.event, com1_dev.fd, EV_READ | EV_PERSIST,
com_rcv_event, (void *)(intptr_t)vmid);
- event_base_set(evbase, &com1_dev.event);
event_set(&com1_dev.wake, com1_dev.fd, EV_WRITE,
com_rcv_event, (void *)(intptr_t)vmid);
- event_base_set(evbase, &com1_dev.wake);
event_add(&com1_dev.wake, NULL);
return (0);
diff --git a/usr.sbin/vmd/virtio.c b/usr.sbin/vmd/virtio.c
index 8dc42ffe5c1..92168f59156 100644
--- a/usr.sbin/vmd/virtio.c
+++ b/usr.sbin/vmd/virtio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: virtio.c,v 1.80 2019/11/29 00:51:27 mlarkin Exp $ */
+/* $OpenBSD: virtio.c,v 1.81 2019/11/30 00:51:29 mlarkin Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -48,8 +48,6 @@
#include "atomicio.h"
extern char *__progname;
-extern struct event_base *evbase;
-
struct viornd_dev viornd;
struct vioblk_dev *vioblk;
struct vionet_dev *vionet;
@@ -1881,7 +1879,6 @@ virtio_init(struct vmd_vm *vm, int child_cdrom,
event_set(&vionet[i].event, vionet[i].fd,
EV_READ | EV_PERSIST, vionet_rx_event, &vionet[i]);
- event_base_set(evbase, &vionet[i].event);
if (event_add(&vionet[i].event, NULL)) {
log_warn("could not initialize vionet event "
"handler");
@@ -2036,7 +2033,6 @@ virtio_init(struct vmd_vm *vm, int child_cdrom,
vmmci.pci_id = id;
evtimer_set(&vmmci.timeout, vmmci_timeout, NULL);
- event_base_set(evbase, &vmmci.timeout);
}
void
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index d787839cc1e..1e687924a61 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vm.c,v 1.52 2019/11/29 00:51:28 mlarkin Exp $ */
+/* $OpenBSD: vm.c,v 1.53 2019/11/30 00:51:29 mlarkin Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -114,8 +114,6 @@ pthread_mutex_t vcpu_run_mtx[VMM_MAX_VCPUS_PER_VM];
uint8_t vcpu_hlt[VMM_MAX_VCPUS_PER_VM];
uint8_t vcpu_done[VMM_MAX_VCPUS_PER_VM];
-struct event_base *evbase;
-
/*
* Represents a standard register set for an OS to be booted
* as a flat 64 bit address space.
@@ -362,7 +360,7 @@ start_vm(struct vmd_vm *vm, int fd)
for (i = 0; i < VMM_MAX_NICS_PER_VM; i++)
nicfds[i] = vm->vm_ifs[i].vif_fd;
- evbase = event_base_new();
+ event_init();
if (vm->vm_state & VM_STATE_RECEIVED) {
restore_emulated_hw(vcp, vm->vm_receive_fd, nicfds,
@@ -1299,7 +1297,7 @@ event_thread(void *arg)
uint8_t *donep = arg;
intptr_t ret;
- ret = event_base_dispatch(evbase);
+ ret = event_dispatch();
mutex_lock(&threadmutex);
*donep = 1;
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.