diff --git a/doc/tutorials/images/windows_install_A.png b/doc/tutorials/images/windows_install_A.png new file mode 100644 index 000000000..8042c17b1 Binary files /dev/null and b/doc/tutorials/images/windows_install_A.png differ diff --git a/doc/tutorials/images/windows_install_B.png b/doc/tutorials/images/windows_install_B.png new file mode 100644 index 000000000..48adccb5f Binary files /dev/null and b/doc/tutorials/images/windows_install_B.png differ diff --git a/doc/tutorials/images/windows_install_C.png b/doc/tutorials/images/windows_install_C.png new file mode 100644 index 000000000..9616a6f0b Binary files /dev/null and b/doc/tutorials/images/windows_install_C.png differ diff --git a/doc/tutorials/install_by_vga_gsg.tar.gz b/doc/tutorials/install_by_vga_gsg.tar.gz index d683fad06..f1a24b794 100644 Binary files a/doc/tutorials/install_by_vga_gsg.tar.gz and b/doc/tutorials/install_by_vga_gsg.tar.gz differ diff --git a/doc/tutorials/using_windows_as_uos.rst b/doc/tutorials/using_windows_as_uos.rst index 973cb5ae1..927c57626 100644 --- a/doc/tutorials/using_windows_as_uos.rst +++ b/doc/tutorials/using_windows_as_uos.rst @@ -86,7 +86,7 @@ Create Windows 10 Image ======================= Create a Windows 10 image which includes two steps: -#. Re-generate an ISO that includes virtio-win drivers and the Windows graphics drivers that were pre-installed +#. Re-generate an ISO that includes winvirtio or virtio-win drivers and the Windows graphics drivers that were pre-installed from the original Windows ISO. #. Install Windows 10 onto the virtual disk. @@ -107,6 +107,16 @@ Preparations * Download `Intel DCH Graphics Driver `_. +* Download Oracle Windows driver to Service VM in ``/root/img/winvirtio.iso``. +* `Oracle Windows driver `_.Sign in. If you do not have an oracle account, register one. +* Select "Download Package", key in "Oracle Linux 7.6" and click "Search" +* Click: DLP: Oracle Linux 7.6, it will be added to your Cart. +* Click "Checkout" at the top right corner +* In the "Platforms/Language", select "x86 64 bit", click "Continue" +* Check " I accept the terms in the license agreement", click "Continue" +* In the list, right check the item labeled as "Oracle VirtIO Drivers Version for Microsoft Windows 1.x.x, yy MB", and "Save link as ...". At the time of this wiki, it is named as "V982789-01.zip" +* Click Download, When the download is complete, unzip, you will get one ISO named "winvirtio.iso" + Install Windows 10 ADK ---------------------- #. Double click ``adksetup.exe`` to start the installation. @@ -132,6 +142,9 @@ Pre-install drivers and re-generate Windows ISO #. Right click the downloaded ``virtio-win-0.1.141.iso`` and select ``Mount``. The ISO will be mounted to a drive; for example, drive ``D:`` + Or used Oracle Driver + Right click the downloaded ``winvirtio.iso`` and select ``Mount``. The ISO will be mounted to a drive; + for example, drive ``D:`` #. Use ``7-zip`` or similar utility to unzip the downloaded Windows graphics driver ``dch_win64_25.20.100.6444.exe`` to a folder, @@ -175,6 +188,26 @@ Pre-install drivers and re-generate Windows ISO dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\msdk.inf" dism /unmount-wim /mountdir:c:\mount /commit + + REM inject-Oracle-driver-install + Set IDX=1 + + REM Modify boot.wim file to inject drivers + dism /Mount-Wim /WimFile:C:\WIM\boot.wim /Index:%IDX% /MountDir:C:\mount + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\netkvmorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioinput.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\viorng.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioscsiorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioserorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\viostororcl.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\cui_dch.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\HdBusExt.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\iigd_dch.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\IntcDAud.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\msdk.inf" + dism /unmount-wim /mountdir:c:\mount /commit + + Run this ``virtio-inject-boot.bat`` script in a command prompt running as administrator. It may take 4-5 minutes to run, depending on your Windows system performance. @@ -202,6 +235,25 @@ Pre-install drivers and re-generate Windows ISO dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\msdk.inf" dism /unmount-wim /mountdir:c:\mount /commit + + REM inject-Oracle-driver-install + Set IDX=1 + + REM Modify install.wim to inject drivers + dism /Mount-Wim /WimFile:C:\WIM\install.wim /Index:%IDX% /MountDir:C:\mount + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\netkvmorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioinput.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\viorng.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioscsiorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\vioserorcl.inf" + dism /image:C:\mount /Add-Driver "/driver:d:\vio\Win10\amd64\viostororcl.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\cui_dch.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\HdBusExt.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\iigd_dch.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\IntcDAud.inf" + dism /image:C:\mount /Add-Driver "/driver:c:\Dev\Temp\wim\dch_win64_25.20.100.6444\Graphics\msdk.inf" + dism /unmount-wim /mountdir:c:\mount /commit + Run this script in a command prompt running as administrator. It may also take 4-5 minutes to run, depending on your Windows system performance. @@ -263,7 +315,7 @@ Install Windows 10 ------------------ Currently, the ACRNGT OVMF GOP driver is not ready; thus, a special VGA version is used to install Windows 10 on ACRN from scratch. The -``acrn.elf``, ``acrn-dm`` and ``OVMF`` binaries are included in the +``acrn.efi``, ``acrn-dm`` and ``OVMF`` binaries are included in the `tarball `_ together with the script used to install Windows 10. @@ -277,6 +329,8 @@ together with the script used to install Windows 10. - Change ``-s 3,virtio-blk,./win10-ltsc-virtio.img`` to your path to the Windows 10 image. - Change ``-s 8,ahci,cd:./windows10-17763-107-LTSC-Virtio-Gfx.iso`` to the ISO you re-generated above. - Change ``-s 9,ahci,cd:./virtio-win-0.1.141.iso`` to your path to the virtio-win iso. + Or used Oracle driver + - Change ``-s 9,ahci,cd:./winvirtio.iso`` to your path to the winvirtio iso. #. Run ``install_vga.sh`` and connect to the Windows guest using a vnc client.:: @@ -309,6 +363,17 @@ together with the script used to install Windows 10. .. figure:: images/windows_install_6.png :align: center +This is the step to install the Oracle Driver + + .. figure:: images/windows_install_A.png + :align: center + + .. figure:: images/windows_install_B.png + :align: center + + .. figure:: images/windows_install_C.png + :align: center + .. figure:: images/windows_install_7.png :align: center