From 6eb62ad17934b8e8a3bc262a62803e80048a1170 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 24 Feb 2020 20:06:45 +0800 Subject: [PATCH] Remove 'format=raw' from the Qemu options of the disk interfaces. Ref #1699 --- gns3server/compute/qemu/qemu_vm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gns3server/compute/qemu/qemu_vm.py b/gns3server/compute/qemu/qemu_vm.py index c5e169b1..6b0a61fa 100644 --- a/gns3server/compute/qemu/qemu_vm.py +++ b/gns3server/compute/qemu/qemu_vm.py @@ -1645,17 +1645,17 @@ class QemuVM(BaseNode): if interface == "sata": # special case, sata controller doesn't exist in Qemu options.extend(["-device", 'ahci,id=ahci{}'.format(disk_index)]) - options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk,format=raw'.format(disk, disk_index, disk_index)]) + options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk'.format(disk, disk_index, disk_index)]) options.extend(["-device", 'ide-drive,drive=drive{},bus=ahci{}.0,id=drive{}'.format(disk_index, disk_index, disk_index)]) elif interface == "nvme": - options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk,format=raw'.format(disk, disk_index, disk_index)]) + options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk'.format(disk, disk_index, disk_index)]) options.extend(["-device", 'nvme,drive=drive{},serial={}'.format(disk_index, disk_index)]) elif interface == "scsi": options.extend(["-device", 'virtio-scsi-pci,id=scsi{}'.format(disk_index)]) - options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk,format=raw'.format(disk, disk_index, disk_index)]) + options.extend(["-drive", 'file={},if=none,id=drive{},index={},media=disk'.format(disk, disk_index, disk_index)]) options.extend(["-device", 'scsi-hd,drive=drive{}'.format(disk_index)]) #elif interface == "sd": - # options.extend(["-drive", 'file={},id=drive{},index={},format=raw'.format(disk, disk_index, disk_index)]) + # options.extend(["-drive", 'file={},id=drive{},index={}'.format(disk, disk_index, disk_index)]) # options.extend(["-device", 'sd-card,drive=drive{},id=drive{}'.format(disk_index, disk_index, disk_index)]) else: options.extend(["-drive", 'file={},if={},index={},media=disk,id=drive{}'.format(disk, interface, disk_index, disk_index)])