diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2011-09-17 10:41:04 +0200 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2011-09-17 10:41:04 +0200 |
| commit | 67b33515f708afd310d124491777d8e7eb41861b (patch) | |
| tree | 9becc77bedfcb84c1ad61b126f9f8437337dc26c | |
| parent | ea22af3f3cb2d833ca0fce1654260318c98ea3fc (diff) | |
changed to qemu-kvm new device syntax. WARNING: it WILL break your vm config!
| -rwxr-xr-x | kvm-wrapper.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh index 4e84252..a78ad83 100755 --- a/kvm-wrapper.sh +++ b/kvm-wrapper.sh @@ -403,10 +403,10 @@ function kvm_start_vm () # Build KVM Drives (hdd, cdrom) parameters local KVM_DRIVES="" KVM_DRIVE_IF="${KVM_DRIVE_IF:-ide}" - [[ -n "$KVM_DISK1" ]] && KVM_DRIVES="$KVM_DRIVES -drive file=\"$KVM_DISK1\",if=$KVM_DRIVE_IF" - [[ -n "$KVM_DISK2" ]] && KVM_DRIVES="$KVM_DRIVES -drive file=\"$KVM_DISK2\",if=$KVM_DRIVE_IF" - [[ -n "$KVM_DISK3" ]] && KVM_DRIVES="$KVM_DRIVES -drive file=\"$KVM_DISK3\",if=$KVM_DRIVE_IF" - [[ -n "$KVM_DISK4" ]] && KVM_DRIVES="$KVM_DRIVES -drive file=\"$KVM_DISK4\",if=$KVM_DRIVE_IF" + [[ -n "$KVM_DISK1" ]] && KVM_DRIVES="-drive if=none,id=disk1,file=\"$KVM_DISK1\"$KVM_DRIVE_OPT -device $KVM_DRIVE_IF,drive=disk1" + [[ -n "$KVM_DISK2" ]] && KVM_DRIVES="-drive if=none,id=disk2,file=\"$KVM_DISK2\"$KVM_DRIVE_OPT -device $KVM_DRIVE_IF,drive=disk2" + [[ -n "$KVM_DISK3" ]] && KVM_DRIVES="-drive if=none,id=disk3,file=\"$KVM_DISK3\"$KVM_DRIVE_OPT -device $KVM_DRIVE_IF,drive=disk3" + [[ -n "$KVM_DISK4" ]] && KVM_DRIVES="-drive if=none,id=disk4,file=\"$KVM_DISK4\"$KVM_DRIVE_OPT -device $KVM_DRIVE_IF,drive=disk4" [[ -n "$KVM_CDROM" ]] && KVM_DRIVES="$KVM_DRIVES -cdrom \"$KVM_CDROM\"" [[ "$KVM_DRIVES" == "" ]] && [[ "$KVM_BOOTDEVICE" != "n" ]] && fail_exit "Your VM $VM_NAME should at least use one cdrom or harddisk drive !\nPlease check your conf file :\n$VM_DESCRIPTOR" @@ -425,7 +425,7 @@ function kvm_start_vm () [[ "$KVM_NETWORK_MODEL" = "vhost_net" ]] \ && KVM_NET="-netdev type=tap,id=guest0,script=$KVM_NET_SCRIPT-ifup,downscript=$KVM_NET_SCRIPT-ifdown,vhost=on -device virtio-net-pci,netdev=guest0,mac=$KVM_MACADDRESS" \ - || KVM_NET="-net nic,model=$KVM_NETWORK_MODEL,macaddr=$KVM_MACADDRESS -net tap,script=$KVM_NET_SCRIPT-ifup,downscript=$KVM_NET_SCRIPT-ifdown" + || KVM_NET="-netdev type=tap,id=guest0,script=$KVM_NET_SCRIPT-ifup,downscript=$KVM_NET_SCRIPT-ifdown -device $KVM_NETWORK_MODEL,netdev=guest0,mac=$KVM_MACADDRESS" \ # Monitor/serial devices KVM_MONITORDEV="-monitor unix:$MONITOR_FILE,server,nowait" |