Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use QEMU version 3.1.0 #210

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use QEMU version 3.1.0 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40ff873
QEMU tracer uses version 3.1.0
Hamled Mar 25, 2019
9024bb0
QEMU requires known CPU arch for user-mode
Hamled Mar 25, 2019
1a14014
Use Ubuntu 16.04 for Travis CI
Hamled Mar 25, 2019
1830d40
Qira works on Ubuntu 16.04 and 18.04
Hamled Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
dist: xenial

sudo: true

language: python
Expand Down
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
## Supported OS

<pre>
Ubuntu 14.04 and 16.04 supported out of the box.
18.04 is having a problem with building QEMU
See forked QEMU source at https://github.com/geohot/qemu/tree/qira to fix.
Ubuntu 16.04 and 18.04 are supported out of the box.

Non Linux hosts may run the rest of QIRA, but cannot run the QEMU tracer.
Very limited support for Mac OS X and Windows natively.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ubuntu:16.04
RUN apt-get update && apt-get -y install build-essential gcc-multilib g++-multilib lib32z1 git curl python python-virtualenv python-dev

# qemu deps
RUN apt-get -y install pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev
RUN apt-get -y install pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev libcapstone-dev

WORKDIR /qira

Expand Down
2 changes: 1 addition & 1 deletion install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# install system deps
if [ $(which apt-get) ]; then
echo "installing deps for ubuntu"
sudo apt-get -y install git curl python python-virtualenv python-dev build-essential pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev
sudo apt-get -y install git curl python python-virtualenv python-dev build-essential pkg-config zlib1g-dev libglib2.0-dev libpixman-1-dev libcapstone-dev
else
echo "*** You'll need to install Ubuntu or get a working build env for qemu and python yourself ***"
fi
Expand Down
4 changes: 2 additions & 2 deletions tracers/qemu_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

if [ ! -d qemu/qemu ]; then
cd qemu
git clone https://github.com/geohot/qemu.git --depth 1 --branch qira
git clone https://github.com/geohot/qemu.git --depth 1 --branch v3.1.0-qira
cd ..
fi

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
./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 --enable-capstone --python=python
make -j$(getconf _NPROCESSORS_ONLN)