Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Oct 2021 14:15:10 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 000b70f038f4 - stable/13 - bhyve: Fix the WITH_BHYVE_SNAPSHOT build
Message-ID:  <202110301415.19UEFALv050157@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=000b70f038f4fd6893d69bd3dce75a416cd13dfe

commit 000b70f038f4fd6893d69bd3dce75a416cd13dfe
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2021-10-16 17:13:26 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2021-10-30 14:14:41 +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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110301415.19UEFALv050157>