server->machine is now a pointer, so propagate the change from . to ->.

20 files changed, 74 insertions, 74 deletions

diff --git a/sysdeps/bsd/cpu.c b/sysdeps/bsd/cpu.c
index 652fd23d..cf5e721d 100644
--- a/sysdeps/bsd/cpu.c
+++ b/sysdeps/bsd/cpu.c
@@ -61,7 +61,7 @@ void
 _glibtop_init_cpu_p (glibtop *server)
 {
 #ifndef KERN_CP_TIME
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
 		return;
 	}
@@ -100,7 +100,7 @@ glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
 		return;
 	}
 #else
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &cpts, sizeof (cpts)) != sizeof (cpts)) {
 		glibtop_warn_io_r (server, "kvm_read (cp_time)");
 		return;
diff --git a/sysdeps/bsd/glibtop_suid.h b/sysdeps/bsd/glibtop_suid.h
index 1efb997d..253c1d50 100644
--- a/sysdeps/bsd/glibtop_suid.h
+++ b/sysdeps/bsd/glibtop_suid.h
@@ -35,11 +35,11 @@ G_BEGIN_DECLS
 #define UREADOK(ki)	(FORCEUREAD || (KI_PROC(ki)->p_flag & P_INMEM))
 
 static inline void glibtop_suid_enter (glibtop *server) {
-	setregid (server->machine.gid, server->machine.egid);
+	setregid (server->machine->gid, server->machine->egid);
 };
 
 static inline void glibtop_suid_leave (glibtop *server) {
-	if (setregid (server->machine.egid, server->machine.gid))
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
 };
 
diff --git a/sysdeps/bsd/mem.c b/sysdeps/bsd/mem.c
index 1b6147e7..df5912e8 100644
--- a/sysdeps/bsd/mem.c
+++ b/sysdeps/bsd/mem.c
@@ -92,7 +92,7 @@ _glibtop_init_mem_p (glibtop *server)
 {
 	register int pagesize;
 
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (mem)");
 		return;
 	}
@@ -154,14 +154,14 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
 	}
 #else
 	/* Get the data from kvm_* */
