Skip to content
Snippets Groups Projects
Verified Commit f60f378d authored by iliya.saroukha's avatar iliya.saroukha :first_quarter_moon:
Browse files

fix: correctly creating VM when both options are enabled (previously ifs were cascading)

parent d2d399e4
No related branches found
No related tags found
No related merge requests found
...@@ -52,28 +52,33 @@ CPU_COUNT="2" ...@@ -52,28 +52,33 @@ CPU_COUNT="2"
NET_PV="-nic user,model=virtio-net-pci" NET_PV="-nic user,model=virtio-net-pci"
GPU_PV="-vga virtio" GPU_PV="-vga virtio"
# SPICE_SERVER="-device virtio-serial-pci \
# -spice port=8000,disable-ticketing=on \
# -device virtserialport,chardev=spicechannel0,name=com.redhat.spice.0 \
# -chardev spicevmc,id=spicechannel0,name=vdagent,clipboard=on"
QEMU_GA="-device virtio-serial \ QEMU_GA="-device virtio-serial \
-device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \ -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \
-chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0" -chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0"
SPICE_GA="-device virtio-serial-pci \ SPICE_GA="-device virtio-serial-pci \
-chardev qemu-vdagent,id=ch1,name=vdagent,clipboard=on \ -device virtserialport,chardev=ch1,id=ch1,name=com.redhat.spice.0 \
-device virtserialport,chardev=ch1,id=ch1,name=com.redhat.spice.0 " -chardev qemu-vdagent,id=ch1,name=vdagent,clipboard=on"
if $DISK_OPT && $ISO_OPT; then
qemu-system-x86_64 -boot order=d -cdrom $ISO_PATH -m $MEM_COUNT -smp \
cpus=$CPU_COUNT -enable-kvm $NET_PV $GPU_PV \
-drive file=$DISK_PATH,index=0,media=disk,format=qcow2,if=virtio \
$QEMU_GA $SPICE_GA
fi
if $DISK_OPT; then if $DISK_OPT; then
qemu-system-x86_64 -m $MEM_COUNT -smp cpus=$CPU_COUNT -enable-kvm $NET_PV \ qemu-system-x86_64 -m $MEM_COUNT -smp cpus=$CPU_COUNT -enable-kvm $NET_PV \
$GPU_PV $DISK_PATH $QEMU_GA $SPICE_GA $GPU_PV $DISK_PATH $QEMU_GA $SPICE_GA $SPICE_SERVER
fi fi
if $ISO_OPT; then if $ISO_OPT; then
qemu-system-x86_64 -cdrom $ISO_PATH -m $MEM_COUNT -smp cpus=$CPU_COUNT \ qemu-system-x86_64 -cdrom $ISO_PATH -m $MEM_COUNT -smp cpus=$CPU_COUNT \
-enable-kvm $NET_PV $GPU_PV $QEMU_GA $SPICE_GA -enable-kvm $NET_PV $GPU_PV $QEMU_GA $SPICE_GA
fi fi
if $DISK_OPT && $ISO_OPT; then
qemu-system-x86_64 -boot=d -cdrom $ISO_PATH -m $MEM_COUNT -smp \
cpus=$CPU_COUNT -enable-kvm $NET_PV $GPU_PV \
-drive file=$DISK_PATH,index=0,media=disk,format=qcow2,if=virtio \
$QEMU_GA $SPICE_GA
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment