From db88a529c575c2a8566f1c15dc829c406c022f7b Mon Sep 17 00:00:00 2001 From: Geoffroy Van Cutsem Date: Wed, 16 Jun 2021 10:37:37 +0200 Subject: [PATCH] doc: update the ACRN on QEMU tutorial with latest kernel config Update the "Enable ACRN Over QEMU/KVM" tutorial: * Remove the steps explaining how to add the Virtio blk driver to the Service VM kernel. It is now part of the default configuration * Add a note to make it more obvious that the tutorial assumes that the compilation of ACRN and its kernel is done *inside* the QEMU VM that will serve as the Service VM for ACRN Signed-off-by: Geoffroy Van Cutsem --- doc/tutorials/acrn_on_qemu.rst | 44 +++++++-------------------- doc/tutorials/images/acrn_qemu_4.png | Bin 3394 -> 0 bytes 2 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 doc/tutorials/images/acrn_qemu_4.png diff --git a/doc/tutorials/acrn_on_qemu.rst b/doc/tutorials/acrn_on_qemu.rst index 97262cd66..243357f0c 100644 --- a/doc/tutorials/acrn_on_qemu.rst +++ b/doc/tutorials/acrn_on_qemu.rst @@ -118,7 +118,13 @@ This concludes the initial configuration of the Service VM, the next steps will Install ACRN Hypervisor *********************** -1. Install the ACRN build tools and dependencies following the :ref:`install-build-tools-dependencies` +1. Launch the ``ACRNSOS`` Service VM guest and log onto it (SSH is recommended but the console is + available too). + + .. important:: All the steps below are performed **inside** the Service VM guest that we built in the + previous section. + +#. Install the ACRN build tools and dependencies following the :ref:`install-build-tools-dependencies` #. Clone ACRN repo and check out the ``v2.5`` tag. @@ -149,38 +155,10 @@ Install ACRN Hypervisor sudo cp build/hypervisor/acrn.32.out /boot -#. Clone and configure the Service VM kernel repository. The User VM (L2 guest) uses the - ``virtio-blk`` driver to mount the rootfs. We will modify the default kernel - configuration to enable it (built-in). - - .. code-block:: none - - cd ~ - sudo apt install libncurses-dev bc libelf-dev - git clone --shallow-since=2021-01-01 https://github.com/projectacrn/acrn-kernel - cd acrn-kernel - git checkout v2.5 - cp kernel_config_uefi_sos .config - make olddefconfig - make menuconfig - - The figure below shows the additional drivers to be enabled. - - .. figure:: images/acrn_qemu_4.png - :align: center - -#. Build the Service VM (L1 Guest) kernel. - - .. code-block:: none - - make - -#. Install the kernel and modules. - - .. code-block:: none - - sudo make modules_install - sudo cp arch/x86/boot/bzImage /boot +#. Clone and configure the Service VM kernel repository following the instructions at + :ref:`build-and-install-ACRN-kernel` and using the ``v2.5`` tag. The User VM (L2 guest) + uses the ``virtio-blk`` driver to mount the rootfs. This driver is included in the default + kernel configuration as of the ``v2.5`` tag. #. Update Grub to boot the ACRN hypervisor and load the Service VM kernel. Append the following configuration to the :file:`/etc/grub.d/40_custom`. diff --git a/doc/tutorials/images/acrn_qemu_4.png b/doc/tutorials/images/acrn_qemu_4.png deleted file mode 100644 index 0b6670532f54df25d2cdaabb8353176584cf4ce3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3394 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