Hello community,
here is the log from the commit of package kvm for openSUSE:Factory
checked in at Mon Aug 2 11:41:35 CEST 2010.
--------
--- kvm/kvm.changes 2010-06-15 22:00:59.000000000 +0200
+++ kvm/kvm.changes 2010-07-30 06:37:14.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Jul 29 05:56:40 UTC 2010 - brogers@novell.com
+
+- Update to stable release 0.12.5, which includes numerous bug
+ fixes. This and other recent changes address: bnc#598298,
+ bnc#621793, bnc#619991, bnc#603179
+- Warn if default mac address is used
+- rtl8139 stops working after restore
+- Incompatibility with libvirt if disk caching specified in xml
+
+-------------------------------------------------------------------
+Mon Jul 19 16:38:19 UTC 2010 - brogers@novell.com
+
+- qemu-kvm was mistakenly being built without libaio support, which
+ results in less efficient disk i/o (bnc#598271)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kvm-no-pp-directives-in-macros.patch
kvm-qemu-pre0.12.4-0001-Fix-qemu-net-user-hostfwd-example.patch
kvm-qemu-pre0.12.4-0002-fix-undefined-shifts-by-32.patch
kvm-qemu-pre0.12.4-0003-qemu-char.c-drop-debug-printfs-from-qemu_chr_parse_.patch
kvm-qemu-pre0.12.4-0008-target-i386-fix-commit-c22549204a6edc431e8e4358e61b.patch
kvm-qemu-pre0.12.4-0010-spelling-typo-compatibilty-in-hw-fw_cfg.c.patch
kvm-qemu-pre0.12.4-0011-Don-t-set-default-monitor-when-there-is-a-mux-ed-one.patch
kvm-qemu-pre0.12.4-0012-Fix-corner-case-in-chardev-udp-parameter.patch
kvm-qemu-pre0.12.4-0013-workaround-for-cmd646-bmdma-register-access-while-no.patch
kvm-qemu-pre0.12.4-0015-pci-passthrough-zap-option-rom-scanning.patch
kvm-qemu-pre0.12.4-fdc-handling-with-global.patch
kvm-qemu-pre0.12.4-fix-multiwrite-error-code.patch
kvm-qemu-pre0.12.4-fix-multiwrite-error-handling.patch
kvm-qemu-pre0.12.4-fix-multiwrite-memory-leak.patch
kvm-qemu-pre0.12.4-free-iovec-array.patch
kvm-qemu-pre0.12.4-honor-iov-max.patch
kvm-qemu-pre0.12.4-lddqu-instr.patch
kvm-qemu-pre0.12.4-long-mode-long-jmp.patch
kvm-qemu-pre0.12.4-non-kvm-ram-limit.patch
kvm-qemu-pre0.12.4-sib-decode.patch
kvm-qemu-pre0.12.4-vcpu-create-failure.patch
kvm-qemu-preXX-fix-multiboot.patch
kvm-qemu-preXX-nic-device-pxe-boot.patch
kvm-qemu-preXX-vmdk-double-free.patch
kvm-qemu-preXX-vvfat-buffer.patch
qemu-kvm-0.12.3.tar.bz2
qemu-kvm-pre0.12.5-0002-pci-irq_state-vmstate-breakage.patch
qemu-kvm-pre0.12.5-0003-block-fix-sector-comparism-in-multiwrite_req_compar.patch
qemu-kvm-pre0.12.5-0004-virtio-blk-fix-barrier-support.patch
qemu-kvm-pre0.12.5-0005-block-fix-aio_flush-segfaults-for-read-only-protoco.patch
qemu-kvm-pre0.12.5-0006-qemu-sockets-avoid-strlen-of-NULL-pointer.patch
New:
----
kvm-qemu-preXX-move-unsafe-to-end-of-caching-modes-in-help.patch
kvm-qemu-preXX-report-default-mac-used.patch
kvm-qemu-user-space-tool-name.patch
qemu-kvm-0.12.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kvm.spec ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:39.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kvm (Version 0.12.3)
+# spec file for package kvm (Version 0.12.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -45,7 +45,7 @@
%define using_buildservice 0%{?opensuse_bs}
Name: kvm
-BuildRequires: SDL-devel alsa alsa-devel gnutls-devel ncurses-devel pciutils-devel perl python texinfo
+BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel ncurses-devel pciutils-devel perl python texinfo
%ifarch %ix86 x86_64 ia64
%if %{build_fw_from_source}
# needed for building vgabios:
@@ -76,8 +76,8 @@
Group: System/Kernel
Summary: Kernel-based Virtual Machine
Url: http://kvm.qumranet.com/
-Version: 0.12.3
-Release: 2
+Version: 0.12.5
+Release: 1
Source0: qemu-%{name}-%{version}.tar.bz2
Source1: 60-kvm.rules
Source2: qemu-ifup
@@ -99,6 +99,8 @@
Patch07: kvm-qemu-no-fallback-if-open-kvm-fails.patch
Patch08: seabios-preXX-ap-start.patch
Patch09: seabios-preXX-enable-irq-in-spin-functions.patch
+Patch10: kvm-qemu-user-space-tool-name.patch
+
# Mac OS X patches
Patch11: kvm-qemu-lpc.patch
Patch12: kvm-qemu-applesmc.patch
@@ -107,57 +109,29 @@
Patch16: kvm-qemu-rtl8139-link.patch
Patch90: kvm-bios.patch
# Post-release upstream patches
-Patch100: kvm-no-pp-directives-in-macros.patch
-Patch101: kvm-qemu-preXX-dictzip1.patch
-Patch102: kvm-qemu-preXX-dictzip2.patch
-Patch103: kvm-qemu-preXX-dictzip3.patch
-Patch104: kvm-qemu-preXX-dictzip4.patch
-Patch105: kvm-qemu-preXX-dictzip5.patch
-Patch106: kvm-qemu-preXX-dictzip6.patch
-Patch107: kvm-qemu-preXX-nic-device-pxe-boot.patch
-Patch108: kvm-qemu-preXX-virtio-hotplug.patch
-Patch109: kvm-qemu-preXX-vvfat-buffer.patch
-Patch110: kvm-qemu-preXX-write-full.patch
-Patch111: kvm-qemu-preXX-qcow2-error-handling.patch
-Patch112: kvm-qemu-preXX-qcow2-regression.patch
-Patch113: kvm-qemu-preXX-rtl8139-timer.patch
-Patch114: kvm-qemu-preXX-32bit-breakpoint-crash.patch
-Patch115: kvm-qemu-preXX-curses-return-key.patch
-Patch116: kvm-qemu-pre0.12.4-lddqu-instr.patch
-Patch117: kvm-qemu-pre0.12.4-long-mode-long-jmp.patch
-Patch118: kvm-qemu-preXX-sdl-grab-help.patch
-Patch119: kvm-qemu-preXX-vmdk-double-free.patch
-Patch120: kvm-qemu-pre0.12.4-sib-decode.patch
-Patch121: kvm-qemu-preXX-qdev-ide-bios-setup.patch
-Patch122: kvm-qemu-preXX-balloon-report-overflow.patch
-Patch123: kvm-qemu-pre0.12.4-vcpu-create-failure.patch
-Patch124: kvm-qemu-pre0.12.4-non-kvm-ram-limit.patch
-Patch125: kvm-qemu-pre0.12.4-fdc-handling-with-global.patch
-Patch126: kvm-qemu-pre0.12.4-0001-Fix-qemu-net-user-hostfwd-example.patch
-Patch127: kvm-qemu-pre0.12.4-0002-fix-undefined-shifts-by-32.patch
-Patch128: kvm-qemu-pre0.12.4-0003-qemu-char.c-drop-debug-printfs-from-qemu_chr_parse_.patch
-Patch129: kvm-qemu-pre0.12.4-0008-target-i386-fix-commit-c22549204a6edc431e8e4358e61b.patch
-Patch130: kvm-qemu-pre0.12.4-0010-spelling-typo-compatibilty-in-hw-fw_cfg.c.patch
-Patch131: kvm-qemu-pre0.12.4-0011-Don-t-set-default-monitor-when-there-is-a-mux-ed-one.patch
-Patch132: kvm-qemu-pre0.12.4-0012-Fix-corner-case-in-chardev-udp-parameter.patch
-Patch133: kvm-qemu-pre0.12.4-0013-workaround-for-cmd646-bmdma-register-access-while-no.patch
-Patch134: kvm-qemu-pre0.12.4-0015-pci-passthrough-zap-option-rom-scanning.patch
-Patch135: kvm-qemu-preXX-report-open-failure.patch
-Patch136: kvm-qemu-preXX-boot-option.patch
-Patch137: kvm-qemu-pre0.12.4-honor-iov-max.patch
-Patch138: kvm-qemu-pre0.12.4-fix-multiwrite-error-handling.patch
-Patch139: kvm-qemu-pre0.12.4-fix-multiwrite-error-code.patch
-Patch140: kvm-qemu-pre0.12.4-fix-multiwrite-memory-leak.patch
-Patch141: kvm-qemu-pre0.12.4-free-iovec-array.patch
-Patch142: kvm-qemu-pre0.13-flush-unsafe.patch
-Patch143: kvm-qemu-pre0.13-flush-unsafe-snapshot.patch
-Patch144: kvm-qemu-preXX-default-writeback.patch
-Patch145: qemu-kvm-pre0.12.5-0002-pci-irq_state-vmstate-breakage.patch
-Patch146: qemu-kvm-pre0.12.5-0003-block-fix-sector-comparism-in-multiwrite_req_compar.patch
-Patch147: qemu-kvm-pre0.12.5-0004-virtio-blk-fix-barrier-support.patch
-Patch148: qemu-kvm-pre0.12.5-0005-block-fix-aio_flush-segfaults-for-read-only-protoco.patch
-Patch149: qemu-kvm-pre0.12.5-0006-qemu-sockets-avoid-strlen-of-NULL-pointer.patch
-Patch150: kvm-qemu-preXX-fix-multiboot.patch
+Patch100: kvm-qemu-preXX-dictzip1.patch
+Patch101: kvm-qemu-preXX-dictzip2.patch
+Patch102: kvm-qemu-preXX-dictzip3.patch
+Patch103: kvm-qemu-preXX-dictzip4.patch
+Patch104: kvm-qemu-preXX-dictzip5.patch
+Patch105: kvm-qemu-preXX-dictzip6.patch
+Patch106: kvm-qemu-preXX-virtio-hotplug.patch
+Patch107: kvm-qemu-preXX-write-full.patch
+Patch108: kvm-qemu-preXX-qcow2-error-handling.patch
+Patch109: kvm-qemu-preXX-qcow2-regression.patch
+Patch110: kvm-qemu-preXX-rtl8139-timer.patch
+Patch111: kvm-qemu-preXX-32bit-breakpoint-crash.patch
+Patch112: kvm-qemu-preXX-curses-return-key.patch
+Patch113: kvm-qemu-preXX-sdl-grab-help.patch
+Patch114: kvm-qemu-preXX-qdev-ide-bios-setup.patch
+Patch115: kvm-qemu-preXX-balloon-report-overflow.patch
+Patch116: kvm-qemu-preXX-report-open-failure.patch
+Patch117: kvm-qemu-preXX-boot-option.patch
+Patch118: kvm-qemu-pre0.13-flush-unsafe.patch
+Patch119: kvm-qemu-pre0.13-flush-unsafe-snapshot.patch
+Patch120: kvm-qemu-preXX-default-writeback.patch
+Patch121: kvm-qemu-preXX-move-unsafe-to-end-of-caching-modes-in-help.patch
+Patch122: kvm-qemu-preXX-report-default-mac-used.patch
Patch200: kvm-studio-slirp-nooutgoing.patch
Patch201: kvm-studio-vnc.patch
@@ -235,6 +209,7 @@
%patch07 -p1
%patch08 -p1
%patch09 -p1
+%patch10 -p1
# Mac OS X guest
%if %{mac_bios}
%patch11 -p1
@@ -269,34 +244,6 @@
%patch120 -p1
%patch121 -p1
%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
-%patch134 -p1
-%patch135 -p1
-%patch136 -p1
-%patch137 -p1
-%patch138 -p1
-%patch139 -p1
-%patch140 -p1
-%patch141 -p1
-%patch142 -p1
-%patch143 -p1
-%patch144 -p1
-%patch145 -p1
-%patch146 -p1
-%patch147 -p1
-%patch148 -p1
-%patch149 -p1
-%patch150 -p1
# Studio addons
%patch200 -p1
++++++ kvm-qemu-applesmc.patch ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:40.000000000 +0200
@@ -1,8 +1,8 @@
#qemu-only -> submit upstream qemu
-Index: qemu-kvm-0.12.3/Makefile.target
+Index: qemu-kvm-0.12.5/Makefile.target
===================================================================
---- qemu-kvm-0.12.3.orig/Makefile.target
-+++ qemu-kvm-0.12.3/Makefile.target
+--- qemu-kvm-0.12.5.orig/Makefile.target
++++ qemu-kvm-0.12.5/Makefile.target
@@ -206,7 +206,7 @@ obj-i386-y += pckbd.o $(sound-obj-y) dma
obj-i386-y += vga.o vga-pci.o vga-isa.o
obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
@@ -12,10 +12,10 @@
obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += extboot.o
obj-i386-y += ne2000-isa.o
-Index: qemu-kvm-0.12.3/hw/applesmc.c
+Index: qemu-kvm-0.12.5/hw/applesmc.c
===================================================================
--- /dev/null
-+++ qemu-kvm-0.12.3/hw/applesmc.c
++++ qemu-kvm-0.12.5/hw/applesmc.c
@@ -0,0 +1,171 @@
+/*
+ * Apple SMC controller
@@ -188,10 +188,10 @@
+ register_ioport_write(APPLESMC_CMD_PORT, 4, 1, applesmc_io_cmd_writeb, s);
+}
+
-Index: qemu-kvm-0.12.3/hw/pc.h
+Index: qemu-kvm-0.12.5/hw/pc.h
===================================================================
---- qemu-kvm-0.12.3.orig/hw/pc.h
-+++ qemu-kvm-0.12.3/hw/pc.h
+--- qemu-kvm-0.12.5.orig/hw/pc.h
++++ qemu-kvm-0.12.5/hw/pc.h
@@ -163,6 +163,10 @@ void isa_cirrus_vga_init(void);
void isa_ne2000_init(int base, int irq, NICInfo *nd);
@@ -203,11 +203,11 @@
/* lpc.c */
void lpc_init(PCIBus *bus, int devfn, qemu_irq *pic);
-Index: qemu-kvm-0.12.3/vl.c
+Index: qemu-kvm-0.12.5/vl.c
===================================================================
---- qemu-kvm-0.12.3.orig/vl.c
-+++ qemu-kvm-0.12.3/vl.c
-@@ -5496,6 +5496,9 @@ int main(int argc, char **argv, char **e
+--- qemu-kvm-0.12.5.orig/vl.c
++++ qemu-kvm-0.12.5/vl.c
+@@ -5507,6 +5507,9 @@ int main(int argc, char **argv, char **e
exit(1);
}
break;
@@ -217,10 +217,10 @@
#endif
#ifdef CONFIG_KVM
#ifdef KVM_UPSTREAM
-Index: qemu-kvm-0.12.3/qemu-options.hx
+Index: qemu-kvm-0.12.5/qemu-options.hx
===================================================================
---- qemu-kvm-0.12.3.orig/qemu-options.hx
-+++ qemu-kvm-0.12.3/qemu-options.hx
+--- qemu-kvm-0.12.5.orig/qemu-options.hx
++++ qemu-kvm-0.12.5/qemu-options.hx
@@ -717,6 +717,15 @@ be needed to boot from old floppy disks.
ETEXI
++++++ kvm-qemu-ide-ich6.patch ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:40.000000000 +0200
@@ -1,9 +1,9 @@
#qemu-only -> submit upstream qemu
-Index: qemu-kvm-0.12.2/hw/irq.c
+Index: qemu-kvm-0.12.5/hw/irq.c
===================================================================
---- qemu-kvm-0.12.2.orig/hw/irq.c
-+++ qemu-kvm-0.12.2/hw/irq.c
+--- qemu-kvm-0.12.5.orig/hw/irq.c
++++ qemu-kvm-0.12.5/hw/irq.c
@@ -35,6 +35,7 @@ void qemu_set_irq(qemu_irq irq, int leve
if (!irq)
return;
@@ -12,10 +12,10 @@
irq->handler(irq->opaque, irq->n, level);
}
-Index: qemu-kvm-0.12.2/hw/ide.h
+Index: qemu-kvm-0.12.5/hw/ide.h
===================================================================
---- qemu-kvm-0.12.2.orig/hw/ide.h
-+++ qemu-kvm-0.12.2/hw/ide.h
+--- qemu-kvm-0.12.5.orig/hw/ide.h
++++ qemu-kvm-0.12.5/hw/ide.h
@@ -12,6 +12,7 @@ void pci_cmd646_ide_init(PCIBus *bus, Dr
int secondary_ide_enabled);
void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn);
@@ -24,11 +24,11 @@
/* ide-macio.c */
int pmac_ide_init (DriveInfo **hd_table, qemu_irq irq,
-Index: qemu-kvm-0.12.2/hw/ide/piix.c
+Index: qemu-kvm-0.12.5/hw/ide/piix.c
===================================================================
---- qemu-kvm-0.12.2.orig/hw/ide/piix.c
-+++ qemu-kvm-0.12.2/hw/ide/piix.c
-@@ -155,6 +155,29 @@ static int pci_piix4_ide_initfn(PCIDevic
+--- qemu-kvm-0.12.5.orig/hw/ide/piix.c
++++ qemu-kvm-0.12.5/hw/ide/piix.c
+@@ -156,6 +156,29 @@ static int pci_piix4_ide_initfn(PCIDevic
return pci_piix_ide_initfn(d);
}
@@ -58,7 +58,7 @@
/* hd_table must contain 4 block drivers */
/* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */
void pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn)
-@@ -175,6 +198,16 @@ void pci_piix4_ide_init(PCIBus *bus, Dri
+@@ -176,6 +199,16 @@ void pci_piix4_ide_init(PCIBus *bus, Dri
pci_ide_create_devs(dev, hd_table);
}
@@ -75,7 +75,7 @@
static PCIDeviceInfo piix_ide_info[] = {
{
.qdev.name = "piix3-ide",
-@@ -187,6 +220,11 @@ static PCIDeviceInfo piix_ide_info[] = {
+@@ -188,6 +221,11 @@ static PCIDeviceInfo piix_ide_info[] = {
.qdev.no_user = 1,
.init = pci_piix4_ide_initfn,
},{
@@ -87,10 +87,10 @@
/* end of list */
}
};
-Index: qemu-kvm-0.12.2/hw/pci_ids.h
+Index: qemu-kvm-0.12.5/hw/pci_ids.h
===================================================================
---- qemu-kvm-0.12.2.orig/hw/pci_ids.h
-+++ qemu-kvm-0.12.2/hw/pci_ids.h
+--- qemu-kvm-0.12.5.orig/hw/pci_ids.h
++++ qemu-kvm-0.12.5/hw/pci_ids.h
@@ -88,6 +88,7 @@
#define PCI_VENDOR_ID_INTEL 0x8086
#define PCI_DEVICE_ID_INTEL_82441 0x1237
++++++ kvm-qemu-macmodel.patch ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:40.000000000 +0200
@@ -7,10 +7,10 @@
# pc_init1(.... , PCI | IOAPIC | PIIX, .....
# pc_init1(.... , PCI | ICH6, LPC, SMC , ...)
-Index: qemu-kvm-0.12.3/hw/pc.c
+Index: qemu-kvm-0.12.5/hw/pc.c
===================================================================
---- qemu-kvm-0.12.3.orig/hw/pc.c
-+++ qemu-kvm-0.12.3/hw/pc.c
+--- qemu-kvm-0.12.5.orig/hw/pc.c
++++ qemu-kvm-0.12.5/hw/pc.c
@@ -92,6 +92,12 @@ static void isa_irq_handler(void *opaque
qemu_set_irq(isa->ioapic[n], level);
};
@@ -236,11 +236,11 @@
}
machine_init(pc_machine_init);
-Index: qemu-kvm-0.12.3/vl.c
+Index: qemu-kvm-0.12.5/vl.c
===================================================================
---- qemu-kvm-0.12.3.orig/vl.c
-+++ qemu-kvm-0.12.3/vl.c
-@@ -5899,6 +5899,10 @@ int main(int argc, char **argv, char **e
+--- qemu-kvm-0.12.5.orig/vl.c
++++ qemu-kvm-0.12.5/vl.c
+@@ -5910,6 +5910,10 @@ int main(int argc, char **argv, char **e
if (kvm_enabled()) {
int ret;
++++++ kvm-qemu-no-fallback-if-open-kvm-fails.patch ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:40.000000000 +0200
@@ -1,8 +1,8 @@
-Index: qemu-kvm-0.12.3/vl.c
+Index: qemu-kvm-0.12.5/vl.c
===================================================================
---- qemu-kvm-0.12.3.orig/vl.c
-+++ qemu-kvm-0.12.3/vl.c
-@@ -5902,6 +5902,8 @@ int main(int argc, char **argv, char **e
+--- qemu-kvm-0.12.5.orig/vl.c
++++ qemu-kvm-0.12.5/vl.c
+@@ -5913,6 +5913,8 @@ int main(int argc, char **argv, char **e
fprintf(stderr, "failed to initialize KVM\n");
exit(1);
#endif
++++++ kvm-qemu-pre0.13-flush-unsafe.patch ++++++
--- /var/tmp/diff_new_pack.Lhk4wj/_old 2010-08-02 11:37:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Lhk4wj/_new 2010-08-02 11:37:40.000000000 +0200
@@ -44,7 +44,7 @@
/*
* Yes, BDRV_O_NOCACHE aka O_DIRECT means we have to present a
-@@ -1098,6 +1101,11 @@ void bdrv_flush(BlockDriverState *bs)
+@@ -1137,6 +1140,11 @@ void bdrv_flush(BlockDriverState *bs)
{
if (!bs->drv)
return;
@@ -56,7 +56,7 @@
if (bs->drv->bdrv_flush)
bs->drv->bdrv_flush(bs);
if (bs->backing_hd)
-@@ -1784,6 +1792,10 @@ BlockDriverAIOCB *bdrv_aio_flush(BlockDr
+@@ -1855,6 +1863,10 @@ BlockDriverAIOCB *bdrv_aio_flush(BlockDr
{
BlockDriver *drv = bs->drv;
@@ -67,7 +67,7 @@
if (!drv)
return NULL;
-@@ -1902,6 +1914,25 @@ static BlockDriverAIOCB *bdrv_aio_flush_
+@@ -1973,6 +1985,25 @@ static BlockDriverAIOCB *bdrv_aio_flush_
qemu_bh_schedule(acb->bh);
return &acb->common;
}
@@ -175,15 +175,3 @@
if (aio == 1) {
bdrv_flags |= BDRV_O_NATIVE_AIO;
-Index: qemu-kvm-0.12.3/block_int.h
-===================================================================
---- qemu-kvm-0.12.3.orig/block_int.h
-+++ qemu-kvm-0.12.3/block_int.h
-@@ -127,6 +127,7 @@ struct BlockDriverState {
- int64_t total_sectors; /* if we are reading a disk image, give its
- size in sectors */
- int read_only; /* if true, the media is read only */
-+ int open_flags; /* flags used to open the file, re-used for re-open */
- int removable; /* if true, the media can be removed */
- int locked; /* if true, the media cannot temporarily be ejected */
- int encrypted; /* if true, the media is encrypted */
++++++ kvm-qemu-preXX-move-unsafe-to-end-of-caching-modes-in-help.patch ++++++
Libvirt parses qemu help output to determine qemu features. In particular
it probes for the following: "cache=writethrough|writeback|none". The
addition of the unsafe cache mode was inserted within this string, as
opposed to being added to the end, which impacted libvirt's probe.
Unbreak libvirt by keeping the existing cache modes intact and add
unsafe to the end.
This problem only manifests itself if a caching mode is explicitly
specified in the libvirt xml, in which case older syntax for caching is
passed to qemu, which it no longer understands.
Signed-off-by: Bruce Rogers