Make cache=default when adding new disk to existing VM (bz #976925)

0001-Fix-rawhide-URL-installs.patch

@@ -1,4 +1,4 @@
-From 17406905d786734e9d30b3a808314f7bb1e28891 Mon Sep 17 00:00:00 2001
+From 4d22adaf9306248350fca5f5542afa01d3cf992a Mon Sep 17 00:00:00 2001
 From: Lars Seipel <lars.seipel@gmail.com>
 Date: Mon, 29 Jul 2013 12:28:22 -0400
 Subject: [PATCH] Fix rawhide URL installs

0002-console-Fix-spice-with-TLS-bz-904295.patch

@@ -1,4 +1,4 @@
-From 11eb5ff728413ca1b3c6404e4e42550add553355 Mon Sep 17 00:00:00 2001
+From 1cbf848d4e7bb5938c8d74484484d6e0376295a2 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Sun, 1 Sep 2013 16:08:14 -0400
 Subject: [PATCH] console: Fix spice with TLS (bz #904295)

0003-manager-Disable-graph-data-func-if-graph-isn-t-visib.patch

@@ -1,4 +1,4 @@
-From 0c452553f19bcaf9cf5ebc52d1d18014ffe10160 Mon Sep 17 00:00:00 2001
+From 3b85e3ebb39f7a374235827ab86b49f4f19fa6a3 Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Sun, 1 Sep 2013 21:35:23 -0400
 Subject: [PATCH] manager: Disable graph data func if graph isn't visible

0004-inspection-Check-can_set_row_none-before-setting-ico.patch

@@ -1,4 +1,4 @@
-From 89d78c1af3f84113ea0d18b4229e98d16c12bfef Mon Sep 17 00:00:00 2001
+From e3a0d7f0246dcc115d8c62d6aa29b7cc526a28df Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Jun 2013 18:45:53 +0100
 Subject: [PATCH] inspection: Check can_set_row_none before setting icon to

0005-virt-manager-ignore-VIR_ERR_NO_DOMAIN-when-a-domain-.patch

@@ -1,4 +1,4 @@
-From 6df408590cf0c4c094bcc5e8700700118e2d71c6 Mon Sep 17 00:00:00 2001
+From 8b3bb638f500f2aa4ef21f704771edaa16b2d9e7 Mon Sep 17 00:00:00 2001
 From: Giuseppe Scrivano <gscrivan@redhat.com>
 Date: Fri, 16 Aug 2013 15:59:33 +0200
 Subject: [PATCH] virt-manager: ignore VIR_ERR_NO_DOMAIN when a domain was just

0006-manager-Merge-some-row-creation-drop-unneeded-row-ke.patch

@@ -1,4 +1,4 @@
-From c3e576155228cc3f3f05d3953edadbf589b74d8c Mon Sep 17 00:00:00 2001
+From 2f8eb759c74783f6440c81cfcb714cb313a7aebb Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Sun, 1 Sep 2013 18:36:58 -0400
 Subject: [PATCH] manager: Merge some row creation, drop unneeded row keys

0007-manager-Separate-stats-and-state-update-callbacks.patch

@@ -1,4 +1,4 @@
-From ed5dc524c54e72ee7f75749f11eb0606dddee8ea Mon Sep 17 00:00:00 2001
+From 28445979692b178f5e3fdbbd7e8178f4c7b5628c Mon Sep 17 00:00:00 2001
 From: Cole Robinson <crobinso@redhat.com>
 Date: Mon, 2 Sep 2013 09:09:31 -0400
 Subject: [PATCH] manager: Separate stats and state update callbacks

0008-addhw-disk-cache-default-should-be-default-not-none.patch

@@ -0,0 +1,35 @@
+From b3e2f2a146209459fcd3467f059657687e7aaa65 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 9 Sep 2013 10:50:56 -0400
+Subject: [PATCH] addhw: disk cache default should be 'default' not 'none'
+
+(cherry picked from commit b6c078ad75684eae3b563c4f8f8ab965a57fdd78)
+---
+ virtManager/uihelpers.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/virtManager/uihelpers.py b/virtManager/uihelpers.py
+index ff254ab..52180c9 100644
+--- a/virtManager/uihelpers.py
++++ b/virtManager/uihelpers.py
+@@ -344,7 +344,7 @@ def populate_netmodel_combo(vm, combo):
+             model.append([m, m])
+ 
+ 
+-def build_cache_combo(vm, combo, no_default=False):
++def build_cache_combo(vm, combo):
+     ignore = vm
+     dev_model = Gtk.ListStore(str, str)
+     combo.set_model(dev_model)
+@@ -357,9 +357,8 @@ def build_cache_combo(vm, combo, no_default=False):
+     for m in virtinst.VirtualDisk.cache_types:
+         dev_model.append([m, m])
+ 
+-    if not no_default:
+-        dev_model.append([None, "default"])
+-    combo.set_active(0)
++    dev_model.append([None, "default"])
++    combo.set_active(len(dev_model) - 1)
+ 
+ 
+ def build_io_combo(vm, combo, no_default=False):

virt-manager.spec

@@ -21,7 +21,7 @@
 
 
 %define _version 0.10.0
-%define _release 2
+%define _release 3
 
 
 # This macro is used for the continuous automated builds. It just
@@ -51,6 +51,8 @@ Patch0004: 0004-inspection-Check-can_set_row_none-before-setting-ico.patch
 Patch0005: 0005-virt-manager-ignore-VIR_ERR_NO_DOMAIN-when-a-domain-.patch
 Patch0006: 0006-manager-Merge-some-row-creation-drop-unneeded-row-ke.patch
 Patch0007: 0007-manager-Separate-stats-and-state-update-callbacks.patch
+# Make cache=default when adding new disk to existing VM (bz #976925)
+Patch0008: 0008-addhw-disk-cache-default-should-be-default-not-none.patch
 BuildArch: noarch
 
 
@@ -125,6 +127,8 @@ machine).
 %patch0005 -p1
 %patch0006 -p1
 %patch0007 -p1
+# Make cache=default when adding new disk to existing VM (bz #976925)
+%patch0008 -p1
 
 %build
 %if %{qemu_user}
@@ -235,6 +239,9 @@ fi
 
 
 %changelog
+* Wed Sep 25 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-3
+- Make cache=default when adding new disk to existing VM (bz #976925)
+
 * Tue Sep 24 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-2
 - Fix parsing rawhide .treeinfo (bz #989162)
 - Fix spice with TLS (bz #904295)