The virDomainDiskSourceNVMeParse() function uses old style of
parsing XML (virXMLPropString + str2enum conversion). Use
virXMLPropEnumDefault() which encapsulates those steps.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/conf/domain_conf.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 561af84eed..bf9db38340 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8405,7 +8405,6 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node,
 {
     g_autoptr(virStorageSourceNVMeDef) nvme = NULL;
     g_autofree char *type = NULL;
-    g_autofree char *namespc = NULL;
     xmlNodePtr address;
 
     nvme = g_new0(virStorageSourceNVMeDef, 1);
@@ -8423,18 +8422,10 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node,
         return -1;
     }
 
-    if (!(namespc = virXMLPropString(node, "namespace"))) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("missing 'namespace' attribute to disk source"));
+    if (virXMLPropULongLong(node, "namespace", 10,
+                            VIR_XML_PROP_REQUIRED,
+                            &nvme->namespc) < 0)
         return -1;
-    }
-
-    if (virStrToLong_ull(namespc, NULL, 10, &nvme->namespc) < 0) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("malformed namespace '%s'"),
-                       namespc);
-        return -1;
-    }
 
     if (virXMLPropTristateBool(node, "managed", VIR_XML_PROP_NONE,
                                &nvme->managed) < 0)
-- 
2.35.1

On 5/23/22 3:08 PM, Michal Privoznik wrote:
> The virDomainDiskSourceNVMeParse() function uses old style of
> parsing XML (virXMLPropString + str2enum conversion). Use
> virXMLPropEnumDefault() which encapsulates those steps.
> 
> Signed-off-by: Michal Privoznik<mprivozn@redhat.com>
> ---
>   src/conf/domain_conf.c | 15 +++------------
>   1 file changed, 3 insertions(+), 12 deletions(-)

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>

-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294

On 5/24/22 6:02 PM, Boris Fiuczynski wrote:
> On 5/23/22 3:08 PM, Michal Privoznik wrote:
>> The virDomainDiskSourceNVMeParse() function uses old style of
>> parsing XML (virXMLPropString + str2enum conversion). Use
>> virXMLPropEnumDefault() which encapsulates those steps.

ups, above should be mentioning str2uul and virXMLPropULongLong

>>
>> Signed-off-by: Michal Privoznik<mprivozn@redhat.com>
>> ---
>>   src/conf/domain_conf.c | 15 +++------------
>>   1 file changed, 3 insertions(+), 12 deletions(-)
> 
> Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
> 


-- 
Mit freundlichen Grüßen/Kind regards
    Boris Fiuczynski

IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Gregor Pillen
Geschäftsführung: David Faller
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294