git: de957de09785 - stable/13 - bhyve: Fix the WITH_BHYVE_SNAPSHOT build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Nov 2021 18:11:58 UTC
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=de957de097857fabb69a59a9ba36276c5e735de5
commit de957de097857fabb69a59a9ba36276c5e735de5
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-10-16 17:13:26 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-11-15 18:11:53 +0000
bhyve: Fix the WITH_BHYVE_SNAPSHOT build
Note, this breaks compatibility with snapshots generated by older builds
of bhyve(8).
Fixes: 7fa233534736 ("bhyve: Map the MSI-X table unconditionally for passthrough")
Reported by: Greg V <greg@unrelenting.technology>
Reviewed by: grehan, bz
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 77bc75c7abd29de69d3ef35b66c23c7baba95094)
---
usr.sbin/bhyve/pci_emul.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 113ac5121238..d155029d269f 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -2079,7 +2079,6 @@ pci_snapshot_pci_dev(struct vm_snapshot_meta *meta)
SNAPSHOT_VAR_OR_LEAVE(pi->pi_msix.pba_offset, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(pi->pi_msix.pba_size, meta, ret, done);
SNAPSHOT_VAR_OR_LEAVE(pi->pi_msix.function_mask, meta, ret, done);
- SNAPSHOT_VAR_OR_LEAVE(pi->pi_msix.pba_page_offset, meta, ret, done);
SNAPSHOT_BUF_OR_LEAVE(pi->pi_cfgdata, sizeof(pi->pi_cfgdata),
meta, ret, done);