From 0fdd82e66e3cb563c91d38a020047830558b8bcf Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Wed, 22 Dec 2010 17:01:53 +0100
Subject: [PATCH] virsh: Add --force option to update-device

---
 tools/virsh.c   |  5 +++++
 tools/virsh.pod | 14 ++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tools/virsh.c b/tools/virsh.c
index 8c123bb689..55e2a688ea 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -8293,6 +8293,7 @@ static const vshCmdOptDef opts_update_device[] = {
     {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")},
     {"file",   VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")},
     {"persistent", VSH_OT_BOOL, 0, N_("persist device update")},
+    {"force",  VSH_OT_BOOL, 0, N_("force device update")},
     {NULL, 0, 0, NULL}
 };
 
@@ -8331,6 +8332,10 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd)
     } else {
         flags = VIR_DOMAIN_DEVICE_MODIFY_LIVE;
     }
+
+    if (vshCommandOptBool(cmd, "force"))
+        flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE;
+
     ret = virDomainUpdateDeviceFlags(dom, buffer, flags);
     VIR_FREE(buffer);
 
diff --git a/tools/virsh.pod b/tools/virsh.pod
index 9cb6829738..9c45a61199 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -731,12 +731,14 @@ I<type> can be either I<network> to indicate a physical network device or I<brid
 It is recommended to use the I<mac> option to distinguish between the interfaces
 if more than one are present on the domain.
 
-=item B<update-device> I<domain-id> I<file> optional I<--persistent>
-
-Update the characteristics of a device associated with I<domain-id>,
-based on the device definition in an XML I<file>.  If the I<--persistent>
-option is used, the changes will affect the next boot of the domain.
-See the documentation to learn about libvirt XML format for a device.
+=item B<update-device> I<domain-id> I<file> optional I<--persistent> I<--force>
+
+Update the characteristics of a device associated with I<domain-id>, based on
+the device definition in an XML I<file>.  If the I<--persistent> option is
+used, the changes will affect the next boot of the domain. The I<--force>
+option can be used to force device update, e.g., to eject a CD-ROM even if it
+is locked/mounted in the domain. See the documentation to learn about libvirt
+XML format for a device.
 
 =back
 
-- 
GitLab