From aabcf94ebf853817146d7ac79d29afc91ac0fa71 Mon Sep 17 00:00:00 2001 From: fuzhongl Date: Mon, 3 Aug 2020 08:14:42 +0800 Subject: [PATCH] Doc: Getting Started Guide Update for hybrid mode Signed-off-by: fuzhongl --- doc/tutorials/using_hybrid_mode_on_nuc.rst | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/tutorials/using_hybrid_mode_on_nuc.rst b/doc/tutorials/using_hybrid_mode_on_nuc.rst index 3acd4b5eb..9e9886030 100644 --- a/doc/tutorials/using_hybrid_mode_on_nuc.rst +++ b/doc/tutorials/using_hybrid_mode_on_nuc.rst @@ -3,7 +3,7 @@ Getting Started Guide for ACRN hybrid mode ########################################## ACRN hypervisor supports a hybrid scenario where the User VM (such as Zephyr -or Clear Linux) runs in a pre-launched VM or in a post-launched VM that is +or Ubuntu) runs in a pre-launched VM or in a post-launched VM that is launched by a Device model in the Service VM. The following guidelines describe how to set up the ACRN hypervisor hybrid scenario on the Intel NUC, as shown in :numref:`hybrid_scenario_on_nuc`. @@ -19,7 +19,7 @@ Prerequisites ************* - Use the `Intel NUC Kit NUC7i7DNHE `_. - Connect to the serial port as described in :ref:`Connecting to the serial port `. -- Install GRUB on your SATA device or on the NVME disk of your NUC. +- Install Ubuntu 18.04 on your SATA device or on the NVME disk of your NUC. Update Ubuntu GRUB ****************** @@ -31,7 +31,7 @@ Perform the following to update Ubuntu GRUB so it can boot the hypervisor and lo .. code-block:: bash :emphasize-lines: 10,11 - menuentry 'ACRN hypervisor Hybird Scenario' --class ubuntu --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-e23c76ae-b06d-4a6e-ad42-46b8eedfd7d3' { + menuentry 'ACRN hypervisor Hybrid Scenario' --id ACRN_Hybrid --class ubuntu --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-e23c76ae-b06d-4a6e-ad42-46b8eedfd7d3' { recordfail load_video gfxmode $linux_gfx_mode @@ -39,21 +39,21 @@ Perform the following to update Ubuntu GRUB so it can boot the hypervisor and lo insmod part_gpt insmod ext2 echo 'Loading hypervisor Hybrid scenario ...' - multiboot --quirk-modules-after-kernel /boot/acrn.32.out - module /boot/zephyr.bin xxxxxx - module /boot/bzImage yyyyyy + multiboot2 /boot/acrn.bin + module2 /boot/zephyr.bin xxxxxx + module2 /boot/bzImage yyyyyy } .. note:: The module ``/boot/zephyr.bin`` is the VM0 (Zephyr) kernel file. The param ``xxxxxx`` is VM0's kernel file tag and must exactly match the - ``kernel_mod_tag`` of VM0 which is configured in the ``hypervisor/scenarios/hybrid/vm_configurations.c`` + ``kernel_mod_tag`` of VM0 which is configured in the ``misc/vm_configs/scenarios/hybrid/vm_configurations.c`` file. The multiboot module ``/boot/bzImage`` is the Service VM kernel file. The param ``yyyyyy`` is the bzImage tag and must exactly match the - ``kernel_mod_tag`` of VM1 in the ``hypervisor/scenarios/hybrid/vm_configurations.c`` + ``kernel_mod_tag`` of VM1 in the ``misc/vm_configs/scenarios/hybrid/vm_configurations.c`` file. The kernel command line arguments used to boot the Service VM are - located in the header file ``hypervisor/scenarios/hybrid/vm_configurations.h`` + located in the header file ``misc/vm_configs/scenarios/hybrid/vm_configurations.h`` and are configured by the `SOS_VM_BOOTARGS` macro. #. Modify the ``/etc/default/grub`` file as follows to make the GRUB menu @@ -61,6 +61,8 @@ Perform the following to update Ubuntu GRUB so it can boot the hypervisor and lo .. code-block:: bash + GRUB_DEFAULT=ACRN_Hybrid + GRUB_TIMEOUT=5 # GRUB_HIDDEN_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT_QUIET=false