External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: migration: Refactor hostdev validation in migration check

Browse Source 
The hostdev check can error out right away.
This commit is contained in:
Peter Krempa 2015-04-22 11:41:22 +02:00
parent 584db1054c
commit bd57977391
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_migration.c
View File

@ -1951,7 +1951,6 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
{ {
int nsnapshots; int nsnapshots;
int pauseReason; int pauseReason;
bool forbid;
size_t i; size_t i;
if (vm) { if (vm) {
@ -1995,22 +1994,16 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
} }
/* Migration with USB host devices is allowed, all other devices are /* Migration with USB host devices is allowed, all other devices are
* forbidden. * forbidden. */
*/
forbid = false;
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevDefPtr hostdev = def->hostdevs[i]; virDomainHostdevDefPtr hostdev = def->hostdevs[i];
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
forbid = true; virReportError(VIR_ERR_OPERATION_INVALID, "%s",
break; _("domain has assigned non-USB host devices"));
return false;
} }
} }
if (forbid) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("domain has assigned non-USB host devices"));
return false;
}
if (def->cpu && def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { if (def->cpu && def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
for (i = 0; i < def->cpu->nfeatures; i++) { for (i = 0; i < def->cpu->nfeatures; i++) {