Skip to content

Instantly share code, notes, and snippets.

@vtolstov
Created December 14, 2015 13:25
Show Gist options
  • Save vtolstov/10a74450c44c1bf24a11 to your computer and use it in GitHub Desktop.
Save vtolstov/10a74450c44c1bf24a11 to your computer and use it in GitHub Desktop.
stdin
diff --git a/debian/changelog b/debian/changelog
index b91b58d..1147142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libvirt (1.3.0-3) stable; urgency=medium
+libvirt (1.3.0-4) stable; urgency=medium
* New upstream version
diff --git a/debian/patches/libvirt-qemu-detect-zeros.patch b/debian/patches/libvirt-qemu-detect-zeros.patch
index 582c49d..d86dee6 100644
--- a/debian/patches/libvirt-qemu-detect-zeros.patch
+++ b/debian/patches/libvirt-qemu-detect-zeros.patch
@@ -130,7 +130,7 @@ index d2f37e408bab..49b76adc416f 100644
+ if (disk->detect_zeros) {
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DETECT_ZEROS)) {
-+ virBufferAsprintf(&opt, ",detect_zeros=%s",
++ virBufferAsprintf(&opt, ",detect-zeroes=%s",
+ virDomainDiskDetectZerosTypeToString(disk->detect_zeros));
+ } else {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -198,11 +198,11 @@ index 000000000000..5224a69798b2
+-boot dc \
+-usb \
+-drive file=/var/lib/libvirt/images/f14.img,if=none,id=drive-virtio-disk0,\
-+format=qcow2,discard=unmap,detect_zeroes=unmap \
++format=qcow2,discard=unmap,detect-zeroes=unmap \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
+id=virtio-disk0 \
+-drive file=/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,if=none,media=cdrom,\
-+id=drive-ide0-1-0,format=raw,discard=ignore,detect_zeroes=off \
++id=drive-ide0-1-0,format=raw,discard=ignore,detect-zeroes=off \
+-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment