mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 19:41:16 +00:00
conf: set postParseFailed even without ALLOW_POST_PARSE_FAIL
We allow the postParse callbacks to fail for some reasons (missing emulator binary) when parsing the configs from /etc/libvirt. In that case, def->postParseFailed is set to true and the post parse callbacks are re-executed on domain startup. However this bool was only set when virDomainDefPostParse was called with the ALLOW_POST_PARSE_FAIL flag set. If the callback failed again on domain startup, the bool would be reset and subsequent startups would not attempt to reexecute the callback. Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
dc824c6128
commit
444f15adb8
@ -5027,6 +5027,9 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
|
||||
unsigned int parseFlags,
|
||||
int ret)
|
||||
{
|
||||
if (ret != 0)
|
||||
def->postParseFailed = true;
|
||||
|
||||
if (ret <= 0)
|
||||
return ret;
|
||||
|
||||
@ -5034,7 +5037,6 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
|
||||
return -1;
|
||||
|
||||
virResetLastError();
|
||||
def->postParseFailed = true;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user