-	if (kvm_read (server->machine.kd, nlst[1].n_value,
+	if (kvm_read (server->machine->kd, nlst[1].n_value,
 		      &vmm, sizeof (vmm)) != sizeof (vmm)) {
 		glibtop_warn_io_r (server, "kvm_read (cnt)");
 		return;
 	}
 #endif
 
-	if (kvm_read (server->machine.kd, nlst[0].n_value,
+	if (kvm_read (server->machine->kd, nlst[0].n_value,
 		      &bufspace, sizeof (bufspace)) != sizeof (bufspace)) {
 		glibtop_warn_io_r (server, "kvm_read (bufspace)");
 		return;
diff --git a/sysdeps/bsd/msg_limits.c b/sysdeps/bsd/msg_limits.c
index 535b08f4..44aed99b 100644
--- a/sysdeps/bsd/msg_limits.c
+++ b/sysdeps/bsd/msg_limits.c
@@ -75,12 +75,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_msg_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (msg_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_msginfo, sizeof (_msginfo)) != sizeof (_msginfo)) {
 		glibtop_warn_io_r (server, "kvm_read (msginfo)");
 		return;
diff --git a/sysdeps/bsd/netload.c b/sysdeps/bsd/netload.c
index 25ed9e79..2195e191 100644
--- a/sysdeps/bsd/netload.c
+++ b/sysdeps/bsd/netload.c
@@ -72,7 +72,7 @@ _glibtop_init_netload_p (glibtop *server)
 {
     server->sysdeps.netload = _glibtop_sysdeps_netload;
 
-    if (kvm_nlist (server->machine.kd, nlst) < 0)
+    if (kvm_nlist (server->machine->kd, nlst) < 0)
 	glibtop_error_io_r (server, "kvm_nlist");
 }
 
@@ -99,7 +99,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 
     memset (buf, 0, sizeof (glibtop_netload));
 
-    if (kvm_read (server->machine.kd, nlst [0].n_value,
+    if (kvm_read (server->machine->kd, nlst [0].n_value,
 		  &ifnetaddr, sizeof (ifnetaddr)) != sizeof (ifnetaddr))
 	glibtop_error_io_r (server, "kvm_read (ifnet)");
 
@@ -111,12 +111,12 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	{
 	    ifnetfound = ifnetaddr;
 
-	    if (kvm_read (server->machine.kd, ifnetaddr, &ifnet,
+	    if (kvm_read (server->machine->kd, ifnetaddr, &ifnet,
 			  sizeof (ifnet)) != sizeof (ifnet))
 		    glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
 
 #if (defined(__FreeBSD__) && (__FreeBSD_version < 501113)) || defined(__bsdi__)
-	    if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
+	    if (kvm_read (server->machine->kd, (u_long) ifnet.if_name,
 			  tname, 16) != 16)
 		    glibtop_error_io_r (server, "kvm_read (if_name)");
 	    tname[15] = '\0';
@@ -202,7 +202,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
 	buf->flags = _glibtop_sysdeps_netload;
 
 	while (ifaddraddr) {
-	    if ((kvm_read (server->machine.kd, ifaddraddr, &ifaddr,
+	    if ((kvm_read (server->machine->kd, ifaddraddr, &ifaddr,
 			   sizeof (ifaddr)) != sizeof (ifaddr)))
 		glibtop_error_io_r (server, "kvm_read (ifaddraddr)");
 
diff --git a/sysdeps/bsd/open.c b/sysdeps/bsd/open.c
index b8608c69..e5cbb6cd 100644
--- a/sysdeps/bsd/open.c
+++ b/sysdeps/bsd/open.c
@@ -58,27 +58,27 @@ glibtop_open_p (glibtop *server, const char *program_name,
 
 	/* !!! WE ARE ROOT HERE - CHANGE WITH CAUTION !!! */
 
-	server->machine.uid = getuid ();
-	server->machine.euid = geteuid ();
-	server->machine.gid = getgid ();
-	server->machine.egid = getegid ();
+	server->machine->uid = getuid ();
+	server->machine->euid = geteuid ();
+	server->machine->gid = getgid ();
+	server->machine->egid = getegid ();
 
 #ifdef __FreeBSD__
 	server->os_version_code = __FreeBSD_version;
 #endif
 
 	/* Setup machine-specific data */
-	server->machine.kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
+	server->machine->kd = kvm_open (NULL, NULL, NULL, O_RDONLY, "kvm_open");
 
-	if (server->machine.kd == NULL)
+	if (server->machine->kd == NULL)
 		glibtop_error_io_r (server, "kvm_open");
 
 	/* Drop priviledges. */
 
-	if (setreuid (server->machine.euid, server->machine.uid))
+	if (setreuid (server->machine->euid, server->machine->uid))
 		_exit (1);
 
-	if (setregid (server->machine.egid, server->machine.gid))
+	if (setregid (server->machine->egid, server->machine->gid))
 		_exit (1);
 
 	/* !!! END OF SUID ROOT PART !!! */
diff --git a/sysdeps/bsd/ppp.c b/sysdeps/bsd/ppp.c
index 2e1dcaba..ae9307ad 100644
--- a/sysdeps/bsd/ppp.c
+++ b/sysdeps/bsd/ppp.c
@@ -81,7 +81,7 @@ _glibtop_init_ppp_p (glibtop *server)
 #endif
 #endif /* HAVE_I4B */
 
-	if (kvm_nlist (server->machine.kd, nlst) < 0)
+	if (kvm_nlist (server->machine->kd, nlst) < 0)
 		glibtop_error_io_r (server, "kvm_nlist");
 }
 
@@ -102,7 +102,7 @@ glibtop_get_ppp_p (glibtop *server, glibtop_ppp *buf, unsigned short device)
 
 	memset (buf, 0, sizeof (glibtop_ppp));
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &data, sizeof (data)) != sizeof (data))
 		glibtop_error_io_r (server, "kvm_read (i4bisppp_softc)");
 
diff --git a/sysdeps/bsd/procargs.c b/sysdeps/bsd/procargs.c
index 9c78c053..b2ea761a 100644
--- a/sysdeps/bsd/procargs.c
+++ b/sysdeps/bsd/procargs.c
@@ -72,14 +72,14 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 	glibtop_suid_enter (server);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_suid_leave (server);
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return NULL;
 	}
 
-	args = kvm_getargv (server->machine.kd, pinfo, max_len);
+	args = kvm_getargv (server->machine->kd, pinfo, max_len);
 	if (args == NULL) {
 		glibtop_suid_leave (server);
 		glibtop_warn_io_r (server, "kvm_getargv (%d)", pid);
diff --git a/sysdeps/bsd/prockernel.c b/sysdeps/bsd/prockernel.c
index 65252397..0927c4b1 100644
--- a/sysdeps/bsd/prockernel.c
+++ b/sysdeps/bsd/prockernel.c
@@ -113,7 +113,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -170,11 +170,11 @@ glibtop_get_proc_kernel_p (glibtop *server,
 	/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
 	 * from kernel memory.  */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #else
 
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 #endif
 		       (unsigned long) &u_addr->u_stats,
 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
@@ -195,10 +195,10 @@ glibtop_get_proc_kernel_p (glibtop *server,
 		}
 
 #ifdef __NetBSD__
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #else
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 #endif
 		       (unsigned long) &u_addr->u_pcb,
 		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
diff --git a/sysdeps/bsd/proclist.c b/sysdeps/bsd/proclist.c
index 2b82355b..83310010 100644
--- a/sysdeps/bsd/proclist.c
+++ b/sysdeps/bsd/proclist.c
@@ -72,7 +72,7 @@ glibtop_get_proclist_p (glibtop *server, glibtop_proclist *buf,
 	which = (int)(real_which & GLIBTOP_KERN_PROC_MASK);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, which, arg, &count);
+	pinfo = kvm_getprocs (server->machine->kd, which, arg, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (proclist)");
 		return NULL;
diff --git a/sysdeps/bsd/procmap.c b/sysdeps/bsd/procmap.c
index a90ff17c..bcc01165 100644
--- a/sysdeps/bsd/procmap.c
+++ b/sysdeps/bsd/procmap.c
@@ -128,7 +128,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 	glibtop_suid_enter (server);
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return (glibtop_map_entry*) g_array_free(maps, TRUE);
@@ -136,7 +136,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	/* Now we get the memory maps. */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 #if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
 		      (unsigned long) pinfo [0].ki_vmspace,
 #else
@@ -147,7 +147,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 	first = vmspace.vm_map.header.next;
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) vmspace.vm_map.header.next,
 		      (char *) &entry, sizeof (entry)) != sizeof (entry))
 		glibtop_error_io_r (server, "kvm_read (entry)");
@@ -173,7 +173,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		guint len;
 
 		if (update) {
-			if (kvm_read (server->machine.kd,
+			if (kvm_read (server->machine->kd,
 				      (unsigned long) entry.next,
 				      &entry, sizeof (entry)) != sizeof (entry))
 				glibtop_error_io_r (server, "kvm_read (entry)");
@@ -206,7 +206,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 		/* We're only interested in vnodes */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.uvm_obj,
 			      &vnode, sizeof (vnode)) != sizeof (vnode)) {
 			glibtop_warn_io_r (server, "kvm_read (vnode)");
@@ -218,7 +218,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 
 		/* We're only interested in `vm_object's */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.vm_object,
 			      &object, sizeof (object)) != sizeof (object))
 			glibtop_error_io_r (server, "kvm_read (object)");
@@ -232,7 +232,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) vnode.v_data,
 			      &inode, sizeof (inode)) != sizeof (inode))
 			glibtop_error_io_r (server, "kvm_read (inode)");
@@ -251,7 +251,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if (!object.handle)
 			continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) object.handle,
 			      &vnode, sizeof (vnode)) != sizeof (vnode))
 			glibtop_error_io_r (server, "kvm_read (vnode)");
@@ -270,7 +270,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) vnode.v_data,
 			      &inode, sizeof (inode)) != sizeof (inode))
 			glibtop_error_io_r (server, "kvm_read (inode)");
diff --git a/sysdeps/bsd/procmem.c b/sysdeps/bsd/procmem.c
index d43fbdfe..b20ab800 100644
--- a/sysdeps/bsd/procmem.c
+++ b/sysdeps/bsd/procmem.c
@@ -140,7 +140,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 	if (pid == 0) return;
 
 	/* Get the process data */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count < 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -161,7 +161,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 #define        PROC_VMSPACE   kp_proc.p_vmspace
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].PROC_VMSPACE,
 		      (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) {
 		glibtop_warn_io_r (server, "kvm_read (plimit)");
@@ -182,7 +182,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 	/* Now we get the shared memory. */
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].PROC_VMSPACE,
 		      (char *) &vmspace, sizeof (vmspace)) != sizeof (vmspace)) {
 		glibtop_warn_io_r (server, "kvm_read (vmspace)");
@@ -191,7 +191,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 	first = vmspace.vm_map.header.next;
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) vmspace.vm_map.header.next,
 		      (char *) &entry, sizeof (entry)) != sizeof (entry)) {
 		glibtop_warn_io_r (server, "kvm_read (entry)");
@@ -205,7 +205,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 	 * to OBJT_DEFAULT so if seems this really works. */
 
 	while (entry.next != first) {
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.next,
 			      &entry, sizeof (entry)) != sizeof (entry)) {
 			glibtop_warn_io_r (server, "kvm_read (entry)");
@@ -236,7 +236,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 		/* We're only interested in vnodes */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.uvm_obj,
 			      &vnode, sizeof (vnode)) != sizeof (vnode)) {
 			glibtop_warn_io_r (server, "kvm_read (vnode)");
@@ -248,7 +248,7 @@ glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
 
 		/* We're only interested in `vm_object's */
 
-		if (kvm_read (server->machine.kd,
+		if (kvm_read (server->machine->kd,
 			      (unsigned long) entry.object.vm_object,
 			      &object, sizeof (object)) != sizeof (object)) {
 			glibtop_warn_io_r (server, "kvm_read (object)");
diff --git a/sysdeps/bsd/procsegment.c b/sysdeps/bsd/procsegment.c
index d5fabcaa..282c86f0 100644
--- a/sysdeps/bsd/procsegment.c
+++ b/sysdeps/bsd/procsegment.c
@@ -53,7 +53,7 @@ glibtop_get_proc_segment_p (glibtop *server,
 
 #if 0
 	/* Get the process info from the kernel */
-	kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, count);
+	kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, count);
 	if (*count != 1) {
 		return; /* the zeroed-out buffer indicating no data */
 	}
diff --git a/sysdeps/bsd/procsignal.c b/sysdeps/bsd/procsignal.c
index f688ab22..9771f7dc 100644
--- a/sysdeps/bsd/procsignal.c
+++ b/sysdeps/bsd/procsignal.c
@@ -62,7 +62,7 @@ glibtop_get_proc_signal_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
diff --git a/sysdeps/bsd/procstate.c b/sysdeps/bsd/procstate.c
index 2607625b..6fcec52b 100644
--- a/sysdeps/bsd/procstate.c
+++ b/sysdeps/bsd/procstate.c
@@ -65,7 +65,7 @@ glibtop_get_proc_state_p (glibtop *server,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
diff --git a/sysdeps/bsd/proctime.c b/sysdeps/bsd/proctime.c
index dd073d68..ff29adcb 100644
--- a/sysdeps/bsd/proctime.c
+++ b/sysdeps/bsd/proctime.c
@@ -136,7 +136,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #endif
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -156,7 +156,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || (defined(OpenBSD) && (OpenBSD >= 199912))
 	glibtop_suid_enter (server);
 
-	if (kvm_read (server->machine.kd,
+	if (kvm_read (server->machine->kd,
 		      (unsigned long) pinfo [0].kp_proc.p_stats,
 		      &pstats, sizeof (pstats)) != sizeof (pstats)) {
 		glibtop_warn_io_r (server, "kvm_read (pstats)");
@@ -202,7 +202,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #elif (__FreeBSD_version <= 500013)
 
         if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-            kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+            kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
                        (unsigned long) &u_addr->u_stats,
                        (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
 		{
@@ -218,7 +218,7 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
 #else
 
 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
-	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+	    kvm_uread (server->machine->kd, &(pinfo [0]).kp_proc,
 		       (unsigned long) &u_addr->u_stats,
 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
 		{
diff --git a/sysdeps/bsd/procuid.c b/sysdeps/bsd/procuid.c
index 5fd7dfa2..cee39e00 100644
--- a/sysdeps/bsd/procuid.c
+++ b/sysdeps/bsd/procuid.c
@@ -69,7 +69,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 	if (pid == 0) return;
 
 	/* Get the process information */
-	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+	pinfo = kvm_getprocs (server->machine->kd, KERN_PROC_PID, pid, &count);
 	if ((pinfo == NULL) || (count != 1)) {
 		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return;
@@ -128,7 +128,7 @@ glibtop_get_proc_uid_p (glibtop *server, glibtop_proc_uid *buf,
 	ucred_ptr = (void *) pinfo [0].kp_eproc.e_pcred.pc_ucred;
 
 	if (ucred_ptr) {
-		if (kvm_read (server->machine.kd, (unsigned long) ucred_ptr,
+		if (kvm_read (server->machine->kd, (unsigned long) ucred_ptr,
 			      &ucred, sizeof (ucred)) != sizeof (ucred)) {
 			glibtop_warn_io_r (server, "kvm_read (ucred)");
 		} else {
diff --git a/sysdeps/bsd/sem_limits.c b/sysdeps/bsd/sem_limits.c
index 3cbff601..758b775f 100644
--- a/sysdeps/bsd/sem_limits.c
+++ b/sysdeps/bsd/sem_limits.c
@@ -77,12 +77,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_sem_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (sem_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_seminfo, sizeof (_seminfo)) != sizeof (_seminfo)) {
 		glibtop_warn_io_r (server, "kvm_read (seminfo)");
 		return;
diff --git a/sysdeps/bsd/shm_limits.c b/sysdeps/bsd/shm_limits.c
index 48f21b53..219b532c 100644
--- a/sysdeps/bsd/shm_limits.c
+++ b/sysdeps/bsd/shm_limits.c
@@ -75,12 +75,12 @@ static struct nlist nlst [] = {
 void
 _glibtop_init_shm_limits_p (glibtop *server)
 {
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (shm_limits)");
 		return;
 	}
 
-	if (kvm_read (server->machine.kd, nlst [0].n_value,
+	if (kvm_read (server->machine->kd, nlst [0].n_value,
 		      &_shminfo, sizeof (_shminfo)) != sizeof (_shminfo)) {
 		glibtop_warn_io_r (server, "kvm_read (shminfo)");
 		return;
diff --git a/sysdeps/bsd/swap.c b/sysdeps/bsd/swap.c
index af6d2328..81979a80 100644
--- a/sysdeps/bsd/swap.c
+++ b/sysdeps/bsd/swap.c
@@ -94,14 +94,14 @@ _glibtop_init_swap_p (glibtop *server)
 {
 #if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
 #if __FreeBSD__ < 4 || defined(__bsdi__)
-	if (kvm_nlist (server->machine.kd, nlst) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
 		return;
 	}
 #else
 	struct kvm_swap dummy;
 
-	if (kvm_getswapinfo (server->machine.kd, &dummy, 1, 0) != 0) {
+	if (kvm_getswapinfo (server->machine->kd, &dummy, 1, 0) != 0) {
 		glibtop_warn_io_r (server, "kvm_swap (swap)");
 		return;
 	}
@@ -109,7 +109,7 @@ _glibtop_init_swap_p (glibtop *server)
 #endif
 
 #if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) && !defined(__OpenBSD__)
-	if (kvm_nlist (server->machine.kd, nlst2) < 0) {
+	if (kvm_nlist (server->machine->kd, nlst2) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (cnt)");
 		return;
 	}
@@ -181,7 +181,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 #else
 	/* This is used to get the `pagein' and `pageout' members. */
 
-	if (kvm_read (server->machine.kd, nlst2[0].n_value,
+	if (kvm_read (server->machine->kd, nlst2[0].n_value,
 		      &vmm, sizeof (vmm)) != sizeof (vmm)) {
 		glibtop_warn_io_r (server, "kvm_read (cnt)");
 		return;
@@ -228,7 +228,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Size of largest swap device. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_NSWAP].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_NSWAP].n_value,
 		      &nswap, sizeof (nswap)) != sizeof (nswap)) {
 		glibtop_warn_io_r (server, "kvm_read (nswap)");
 		return;
@@ -236,7 +236,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Number of swap devices. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_NSWDEV].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_NSWDEV].n_value,
 		      &nswdev, sizeof (nswdev)) != sizeof (nswdev)) {
 		glibtop_warn_io_r (server, "kvm_read (nswdev)");
 		return;
@@ -244,7 +244,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Maximum size of a swap block. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_DMMAX].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_DMMAX].n_value,
 		      &dmmax, sizeof (dmmax)) != sizeof (dmmax)) {
 		glibtop_warn_io_r (server, "kvm_read (dmmax)");
 		return;
@@ -252,7 +252,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* List of free swap areas. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_SWAPLIST].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_SWAPLIST].n_value,
 		      &swaplist, sizeof (swaplist)) != sizeof (swaplist)) {
 		glibtop_warn_io_r (server, "kvm_read (swaplist)");
 		return;
@@ -260,7 +260,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* Kernel offset of list of swap devices and sizes. */
 
-	if (kvm_read (server->machine.kd, nlst[VM_SWDEVT].n_value,
+	if (kvm_read (server->machine->kd, nlst[VM_SWDEVT].n_value,
 		      &ptr, sizeof (ptr)) != sizeof (ptr)) {
 		glibtop_warn_io_r (server, "kvm_read (swdevt)");
 		return;
@@ -271,7 +271,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 	sw_size = nswdev * sizeof (*sw);
 	sw = g_malloc (sw_size);
 
-	if (kvm_read (server->machine.kd, ptr, sw, sw_size) != (ssize_t)sw_size) {
+	if (kvm_read (server->machine->kd, ptr, sw, sw_size) != (ssize_t)sw_size) {
 		glibtop_warn_io_r (server, "kvm_read (*swdevt)");
 		return;
 	}
@@ -288,7 +288,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 	while (swapptr) {
 		int	top, bottom, next_block;
 
-		if (kvm_read (server->machine.kd, (int) swapptr, &head,
+		if (kvm_read (server->machine->kd, (int) swapptr, &head,
 			      sizeof (struct rlist)) != sizeof (struct rlist)) {
 			glibtop_warn_io_r (server, "kvm_read (swapptr)");
 			return;
@@ -365,7 +365,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 #else
 
-	nswdev = kvm_getswapinfo(server->machine.kd, kvmsw, 16, 0);
+	nswdev = kvm_getswapinfo(server->machine->kd, kvmsw, 16, 0);
 
 	buf->flags = _glibtop_sysdeps_swap;
 
@@ -380,7 +380,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 
 	/* General info about swap devices. */
 
-	if (kvm_read (server->machine.kd, nlst[0].n_value,
+	if (kvm_read (server->machine->kd, nlst[0].n_value,
 		      &swap, sizeof (swap)) != sizeof (swap)) {
 		glibtop_warn_io_r (server, "kvm_read (swap)");
 		return;