openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainHostdevDefFormatSubsys: Format private data for a virStorageSource 

iSCSI subsystem hostdevs store the data as a virStorageSource. Format
the private data part of the virStorageSource in the appropriate place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-06-16 16:22:50 +02:00
parent 0489a7c6ee
commit 4f708a15b6
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/domain_conf.c
View File

@ -26008,7 +26008,8 @@ static int
virDomainHostdevDefFormatSubsys(virBufferPtr buf, virDomainHostdevDefFormatSubsys(virBufferPtr buf,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def,
unsigned int flags, unsigned int flags,
bool includeTypeInAddr) bool includeTypeInAddr,
virDomainXMLOptionPtr xmlopt)
{ {
bool closedSource = false; bool closedSource = false;
virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb; virDomainHostdevSubsysUSBPtr usbsrc = &def->source.subsys.u.usb;
@ -26107,6 +26108,10 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
if (iscsisrc->src->hosts[0].port) if (iscsisrc->src->hosts[0].port)
virBufferAsprintf(buf, " port='%u'", iscsisrc->src->hosts[0].port); virBufferAsprintf(buf, " port='%u'", iscsisrc->src->hosts[0].port);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
if (virDomainDiskSourceFormatPrivateData(buf, iscsisrc->src,
flags, xmlopt) < 0)
return -1;
} else { } else {
virBufferAsprintf(buf, "<adapter name='%s'/>\n", virBufferAsprintf(buf, "<adapter name='%s'/>\n",
scsihostsrc->adapter); scsihostsrc->adapter);
@ -26188,13 +26193,14 @@ static int
virDomainActualNetDefContentsFormat(virBufferPtr buf, virDomainActualNetDefContentsFormat(virBufferPtr buf,
virDomainNetDefPtr def, virDomainNetDefPtr def,
bool inSubelement, bool inSubelement,
unsigned int flags) unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{ {
virDomainNetType actualType = virDomainNetGetActualType(def); virDomainNetType actualType = virDomainNetGetActualType(def);
if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) { if (actualType == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
if (virDomainHostdevDefFormatSubsys(buf, virDomainNetGetActualHostdev(def), if (virDomainHostdevDefFormatSubsys(buf, virDomainNetGetActualHostdev(def),
flags, true) < 0) { flags, true, xmlopt) < 0) {
return -1; return -1;
} }
} else { } else {
@ -26274,7 +26280,8 @@ virDomainActualNetDefContentsFormat(virBufferPtr buf,
static int static int
virDomainActualNetDefFormat(virBufferPtr buf, virDomainActualNetDefFormat(virBufferPtr buf,
virDomainNetDefPtr def, virDomainNetDefPtr def,
unsigned int flags) unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{ {
virDomainNetType type; virDomainNetType type;
const char *typeStr; const char *typeStr;
@ -26302,7 +26309,7 @@ virDomainActualNetDefFormat(virBufferPtr buf,
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (virDomainActualNetDefContentsFormat(buf, def, true, flags) < 0) if (virDomainActualNetDefContentsFormat(buf, def, true, flags, xmlopt) < 0)
return -1; return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</actual>\n"); virBufferAddLit(buf, "</actual>\n");
@ -26503,7 +26510,7 @@ virDomainNetDefFormat(virBufferPtr buf,
* the standard place... (this is for public reporting of * the standard place... (this is for public reporting of
* interface status) * interface status)
*/ */
if (virDomainActualNetDefContentsFormat(buf, def, false, flags) < 0) if (virDomainActualNetDefContentsFormat(buf, def, false, flags, xmlopt) < 0)
return -1; return -1;
} else { } else {
/* ...but if we've asked for the inactive XML (rather than /* ...but if we've asked for the inactive XML (rather than
@ -26605,7 +26612,7 @@ virDomainNetDefFormat(virBufferPtr buf,
case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_HOSTDEV:
if (virDomainHostdevDefFormatSubsys(buf, &def->data.hostdev.def, if (virDomainHostdevDefFormatSubsys(buf, &def->data.hostdev.def,
flags, true) < 0) { flags, true, xmlopt) < 0) {
return -1; return -1;
} }
break; break;
@ -26651,7 +26658,7 @@ virDomainNetDefFormat(virBufferPtr buf,
*/ */
if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK && if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
(flags & VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET) && (flags & VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET) &&
(virDomainActualNetDefFormat(buf, def, flags) < 0)) (virDomainActualNetDefFormat(buf, def, flags, xmlopt) < 0))
return -1; return -1;
} }
@ -28228,7 +28235,8 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
static int static int
virDomainHostdevDefFormat(virBufferPtr buf, virDomainHostdevDefFormat(virBufferPtr buf,
virDomainHostdevDefPtr def, virDomainHostdevDefPtr def,
unsigned int flags) unsigned int flags,
virDomainXMLOptionPtr xmlopt)
{ {
const char *mode = virDomainHostdevModeTypeToString(def->mode); const char *mode = virDomainHostdevModeTypeToString(def->mode);
virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi; virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi;
@ -28307,7 +28315,7 @@ virDomainHostdevDefFormat(virBufferPtr buf,
switch (def->mode) { switch (def->mode) {
case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
if (virDomainHostdevDefFormatSubsys(buf, def, flags, false) < 0) if (virDomainHostdevDefFormatSubsys(buf, def, flags, false, xmlopt) < 0)
return -1; return -1;
break; break;
case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES:
@ -29917,7 +29925,7 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
* and will have already been formatted there. * and will have already been formatted there.
*/ */
if (!def->hostdevs[n]->parentnet && if (!def->hostdevs[n]->parentnet &&
virDomainHostdevDefFormat(buf, def->hostdevs[n], flags) < 0) { virDomainHostdevDefFormat(buf, def->hostdevs[n], flags, xmlopt) < 0) {
return -1; return -1;
} }
} }
@ -31040,7 +31048,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
rc = virDomainVideoDefFormat(&buf, src->data.video, flags); rc = virDomainVideoDefFormat(&buf, src->data.video, flags);
break; break;
case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_HOSTDEV:
rc = virDomainHostdevDefFormat(&buf, src->data.hostdev, flags); rc = virDomainHostdevDefFormat(&buf, src->data.hostdev, flags, xmlopt);
break; break;
case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_WATCHDOG:
rc = virDomainWatchdogDefFormat(&buf, src->data.watchdog, flags); rc = virDomainWatchdogDefFormat(&buf, src->data.watchdog, flags);