Skip to content

Commit f9b25c2

Browse files
kleinwebystefano-garzarella
authored andcommitted
vhost: Fix building docs
Building docs (as on docs.rs) has been broken since 8ee8739. This commit introduces POSTCOPY and made this feature mutually exclusive with xen. As docs are build for all features the corresponding check will be triggered and the docs can not be built. This patch extends the check to allow both "postcopy" and "xen" to be enabled when building docs. Signed-off-by: Christian Speich <[email protected]>
1 parent 03ba6ea commit f9b25c2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

vhost/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
### Changed
77
### Deprecated
88
### Fixed
9+
- [[#304]](https://github.com/rust-vmm/vhost/pull/304) Fix building docs.
910

1011
## v0.14.0
1112

vhost/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub mod vsock;
5454
/// Due to the way `xen` handles memory mappings we can not combine it with
5555
/// `postcopy` feature which relies on persistent memory mappings. Thus we
5656
/// disallow enabling both features at the same time.
57-
#[cfg(all(feature = "postcopy", feature = "xen"))]
57+
#[cfg(all(not(doc), feature = "postcopy", feature = "xen"))]
5858
compile_error!("Both `postcopy` and `xen` features can not be enabled at the same time.");
5959

6060
/// Error codes for vhost operations

0 commit comments

Comments
 (0)