From 38f74f17c53688d7991f528d3921a06610526d23 Mon Sep 17 00:00:00 2001 From: yurialek Date: Tue, 29 Jan 2019 17:54:38 +0100 Subject: [PATCH] Minor changes --- CHANGELOG.md | 25 +++++++++++++++++++++++-- scripts/config | 20 ++++++++++---------- scripts/macos-basic.sh | 2 +- scripts/macos-network.sh | 2 +- scripts/macos-virsh.sh | 2 +- scripts/macos.sh | 2 +- scripts/windows-basic.sh | 2 +- scripts/windows-network.sh | 2 +- scripts/windows-virsh.sh | 2 +- scripts/windows.sh | 2 +- 10 files changed, 41 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3fc9af..f620bef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2019/01/29 +Minor changes in the scripts and new pages in the wiki. +### Added +- [Wiki](https://gitlab.com/YuriAlek/vfio/wikis/home) + - [Edit config and config](https://gitlab.com/YuriAlek/vfio/wikis/Edit-the-config) + - [Edit config and script](https://gitlab.com/YuriAlek/vfio/wikis/Edit-the-scripts) + - [Troubleshoot](https://gitlab.com/YuriAlek/vfio/wikis/Troubleshoot) + - [Windows](https://gitlab.com/YuriAlek/vfio/wikis/Windows) +### Changed +- [Wiki](https://gitlab.com/YuriAlek/vfio/wikis/home) + - [Home](https://gitlab.com/YuriAlek/vfio/wikis/Home) + - [Use](https://gitlab.com/YuriAlek/vfio/wikis/Use) +- [scritps](/scripts) + - [config](/scripts/config) + - [macos.sh](/scripts/macos.sh) + - [macos-basic.sh](/scripts/macos-basic.sh) + - [macos-network.sh](/scripts/macos-network.sh) + - [macos-virsh.sh](/scripts/macos-virsh.sh) + - [windows.sh](/scripts/windows.sh) + - [windows-basic.sh](/scripts/windows-basic.sh) + - [windows-network.sh](/scripts/windows-network.sh) + - [windows-virsh.sh](/scripts/windows-virsh.sh) + ## 2019/01/02 ### Changed - [scritps](/scripts) @@ -22,10 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## 2018/12/30 ### Added - [Wiki](https://gitlab.com/YuriAlek/vfio/wikis/home) - - [Edit config and script](https://gitlab.com/YuriAlek/vfio/wikis/Edit-config-and-script) - [Home](https://gitlab.com/YuriAlek/vfio/wikis/Home) - [Install](https://gitlab.com/YuriAlek/vfio/wikis/Install) - - [Troubleshoot](https://gitlab.com/YuriAlek/vfio/wikis/Troubleshoot) - [Use](https://gitlab.com/YuriAlek/vfio/wikis/Use) - [vbios](https://gitlab.com/YuriAlek/vfio/wikis/vbios) - [scritps](/scripts) diff --git a/scripts/config b/scripts/config index 6e6c970..a7040dd 100644 --- a/scripts/config +++ b/scripts/config @@ -1,15 +1,15 @@ ## User VM_USER= -## For extracting the VBIOS -VBIOS_EXTRACT_PATH=/root/VBIOS.rom -NVFLASH=/root/nvflash_linux -extract_videobusid="0000:" - ## IOMMU groups IOMMU_GPU="" IOMMU_GPU_AUDIO="" +## For extracting the VBIOS +VBIOS_EXTRACT_PATH=/root/VBIOS.rom +NVFLASH=/root/nvflash_linux +extract_videobusid="0000:$IOMMU_GPU" + ## Virsh devices VIRSH_GPU=pci_0000_ VIRSH_GPU_AUDIO=pci_0000_ @@ -38,19 +38,19 @@ LOG=/home/$VM_USER/qemu_log.txt ## Local path for storage IMAGES=/home/$VM_USER/ -## Windows and MacOS +## VBIOS VBIOS=$IMAGES/VBIOS.rom -OVMF=/usr/share/ovmf/x64/OVMF_CODE.fd -OVMF_VARS=/usr/share/ovmf/x64/OVMF_VARS.fd ## Windows VIRTIO=$IMAGES/virtio.iso WINDOWS_ISO=$IMAGES/win10.iso -WINDOWS_IMG=$IMAGES/windows.raw +WINDOWS_IMG=$IMAGES/windows.qcow2 +OVMF=/usr/share/ovmf/x64/OVMF_CODE.fd +OVMF_VARS=/usr/share/ovmf/x64/OVMF_VARS.fd ## MacOS MACOS_ISO=$IMAGES/mojave.iso -MACOS_IMG=$IMAGES/mojave.raw +MACOS_IMG=$IMAGES/mojave.qcow2 MACOS_CLOVER=$IMAGES/clover.qcow2 MACOS_OVMF=$IMAGES/MACOS_OVMF_CODE.fd MACOS_OVMF_VARS=$IMAGES/MACOS_OVMF_VARS.fd diff --git a/scripts/macos-basic.sh b/scripts/macos-basic.sh index 4c2ed89..e3f77b1 100644 --- a/scripts/macos-basic.sh +++ b/scripts/macos-basic.sh @@ -60,7 +60,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-drive,bus=ide.0,drive=ISO \ -drive id=ISO,if=none,snapshot=on,media=cdrom,file=$MACOS_ISO \ -device ide-drive,bus=ide.1,drive=HDD \ - -drive id=HDD,file=$MACOS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=HDD,file=$MACOS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & # Wait for QEMU wait diff --git a/scripts/macos-network.sh b/scripts/macos-network.sh index b61493e..415438d 100644 --- a/scripts/macos-network.sh +++ b/scripts/macos-network.sh @@ -104,7 +104,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-drive,bus=ide.0,drive=ISO \ -drive id=ISO,if=none,snapshot=on,media=cdrom,file=$MACOS_ISO \ -device ide-drive,bus=ide.1,drive=HDD \ - -drive id=HDD,file=$MACOS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=HDD,file=$MACOS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait diff --git a/scripts/macos-virsh.sh b/scripts/macos-virsh.sh index b31eb15..2a1553d 100644 --- a/scripts/macos-virsh.sh +++ b/scripts/macos-virsh.sh @@ -50,7 +50,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-drive,bus=ide.0,drive=ISO \ -drive id=ISO,if=none,snapshot=on,media=cdrom,file=$MACOS_ISO \ -device ide-drive,bus=ide.1,drive=HDD \ - -drive id=HDD,file=$MACOS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=HDD,file=$MACOS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait diff --git a/scripts/macos.sh b/scripts/macos.sh index 3f10fac..819e3e7 100644 --- a/scripts/macos.sh +++ b/scripts/macos.sh @@ -97,7 +97,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-drive,bus=ide.0,drive=ISO \ -drive id=ISO,if=none,snapshot=on,media=cdrom,file=$MACOS_ISO \ -device ide-drive,bus=ide.1,drive=HDD \ - -drive id=HDD,file=$MACOS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=HDD,file=$MACOS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait diff --git a/scripts/windows-basic.sh b/scripts/windows-basic.sh index ac9ac52..9c5c18b 100644 --- a/scripts/windows-basic.sh +++ b/scripts/windows-basic.sh @@ -57,7 +57,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-cd,bus=ide.1,drive=cd2 \ -device virtio-scsi-pci,id=scsi0 \ -device scsi-hd,bus=scsi0.0,drive=rootfs \ - -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & # Wait for QEMU wait diff --git a/scripts/windows-network.sh b/scripts/windows-network.sh index 10efe36..864afb8 100644 --- a/scripts/windows-network.sh +++ b/scripts/windows-network.sh @@ -101,7 +101,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-cd,bus=ide.1,drive=cd2 \ -device virtio-scsi-pci,id=scsi0 \ -device scsi-hd,bus=scsi0.0,drive=rootfs \ - -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait diff --git a/scripts/windows-virsh.sh b/scripts/windows-virsh.sh index 2dc2325..4a76f18 100644 --- a/scripts/windows-virsh.sh +++ b/scripts/windows-virsh.sh @@ -47,7 +47,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-cd,bus=ide.1,drive=cd2 \ -device virtio-scsi-pci,id=scsi0 \ -device scsi-hd,bus=scsi0.0,drive=rootfs \ - -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait diff --git a/scripts/windows.sh b/scripts/windows.sh index e7cc049..bb265e8 100644 --- a/scripts/windows.sh +++ b/scripts/windows.sh @@ -91,7 +91,7 @@ qemu-system-x86_64 -runas $VM_USER -enable-kvm \ -device ide-cd,bus=ide.1,drive=cd2 \ -device virtio-scsi-pci,id=scsi0 \ -device scsi-hd,bus=scsi0.0,drive=rootfs \ - -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=raw,if=none >> $LOG 2>&1 & + -drive id=rootfs,file=$WINDOWS_IMG,media=disk,format=qcow2,if=none >> $LOG 2>&1 & ## Wait for QEMU wait