openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Expand the address set when attaching a virtio-serial controller

This commit is contained in:
Ján Tomko 2015-03-02 10:59:25 +01:00
parent 5903378834
commit ee0d97a770
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_hotplug.c
View File

@ -437,6 +437,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
char *devstr = NULL; char *devstr = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
bool releaseaddr = false; bool releaseaddr = false;
bool addedToAddrSet = false;
if (virDomainControllerFind(vm->def, controller->type, controller->idx) >= 0) { if (virDomainControllerFind(vm->def, controller->type, controller->idx) >= 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
@ -475,6 +476,12 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL &&
virDomainVirtioSerialAddrSetAddController(priv->vioserialaddrs,
controller) < 0)
goto cleanup;
addedToAddrSet = true;
if (!(devstr = qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, NULL))) if (!(devstr = qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, NULL)))
goto cleanup; goto cleanup;
} }
@ -503,6 +510,9 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
} }
cleanup: cleanup:
if (ret != 0 && addedToAddrSet)
virDomainVirtioSerialAddrSetRemoveController(priv->vioserialaddrs,
controller);
if (ret != 0 && releaseaddr) if (ret != 0 && releaseaddr)
qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL); qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL);