From ce83dce42bdb30e2149e097747d73ea7fa8995f4 Mon Sep 17 00:00:00 2001 From: Chan9Yan9 Date: Mon, 23 Dec 2024 11:20:02 +0800 Subject: [PATCH 1/6] Update for China Mainland --- videzzo_qemu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/videzzo_qemu/Makefile b/videzzo_qemu/Makefile index e0f9818..2788ec3 100644 --- a/videzzo_qemu/Makefile +++ b/videzzo_qemu/Makefile @@ -37,7 +37,7 @@ qemu-dep: sudo apt-get install -y make autoconf automake libtool ninja-build libglib2.0-dev \ libfdt-dev libpixman-1-dev zlib1g-dev patchelf wget libattr1 libattr1-dev \ libcap-ng-dev pkg-config libvncserver-dev && \ - git clone https://github.com/qemu/qemu.git --depth 1; make patch; fi + git clone https://gitlab.com/qemu-project/qemu.git --depth 1; make patch; fi qemu: qemu-dep make compile From 3738edaefee73c2177ab9d5a76654ffd32dfdc59 Mon Sep 17 00:00:00 2001 From: Chan9Yan9 Date: Mon, 23 Dec 2024 15:21:49 +0800 Subject: [PATCH 2/6] Pre Download rustc in Docker image --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 35e83f9..357d7c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py RUN python3 get-pip.py RUN python3 -m pip install wllvm picire gdown pyyaml tomli + WORKDIR /root # update binutils @@ -31,6 +32,11 @@ RUN wget -q -O ~/.gdbinit-gef.py https://raw.githubusercontent.com/hugsy/gef/mai RUN echo source /root/.gdbinit-gef.py >> ~/.gdbinit ENV LC_CTYPE=C.UTF-8 + +# update rustc +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +ENV PATH="/root/.cargo/bin:${PATH}" + # virtualbox RUN apt-get install -y acpica-tools chrpath doxygen g++-multilib libasound2-dev libcap-dev \ libcurl4-openssl-dev libdevmapper-dev libidl-dev libopus-dev libpam0g-dev \ From b7affa1a960d4e631974dcdb23fa3ff287bcaca9 Mon Sep 17 00:00:00 2001 From: Chan9Yan9 Date: Mon, 23 Dec 2024 15:26:03 +0800 Subject: [PATCH 3/6] QEMU rename sysemu to system --- videzzo_qemu/videzzo_qemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/videzzo_qemu/videzzo_qemu.c b/videzzo_qemu/videzzo_qemu.c index e977fcf..2094c52 100644 --- a/videzzo_qemu/videzzo_qemu.c +++ b/videzzo_qemu/videzzo_qemu.c @@ -39,8 +39,8 @@ #include "qemu/cutils.h" #include "qemu/datadir.h" #include "qemu/main-loop.h" -#include "sysemu/qtest.h" -#include "sysemu/sysemu.h" +#include "system/qtest.h" +#include "system/system.h" #include "videzzo.h" #ifdef CLANG_COV_DUMP #include "clangcovdump.h" From f29fcae505d3ef7f85443ae625d648bf5775e505 Mon Sep 17 00:00:00 2001 From: Chan9Yan9 Date: Mon, 23 Dec 2024 15:29:42 +0800 Subject: [PATCH 4/6] Add an update log for ViDeZZo --- UpdateLog.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 UpdateLog.md diff --git a/UpdateLog.md b/UpdateLog.md new file mode 100644 index 0000000..053fe71 --- /dev/null +++ b/UpdateLog.md @@ -0,0 +1,16 @@ +We created this log to record the adjustments made to ViDeZZo after the publication of the paper, in order to adapt to updates for the hypervisor. This will help future researchers adapt to different versions of the hypervisor based on this log. + +## Commit d097238 +The QEMU official has replaced the `--enable-sanitizers` option in the compilation process with `--enable-asan` and `--enable-ubsan`. +QEMU update hash: [d097238](https://github.com/HexHive/ViDeZZo/commit/d097238a130bd063350a7d9471f0c83f2fa12fc2) + +## Commit ce83dce +Help users in mainland China clone QEMU more conveniently. + +## Commit 3738eda +Starting from version a1dacb66, QEMU requires rustc during the compilation process. +QEMU update hash: [a1dacb66](https://gitlab.com/qemu-project/qemu/-/commit/a1dacb66915eb7d08a0596cc97068a37c39930d3) + +## Commit b7affa1 +The QEMU official has renamed sysemu to system. +QEMU update hash: [32cad1ff](https://gitlab.com/qemu-project/qemu/-/commit/32cad1ffb81dcecf6f4a8af56d6e5892682839b1) \ No newline at end of file From 4a8cc0ab74e34ca414431c49d2de5a539c82d40d Mon Sep 17 00:00:00 2001 From: Zexiang Zhang <67211718+Chan9Yan9@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:34:09 +0800 Subject: [PATCH 5/6] Update UpdateLog.md --- UpdateLog.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UpdateLog.md b/UpdateLog.md index 053fe71..312bf54 100644 --- a/UpdateLog.md +++ b/UpdateLog.md @@ -5,12 +5,12 @@ The QEMU official has replaced the `--enable-sanitizers` option in the compilati QEMU update hash: [d097238](https://github.com/HexHive/ViDeZZo/commit/d097238a130bd063350a7d9471f0c83f2fa12fc2) ## Commit ce83dce -Help users in mainland China clone QEMU more conveniently. +Help users in China mainland clone QEMU more conveniently. ## Commit 3738eda -Starting from version a1dacb66, QEMU requires rustc during the compilation process. +Starting from version `a1dacb66`, QEMU requires rustc during the compilation process. QEMU update hash: [a1dacb66](https://gitlab.com/qemu-project/qemu/-/commit/a1dacb66915eb7d08a0596cc97068a37c39930d3) ## Commit b7affa1 The QEMU official has renamed sysemu to system. -QEMU update hash: [32cad1ff](https://gitlab.com/qemu-project/qemu/-/commit/32cad1ffb81dcecf6f4a8af56d6e5892682839b1) \ No newline at end of file +QEMU update hash: [32cad1ff](https://gitlab.com/qemu-project/qemu/-/commit/32cad1ffb81dcecf6f4a8af56d6e5892682839b1) From d7418192ab8cfeb8f9e589254da7c216db43cdaa Mon Sep 17 00:00:00 2001 From: Zexiang Zhang <67211718+Chan9Yan9@users.noreply.github.com> Date: Mon, 23 Dec 2024 21:08:15 +0800 Subject: [PATCH 6/6] Update 05-deploy.sh --- videzzo_tool/05-deploy.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/videzzo_tool/05-deploy.sh b/videzzo_tool/05-deploy.sh index ed0cb5d..99f5ee8 100755 --- a/videzzo_tool/05-deploy.sh +++ b/videzzo_tool/05-deploy.sh @@ -31,7 +31,9 @@ case "${o}" in ;; v) vmm=${OPTARG} - ((vmm == 'vbox' || vmm == 'qemu' || vmm == 'all')) || usage + if [[ "$vmm" != "vbox" && "$vmm" != "qemu" && "$vmm" != "all" ]]; then + usage + fi ;; *) usage