From 84f7b286c23051e4081be0467bf0f17d991b5502 Mon Sep 17 00:00:00 2001
From: Osier Yang <jyang@redhat.com>
Date: Thu, 2 Dec 2010 09:19:30 +0800
Subject: [PATCH] virsh: Remove using phy as default disk driver in
 cmdAttachDisk

* tools/virsh.c (virsh shouldn't use 'phy' as the disk driver if
user doesn't specify "--driver", it causes bugs, as not all of
hypervisor driver supports 'phy', and actually hypervisor should
known the correct default disk driver and subdriver, so remove it)
---
 tools/virsh.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index 6a9aba2848..c09c0d848b 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -8668,11 +8668,16 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd)
         virBufferVSprintf(&buf, " device='%s'", type);
     virBufferAddLit(&buf, ">\n");
 
-    virBufferVSprintf(&buf, "  <driver name='%s'",
-                      (driver) ? driver : "phy");
+    if (driver || subdriver)
+        virBufferVSprintf(&buf, "  <driver");
+
+    if (driver)
+        virBufferVSprintf(&buf, " name='%s'", driver);
     if (subdriver)
         virBufferVSprintf(&buf, " type='%s'", subdriver);
-    virBufferAddLit(&buf, "/>\n");
+
+    if (driver || subdriver)
+        virBufferAddLit(&buf, "/>\n");
 
     virBufferVSprintf(&buf, "  <source %s='%s'/>\n",
                       (isFile) ? "file" : "dev",
-- 
GitLab