From 9a5480b53e5c8ea61348042e656a23c9d027e3c8 Mon Sep 17 00:00:00 2001
From: dv <dv@openbsd.org>
Date: Fri, 28 Apr 2023 18:52:22 +0000
Subject: [PATCH] Remove unneeded header includes in vmd.

No functional change. virtio block/networking emulation do not need
to know about vmm or any kernel types.
---
 usr.sbin/vmd/vioblk.c   | 4 +---
 usr.sbin/vmd/vionet.c   | 4 +---
 usr.sbin/vmd/vioqcow2.c | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/usr.sbin/vmd/vioblk.c b/usr.sbin/vmd/vioblk.c
index 08e5f397341..9373a135aa8 100644
--- a/usr.sbin/vmd/vioblk.c
+++ b/usr.sbin/vmd/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.1 2023/04/27 22:47:27 dv Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.2 2023/04/28 18:52:22 dv Exp $	*/
 
 /*
  * Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
@@ -18,9 +18,7 @@
  */
 #include <sys/mman.h>
 #include <sys/param.h> /* PAGE_SIZE */
-#include <sys/socket.h>
 
-#include <machine/vmmvar.h>
 #include <dev/pci/virtio_pcireg.h>
 #include <dev/pv/vioblkreg.h>
 #include <dev/pv/virtioreg.h>
diff --git a/usr.sbin/vmd/vionet.c b/usr.sbin/vmd/vionet.c
index 77ba469df51..6ce905fdccf 100644
--- a/usr.sbin/vmd/vionet.c
+++ b/usr.sbin/vmd/vionet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vionet.c,v 1.1 2023/04/27 22:47:27 dv Exp $	*/
+/*	$OpenBSD: vionet.c,v 1.2 2023/04/28 18:52:22 dv Exp $	*/
 
 /*
  * Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
@@ -23,8 +23,6 @@
 #include <dev/pci/virtio_pcireg.h>
 #include <dev/pv/virtioreg.h>
 
-#include <machine/vmmvar.h>
-
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/usr.sbin/vmd/vioqcow2.c b/usr.sbin/vmd/vioqcow2.c
index 035f199a1f5..96f830d58bf 100644
--- a/usr.sbin/vmd/vioqcow2.c
+++ b/usr.sbin/vmd/vioqcow2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioqcow2.c,v 1.21 2023/04/27 22:47:27 dv Exp $	*/
+/*	$OpenBSD: vioqcow2.c,v 1.22 2023/04/28 18:52:22 dv Exp $	*/
 
 /*
  * Copyright (c) 2018 Ori Bernstein <ori@eigenstate.org>
@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 
 #include <dev/pci/pcireg.h>
-#include <machine/vmmvar.h>
 
 #include <assert.h>
 #include <err.h>
-- 
2.20.1