From nobody Mon Feb 9 10:30:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1642772052; cv=none; d=zohomail.com; s=zohoarc; b=U4kv58gns8rDPCGzGqmvj+rA8GBw8HWo7RrKPCos0/XbH1jyPtZ2WTsHTt+Bt3e7SeHE9dOQwzvQRpm6NcIIq5L7I3kRXZJ6vs2MaBYMybMTvJNM6UlsLCjWa83Gfjytr3DKAX3cqu/hnxrX1oNjxpkjWWdZaYYvmIqevpnNT2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642772052; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vgN3527r3WLj6Tyh0rh0CMDF2jq8j57jwO6/hhl9qpk=; b=imD4T6E79/f508ClJU0Cenw/75MvLZNcMv6lByig1AGDxe2KrP7fXmRh/ni2MaZC/sSEKN1tm1EAEOnaXU5WvAbj+mbfhuAEeJcziFmLhozpn7KTqprKRVAbBlIGq2uZ1iQ+ShPHvYulB3inlMIUr+XFYRmg2vRDpzvW6R2L4vI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1642772052211693.9687399420583; Fri, 21 Jan 2022 05:34:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-616-ffFzQkWnMPCtR9tzBAtGrQ-1; Fri, 21 Jan 2022 08:34:09 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC83686A8C7; Fri, 21 Jan 2022 13:34:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7FDE8108F850; Fri, 21 Jan 2022 13:34:04 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3E9FA1832DC0; Fri, 21 Jan 2022 13:34:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20LDSVOm011993 for ; Fri, 21 Jan 2022 08:28:31 -0500 Received: by smtp.corp.redhat.com (Postfix) id 788521090033; Fri, 21 Jan 2022 13:28:31 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02E3E109004C for ; Fri, 21 Jan 2022 13:28:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1642772051; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=vgN3527r3WLj6Tyh0rh0CMDF2jq8j57jwO6/hhl9qpk=; b=DEoqfw7T47rRt4gKCusdo8Ux9JYR24/km8Gh8P+1b1ybWxRh2BQUOUJwxJkgo1F8Xs79C/ lwc8ge0iXjxX5A7HuO+SsoMhzVZm2UnmyDKJUlT2D2fM+oZfWYDAefwBHu/meuS4xJCCb2 lnNQrvQMdvp7bFq6YE/QbKabgorOiTA= X-MC-Unique: ffFzQkWnMPCtR9tzBAtGrQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 08/12] conf: Convert virDomainDefParseBootXML() to virXMLProp*() Date: Fri, 21 Jan 2022 14:28:15 +0100 Message-Id: <834a04b9a5488173cd2f2d0b01295831dc7844e6.1642771642.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1642772053921100001 Content-Type: text/plain; charset="utf-8" After previous cleanups, the virDomainDefParseBootXML() function uses a mixture of virXMLProp*() and the old virXMLPropString() + virXXXTypeFromString() patterns. Rework it so that virXMLProp*() is used. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 61 +++++++++++++++++------------------------ src/conf/domain_conf.h | 4 +-- src/libxl/libxl_conf.c | 2 ++ src/libxl/xen_xl.c | 2 ++ src/libxl/xen_xm.c | 2 ++ src/qemu/qemu_process.c | 2 +- src/vz/vz_sdk.c | 4 ++- 7 files changed, 37 insertions(+), 40 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 281879b915..30f0a13e2a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16905,7 +16905,6 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, xmlNodePtr node; size_t i; int n; - g_autofree char *tmp =3D NULL; g_autofree xmlNodePtr *nodes =3D NULL; =20 /* analysis of the boot devices */ @@ -16913,20 +16912,13 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, return -1; =20 for (i =3D 0; i < n && i < VIR_DOMAIN_BOOT_LAST; i++) { - int val; - g_autofree char *dev =3D virXMLPropString(nodes[i], "dev"); - if (!dev) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing boot device")); + if (virXMLPropEnum(nodes[i], "dev", + virDomainBootTypeFromString, + VIR_XML_PROP_REQUIRED, + &def->os.bootDevs[def->os.nBootDevs]) < 0) return -1; - } - if ((val =3D virDomainBootTypeFromString(dev)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown boot device '%s'"), - dev); - return -1; - } - def->os.bootDevs[def->os.nBootDevs++] =3D val; + + def->os.nBootDevs++; } =20 if ((node =3D virXPathNode("./os/bootmenu[1]", ctxt))) { @@ -16940,36 +16932,33 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, def->os.bootmenu =3D VIR_TRISTATE_BOOL_NO; } =20 - tmp =3D virXMLPropString(node, "timeout"); - if (tmp && def->os.bootmenu =3D=3D VIR_TRISTATE_BOOL_YES) { - if (virStrToLong_uip(tmp, NULL, 0, &def->os.bm_timeout) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid value for boot menu timeout")); + if (def->os.bootmenu =3D=3D VIR_TRISTATE_BOOL_YES) { + int rv; + + if ((rv =3D virXMLPropUInt(node, "timeout", 10, + VIR_XML_PROP_NONE, + &def->os.bm_timeout)) < 0) { return -1; + } else if (rv > 0) { + def->os.bm_timeout_set =3D true; } - def->os.bm_timeout_set =3D true; } - VIR_FREE(tmp); } =20 if ((node =3D virXPathNode("./os/bios[1]", ctxt))) { - tmp =3D virXMLPropString(node, "useserial"); - if (tmp) { - bool state =3D false; - ignore_value(virStringParseYesNo(tmp, &state)); - def->os.bios.useserial =3D virTristateBoolFromBool(state); - VIR_FREE(tmp); + int rv; + + if (virXMLPropTristateBool(node, "useserial", + VIR_XML_PROP_NONE, + &def->os.bios.useserial) < 0) { + def->os.bios.useserial =3D VIR_TRISTATE_BOOL_NO; } =20 - tmp =3D virXMLPropString(node, "rebootTimeout"); - if (tmp) { - /* that was really just for the check if it is there */ - - if (virStrToLong_i(tmp, NULL, 0, &def->os.bios.rt_delay) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid value for rebootTimeout")); - return -1; - } + if ((rv =3D virXMLPropInt(node, "rebootTimeout", 10, + VIR_XML_PROP_NONE, + &def->os.bios.rt_delay, 0)) < 0) { + return -1; + } else if (rv > 0) { def->os.bios.rt_set =3D true; } } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c2c263dfab..584e15b6c7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2195,7 +2195,7 @@ typedef enum { VIR_ENUM_DECL(virDomainLockFailure); =20 struct _virDomainBIOSDef { - int useserial; /* enum virTristateBool */ + virTristateBool useserial; /* reboot-timeout parameters */ bool rt_set; int rt_delay; @@ -2324,7 +2324,7 @@ struct _virDomainOSDef { virArch arch; char *machine; size_t nBootDevs; - int bootDevs[VIR_DOMAIN_BOOT_LAST]; + virDomainBootOrder bootDevs[VIR_DOMAIN_BOOT_LAST]; virTristateBool bootmenu; unsigned int bm_timeout; bool bm_timeout_set; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1ac6253ad7..561171126c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -609,6 +609,8 @@ libxlMakeDomBuildInfo(virDomainDef *def, case VIR_DOMAIN_BOOT_NET: bootorder[i] =3D 'n'; break; + case VIR_DOMAIN_BOOT_LAST: + break; } } if (def->os.nBootDevs =3D=3D 0) { diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 799fe05cbd..87194ccbd1 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -1153,6 +1153,8 @@ xenFormatXLOS(virConf *conf, virDomainDef *def) default: boot[i] =3D 'c'; break; + case VIR_DOMAIN_BOOT_LAST: + break; } } =20 diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 2e636d874e..a962da9cad 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -457,6 +457,8 @@ xenFormatXMOS(virConf *conf, virDomainDef *def) default: boot[i] =3D 'c'; break; + case VIR_DOMAIN_BOOT_LAST: + break; } } =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7ff4dc1835..336f0bab2e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6183,7 +6183,7 @@ qemuProcessPrepareDeviceBootorder(virDomainDef *def) return; =20 for (i =3D 0; i < def->os.nBootDevs; i++) { - switch ((virDomainBootOrder) def->os.bootDevs[i]) { + switch (def->os.bootDevs[i]) { case VIR_DOMAIN_BOOT_CDROM: bootCD =3D i + 1; break; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 94c6cd5c7a..ccfd3e9d55 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3799,7 +3799,7 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDef = *def) for (i =3D 0; i < def->os.nBootDevs; ++i) { virType =3D def->os.bootDevs[i]; =20 - switch ((int)virType) { + switch (virType) { case VIR_DOMAIN_BOOT_CDROM: sdkType =3D PDE_OPTICAL_DISK; break; @@ -3809,6 +3809,8 @@ prlsdkSetBootOrderVm(PRL_HANDLE sdkdom, virDomainDef = *def) case VIR_DOMAIN_BOOT_NET: sdkType =3D PDE_GENERIC_NETWORK_ADAPTER; break; + case VIR_DOMAIN_BOOT_FLOPPY: + case VIR_DOMAIN_BOOT_LAST: default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported boot device type: '%s'"), --=20 2.34.1