From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 16 Jul 2013 19:16:09 +0000 (+0200)
Subject: qemu: Separate char device removal into a standalone function
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d077cda4e9f9e551f5cad6fcd2c3ed666bd138aa;p=libvirt.git

qemu: Separate char device removal into a standalone function
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a98de9d253..54b4c82d0e 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2475,6 +2475,19 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
 }
 
 
+static void
+qemuDomainRemoveChrDevice(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+                          virDomainObjPtr vm,
+                          virDomainChrDefPtr chr)
+{
+    VIR_DEBUG("Removing character device %s from domain %p %s",
+              chr->info.alias, vm, vm->def->name);
+
+    qemuDomainChrRemove(vm->def, chr);
+    virDomainChrDefFree(chr);
+}
+
+
 int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver,
                                      virDomainObjPtr vm,
                                      virDomainDiskDefPtr detach)
@@ -3170,8 +3183,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
     }
     qemuDomainObjExitMonitor(driver, vm);
 
-    qemuDomainChrRemove(vmdef, tmpChr);
-    virDomainChrDefFree(tmpChr);
+    qemuDomainRemoveChrDevice(driver, vm, tmpChr);
     ret = 0;
 
 cleanup: