diff --git a/Qemu/launch_from_eclipse b/Qemu/launch_from_eclipse index a1b2a49c4..efae0c145 100755 --- a/Qemu/launch_from_eclipse +++ b/Qemu/launch_from_eclipse @@ -2,6 +2,8 @@ SCRIPT_ABS_FILENAME=`LC_ALL=en_US.ISO8859-1 perl -e 'use Cwd "abs_path";print abs_path(shift)' "${BASH_SOURCE[0]}"` SCRIPT_DIR=`dirname "$SCRIPT_ABS_FILENAME"` +#SCRIPT_DIR="$(pwd)" # copy in terminal to be able to copy and paste command from this file + OSTYPE=`uname -s` echo $OSTYPE @@ -35,9 +37,9 @@ then then killall qemu-system-x86_64 fi - > "$SCRIPT_DIR"/serial0_qemu_out.log # empty file without erasing it. Useful for editor for refreshing and reloading. + > ./serial0_qemu_out.log # empty file without erasing it. Useful for editor for refreshing and reloading. - hdiutil attach "$SCRIPT_DIR"/disk_image_gpt.img || exit 1 + hdiutil attach ./disk_image_gpt.img || exit 1 shopt -s nocasematch @@ -56,19 +58,20 @@ then diskutil eject /Volumes/QEMU_EFI || exit 1 - /usr/local/bin/qemu-system-x86_64 \ - -L "$SCRIPT_DIR" \ + ./qemu_portable/qemu-system-x86_64 \ + -L qemu_portable \ -m 2048 \ -cpu core2duo \ - -bios bios.bin \ + -bios bios.bin-1.13.0 \ -machine q35 \ -device VGA,vgamem_mb=64,edid=on,xres=1024,yres=768 \ -device ahci,id=ahi \ - -drive format=raw,id=hda,file="$SCRIPT_DIR"/disk_image_gpt.img \ + -drive format=raw,id=hda,file=./disk_image_gpt.img \ -usb \ -device usb-mouse,bus=usb-bus.0,port=2 \ -device usb-kbd,bus=usb-bus.0,port=1 \ - -serial file:"$SCRIPT_DIR"/serial0_qemu_out.log \ + -serial file:./serial0_qemu_out.log \ + -nic none \ -gdb tcp::9000 & [[ $? -eq 0 ]] || exit 1 @@ -77,8 +80,8 @@ then image_base_str="Clover : Image base = " getImageBase() { - [ -f "$SCRIPT_DIR"/serial0_qemu_out.log ] || return 1 - grep "$image_base_str" "$SCRIPT_DIR"/serial0_qemu_out.log + [ -f ./serial0_qemu_out.log ] || return 1 + grep "$image_base_str" ./serial0_qemu_out.log return $? } @@ -91,11 +94,11 @@ then if [ $count -ge $timeout ] then - echo Cannot find "\"Clover : Image base = \"" in "$SCRIPT_DIR"/serial0_qemu_out.log after $timeout seconds + echo Cannot find "\"Clover : Image base = \"" in ./serial0_qemu_out.log after $timeout seconds exit 1 fi - adr="$(grep "$image_base_str" "$SCRIPT_DIR"/serial0_qemu_out.log | awk '{printf "0x%x",$8/NR}')" + adr="$(grep "$image_base_str" ./serial0_qemu_out.log | awk '{printf "0x%x",$8/NR}')" echo adr="$adr" diff --git a/Qemu/qemu_portable/efi-e1000e.rom b/Qemu/qemu_portable/efi-e1000e.rom new file mode 100644 index 000000000..f536bdbd4 Binary files /dev/null and b/Qemu/qemu_portable/efi-e1000e.rom differ diff --git a/Qemu/qemu_portable/kvmvapic.bin b/Qemu/qemu_portable/kvmvapic.bin new file mode 100644 index 000000000..045f5c288 Binary files /dev/null and b/Qemu/qemu_portable/kvmvapic.bin differ diff --git a/Qemu/qemu_portable/libcrypto.1.1.dylib b/Qemu/qemu_portable/libcrypto.1.1.dylib new file mode 100644 index 000000000..1e3b5a111 Binary files /dev/null and b/Qemu/qemu_portable/libcrypto.1.1.dylib differ diff --git a/Qemu/qemu_portable/libffi.6.dylib b/Qemu/qemu_portable/libffi.6.dylib new file mode 100644 index 000000000..5521e6876 Binary files /dev/null and b/Qemu/qemu_portable/libffi.6.dylib differ diff --git a/Qemu/qemu_portable/libglib-2.0.0.dylib b/Qemu/qemu_portable/libglib-2.0.0.dylib new file mode 100644 index 000000000..033c6a5d1 Binary files /dev/null and b/Qemu/qemu_portable/libglib-2.0.0.dylib differ diff --git a/Qemu/qemu_portable/libgmp.10.dylib b/Qemu/qemu_portable/libgmp.10.dylib new file mode 100644 index 000000000..6efe29d88 Binary files /dev/null and b/Qemu/qemu_portable/libgmp.10.dylib differ diff --git a/Qemu/qemu_portable/libgnutls.30.dylib b/Qemu/qemu_portable/libgnutls.30.dylib new file mode 100644 index 000000000..202a0e86a Binary files /dev/null and b/Qemu/qemu_portable/libgnutls.30.dylib differ diff --git a/Qemu/qemu_portable/libgthread-2.0.0.dylib b/Qemu/qemu_portable/libgthread-2.0.0.dylib new file mode 100644 index 000000000..b10b39a9c Binary files /dev/null and b/Qemu/qemu_portable/libgthread-2.0.0.dylib differ diff --git a/Qemu/qemu_portable/libhogweed.4.dylib b/Qemu/qemu_portable/libhogweed.4.dylib new file mode 100644 index 000000000..a6d77656a Binary files /dev/null and b/Qemu/qemu_portable/libhogweed.4.dylib differ diff --git a/Qemu/qemu_portable/libidn2.0.dylib b/Qemu/qemu_portable/libidn2.0.dylib new file mode 100644 index 000000000..b4b7a4ebb Binary files /dev/null and b/Qemu/qemu_portable/libidn2.0.dylib differ diff --git a/Qemu/qemu_portable/libintl.8.dylib b/Qemu/qemu_portable/libintl.8.dylib new file mode 100644 index 000000000..1f7bbd0f4 Binary files /dev/null and b/Qemu/qemu_portable/libintl.8.dylib differ diff --git a/Qemu/qemu_portable/libjpeg.9.dylib b/Qemu/qemu_portable/libjpeg.9.dylib new file mode 100644 index 000000000..d87d62a8d Binary files /dev/null and b/Qemu/qemu_portable/libjpeg.9.dylib differ diff --git a/Qemu/qemu_portable/liblzo2.2.dylib b/Qemu/qemu_portable/liblzo2.2.dylib new file mode 100644 index 000000000..c99c7b26b Binary files /dev/null and b/Qemu/qemu_portable/liblzo2.2.dylib differ diff --git a/Qemu/qemu_portable/libncursesw.6.dylib b/Qemu/qemu_portable/libncursesw.6.dylib new file mode 100644 index 000000000..77ff5e6d6 Binary files /dev/null and b/Qemu/qemu_portable/libncursesw.6.dylib differ diff --git a/Qemu/qemu_portable/libnettle.6.5.dylib b/Qemu/qemu_portable/libnettle.6.5.dylib new file mode 100644 index 000000000..8fbaae617 Binary files /dev/null and b/Qemu/qemu_portable/libnettle.6.5.dylib differ diff --git a/Qemu/qemu_portable/libnettle.6.dylib b/Qemu/qemu_portable/libnettle.6.dylib new file mode 120000 index 000000000..e48c448fd --- /dev/null +++ b/Qemu/qemu_portable/libnettle.6.dylib @@ -0,0 +1 @@ +libnettle.6.5.dylib \ No newline at end of file diff --git a/Qemu/qemu_portable/libp11-kit.0.dylib b/Qemu/qemu_portable/libp11-kit.0.dylib new file mode 100644 index 000000000..d63916949 Binary files /dev/null and b/Qemu/qemu_portable/libp11-kit.0.dylib differ diff --git a/Qemu/qemu_portable/libpcre.1.dylib b/Qemu/qemu_portable/libpcre.1.dylib new file mode 100644 index 000000000..d036c16c3 Binary files /dev/null and b/Qemu/qemu_portable/libpcre.1.dylib differ diff --git a/Qemu/qemu_portable/libpixman-1.0.dylib b/Qemu/qemu_portable/libpixman-1.0.dylib new file mode 100644 index 000000000..c2fe04be6 Binary files /dev/null and b/Qemu/qemu_portable/libpixman-1.0.dylib differ diff --git a/Qemu/qemu_portable/libpng16.16.dylib b/Qemu/qemu_portable/libpng16.16.dylib new file mode 100644 index 000000000..1be2dabfd Binary files /dev/null and b/Qemu/qemu_portable/libpng16.16.dylib differ diff --git a/Qemu/qemu_portable/libssh.4.8.4.dylib b/Qemu/qemu_portable/libssh.4.8.4.dylib new file mode 100644 index 000000000..6e7c4ea3f Binary files /dev/null and b/Qemu/qemu_portable/libssh.4.8.4.dylib differ diff --git a/Qemu/qemu_portable/libssh.4.dylib b/Qemu/qemu_portable/libssh.4.dylib new file mode 120000 index 000000000..ecf760c68 --- /dev/null +++ b/Qemu/qemu_portable/libssh.4.dylib @@ -0,0 +1 @@ +libssh.4.8.4.dylib \ No newline at end of file diff --git a/Qemu/qemu_portable/libtasn1.6.dylib b/Qemu/qemu_portable/libtasn1.6.dylib new file mode 100644 index 000000000..f0e883d48 Binary files /dev/null and b/Qemu/qemu_portable/libtasn1.6.dylib differ diff --git a/Qemu/qemu_portable/libunistring.2.dylib b/Qemu/qemu_portable/libunistring.2.dylib new file mode 100644 index 000000000..6ed8d7e0a Binary files /dev/null and b/Qemu/qemu_portable/libunistring.2.dylib differ diff --git a/Qemu/qemu_portable/libusb-1.0.0.dylib b/Qemu/qemu_portable/libusb-1.0.0.dylib new file mode 100644 index 000000000..8956c110f Binary files /dev/null and b/Qemu/qemu_portable/libusb-1.0.0.dylib differ diff --git a/Qemu/qemu_portable/libvdeplug.3.dylib b/Qemu/qemu_portable/libvdeplug.3.dylib new file mode 100644 index 000000000..9a63997ba Binary files /dev/null and b/Qemu/qemu_portable/libvdeplug.3.dylib differ diff --git a/Qemu/qemu_portable/qemu-system-x86_64 b/Qemu/qemu_portable/qemu-system-x86_64 new file mode 100755 index 000000000..999d07eed Binary files /dev/null and b/Qemu/qemu_portable/qemu-system-x86_64 differ