From 21a4a743d2ec6610e20ded6649b449c82b0bab9f Mon Sep 17 00:00:00 2001
From: George Hotz <george@comma.ai>
Date: Sun, 24 Mar 2019 13:51:20 -0700
Subject: [PATCH] switch qemu build to clone from github

---
 .gitignore                |  1 -
 tracers/qemu/.gitignore   |  1 +
 tracers/qemu/qira-aarch64 |  1 +
 tracers/qemu/qira-arm     |  1 +
 tracers/qemu/qira-i386    |  1 +
 tracers/qemu/qira-mips    |  1 +
 tracers/qemu/qira-mipsel  |  1 +
 tracers/qemu/qira-ppc     |  1 +
 tracers/qemu/qira-x86_64  |  1 +
 tracers/qemu_build.sh     | 39 ++++-----------------------------------
 10 files changed, 12 insertions(+), 36 deletions(-)
 create mode 100644 tracers/qemu/.gitignore
 create mode 120000 tracers/qemu/qira-aarch64
 create mode 120000 tracers/qemu/qira-arm
 create mode 120000 tracers/qemu/qira-i386
 create mode 120000 tracers/qemu/qira-mips
 create mode 120000 tracers/qemu/qira-mipsel
 create mode 120000 tracers/qemu/qira-ppc
 create mode 120000 tracers/qemu/qira-x86_64

diff --git a/.gitignore b/.gitignore
index 698cf5ae..74e1cf6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ distrib/
 qiradb/build
 cda/include
 cda/clang-latest
-qemu
 tests/system
 pin/pin-*
 pin/obj-*
diff --git a/tracers/qemu/.gitignore b/tracers/qemu/.gitignore
new file mode 100644
index 00000000..1750fe82
--- /dev/null
+++ b/tracers/qemu/.gitignore
@@ -0,0 +1 @@
+qemu
diff --git a/tracers/qemu/qira-aarch64 b/tracers/qemu/qira-aarch64
new file mode 120000
index 00000000..e81940f2
--- /dev/null
+++ b/tracers/qemu/qira-aarch64
@@ -0,0 +1 @@
+qemu/aarch64-linux-user/qemu-aarch64
\ No newline at end of file
diff --git a/tracers/qemu/qira-arm b/tracers/qemu/qira-arm
new file mode 120000
index 00000000..9a82e21d
--- /dev/null
+++ b/tracers/qemu/qira-arm
@@ -0,0 +1 @@
+qemu/arm-linux-user/qemu-arm
\ No newline at end of file
diff --git a/tracers/qemu/qira-i386 b/tracers/qemu/qira-i386
new file mode 120000
index 00000000..11e24e70
--- /dev/null
+++ b/tracers/qemu/qira-i386
@@ -0,0 +1 @@
+qemu/i386-linux-user/qemu-i386
\ No newline at end of file
diff --git a/tracers/qemu/qira-mips b/tracers/qemu/qira-mips
new file mode 120000
index 00000000..938a9638
--- /dev/null
+++ b/tracers/qemu/qira-mips
@@ -0,0 +1 @@
+qemu/mips-linux-user/qemu-mips
\ No newline at end of file
diff --git a/tracers/qemu/qira-mipsel b/tracers/qemu/qira-mipsel
new file mode 120000
index 00000000..0def7f58
--- /dev/null
+++ b/tracers/qemu/qira-mipsel
@@ -0,0 +1 @@
+qemu/mipsel-linux-user/qemu-mipsel
\ No newline at end of file
diff --git a/tracers/qemu/qira-ppc b/tracers/qemu/qira-ppc
new file mode 120000
index 00000000..515ec316
--- /dev/null
+++ b/tracers/qemu/qira-ppc
@@ -0,0 +1 @@
+qemu/ppc-linux-user/qemu-ppc
\ No newline at end of file
diff --git a/tracers/qemu/qira-x86_64 b/tracers/qemu/qira-x86_64
new file mode 120000
index 00000000..7799e1be
--- /dev/null
+++ b/tracers/qemu/qira-x86_64
@@ -0,0 +1 @@
+qemu/x86_64-linux-user/qemu-x86_64
\ No newline at end of file
diff --git a/tracers/qemu_build.sh b/tracers/qemu_build.sh
index f3586790..03f90513 100755
--- a/tracers/qemu_build.sh
+++ b/tracers/qemu_build.sh
@@ -1,43 +1,12 @@
 #!/bin/bash
 
-QEMU_VERSION=2.5.1
-
-#hardcoded to 2.5.1 for now
-QEMU_SHA256="028752c33bb786abbfe496ba57315dc5a7d0a33b5a7a767f6d7a29020c525d2c"
-
-# ok, strict mode
-set -e
-
-# get qemu if we don't have it
-if [ ! -d qemu/qemu-latest ]; then
-  rm -rf qemu
-  mkdir -p qemu
+if [ ! -d qemu/qemu ]; then
   cd qemu
-  curl -Lo qemu-$QEMU_VERSION.tar.bz2 http://wiki.qemu-project.org/download/qemu-$QEMU_VERSION.tar.bz2
-
-  HASH=`sha256sum ./qemu-"$QEMU_VERSION".tar.bz2 2>/dev/null | cut -d' ' -f1`
-  if [ "$HASH" != "$QEMU_SHA256" ]; then
-    echo "Error: qemu-"$QEMU_VERSION".tar.bz2 has an invalid checksum."
-    exit 1
-  fi
-
-  tar xf qemu-$QEMU_VERSION.tar.bz2
-  ln -s qemu-$QEMU_VERSION qemu-latest
-
-  ln -s qemu-latest/arm-linux-user/qemu-arm qira-arm
-  ln -s qemu-latest/i386-linux-user/qemu-i386 qira-i386
-  ln -s qemu-latest/x86_64-linux-user/qemu-x86_64 qira-x86_64
-  ln -s qemu-latest/ppc-linux-user/qemu-ppc qira-ppc
-  ln -s qemu-latest/aarch64-linux-user/qemu-aarch64 qira-aarch64
-  ln -s qemu-latest/mips-linux-user/qemu-mips qira-mips
-  ln -s qemu-latest/mipsel-linux-user/qemu-mipsel qira-mipsel
-
-  cd qemu-latest
-  patch -p1 < ../../qemu.patch
-  cd ../..
+  git clone https://github.com/geohot/qemu.git --depth 1 --branch qira
+  cd ..
 fi
 
-cd qemu/qemu-latest
+cd qemu/qemu
 ./configure --target-list=i386-linux-user,x86_64-linux-user,arm-linux-user,ppc-linux-user,aarch64-linux-user,mips-linux-user,mipsel-linux-user --enable-tcg-interpreter --enable-debug-tcg --cpu=unknown --python=python
 make -j $(grep processor < /proc/cpuinfo | wc -l)