From 58474854f2fe3f69308b7cb5225ebde5c791bb5d Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Fri, 16 Oct 2020 11:48:57 +0200 Subject: [PATCH] docs: Remove all virtio-mmio references Signed-off-by: Sebastien Boeuf --- docs/arm64.md | 18 ++++-------------- docs/device_model.md | 8 ++------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/docs/arm64.md b/docs/arm64.md index 27e698f9b..60d81e077 100644 --- a/docs/arm64.md +++ b/docs/arm64.md @@ -16,20 +16,10 @@ sudo apt-get install libfdt-dev ## Build -For Virtio devices, you can choose MMIO or PCI as transport option. - -### MMIO +Using PCI devices requires GICv3-ITS for MSI messaging. GICv3-ITS is very common in modern servers. ```bash -cargo build --no-default-features --features mmio,kvm -``` - -### PCI - -Using PCI devices requires GICv3-ITS for MSI messaging. GICv3-ITS is very common in modern servers, but your machine happen to be old ones with GICv2(M) (like Raspberry Pi 4) or GICv3 without ITS, MMIO can still work. - -```bash -cargo build --no-default-features --features pci,kvm +cargo build --no-default-features --features kvm ``` ## Image @@ -51,7 +41,7 @@ To build the development container: ./scripts/dev_cli.sh build-container ``` -To build Cloud-hypervisor in the container: (The default option for Virtio transport is MMIO.) +To build Cloud-hypervisor in the container: ```bash ./scripts/dev_cli.sh build @@ -62,7 +52,7 @@ To build Cloud-hypervisor in the container: (The default option for Virtio trans Assuming you have built Cloud-hypervisor with the development container, a VM can be started with command: ```bash -sudo build/cargo_target/aarch64-unknown-linux-gnu/debug/cloud-hypervisor --kernel kernel.bin --disk path=rootfs.ext4 --cmdline "keep_bootcon console=hvc0 reboot=k panic=1 pci=off root=/dev/vda rw" --cpus boot=4 --memory size=512M --serial file=serial.log --log-file log.log -vvv +sudo build/cargo_target/aarch64-unknown-linux-gnu/debug/cloud-hypervisor --kernel kernel.bin --disk path=rootfs.ext4 --cmdline "keep_bootcon console=hvc0 reboot=k panic=1 root=/dev/vda rw" --cpus boot=4 --memory size=512M --serial file=serial.log --log-file log.log -vvv ``` If the build was done out of the container, replace the binary path with `target/debug/cloud-hypervisor`. diff --git a/docs/device_model.md b/docs/device_model.md index 15a039473..33d6ea462 100644 --- a/docs/device_model.md +++ b/docs/device_model.md @@ -75,12 +75,8 @@ feature is enabled by default. ## Virtio devices -For all virtio devices listed below, both `virtio-mmio` and `virtio-pci` -transport layers are supported, `virtio-pci` being the default. - -Both `virtio-mmio` and `virtio-pci` can be compiled out. `virtio-pci` is -built-in by default, and enabled by default. If both transport layers were -built at the same time, `virtio-pci` would be the default transport layer. +For all virtio devices listed below, only `virtio-pci` transport layer is +supported. ### virtio-block