Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 ba54acd3 编写于 作者: J Ján Tomko
浏览文件
操作

Turn virDomainDeviceInfoFormat into void 

The rombar attribute was already validated at the time of parsing
the XML.
上级 7330a365
隐藏空白更改
内联 并排
Showing with 30 addition and 64 deletion
src/conf/domain_conf.c
浏览文件 @ ba54acd3
...@@ -5332,7 +5332,7 @@ virDomainVirtioOptionsFormat(virBufferPtr buf, ...@@ -5332,7 +5332,7 @@ virDomainVirtioOptionsFormat(virBufferPtr buf,
} }
static int ATTRIBUTE_NONNULL(2) static void ATTRIBUTE_NONNULL(2)
virDomainDeviceInfoFormat(virBufferPtr buf, virDomainDeviceInfoFormat(virBufferPtr buf,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
unsigned int flags) unsigned int flags)
...@@ -5360,16 +5360,10 @@ virDomainDeviceInfoFormat(virBufferPtr buf, ...@@ -5360,16 +5360,10 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
virBufferAddLit(buf, "<rom"); virBufferAddLit(buf, "<rom");
if (info->rombar) { if (info->rombar) {
const char *rombar = virTristateSwitchTypeToString(info->rombar); const char *rombar = virTristateSwitchTypeToString(info->rombar);
if (!rombar) { if (rombar)
virReportError(VIR_ERR_INTERNAL_ERROR, virBufferAsprintf(buf, " bar='%s'", rombar);
_("unexpected rom bar value %d"),
info->rombar);
return -1;
}
virBufferAsprintf(buf, " bar='%s'", rombar);
} }
if (info->romfile) if (info->romfile)
virBufferEscapeString(buf, " file='%s'", info->romfile); virBufferEscapeString(buf, " file='%s'", info->romfile);
...@@ -5378,7 +5372,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf, ...@@ -5378,7 +5372,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE ||
info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)
return 0; return;
virBufferAsprintf(buf, "<address type='%s'", virBufferAsprintf(buf, "<address type='%s'",
virDomainDeviceAddressTypeToString(info->type)); virDomainDeviceAddressTypeToString(info->type));
...@@ -5465,7 +5459,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf, ...@@ -5465,7 +5459,6 @@ virDomainDeviceInfoFormat(virBufferPtr buf,
} }
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
return 0;
} }
static int static int
...@@ -21724,9 +21717,8 @@ virDomainDiskDefFormat(virBufferPtr buf, ...@@ -21724,9 +21717,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
if (def->src->encryption && if (def->src->encryption &&
virStorageEncryptionFormat(buf, def->src->encryption) < 0) virStorageEncryptionFormat(buf, def->src->encryption) < 0)
return -1; return -1;
if (virDomainDeviceInfoFormat(buf, &def->info, virDomainDeviceInfoFormat(buf, &def->info,
flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) < 0) flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</disk>\n"); virBufferAddLit(buf, "</disk>\n");
...@@ -21898,8 +21890,7 @@ virDomainControllerDefFormat(virBufferPtr buf, ...@@ -21898,8 +21890,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
virDomainControllerDriverFormat(&childBuf, def); virDomainControllerDriverFormat(&childBuf, def);
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
return -1;
if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI && if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
def->opts.pciopts.pcihole64) { def->opts.pciopts.pcihole64) {
...@@ -22031,9 +22022,7 @@ virDomainFSDefFormat(virBufferPtr buf, ...@@ -22031,9 +22022,7 @@ virDomainFSDefFormat(virBufferPtr buf,
if (def->readonly) if (def->readonly)
virBufferAddLit(buf, "<readonly/>\n"); virBufferAddLit(buf, "<readonly/>\n");
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
if (def->space_hard_limit) if (def->space_hard_limit)
virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>" virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>"
...@@ -22802,10 +22791,9 @@ virDomainNetDefFormat(virBufferPtr buf, ...@@ -22802,10 +22791,9 @@ virDomainNetDefFormat(virBufferPtr buf,
virDomainNetDefCoalesceFormatXML(buf, def->coalesce); virDomainNetDefCoalesceFormatXML(buf, def->coalesce);
if (virDomainDeviceInfoFormat(buf, &def->info, virDomainDeviceInfoFormat(buf, &def->info,
flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT
| VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM) < 0) | VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</interface>\n"); virBufferAddLit(buf, "</interface>\n");
...@@ -23040,8 +23028,7 @@ virDomainChrDefFormat(virBufferPtr buf, ...@@ -23040,8 +23028,7 @@ virDomainChrDefFormat(virBufferPtr buf,
break; break;
} }
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAsprintf(buf, "</%s>\n", elementName); virBufferAsprintf(buf, "</%s>\n", elementName);
...@@ -23090,10 +23077,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, ...@@ -23090,10 +23077,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf,
_("unexpected smartcard type %d"), def->type); _("unexpected smartcard type %d"), def->type);
return -1; return -1;
} }
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) { virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
virBufferFreeAndReset(&childBuf);
return -1;
}
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; return -1;
...@@ -23150,8 +23134,7 @@ virDomainTPMDefFormat(virBufferPtr buf, ...@@ -23150,8 +23134,7 @@ virDomainTPMDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</backend>\n"); virBufferAddLit(buf, "</backend>\n");
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</tpm>\n"); virBufferAddLit(buf, "</tpm>\n");
...@@ -23180,10 +23163,7 @@ virDomainSoundDefFormat(virBufferPtr buf, ...@@ -23180,10 +23163,7 @@ virDomainSoundDefFormat(virBufferPtr buf,
for (i = 0; i < def->ncodecs; i++) for (i = 0; i < def->ncodecs; i++)
virDomainSoundCodecDefFormat(&childBuf, def->codecs[i]); virDomainSoundCodecDefFormat(&childBuf, def->codecs[i]);
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) { virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
virBufferFreeAndReset(&childBuf);
return -1;
}
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; return -1;
...@@ -23227,10 +23207,7 @@ virDomainMemballoonDefFormat(virBufferPtr buf, ...@@ -23227,10 +23207,7 @@ virDomainMemballoonDefFormat(virBufferPtr buf,
if (def->period) if (def->period)
virBufferAsprintf(&childrenBuf, "<stats period='%i'/>\n", def->period); virBufferAsprintf(&childrenBuf, "<stats period='%i'/>\n", def->period);
if (virDomainDeviceInfoFormat(&childrenBuf, &def->info, flags) < 0) { virDomainDeviceInfoFormat(&childrenBuf, &def->info, flags);
virBufferFreeAndReset(&childrenBuf);
return -1;
}
if (def->virtio) { if (def->virtio) {
virBuffer driverBuf = VIR_BUFFER_INITIALIZER; virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
...@@ -23269,8 +23246,7 @@ virDomainNVRAMDefFormat(virBufferPtr buf, ...@@ -23269,8 +23246,7 @@ virDomainNVRAMDefFormat(virBufferPtr buf,
{ {
virBufferAddLit(buf, "<nvram>\n"); virBufferAddLit(buf, "<nvram>\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</nvram>\n"); virBufferAddLit(buf, "</nvram>\n");
...@@ -23302,8 +23278,7 @@ virDomainWatchdogDefFormat(virBufferPtr buf, ...@@ -23302,8 +23278,7 @@ virDomainWatchdogDefFormat(virBufferPtr buf,
return -1; return -1;
} }
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
return -1;
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; return -1;
...@@ -23335,8 +23310,7 @@ static int virDomainPanicDefFormat(virBufferPtr buf, ...@@ -23335,8 +23310,7 @@ static int virDomainPanicDefFormat(virBufferPtr buf,
virDomainPanicModelTypeToString(def->model)); virDomainPanicModelTypeToString(def->model));
virBufferAdjustIndent(&childrenBuf, indent + 2); virBufferAdjustIndent(&childrenBuf, indent + 2);
if (virDomainDeviceInfoFormat(&childrenBuf, &def->info, 0) < 0) virDomainDeviceInfoFormat(&childrenBuf, &def->info, 0);
return -1;
if (virBufferCheckError(&childrenBuf) < 0) if (virBufferCheckError(&childrenBuf) < 0)
return -1; return -1;
...@@ -23383,8 +23357,7 @@ virDomainShmemDefFormat(virBufferPtr buf, ...@@ -23383,8 +23357,7 @@ virDomainShmemDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</shmem>\n"); virBufferAddLit(buf, "</shmem>\n");
...@@ -23438,8 +23411,7 @@ virDomainRNGDefFormat(virBufferPtr buf, ...@@ -23438,8 +23411,7 @@ virDomainRNGDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</rng>\n"); virBufferAddLit(buf, "</rng>\n");
...@@ -23557,8 +23529,7 @@ virDomainMemoryDefFormat(virBufferPtr buf, ...@@ -23557,8 +23529,7 @@ virDomainMemoryDefFormat(virBufferPtr buf,
virDomainMemoryTargetDefFormat(buf, def); virDomainMemoryTargetDefFormat(buf, def);
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</memory>\n"); virBufferAddLit(buf, "</memory>\n");
...@@ -23634,8 +23605,7 @@ virDomainVideoDefFormat(virBufferPtr buf, ...@@ -23634,8 +23605,7 @@ virDomainVideoDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) virDomainDeviceInfoFormat(buf, &def->info, flags);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</video>\n"); virBufferAddLit(buf, "</video>\n");
...@@ -23684,8 +23654,7 @@ virDomainInputDefFormat(virBufferPtr buf, ...@@ -23684,8 +23654,7 @@ virDomainInputDefFormat(virBufferPtr buf,
virBufferAddLit(&childbuf, "/>\n"); virBufferAddLit(&childbuf, "/>\n");
} }
virBufferEscapeString(&childbuf, "<source evdev='%s'/>\n", def->source.evdev); virBufferEscapeString(&childbuf, "<source evdev='%s'/>\n", def->source.evdev);
if (virDomainDeviceInfoFormat(&childbuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childbuf, &def->info, flags);
return -1;
if (virBufferCheckError(&childbuf) < 0) if (virBufferCheckError(&childbuf) < 0)
return -1; return -1;
...@@ -24245,10 +24214,9 @@ virDomainHostdevDefFormat(virBufferPtr buf, ...@@ -24245,10 +24214,9 @@ virDomainHostdevDefFormat(virBufferPtr buf,
if (def->shareable) if (def->shareable)
virBufferAddLit(buf, "<shareable/>\n"); virBufferAddLit(buf, "<shareable/>\n");
if (virDomainDeviceInfoFormat(buf, def->info, virDomainDeviceInfoFormat(buf, def->info,
flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT
| VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM) < 0) | VIR_DOMAIN_DEF_FORMAT_ALLOW_ROM);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</hostdev>\n"); virBufferAddLit(buf, "</hostdev>\n");
...@@ -24269,9 +24237,8 @@ virDomainRedirdevDefFormat(virBufferPtr buf, ...@@ -24269,9 +24237,8 @@ virDomainRedirdevDefFormat(virBufferPtr buf,
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (virDomainChrSourceDefFormat(buf, def->source, false, flags) < 0) if (virDomainChrSourceDefFormat(buf, def->source, false, flags) < 0)
return -1; return -1;
if (virDomainDeviceInfoFormat(buf, &def->info, virDomainDeviceInfoFormat(buf, &def->info,
flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT) < 0) flags | VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT);
return -1;
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</redirdev>\n"); virBufferAddLit(buf, "</redirdev>\n");
return 0; return 0;
...@@ -24332,8 +24299,7 @@ virDomainHubDefFormat(virBufferPtr buf, ...@@ -24332,8 +24299,7 @@ virDomainHubDefFormat(virBufferPtr buf,
return -1; return -1;
} }
if (virDomainDeviceInfoFormat(&childBuf, &def->info, flags) < 0) virDomainDeviceInfoFormat(&childBuf, &def->info, flags);
return -1;
if (virBufferCheckError(&childBuf) < 0) if (virBufferCheckError(&childBuf) < 0)
return -1; return -1;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或