External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Simplify conditions in CPU parser/formatter

Browse Source 
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2015-06-22 10:27:05 +02:00
parent 423015137a
commit 0966f0d7e0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/cpu_conf.c
View File

@ -330,8 +330,7 @@ virCPUDefParseXML(xmlNodePtr node,
goto error; goto error;
if (n > 0) { if (n > 0) {
if (!def->model && def->mode != VIR_CPU_MODE_HOST_MODEL && if (!def->model && def->mode == VIR_CPU_MODE_CUSTOM) {
def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("Non-empty feature list specified without " _("Non-empty feature list specified without "
"CPU model")); "CPU model"));
@ -518,10 +517,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
(def->mode == VIR_CPU_MODE_HOST_MODEL || (def->mode == VIR_CPU_MODE_HOST_MODEL ||
(def->mode == VIR_CPU_MODE_CUSTOM && def->model))); (def->mode == VIR_CPU_MODE_CUSTOM && def->model)));
if (!def->model && if (!def->model && def->mode == VIR_CPU_MODE_CUSTOM && def->nfeatures) {
def->mode != VIR_CPU_MODE_HOST_MODEL &&
def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH &&
def->nfeatures) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Non-empty feature list specified without CPU model")); _("Non-empty feature list specified without CPU model"));
return -1; return -1;