aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-05-26 10:05:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-05-26 10:05:10 -0300
commitae845472f6aea3955d0893067d3ddc74880fa841 (patch)
treed3335b163d87d32420d2e09c1f2b4e369fb62b1d
parent577e07f537d3edc6925d65f8829fdb506b522a2d (diff)
downloadkvmx-ae845472f6aea3955d0893067d3ddc74880fa841.tar.gz
kvmx-ae845472f6aea3955d0893067d3ddc74880fa841.tar.bz2
Adds memory, smp and qemu_opts params
-rw-r--r--README.md1
-rwxr-xr-xkvmx14
2 files changed, 11 insertions, 4 deletions
diff --git a/README.md b/README.md
index d51389b..25df4f0 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,6 @@ If no folder is specified, the current folder is assumed as the project home.
* Alternative folder sharing support (NFS, SMB or even [via SSH](https://superuser.com/questions/831659/mount-a-local-directory-to-a-remote-ssh-server)).
* Remount 9p shared folders and reinitialize spice-vdagent upon resume from disk [see possible bug](https://bugzilla.redhat.com/show_bug.cgi?id=1333072).
* [Nested virtualization](http://www.rdoxenham.com/?p=275).
-* More params (memory, cpus, ssh, serial console, additional shared folders, etc).
* Integration with [image-bootstrap](https://github.com/hartwork/image-bootstrap).
* Systemd service.
* Shell completions.
diff --git a/kvmx b/kvmx
index b36e834..86d4897 100755
--- a/kvmx
+++ b/kvmx
@@ -308,16 +308,24 @@ function kvmx_up {
graphics="-vga qxl"
fi
+ if [ -z "$memory" ]; then
+ memory="2048"
+ fi
+
+ if [ -z "$smp" ]; then
+ smp="2"
+ fi
+
# Run virtual machine
# See https://en.wikipedia.org/wiki/Nohup#Overcoming_hanging
- nohup kvm -m 2048 -name $VM -drive file=$image,if=virtio $graphics $shared \
+ nohup kvm -m $memory -name $VM -drive file=$image,if=virtio $graphics $shared \
-spice port=$PORT,addr=127.0.0.1,disable-ticketing,streaming-video=off,jpeg-wan-compression=never,playback-compression=off,zlib-glz-wan-compression=never,image-compression=off \
-device virtio-serial-pci \
-device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
-chardev spicevmc,id=spicechannel0,name=vdagent \
- -smp 2 -soundhw ac97 -cpu host -balloon virtio \
+ -smp $smp -soundhw ac97 -cpu host -balloon virtio \
-net nic,model=virtio \
- -net user,hostfwd=tcp:127.0.0.1:$SSH-:22,hostfwd=udp:127.0.0.1:$XDMCP_PORT-:177$hostfwd &> $LOGFILE < /dev/null &
+ -net user,hostfwd=tcp:127.0.0.1:$SSH-:22,hostfwd=udp:127.0.0.1:$XDMCP_PORT-:177$hostfwd $qemu_opts &> $LOGFILE < /dev/null &
PID="$!"