mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-20 07:59:00 +00:00
qemu: Separate char device removal into a standalone function
This commit is contained in:
parent
bac2182041
commit
d077cda4e9
@ -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,
|
int qemuDomainDetachVirtioDiskDevice(virQEMUDriverPtr driver,
|
||||||
virDomainObjPtr vm,
|
virDomainObjPtr vm,
|
||||||
virDomainDiskDefPtr detach)
|
virDomainDiskDefPtr detach)
|
||||||
@ -3170,8 +3183,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|||||||
}
|
}
|
||||||
qemuDomainObjExitMonitor(driver, vm);
|
qemuDomainObjExitMonitor(driver, vm);
|
||||||
|
|
||||||
qemuDomainChrRemove(vmdef, tmpChr);
|
qemuDomainRemoveChrDevice(driver, vm, tmpChr);
|
||||||
virDomainChrDefFree(tmpChr);
|
|
||||||
ret = 0;
|
ret = 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user