diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d5b15db27c..77319dc6e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10580,7 +10580,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, _("ram attribute only supported for type of qxl")); goto error; } - if (virStrToLong_ui(ram, NULL, 10, &def->ram) < 0) { + if (virStrToLong_uip(ram, NULL, 10, &def->ram) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video ram '%s'"), ram); goto error; @@ -10590,7 +10590,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } if (vram) { - if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { + if (virStrToLong_uip(vram, NULL, 10, &def->vram) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video vram '%s'"), vram); goto error; @@ -10605,7 +10605,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, _("vgamem attribute only supported for type of qxl")); goto error; } - if (virStrToLong_ui(vgamem, NULL, 10, &def->vgamem) < 0) { + if (virStrToLong_uip(vgamem, NULL, 10, &def->vgamem) < 0) { virReportError(VIR_ERR_XML_ERROR, _("cannot parse video vgamem '%s'"), vgamem); goto error; @@ -10613,7 +10613,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } if (heads) { - if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { + if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse video heads '%s'"), heads); goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml new file mode 100644 index 0000000000..e3848e139c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-invalid.xml @@ -0,0 +1,30 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu + + + +
+ + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 77ee6307e5..f864c2a105 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1362,6 +1362,7 @@ mymain(void) QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGAMEM); + DO_TEST_PARSE_ERROR("video-invalid", NONE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM);