From 133a513ddc9aedf83489373f4af9971347bc6201 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Sun, 1 Sep 2024 14:00:26 +0000
Subject: [PATCH] vmm: Make vmm_dev.h more self-contained

vmm.h is required for VM_MAX_SUFFIXLEN.  vmm_snapshot.h is required for
struct vm_snapshot_meta.

This is a prerequisite for including vmm_dev.h in the headers parsed by
libsysdecode.

Reviewed by:	jhb
Differential Revision:	https://reviews.freebsd.org/D46485
---
 sys/amd64/include/vmm_dev.h | 3 ++-
 sys/arm64/include/vmm_dev.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h
index 5f347e46b9c4..b77b0ef5d996 100644
--- a/sys/amd64/include/vmm_dev.h
+++ b/sys/amd64/include/vmm_dev.h
@@ -29,7 +29,8 @@
 #ifndef	_VMM_DEV_H_
 #define	_VMM_DEV_H_
 
-struct vm_snapshot_meta;
+#include <machine/vmm.h>
+#include <machine/vmm_snapshot.h>
 
 struct vm_memmap {
 	vm_paddr_t	gpa;
diff --git a/sys/arm64/include/vmm_dev.h b/sys/arm64/include/vmm_dev.h
index 08c237d31046..938bea47c7f8 100644
--- a/sys/arm64/include/vmm_dev.h
+++ b/sys/arm64/include/vmm_dev.h
@@ -27,6 +27,8 @@
 #ifndef	_VMM_DEV_H_
 #define	_VMM_DEV_H_
 
+#include <machine/vmm.h>
+
 struct vm_memmap {
 	vm_paddr_t	gpa;
 	int		segid;		/* memory segment */