From 217425eeb2f167d23b6bb5e6c74e310a7930bfd6 Mon Sep 17 00:00:00 2001 From: Yadong Qi Date: Wed, 29 Sep 2021 15:26:08 +0800 Subject: [PATCH] Upgrade QEMU to 6.0.0 Signed-off-by: Yadong Qi --- scripts/setup_host.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/setup_host.sh b/scripts/setup_host.sh index a98a0f93..46adb14a 100755 --- a/scripts/setup_host.sh +++ b/scripts/setup_host.sh @@ -9,7 +9,7 @@ set -eE #--------- Global variable ------------------- reboot_required=0 -QEMU_REL="qemu-4.2.0" +QEMU_REL="qemu-6.0.0" CIV_WORK_DIR=$(pwd) CIV_GOP_DIR=$CIV_WORK_DIR/GOP_PKG CIV_VERTICAl_DIR=$CIV_WORK_DIR/vertical_patches/host @@ -37,16 +37,16 @@ function ubu_changes_require(){ function ubu_install_qemu_gvt(){ sudo apt purge -y "^qemu" sudo apt autoremove -y - sudo apt install -y git libfdt-dev libpixman-1-dev libssl-dev vim socat libsdl2-dev libspice-server-dev autoconf libtool xtightvncviewer tightvncserver x11vnc uuid-runtime uuid uml-utilities bridge-utils python-dev liblzma-dev libc6-dev libegl1-mesa-dev libepoxy-dev libdrm-dev libgbm-dev libaio-dev libusb-1.0-0-dev libgtk-3-dev bison libcap-dev libattr1-dev flex libvirglrenderer-dev build-essential gettext libegl-mesa0 libegl-dev libglvnd-dev libgl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libegl1 gcc g++ pkg-config libpulse-dev libgl1-mesa-dri + sudo apt install -y git libfdt-dev libpixman-1-dev libssl-dev vim socat libsdl2-dev libspice-server-dev autoconf libtool xtightvncviewer tightvncserver x11vnc uuid-runtime uuid uml-utilities bridge-utils python-dev liblzma-dev libc6-dev libegl1-mesa-dev libepoxy-dev libdrm-dev libgbm-dev libaio-dev libusb-1.0-0-dev libgtk-3-dev bison libcap-dev libattr1-dev flex libvirglrenderer-dev build-essential gettext libegl-mesa0 libegl-dev libglvnd-dev libgl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev libegl1 gcc g++ pkg-config libpulse-dev libgl1-mesa-dri ninja-build libcap-ng-dev libattr1-dev [ ! -f $CIV_WORK_DIR/$QEMU_REL.tar.xz ] && wget https://download.qemu.org/$QEMU_REL.tar.xz -P $CIV_WORK_DIR [ -d $CIV_WORK_DIR/$QEMU_REL ] && rm -rf $CIV_WORK_DIR/$QEMU_REL tar -xf $CIV_WORK_DIR/$QEMU_REL.tar.xz cd $CIV_WORK_DIR/$QEMU_REL/ - patch -p1 < $CIV_WORK_DIR/patches/qemu/Disable-EDID-auto-generation-in-QEMU.patch - patch -p1 < $CIV_WORK_DIR/patches/qemu/0001-Revert-Revert-vfio-pci-quirks.c-Disable-stolen-memor.patch - patch -p1 < $CIV_WORK_DIR/patches/qemu/0002-qemu-change-fence-poll-time-by-current-workload.patch + #patch -p1 < $CIV_WORK_DIR/patches/qemu/Disable-EDID-auto-generation-in-QEMU.patch + #patch -p1 < $CIV_WORK_DIR/patches/qemu/0001-Revert-Revert-vfio-pci-quirks.c-Disable-stolen-memor.patch + #patch -p1 < $CIV_WORK_DIR/patches/qemu/0002-qemu-change-fence-poll-time-by-current-workload.patch if [ -d $CIV_GOP_DIR ]; then for i in $CIV_GOP_DIR/qemu/*.patch; do patch -p1 < $i; done fi @@ -83,7 +83,7 @@ function ubu_build_ovmf_gvt(){ sudo apt install -y uuid-dev nasm acpidump iasl cd $CIV_WORK_DIR/$QEMU_REL/roms/edk2 - patch -p4 < $CIV_WORK_DIR/patches/ovmf/OvmfPkg-add-IgdAssgingmentDxe-for-qemu-4_2_0.patch + #patch -p4 < $CIV_WORK_DIR/patches/ovmf/OvmfPkg-add-IgdAssgingmentDxe-for-qemu-4_2_0.patch if [ -d $CIV_GOP_DIR ]; then for i in $CIV_GOP_DIR/ovmf/*.patch; do patch -p1 < $i; done cp $CIV_GOP_DIR/ovmf/Vbt.bin OvmfPkg/Vbt/Vbt.bin