On 21.09.2017 17:32, Jiri Denemark wrote:
On Thu, Sep 21, 2017 at 16:39:38 +0300, Nikolay Shirokovskiy wrote:
> qemu code always set VIR_DOMAIN_XML_SECURE flags when VIR_DOMAIN_XML_MIGRATABLE
> is set. At the same time qemu code itself does not analyse VIR_DOMAIN_XML_SECURE
> presense in any way. Thus we can just append secure flag conditionally
> down the stack before call to virDomainDefFormatInternal which actually checks
> secure flag. This drops a couple of adhoc macros also.
I think the adhoc macros are actually useful. They make sure that all
places where a definition is copied or formatted in a certain way will
use the same flags. Even if it's just a single flag.
It is just flag QEMU_DOMAIN_FORMAT_LIVE_FLAGS was not very clear to me.
In one place it combined with VIR_DOMAIN_XML_INACTIVE which looks odd.
But the main purpose of this patch is not to remove macros but rather
to clarify the fact that migratable flag is always used with together
with secure flag.
Nikolay
> I would even put appending secure flag if migratable is present into
> virDomainDefFormatConvertXMLFlags but not all hypervisors drivers agree on
> this point.
...
> @@ -6995,7 +6994,7 @@ static char
> goto cleanup;
>
> if ((flags & VIR_DOMAIN_XML_MIGRATABLE))
> - flags |= QEMU_DOMAIN_FORMAT_LIVE_FLAGS;
> + flags |= VIR_DOMAIN_XML_UPDATE_CPU;
Oh I se what was the local change now. The annoyingly slow mail delivery
from the mailing list caused me to see 2/2 without the rest of the
series.
Jirka