github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 15:31:35 +00:00
Code Issues Projects Releases Wiki Activity

DM: update launch scripts to use OVMF.fd directly from the rootfs

Browse Source 
* Update the launch scripts provided as examples on how to launch a Zephyr,
VxWorks or Windows User VM to directly use the 'OVMF.fd' bios file installed
by default in '/usr/share/acrn/bios/'
* Remove the OVMF.fd that was kept under 'doc/tutorials' (no longer needed)
* Adapt the tutorials to reflect this change

Tracked-On: #3673
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Geoffroy Van Cutsem 2019-09-16 12:16:34 +02:00 committed by wenlingz
parent bfc923080c
commit 42b864b1f3
7 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devicemodel/samples/nuc/launch_vxworks.sh
View File

@ -25,7 +25,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge \
-s 5,virtio-console,@stdio:stdio_port \ -s 5,virtio-console,@stdio:stdio_port \
-s 3,virtio-blk,./VxWorks.img \ -s 3,virtio-blk,./VxWorks.img \
--virtio_poll 1000000 \ --virtio_poll 1000000 \
--ovmf ./OVMF.fd \ --ovmf /usr/share/acrn/bios/OVMF.fd \
--lapic_pt \ --lapic_pt \
$vm_name $vm_name
} }

2
devicemodel/samples/nuc/launch_win.sh
View File

@ -24,7 +24,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \
-s 3,virtio-blk,./win10-ltsc.img \ -s 3,virtio-blk,./win10-ltsc.img \
-s 4,virtio-net,tap0 \ -s 4,virtio-net,tap0 \
-s 5,passthru,00/1f/3 \ -s 5,passthru,00/1f/3 \
--ovmf ./OVMF.fd \ --ovmf /usr/share/acrn/bios/OVMF.fd \
$vm_name $vm_name
} }

2
devicemodel/samples/nuc/launch_zephyr.sh
View File

@ -18,7 +18,7 @@ mem_size=128M
acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \
-s 5,virtio-console,@pty:pty_port \ -s 5,virtio-console,@pty:pty_port \
-s 3,virtio-blk,./zephyr.img \ -s 3,virtio-blk,./zephyr.img \
--ovmf ./OVMF.fd \ --ovmf /usr/share/acrn/bios/OVMF.fd \
$vm_name $vm_name
} }

BIN
doc/tutorials/OVMF.fd
View File

Binary file not shown.

1
doc/tutorials/using_vxworks_as_uos.rst
View File

@ -102,7 +102,6 @@ Steps for Using VxWorks as User OS
$ mkdir vxworks && cd vxworks $ mkdir vxworks && cd vxworks
$ cp /usr/share/acrn/samples/nuc/launch_vxworks.sh . $ cp /usr/share/acrn/samples/nuc/launch_vxworks.sh .
$ cp /usr/share/acrn/bios/OVMF.fd .
You will also need to copy the ``VxWorks.img`` created in the VxWorks build environment into directory You will also need to copy the ``VxWorks.img`` created in the VxWorks build environment into directory
``vxworks`` (via, e.g. a USB stick or network). ``vxworks`` (via, e.g. a USB stick or network).

5
doc/tutorials/using_windows_as_uos.rst
View File

@ -337,9 +337,6 @@ Boot Windows with GVT-g on ACRN
=============================== ===============================
#. Modify the ``/usr/share/acrn/samples/nuc/launch_win.sh`` script to specify the Windows image generated above. #. Modify the ``/usr/share/acrn/samples/nuc/launch_win.sh`` script to specify the Windows image generated above.
#. Download `OVMF.fd <https://raw.githubusercontent.com/projectacrn/acrn-hypervisor/master/doc/tutorials/OVMF.fd>`_
binary to the directory in Service VM: ``/usr/share/acrn/samples/nuc/``.
#. Run the ``launch_win.sh`` and you should see the WaaG desktop coming up over the HDMI monitor (instead of the VNC). #. Run the ``launch_win.sh`` and you should see the WaaG desktop coming up over the HDMI monitor (instead of the VNC).
.. note:: Use the following command to disable the GNOME Display Manager (GDM) if it is enabled:: .. note:: Use the following command to disable the GNOME Display Manager (GDM) if it is enabled::
@ -420,7 +417,7 @@ Device configurations of acrn-dm command line
* *-s 8,ahci,cd:/root/img/virtio-win-0.1.141.iso*: This is another cdrom device * *-s 8,ahci,cd:/root/img/virtio-win-0.1.141.iso*: This is another cdrom device
to install the virtio Windows driver later. Make sure it points to your VirtIO ISO path. to install the virtio Windows driver later. Make sure it points to your VirtIO ISO path.
* *--ovmf /root/bios/OVMF.fd*: * *--ovmf /usr/share/acrn/bios/OVMF.fd*:
Make sure it points to your OVMF binary path Make sure it points to your OVMF binary path
References References

1
doc/tutorials/using_zephyr_as_uos.rst
View File

@ -97,7 +97,6 @@ Steps for Using Zephyr as User OS
$ mkdir zephyr && cd zephyr $ mkdir zephyr && cd zephyr
$ cp /usr/share/acrn/samples/nuc/launch_zephyr.sh . $ cp /usr/share/acrn/samples/nuc/launch_zephyr.sh .
$ cp /usr/share/acrn/bios/OVMF.fd .
You will also need to copy the ``zephyr.img`` created in the above section into directory ``zephyr``. You will also need to copy the ``zephyr.img`` created in the above section into directory ``zephyr``.