Re: [libvirt] [PATCHv6 2/2] qemu: Disk Geometry Override Support

Pushed with this squashed in: diff --git i/src/qemu/qemu_command.c w/src/qemu/qemu_command.c index cdc8e55..ca62f0c 100644 --- i/src/qemu/qemu_command.c +++ w/src/qemu/qemu_command.c @@ -2281,7 +2281,7 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, qemuCapsGet(qemuCaps, QEMU_CAPS_DRIVE_FORMAT)) virBufferAsprintf(&opt, ",format=%s", disk->driverType); - /* generate geometry command string*/ + /* generate geometry command string */ if (disk->geometry.cylinders > 0 && disk->geometry.heads > 0 && disk->geometry.sectors > 0) { diff --git i/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args w/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args index 7cd6650..c0de2ed 100644 --- i/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args +++ w/tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args @@ -1,4 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,cyls=16383,heads=16,secs=63,trans=lba \ +-no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,bus=0,unit=0,\ +cyls=16383,heads=16,secs=63,trans=lba \ -net none -serial none -parallel none -usb