External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Assign an address when hotplugging a virtio-serial device

Browse Source
This commit is contained in:
Ján Tomko 2015-03-02 10:59:52 +01:00
parent ee0d97a770
commit 89e991a2aa
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_hotplug.c
View File

@ -1541,6 +1541,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
virDomainDefPtr vmdef = vm->def; virDomainDefPtr vmdef = vm->def;
char *devstr = NULL; char *devstr = NULL;
char *charAlias = NULL; char *charAlias = NULL;
bool need_release = false;
bool allowZero = false;
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
@ -1551,6 +1553,16 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0)
goto cleanup; goto cleanup;
if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO)
allowZero = true;
if (virDomainVirtioSerialAddrAutoAssign(priv->vioserialaddrs,
&chr->info,
allowZero) < 0)
goto cleanup;
need_release = true;
if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0)
goto cleanup; goto cleanup;
@ -1582,6 +1594,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
cleanup: cleanup:
if (ret < 0 && virDomainObjIsActive(vm)) if (ret < 0 && virDomainObjIsActive(vm))
qemuDomainChrInsertPreAllocCleanup(vm->def, chr); qemuDomainChrInsertPreAllocCleanup(vm->def, chr);
if (ret < 0 && need_release)
virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &chr->info);
VIR_FREE(charAlias); VIR_FREE(charAlias);
VIR_FREE(devstr); VIR_FREE(devstr);
return ret; return ret;
@ -4120,10 +4134,13 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
rc = qemuDomainWaitForDeviceRemoval(vm); rc = qemuDomainWaitForDeviceRemoval(vm);
if (rc == 0 || rc == 1) if (rc == 0 || rc == 1) {
virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &tmpChr->info);
ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr); ret = qemuDomainRemoveChrDevice(driver, vm, tmpChr);
else } else {
ret = 0; ret = 0;
}
cleanup: cleanup:
qemuDomainResetDeviceRemoval(vm); qemuDomainResetDeviceRemoval(vm);

2
tests/qemuhotplugtest.c
View File

@ -86,7 +86,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
if (event) if (event)
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_DEL_EVENT);
if (qemuDomainAssignPCIAddresses((*vm)->def, priv->qemuCaps, *vm) < 0) if (qemuDomainAssignAddresses((*vm)->def, priv->qemuCaps, *vm) < 0)
goto cleanup; goto cleanup;
if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0) if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)