Index: virt-manager-0.9.5/src/virtManager/uihelpers.py
===================================================================
--- virt-manager-0.9.5.orig/src/virtManager/uihelpers.py
+++ virt-manager-0.9.5/src/virtManager/uihelpers.py
@@ -400,13 +400,12 @@ def build_storage_format_combo(vm, combo
     combo.set_model(dev_model)
     combo.set_text_column(0)
 
-    formats = ["raw", "qcow2", "qed"]
-    if vm.rhel6_defaults():
-        formats.append("vmdk")
-        formats.append("vdi")
-
-    for m in formats:
-        dev_model.append([m])
+    if vm.conn.is_xen():
+        for m in ["raw", "qcow2", "vmdk"]:
+            dev_model.append([m])
+    else:
+        for m in ["raw", "qcow2", "qed", "vmdk", "vdi"]:
+            dev_model.append([m])
 
     combo.set_active(0)