From nobody Tue Oct 22 22:33:07 2024 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=1694699870; cv=none; d=zohomail.com; s=zohoarc; b=iz1u8wJ4GTbrw2w6A2c2WKJDOxBrMWY/gBt7FLbRoO3olqi//O834kIhGCjOYgQU+vnsQ9tbRohBOAMU00/PpXd9CtORxSePF10GElov3YCAcI/5y9YzSq2xhCu+EWZibfOOIrfgUjDrmUfWghK7t4yRwCezVrNvl5pAPl/G/fA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694699870; 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=+1nQGJWa/zx2G/V+zYQYOwuIfSPCV5VqE4uIM/i/UDI=; b=d7QImNKuBeBxVK/G3S2O8xM6M5Y98a8lYVgOd0f0rMZ94R8lx+5w9FDXGjl1fgCIA+GrfUg5/jir6pOuMeorCnCg8S+yqXm95xCFplP7omD7U37/hJveyFjfKSymPsE7EF5rU7wuJFK9mQBI38EEfZYOGLE8k34pCZPOtENc/TA= 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 1694699869998186.56018656185972; Thu, 14 Sep 2023 06:57:49 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-198-pqfKMPPnMKKczvO8LTWVGw-1; Thu, 14 Sep 2023 09:57:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B2964185A790; Thu, 14 Sep 2023 13:57:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F56E40C2070; Thu, 14 Sep 2023 13:57:42 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7CD6B19451E8; Thu, 14 Sep 2023 13:56:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1D21819465B9 for ; Thu, 14 Sep 2023 13:56:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1843540C6E71; Thu, 14 Sep 2023 13:56:36 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.2.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id B456740C6E76 for ; Thu, 14 Sep 2023 13:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694699869; 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=+1nQGJWa/zx2G/V+zYQYOwuIfSPCV5VqE4uIM/i/UDI=; b=CssCWwXMXlKXVTUQrOe5DUZ1VfaeHAfB5NQ+/pXdcFAXa4jPkJr0SsAIBUX2D6vyrx2rsQ yHS/voyLntbfTssfBcGMMyI/6CRtyxwzObMGnzzCar8rEAe0r1HE++5Nl11xChHoKRFBhD N/xLmxJ7lkJTsNqtLsmGFmKlGr35Z5U= X-MC-Unique: pqfKMPPnMKKczvO8LTWVGw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 18/20] virDomainDeviceInfo: Convert 'type' field to proper enum type Date: Thu, 14 Sep 2023 15:56:19 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1694699870952100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Convert the field, adjust the XML parsers to use virXMLPropEnum() and fill in missing cases to switch() statements. Signed-off-by: Michal Privoznik --- src/conf/device_conf.c | 12 +++++++++++- src/conf/device_conf.h | 4 ++-- src/conf/domain_conf.c | 21 +++++++-------------- src/conf/domain_validate.c | 2 +- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_monitor.c | 12 ++++++++++++ src/qemu/qemu_validate.c | 2 +- 7 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index aa0cc8945c..f3d977f2b7 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -98,7 +98,7 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceIn= fo *a, if (a->type !=3D b->type) return false; =20 - switch ((virDomainDeviceAddressType) a->type) { + switch (a->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: /* address types below don't have any specific data */ @@ -427,6 +427,16 @@ virDomainDeviceAddressIsValid(virDomainDeviceInfo *inf= o, =20 case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: return true; + + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: + break; } =20 return false; diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index f2907dc596..a83377417a 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -32,7 +32,7 @@ #include "virenum.h" =20 typedef enum { - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE =3D 0, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL, @@ -116,7 +116,7 @@ struct _virDomainDeviceDimmAddress { typedef struct _virDomainDeviceInfo virDomainDeviceInfo; struct _virDomainDeviceInfo { char *alias; - int type; /* virDomainDeviceAddressType */ + virDomainDeviceAddressType type; union { virPCIDeviceAddress pci; virDomainDeviceDriveAddress drive; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f48020f893..a743a0628c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5366,7 +5366,7 @@ virDomainDeviceInfoFormat(virBuffer *buf, virBufferAsprintf(&attrBuf, " type=3D'%s'", virDomainDeviceAddressTypeToString(info->type)); =20 - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (!virPCIDeviceAddressIsEmpty(&info->addr.pci)) { virBufferAsprintf(&attrBuf, " domain=3D'0x%04x' bus=3D'0x%02x'= " @@ -5539,21 +5539,14 @@ static int virDomainDeviceAddressParseXML(xmlNodePtr address, virDomainDeviceInfo *info) { - g_autofree char *type =3D virXMLPropString(address, "type"); - - if (!type) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("No type specified for device address")); - return -1; - } - - if ((info->type =3D virDomainDeviceAddressTypeFromString(type)) <=3D 0= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown address type '%1$s'"), type); + if (virXMLPropEnum(address, "type", + virDomainDeviceAddressTypeFromString, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &info->type) < 0) { return -1; } =20 - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0) return -1; @@ -19625,7 +19618,7 @@ virDomainDeviceInfoCheckABIStability(virDomainDevic= eInfo *src, return false; } =20 - switch ((virDomainDeviceAddressType) src->type) { + switch (src->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (src->addr.pci.domain !=3D dst->addr.pci.domain || src->addr.pci.bus !=3D dst->addr.pci.bus || diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 1d25aa32c2..e70841c1d6 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2806,7 +2806,7 @@ virDomainDeviceInfoValidate(const virDomainDeviceDef = *dev) if (!(info =3D virDomainDeviceGetInfo(dev))) return 0; =20 - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 11ede25c0b..8a7b80719f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -541,7 +541,7 @@ qemuBuildDeviceAddressProps(virJSONValue *props, const virDomainDef *domainDef, const virDomainDeviceInfo *info) { - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: { g_autofree char *pciaddr =3D NULL; g_autofree char *bus =3D qemuBuildDeviceAddressPCIGetBus(domainDef= , info); @@ -981,7 +981,7 @@ qemuBuildVirtioDevGetConfig(const virDomainDeviceDef *d= evice, =20 virBufferAdd(&buf, baseName, -1); =20 - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: implName =3D "pci"; break; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7053539c7d..320729f067 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -954,6 +954,18 @@ qemuMonitorInitBalloonObjectPath(qemuMonitor *mon, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: name =3D "virtio-balloon-ccw"; break; + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: + case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: default: return; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 27fd5b9a99..36c7941fe9 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1479,7 +1479,7 @@ qemuValidateDomainDeviceDefAddress(const virDomainDev= iceDef *dev, const virDomainDef *def, virQEMUCaps *qemuCaps) { - switch ((virDomainDeviceAddressType) info->type) { + switch (info->type) { case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: if (qemuValidateDomainDeviceDefZPCIAddress(info, qemuCaps) < 0) return -1; --=20 2.41.0