From nobody Fri Nov 21 10:10:51 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1762797703; cv=none; d=zohomail.com; s=zohoarc; b=Jjtn75ZuoJmgKIQibNzj5jSlLBmfA6lpZUAM4mhdWR2Sicfbw3Ph5cdbi5n9q6vNYeUxpkbLGatq41WxVemV+jdyTq9rM539vB600TkTvYaSrmelhtTUj0UTFfzFl+vqlLqIZHG9JwOudUUDtA+xfxQ2mEAelG06keQ9TVterqg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762797703; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=fhvmQM7vXkreuYab2XPQtp/CqpmJyhu/ldmR2mdqFqU=; b=aN9fB2kiudoE1o4dDF5F1qCzwM2S8uMZcpWuyRsJSQVC6WHTB9jkBZzGFN0njieEikNhSqxoVCYAQg6W1scNxySPUOTyVA8pJlxhCGrN2sBb2PDXXwlCgXj0dM7jk+jb3quYIFA95oc+OKxWGZDYqM4xFv0tfRyiBmoajhwRxvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1762797703928783.6807987241045; Mon, 10 Nov 2025 10:01:43 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 51C0144204; Mon, 10 Nov 2025 13:01:41 -0500 (EST) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id DDE7344C14; Mon, 10 Nov 2025 12:58:09 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id BD60B441DE; Mon, 10 Nov 2025 12:57:47 -0500 (EST) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D6629449CC for ; Mon, 10 Nov 2025 12:57:46 -0500 (EST) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-b5b823b4f3dso485831666b.3 for ; Mon, 10 Nov 2025 09:57:46 -0800 (PST) Received: from tulp.my.domain (84-25-144-101.cable.dynamic.v4.ziggo.nl. [84.25.144.101]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b72bf9bc214sm1182030966b.52.2025.11.10.09.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 09:57:44 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762797465; x=1763402265; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fhvmQM7vXkreuYab2XPQtp/CqpmJyhu/ldmR2mdqFqU=; b=MXLFR4btLLFu3eoUEDkI0PiW5UIs7cK7W/JKq6dj7FjrlWGWQRP7r3YD0J2cDScWCL 2inRPfLWM4ODD4kwBTCsyV2egRHPQlPw4dPlLViKF4l015jodPI/QUsJWTLxS3I6Svtf aVftzrKBhZGp4dUuq4tZOIuUXc+J/Uiu6GZS6NHoCeEV1ivu3VRELq918FOkjh1ElMpb IVuwVVgWfKxYi0UG6Z1XSwqL6XZP7mV5VNpN0FAaP7LW9ja5XoSGnfs4BENsILWUkiNK +3rxR1U3hwKrqZD4HY9+AscTsF2zLmwsIFIfdlw4htnAblqgmhrlEZrOwuXW/3G9/Syu oufg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762797465; x=1763402265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fhvmQM7vXkreuYab2XPQtp/CqpmJyhu/ldmR2mdqFqU=; b=XVToO4fDlf40GWRckgpfCnJd3hpUd5RgVxNUkTalA9ChzBIapLBNuZ36zdE43yskJQ /D7Q5goRgadrU//Fe2O6HNsQugQMcIL/NFTVyjToErW95KfIaGv9HYjLiKqnPC498BF4 qrWVRsioPFX0/TZCoNlU5jTPevvuj6NPuJhZZopRozuZMbGrlnYxoIhsILr6XfkAj+Aa Bs1BGxem7ZHeVn1H8G5W001sIfkpPCzq15hKLwIbEXXb9Eyh/GNxyy8OdWLikcICbAjB QhkvckmGGoFOo6YSsr//xnKY8aNI1gDHYpiMhlQhcXWotG1v98jQqwGxf7ceYAwt1gi9 5jVg== X-Gm-Message-State: AOJu0Ywwy2QbKrA4LFrlsGysG9OZl96HwdXOGXUinbNP+AN4P5V6+msN MT/rJRPJUjQS+iJ3lYflDTGhwnWI8+kTu4Gq/ClOs7OxiPd9Go9Y5wdv33IKv90CJ5OkzA== X-Gm-Gg: ASbGncsRp+sSDZVyc5BJdVFsSAas/J9psAaXUCEJWmbAB/DHpM4zWi9UUthGvR3GB5H kzKcOS3BK4KPZN9h7yx4hqWwtvhqqcWNQcfBDW0bMC5xnlW5f96thqLjrlbJinurT6kE4ipWC4D 226aep2JrPyO320OHR3EoBwvVlIsfMQzwIAeO9+AlTzmNyQdV3TWQJwQbYp8Mwrtk3pkcxI8rxQ sUbPQVn2HIEAay/Q+94hVoLgJ/LRrMh4ReRe24nAzWdSnB/bs6+S1JhjEVUgCk7KvUCGjqXgxGO K552VwQ4vMCexkP6RYOHtwg2S6j7vd+ARyQfVnGAb0T+4UFzjmLz9gSooU0M0A40If2GBXcsXVb 8yuTikeIodYPGmwKrlqdRbjcrU45Oab8osoEFiiBOlsq/LB7+s1PYja5m9HVQylIcu50wP4rlq3 eDiPiOhBErOdh1BSPvRimrewGu677BB01AhheBkofcpD3knL772+LoyM0+ X-Google-Smtp-Source: AGHT+IHT+PIj/I3Nwnl7icz24LWQ9urZsP2AITEkYhqCucV2rfUNysniaoegM3ab/avtkwVQVQ4gig== X-Received: by 2002:a17:907:80e:b0:b3c:3c8e:189d with SMTP id a640c23a62f3a-b72e05bd5acmr1160514666b.32.1762797465208; Mon, 10 Nov 2025 09:57:45 -0800 (PST) From: Roman Bogorodskiy To: devel@lists.libvirt.org Subject: [PATCH 3/4] bhyve: domain: refactor bhyveDomainDeviceDefValidate() Date: Mon, 10 Nov 2025 18:55:41 +0100 Message-ID: <20251110175542.36724-4-bogorodskiy@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251110175542.36724-1-bogorodskiy@gmail.com> References: <20251110175542.36724-1-bogorodskiy@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: U4KI6LJ63G5IMWDJRS4AWOOS7MX4WDU5 X-Message-ID-Hash: U4KI6LJ63G5IMWDJRS4AWOOS7MX4WDU5 X-MailFrom: bogorodskiy@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Roman Bogorodskiy X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1762797706520153000 Content-Type: text/plain; charset="utf-8" Refactor bhyveDomainDeviceDefValidate() to use switch/case instead of series of ifs which makes it easier to follow. Signed-off-by: Roman Bogorodskiy --- src/bhyve/bhyve_domain.c | 103 +++++++++++++++++++++++++++------------ 1 file changed, 71 insertions(+), 32 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 63d61b9f85..16ca4b1d0f 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -248,13 +248,15 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef= *dev, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) { - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CONTROLLER && - dev->data.controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_ISA && - dev->data.controller->idx !=3D 0) { - return -1; - } + switch (dev->type) { + case VIR_DOMAIN_DEVICE_CONTROLLER: + if (dev->data.controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_I= SA && + dev->data.controller->idx !=3D 0) { + return -1; + } + break; =20 - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_RNG) { + case VIR_DOMAIN_DEVICE_RNG: if (dev->data.rng->model =3D=3D VIR_DOMAIN_RNG_MODEL_VIRTIO) { if (dev->data.rng->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_RANDO= M) { if (STRNEQ(dev->data.rng->source.file, "/dev/random")) { @@ -272,39 +274,76 @@ bhyveDomainDeviceDefValidate(const virDomainDeviceDef= *dev, _("Only 'virio' RNG device model is supported")= ); return -1; } - } else if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR && - dev->data.chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE= _SERIAL) { - virDomainChrDef *chr =3D dev->data.chr; - if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_NMDM && - chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_TCP) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only 'nmdm' and 'tcp' console types are supp= orted")); - return -1; - } - if (chr->target.port > 3) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only four serial ports are supported")); - return -1; - } - if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP) { - if (chr->source->data.tcp.listen =3D=3D false) { + break; + + case VIR_DOMAIN_DEVICE_CHR: + if (dev->data.chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_SE= RIAL) { + virDomainChrDef *chr =3D dev->data.chr; + if (chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_NMDM && + chr->source->type !=3D VIR_DOMAIN_CHR_TYPE_TCP) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only listening TCP sockets are supported= ")); + _("Only 'nmdm' and 'tcp' console types are = supported")); return -1; } - - if (chr->source->data.tcp.protocol !=3D VIR_DOMAIN_CHR_TCP_PRO= TOCOL_RAW) { + if (chr->target.port > 3) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Only 'raw' protocol is supported for TCP= sockets")); + _("Only four serial ports are supported")); return -1; } + if (chr->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_TCP) { + if (chr->source->data.tcp.listen =3D=3D false) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only listening TCP sockets are suppo= rted")); + return -1; + } + + if (chr->source->data.tcp.protocol !=3D VIR_DOMAIN_CHR_TCP= _PROTOCOL_RAW) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only 'raw' protocol is supported for= TCP sockets")); + return -1; + } + } } - } else if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK && - dev->data.disk->rotation_rate && - dev->data.disk->bus !=3D VIR_DOMAIN_DISK_BUS_SATA) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("rotation rate is only valid for SATA bus")); - return -1; + break; + + case VIR_DOMAIN_DEVICE_DISK: { + virDomainDiskDef *disk =3D dev->data.disk; + + if (disk->rotation_rate && + disk->bus !=3D VIR_DOMAIN_DISK_BUS_SATA) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("rotation rate is only valid for SATA bus")); + return -1; + } + + break; + } + case VIR_DOMAIN_DEVICE_AUDIO: + case VIR_DOMAIN_DEVICE_CRYPTO: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_LAST: + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_NET: + case VIR_DOMAIN_DEVICE_NONE: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_PANIC: + case VIR_DOMAIN_DEVICE_PSTORE: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SHMEM: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_VIDEO: + case VIR_DOMAIN_DEVICE_VSOCK: + case VIR_DOMAIN_DEVICE_WATCHDOG: + break; } =20 return 0; --=20 2.51.0