From nobody Tue Oct 22 22:18:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1694699843; cv=none; d=zohomail.com; s=zohoarc; b=NhKg2XVyNCrcWAUIz5jFTAj60/yJtmmeTRFHp6XPOi0uGRoGj4G16thVNL0wh/J3ab87mXGb2sTNp6fUAOGlbr+e9+aTQ99aloEp4tcj+6Dlm6bp5PWRU0WITgTSe29204l/oSl779j4xtSdQevZ9DfMoYYWtAU3PgwSJUBCVMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694699843; 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=DKB3uMwLg0Z/enHfcdFkxISEE41u5hkPBrwX9OJYDwQ=; b=CUObqiN08VVfRZ6oO4jOo9NIlQjGcKBo9NITaB15lutmpjW1sn14kRn99n+ztH6yzgjDF1T9H56VHmSa5ke0+OCSoFlJmHSoNRMbTNNftprY/L7mmeQ2HEvymYd15ZKicR6hNwZxbCGRcpLgJ7ZxEZb9i2eDM/GrdIzwlbfQJwE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1694699843951111.3979778618193; Thu, 14 Sep 2023 06:57:23 -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-175-IO5lY8cFM7ylJNqFqnOy4Q-1; Thu, 14 Sep 2023 09:57:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 E09AB182463D; Thu, 14 Sep 2023 13:57:15 +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 CB9F51054FC3; Thu, 14 Sep 2023 13:57:15 +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 9AA5419465B9; Thu, 14 Sep 2023 13:56:37 +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 14D0D1946A76 for ; Thu, 14 Sep 2023 13:56:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1062C40C6EBF; Thu, 14 Sep 2023 13:56:31 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.2.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB93D40C6EA8 for ; Thu, 14 Sep 2023 13:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694699843; 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=DKB3uMwLg0Z/enHfcdFkxISEE41u5hkPBrwX9OJYDwQ=; b=QIajmhyqo+JFt3d7KYu/qklEXEjF9wdj0yp+byBBfR5gM2jlINGjRTEFP+cAyS80yhlY1R MJ+PuhSiNu5VyNnjx0rUOZVTF1ZpmTQR8HHPl8wleB6QTwEiAyJxs/K3uV9CW3YpQASSs3 IGYA5HOrv6/xUgMeBeCPBJEkc+iIv8U= X-MC-Unique: IO5lY8cFM7ylJNqFqnOy4Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 10/20] virDomainHostdevDef: Convert 'mode' field to proper enum type Date: Thu, 14 Sep 2023 15:56:11 +0200 Message-ID: <359a8b182fa1be83eeb1e99b2b0e98ba19d1283d.1694699682.git.mprivozn@redhat.com> 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.3 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: 1694699844843100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Convert the field, adjust the XML parser to use virXMLPropEnumDefault() and fill in missing cases to switch() statements. Signed-off-by: Michal Privoznik --- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 23 +++++++++++++---------- src/conf/domain_conf.h | 2 +- src/lxc/lxc_cgroup.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 2 ++ src/lxc/lxc_hostdev.c | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/security/security_selinux.c | 2 ++ 10 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index ae875188bd..d4d303a214 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -351,7 +351,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostde= vDef *hostdev, return; } =20 - switch ((virDomainHostdevMode) hostdev->mode) { + switch (hostdev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 65b7b44ccb..c93f89ced6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2648,6 +2648,8 @@ virDomainHostdevDefClear(virDomainHostdevDef *def) break; } break; + case VIR_DOMAIN_HOSTDEV_MODE_LAST: + break; } } =20 @@ -12917,7 +12919,6 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xml= opt, { virDomainHostdevDef *def; VIR_XPATH_NODE_AUTORESTORE(ctxt) - g_autofree char *mode =3D virXMLPropString(node, "mode"); g_autofree char *type =3D virXMLPropString(node, "type"); =20 ctxt->node =3D node; @@ -12925,15 +12926,11 @@ virDomainHostdevDefParseXML(virDomainXMLOption *x= mlopt, if (!(def =3D virDomainHostdevDefNew())) goto error; =20 - if (mode) { - if ((def->mode =3D virDomainHostdevModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown hostdev mode '%1$s'"), mode); - goto error; - } - } else { - def->mode =3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; - } + if (virXMLPropEnumDefault(node, "mode", virDomainHostdevModeTypeFromSt= ring, + VIR_XML_PROP_NONE, + &def->mode, + VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) < 0) + goto error; =20 switch (def->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: @@ -12947,6 +12944,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xml= opt, goto error; break; default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected hostdev mode %1$d"), def->mode); goto error; @@ -14182,6 +14180,8 @@ virDomainHostdevMatch(virDomainHostdevDef *a, return virDomainHostdevMatchSubsys(a, b); case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: return virDomainHostdevMatchCaps(a, b); + case VIR_DOMAIN_HOSTDEV_MODE_LAST: + break; } return 0; } @@ -26087,6 +26087,7 @@ virDomainHostdevDefFormat(virBuffer *buf, } break; default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected hostdev mode %1$d"), def->mode); return -1; @@ -26139,6 +26140,8 @@ virDomainHostdevDefFormat(virBuffer *buf, if (virDomainHostdevDefFormatCaps(buf, def) < 0) return -1; break; + case VIR_DOMAIN_HOSTDEV_MODE_LAST: + break; } =20 virDomainNetTeamingInfoFormat(def->teaming, buf); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d6d0799f63..1f977ef1c8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -371,7 +371,7 @@ struct _virDomainHostdevDef { */ virDomainNetDef *parentnet; =20 - int mode; /* enum virDomainHostdevMode */ + virDomainHostdevMode mode; virDomainStartupPolicy startupPolicy; bool managed; bool missing; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index bc39b16928..21d9b456e8 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -313,6 +313,7 @@ static int virLXCCgroupSetupDeviceACL(virDomainDef *def, break; } default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: break; } } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 6c20429998..e2d67d504d 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1837,6 +1837,7 @@ virLXCControllerSetupAllHostdevs(virLXCController *ct= rl) return -1; break; default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported host device mode %1$s"), virDomainHostdevModeTypeToString(def->mode)); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index f3d3e4eb50..fb0301b811 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3905,6 +3905,7 @@ lxcDomainAttachDeviceHostdevLive(virLXCDriver *driver, return lxcDomainAttachDeviceHostdevCapsLive(driver, vm, dev); =20 default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported host device mode %1$s"), virDomainHostdevModeTypeToString(dev->data.hostdev-= >mode)); @@ -4328,6 +4329,7 @@ lxcDomainDetachDeviceHostdevLive(virLXCDriver *driver, return lxcDomainDetachDeviceHostdevCapsLive(vm, dev); =20 default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported host device mode %1$s"), virDomainHostdevModeTypeToString(dev->data.hostdev-= >mode)); diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c index 8fe02a4276..af3ce3e0ac 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -100,6 +100,7 @@ int virLXCPrepareHostDevices(virLXCDriver *driver, =20 =20 default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported hostdev mode %1$s"), virDomainHostdevModeTypeToString(dev->mode)); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 069f145d26..818e3822d0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10678,7 +10678,7 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev, g_autofree char *tmpPath =3D NULL; int perm =3D 0; =20 - switch ((virDomainHostdevMode) dev->mode) { + switch (dev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: switch ((virDomainHostdevSubsysType)dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 801b904a73..9ed5c6e94b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1280,7 +1280,7 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *= def) * forbidden. */ for (i =3D 0; i < def->nhostdevs; i++) { virDomainHostdevDef *hostdev =3D def->hostdevs[i]; - switch ((virDomainHostdevMode)hostdev->mode) { + switch (hostdev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot migrate a domain with ")); diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 7914aba84d..c3c92f3538 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2345,6 +2345,7 @@ virSecuritySELinuxSetHostdevLabel(virSecurityManager = *mgr, return virSecuritySELinuxSetHostdevCapsLabel(mgr, def, dev, vroot); =20 default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: return 0; } } @@ -2567,6 +2568,7 @@ virSecuritySELinuxRestoreHostdevLabel(virSecurityMana= ger *mgr, return virSecuritySELinuxRestoreHostdevCapsLabel(mgr, dev, vroot); =20 default: + case VIR_DOMAIN_HOSTDEV_MODE_LAST: return 0; } } --=20 2.41.0