if ((rv = qemuDomainAttachDiskGeneric(driver, vm, disk)) < 0) {
if (rv == -1 && releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &disk->info, disk->dst);
+ qemuDomainReleaseDeviceAddress(vm, &disk->info);
return -1;
}
cleanup:
if (ret != 0 && releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &controller->info);
VIR_FREE(devstr);
return ret;
vm->def->nets[vm->def->nnets++] = net;
} else {
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &net->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &net->info);
if (iface_connected) {
virErrorPreserveLast(&originalError);
VIR_WARN("Unable to remove host device from /dev");
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, info);
qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1);
virDomainAuditRedirdev(vm, redirdev, "attach", ret == 0);
cleanup:
if (ret < 0 && need_release)
- qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &redirdev->info);
VIR_FREE(tlsAlias);
VIR_FREE(charAlias);
VIR_FREE(devstr);
if (virDomainObjIsActive(vm))
qemuDomainChrInsertPreAllocCleanup(vmdef, chr);
if (need_release)
- qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &chr->info);
if (teardowncgroup && qemuTeardownChardevCgroup(vm, chr) < 0)
VIR_WARN("Unable to remove chr device cgroup ACL on hotplug fail");
if (teardownlabel && qemuSecurityRestoreChardevLabel(driver, vm, chr) < 0)
virJSONValueFree(props);
if (ret < 0) {
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &rng->info);
if (teardowncgroup && qemuTeardownRNGCgroup(vm, rng) < 0)
VIR_WARN("Unable to remove RNG device cgroup ACL on hotplug fail");
if (teardowndevice && qemuDomainNamespaceTeardownRNG(vm, rng) < 0)
qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0)
VIR_WARN("Unable to remove host device from /dev");
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
virDomainCCWAddressSetFree(ccwaddrs);
vm->def->name,
&hostdev,
1);
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
VIR_FREE(devstr);
return ret;
cleanup:
if (release_address)
- qemuDomainReleaseDeviceAddress(vm, &shmem->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &shmem->info);
virJSONValueFree(props);
VIR_FREE(memAlias);
cleanup:
if (releaseAddress)
- qemuDomainReleaseDeviceAddress(vm, &watchdog->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &watchdog->info);
VIR_FREE(watchdogstr);
return ret;
}
if (teardowndevice)
qemuDomainNamespaceTeardownInput(vm, input);
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &input->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &input->info);
virErrorRestore(&originalError);
}
if (ret < 0) {
virErrorPreserveLast(&originalError);
if (releaseaddr)
- qemuDomainReleaseDeviceAddress(vm, &vsock->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &vsock->info);
virErrorRestore(&originalError);
}
virDomainAuditDisk(vm, disk->src, NULL, "detach", true);
- qemuDomainReleaseDeviceAddress(vm, &disk->info, virDomainDiskGetSource(disk));
+ qemuDomainReleaseDeviceAddress(vm, &disk->info);
/* tear down disk security access */
qemuHotplugPrepareDiskSourceAccess(driver, vm, disk->src, true);
}
}
- qemuDomainReleaseDeviceAddress(vm, &controller->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &controller->info);
virDomainControllerDefFree(controller);
return 0;
}
virDomainHostdevDefPtr hostdev)
{
qemuHostdevReAttachPCIDevices(driver, vm->def->name, &hostdev, 1);
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
static void
virDomainHostdevDefPtr hostdev)
{
qemuHostdevReAttachUSBDevices(driver, vm->def->name, &hostdev, 1);
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
static void
virDomainHostdevDefPtr hostdev)
{
qemuHostdevReAttachMediatedDevices(driver, vm->def->name, &hostdev, 1);
- qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, hostdev->info);
}
}
}
- qemuDomainReleaseDeviceAddress(vm, &net->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &net->info);
virDomainConfNWFilterTeardown(net);
if (cfg->macFilter && (net->ifname != NULL)) {
if (qemuDomainNamespaceTeardownChardev(vm, chr) < 0)
VIR_WARN("Unable to remove chr device from /dev");
- qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &chr->info);
qemuDomainChrRemove(vm->def, chr);
/* The caller does not emit the event, so we must do it here. Note
if ((idx = virDomainRNGFind(vm->def, rng)) >= 0)
virDomainRNGRemove(vm->def, idx);
- qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &rng->info);
virDomainRNGDefFree(rng);
ret = 0;
if ((idx = virDomainShmemDefFind(vm->def, shmem)) >= 0)
virDomainShmemDefRemove(vm->def, idx);
- qemuDomainReleaseDeviceAddress(vm, &shmem->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &shmem->info);
virDomainShmemDefFree(shmem);
ret = 0;
VIR_DEBUG("Removing watchdog %s from domain %p %s",
watchdog->info.alias, vm, vm->def->name);
- qemuDomainReleaseDeviceAddress(vm, &watchdog->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &watchdog->info);
virDomainWatchdogDefFree(vm->def->watchdog);
vm->def->watchdog = NULL;
return 0;
if (vm->def->inputs[i] == dev)
break;
}
- qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &dev->info);
if (qemuSecurityRestoreInputLabel(vm, dev) < 0)
VIR_WARN("Unable to restore security label on input device");
VIR_DEBUG("Removing vsock device %s from domain %p %s",
dev->info.alias, vm, vm->def->name);
- qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &dev->info);
virDomainVsockDefFree(vm->def->vsock);
vm->def->vsock = NULL;
return 0;
if ((idx = virDomainRedirdevDefFind(vm->def, dev)) >= 0)
virDomainRedirdevDefRemove(vm->def, idx);
- qemuDomainReleaseDeviceAddress(vm, &dev->info, NULL);
+ qemuDomainReleaseDeviceAddress(vm, &dev->info);
virDomainRedirdevDefFree(dev);
ret = 0;