diff --git a/qemu/launchers/kvm-spice b/qemu/launchers/spice similarity index 63% rename from qemu/launchers/kvm-spice rename to qemu/launchers/spice index 9c6c5d8..8a56aa5 100755 --- a/qemu/launchers/kvm-spice +++ b/qemu/launchers/spice @@ -1,8 +1,8 @@ #!/bin/sh -x -exec kvm \ +exec "$QEMUSH_BASE" \ -vga qxl \ -chardev spicevmc,id=vdagent,debug=0,name=vdagent \ -device virtio-serial \ -device virtserialport,chardev=vdagent,name=com.redhat.spice.0 \ - -spice port="$(first-free-port 5900)",addr=127.0.0.1,disable-ticketing=on \ + -spice port="$(first-free-port 5900)",addr=127.0.0.1,disable-ticketing=on \ "$@" diff --git a/qemu/launchers/virtiofs b/qemu/launchers/virtiofs new file mode 100755 index 0000000..8b12cc1 --- /dev/null +++ b/qemu/launchers/virtiofs @@ -0,0 +1,7 @@ +#!/bin/sh -x +exec "${QEMUSH_BASE}" \ + -chardev socket,id=char0,path=/run/virtiofsd.sock \ + -device vhost-user-fs-pci,chardev=char0,tag=shared \ + -object memory-backend-memfd,id=mem,size="${QEMUSH_RAM}",share=on \ + -numa node,memdev=mem \ + "$@" diff --git a/qemu/launchers/windows10 b/qemu/launchers/windows10 index b1013ff..a258f70 100755 --- a/qemu/launchers/windows10 +++ b/qemu/launchers/windows10 @@ -3,16 +3,13 @@ # Store VM name in environment variable export QEMUSH_NAME export QEMUSH_RAM=4G +export QEMUSH_BASE=kvm [ -z "$QEMUSH_NAME" ] && QEMUSH_NAME=$(basename "$0") # Launch the virtual machine -exec kvm-spice \ +exec spice \ -drive file="$(pathof disk)",if=virtio \ -net user,hostname="${QEMUSH_NAME}" \ -usbdevice tablet \ -name "$QEMUSH_NAME" \ - -chardev socket,id=char0,path=/run/virtiofsd.sock \ - -device vhost-user-fs-pci,chardev=char0,tag=shared \ - -object memory-backend-memfd,id=mem,size="${QEMUSH_RAM}",share=on \ - -numa node,memdev=mem \ "$@"