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

Remove dead code from qemuDomainAttachControllerDevice

Browse Source 
We only support hotplugging SCSI controllers.
The USB and virtio-serial related code was never reachable because
this function was only called for VIR_DOMAIN_CONTROLLER_TYPE_SCSI
controllers.

This reverts commit ee0d97a and parts of commits 16db8d2
and d6d54cd1.
This commit is contained in:
Ján Tomko 2015-08-12 16:52:11 +02:00
parent aaa42d905a
commit 36d7a36158
4 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/conf/domain_addr.c
View File

@ -884,27 +884,6 @@ virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr addrs
return 0; return 0;
} }
/* virDomainVirtioSerialAddrSetRemoveController
*
* Removes a virtio serial controller from the address set.
*/
void
virDomainVirtioSerialAddrSetRemoveController(virDomainVirtioSerialAddrSetPtr addrs,
virDomainControllerDefPtr cont)
{
ssize_t pos;
if (cont->type != VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
return;
VIR_DEBUG("Removing virtio serial controller index %u "
"from the address set", cont->idx);
pos = virDomainVirtioSerialAddrFindController(addrs, cont->idx);
if (pos >= 0)
VIR_DELETE_ELEMENT(addrs->controllers, pos, addrs->ncontrollers);
}
void void
virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs) virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs)

4
src/conf/domain_addr.h
View File

@ -209,10 +209,6 @@ int
virDomainVirtioSerialAddrSetAddController(virDomainVirtioSerialAddrSetPtr addrs, virDomainVirtioSerialAddrSetAddController(virDomainVirtioSerialAddrSetPtr addrs,
virDomainControllerDefPtr cont) virDomainControllerDefPtr cont)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
void
virDomainVirtioSerialAddrSetRemoveController(virDomainVirtioSerialAddrSetPtr addrs,
virDomainControllerDefPtr cont)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
int int
virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr addrs, virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr addrs,
virDomainDefPtr def) virDomainDefPtr def)

1
src/libvirt_private.syms
View File

@ -115,7 +115,6 @@ virDomainVirtioSerialAddrSetAddController;
virDomainVirtioSerialAddrSetAddControllers; virDomainVirtioSerialAddrSetAddControllers;
virDomainVirtioSerialAddrSetCreate; virDomainVirtioSerialAddrSetCreate;
virDomainVirtioSerialAddrSetFree; virDomainVirtioSerialAddrSetFree;
virDomainVirtioSerialAddrSetRemoveController;
# conf/domain_audit.h # conf/domain_audit.h

18
src/qemu/qemu_hotplug.c
View File

@ -442,7 +442,6 @@ 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 (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
@ -484,20 +483,6 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr driver,
if (qemuAssignDeviceControllerAlias(vm->def, priv->qemuCaps, controller) < 0) if (qemuAssignDeviceControllerAlias(vm->def, priv->qemuCaps, controller) < 0)
goto cleanup; goto cleanup;
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
controller->model == -1 &&
!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("USB controller hotplug unsupported in this QEMU binary"));
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;
} }
@ -526,9 +511,6 @@ 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);