diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2011-09-30 08:41:00 +0200 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2011-09-30 08:41:00 +0200 |
| commit | 906197f2794773c6c8596e3371b8f0e7400cd354 (patch) | |
| tree | d5021c96c225802c0c21fefa33506d18d035c853 | |
| parent | 7a0d96dc7283ff13167aa1a57bf8afadea3894fa (diff) | |
fix KVM_DRIVE_IF for ide-hd, bug in qemu-kvm with disk numbering?
| -rw-r--r-- | kvm-wrapper.conf | 2 | ||||
| -rwxr-xr-x | kvm-wrapper.sh | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kvm-wrapper.conf b/kvm-wrapper.conf index ca9d466..dc04a5c 100644 --- a/kvm-wrapper.conf +++ b/kvm-wrapper.conf @@ -48,7 +48,7 @@ KVM_BRIDGE="br_8" KVM_BOOTDEVICE="-boot order=c" #KVM_DISK1 -KVM_DRIVE_IF="ide" +KVM_DRIVE_IF="ide-hd" KVM_DRIVE_OPT=",cache=none,aio=native" #KVM_CDROM diff --git a/kvm-wrapper.sh b/kvm-wrapper.sh index 6fe2c7e..b72c642 100755 --- a/kvm-wrapper.sh +++ b/kvm-wrapper.sh @@ -404,11 +404,11 @@ 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="-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" + KVM_DRIVE_IF="${KVM_DRIVE_IF:-ide-hd}" + [[ -n "$KVM_DISK1" ]] && KVM_DRIVES="-drive if=none,id=disk1,file=\"$KVM_DISK1\"$KVM_DRIVE_OPT -device ${KVM_DRIVE1_IF:-$KVM_DRIVE_IF},drive=disk1" + [[ -n "$KVM_DISK2" ]] && KVM_DRIVES+=" -drive if=none,id=disk2,file=\"$KVM_DISK2\"$KVM_DRIVE_OPT -device ${KVM_DRIVE2_IF:-$KVM_DRIVE_IF},drive=disk2" + [[ -n "$KVM_DISK3" ]] && KVM_DRIVES+=" -drive if=none,id=disk3,file=\"$KVM_DISK3\"$KVM_DRIVE_OPT -device ${KVM_DRIVE3_IF:-$KVM_DRIVE_IF},drive=disk3" + [[ -n "$KVM_DISK4" ]] && KVM_DRIVES+=" -drive if=none,id=disk4,file=\"$KVM_DISK4\"$KVM_DRIVE_OPT -device ${KVM_DRIVE4_IF:-$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" |