From 3ad20858a43c897027e849823ae7eec38470e3c4 Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Tue, 19 Dec 2017 00:27:32 +0100 Subject: [PATCH] devtools: fix usbDev in runOver0P.sh and runDisk.sh --- runDisk.sh | 3 +-- runOver9P.sh | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/runDisk.sh b/runDisk.sh index 3556894..79083bc 100755 --- a/runDisk.sh +++ b/runDisk.sh @@ -41,7 +41,7 @@ case "$DISK" in bootDisk="-usb -usbdevice host:$DISK" ;; *) - bootDisk="-drive if=none,id=usbstick,file=$DISK -usb -readconfig /usr/share/doc/qemu-system-x86/common/ich9-ehci-uhci.cfg -device usb-host,bus=usb-bus.0,hostbus=3,hostport=1 -device usb-host,bus=usb-bus.0,hostbus=3,hostport=1 -device usb-storage,bus=ehci.0,drive=usbstick " + bootDisk="-readconfig /usr/share/doc/qemu-system-x86/common/ich9-ehci-uhci.cfg -drive if=none,id=usbstick,file=$DISK -usb -device usb-storage,bus=ehci.0,drive=usbstick " ;; esac #bootDisk="-device ahci,id=ahci -drive id=boot,file=$DISK,index=0,cache=writeback,if=none -device ide-drive,drive=boot,bus=ahci.0" @@ -67,4 +67,3 @@ EOF echo $cmd eval $cmd - diff --git a/runOver9P.sh b/runOver9P.sh index e5b0bf9..c49f4e6 100755 --- a/runOver9P.sh +++ b/runOver9P.sh @@ -5,7 +5,7 @@ # # Copyright (C) 2016-2017 Giacomo Tesio -#export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic +export SDL_VIDEO_X11_DGAMOUSE=0 # see https://wiki.archlinux.org/index.php/QEMU#Mouse_cursor_is_jittery_or_erratic if [ "$JEHANNE" = "" ]; then echo $0 requires the shell started by ./hacking/devshell.sh @@ -36,7 +36,7 @@ fi if [ -f $DISK ]; then usbDev="-drive if=none,id=usbstick,file=$DISK -usb -device nec-usb-xhci,id=xhci -device usb-storage,bus=xhci.0,drive=usbstick" - usbDev="-drive if=none,id=usbstick,file=$DISK -usb -readconfig /usr/share/doc/qemu-system-x86/common/ich9-ehci-uhci.cfg -device usb-host,bus=usb-bus.0,hostbus=3,hostport=1 -device usb-host,bus=usb-bus.0,hostbus=3,hostport=1 -device usb-storage,bus=ehci.0,drive=usbstick " + usbDev="-readconfig /usr/share/doc/qemu-system-x86/common/ich9-ehci-uhci.cfg -drive if=none,id=usbstick,file=$DISK -usb -device usb-storage,bus=ehci.0,drive=usbstick " fi if [ "$KERNDIR" = "" ]; then @@ -76,4 +76,3 @@ eval $cmd kill $ufspid wait -