提交 0da43511 编写于 作者: M Michal Privoznik

virStoragePRDefFormat: Suppress path formatting for migratable XML

If there are managed reservations for a disk source, the path to
the pr-helper socket is generated automatically by libvirt when
needed and points somewhere under priv->libDir. Therefore it is
very unlikely that the path will work even on migration
destination (the libDir is derived from domain short name and its
ID).
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 900403a3
...@@ -23565,7 +23565,8 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf, ...@@ -23565,7 +23565,8 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
return -1; return -1;
if (src->pr) if (src->pr)
virStoragePRDefFormat(childBuf, src->pr); virStoragePRDefFormat(childBuf, src->pr,
flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE);
return 0; return 0;
} }
......
...@@ -1982,11 +1982,13 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt) ...@@ -1982,11 +1982,13 @@ virStoragePRDefParseXML(xmlXPathContextPtr ctxt)
void void
virStoragePRDefFormat(virBufferPtr buf, virStoragePRDefFormat(virBufferPtr buf,
virStoragePRDefPtr prd) virStoragePRDefPtr prd,
bool migratable)
{ {
virBufferAsprintf(buf, "<reservations managed='%s'", virBufferAsprintf(buf, "<reservations managed='%s'",
virTristateBoolTypeToString(prd->managed)); virTristateBoolTypeToString(prd->managed));
if (prd->path) { if (prd->path &&
(prd->managed == VIR_TRISTATE_BOOL_NO || !migratable)) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
virBufferAddLit(buf, "<source type='unix'"); virBufferAddLit(buf, "<source type='unix'");
......
...@@ -395,7 +395,8 @@ void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authdef); ...@@ -395,7 +395,8 @@ void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authdef);
void virStoragePRDefFree(virStoragePRDefPtr prd); void virStoragePRDefFree(virStoragePRDefPtr prd);
virStoragePRDefPtr virStoragePRDefParseXML(xmlXPathContextPtr ctxt); virStoragePRDefPtr virStoragePRDefParseXML(xmlXPathContextPtr ctxt);
void virStoragePRDefFormat(virBufferPtr buf, void virStoragePRDefFormat(virBufferPtr buf,
virStoragePRDefPtr prd); virStoragePRDefPtr prd,
bool migratable);
bool virStoragePRDefIsEqual(virStoragePRDefPtr a, bool virStoragePRDefIsEqual(virStoragePRDefPtr a,
virStoragePRDefPtr b); virStoragePRDefPtr b);
bool virStoragePRDefIsManaged(virStoragePRDefPtr prd); bool virStoragePRDefIsManaged(virStoragePRDefPtr prd);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册