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

conf: refactor code for checking ABI stability of panic device

Browse Source
This commit is contained in:
Dmitry Andreev 2015-11-24 15:26:30 +03:00 committed by Jiri Denemark
parent d8ca0cbd4b
commit e5c9e03285
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/conf/domain_conf.c
View File

@ -17613,8 +17613,8 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
}
static bool
virDomainPanicCheckABIStability(virDomainPanicDefPtr src,
virDomainPanicDefPtr dst)
virDomainPanicDefCheckABIStability(virDomainPanicDefPtr src,
virDomainPanicDefPtr dst)
{
if (!src && !dst)
return true;
@ -17688,13 +17688,6 @@ virDomainTPMDefCheckABIStability(virDomainTPMDefPtr src,
return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info);
}
static bool
virDomainPanicDefCheckABIStability(virDomainPanicDefPtr src,
virDomainPanicDefPtr dst)
{
return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info);
}
static bool
virDomainMemoryDefCheckABIStability(virDomainMemoryDefPtr src,
virDomainMemoryDefPtr dst)
@ -18112,7 +18105,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
if (!virDomainRNGDefCheckABIStability(src->rngs[i], dst->rngs[i]))
goto error;
if (!virDomainPanicCheckABIStability(src->panic, dst->panic))
if (!virDomainPanicDefCheckABIStability(src->panic, dst->panic))
goto error;
if (src->nshmems != dst->nshmems) {
@ -18137,16 +18130,6 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
goto error;
}
if (src->panic && dst->panic) {
if (!virDomainPanicDefCheckABIStability(src->panic, dst->panic))
goto error;
} else if (src->panic || dst->panic) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Either both target and source domains or none of "
"them must have PANIC device present"));
goto error;
}
if (src->nmems != dst->nmems) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target domain memory device count %zu "