From nobody Tue Oct 22 22:32:56 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=1694699946; cv=none; d=zohomail.com; s=zohoarc; b=HsSrGUytSAMxtimk+V4xqLESaLJZCGLVQEE+EKfnT5Yjdazuo+6YGF+Kx8QK2+y1PkHlowccJxCqUQlBfzJaft5T+XyrrQc6fxPNVLn55Gz2BiqnYCw8i/H1AYAquWHFmf0frzIRnAXHdtbSU7yiCIp0SZPVMZrZOTfz+VFcX+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694699946; 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=UgskHHsCkHrBtUTeFa1dhsmkFw7R26B6RFHCbv29bIo=; b=XQUlr8idVi33KWqmQx0Xo5oFkXGX265+qcEqP0f2QvyhZ9v83vLuibzQTVXYW+2xMNd9koKOKQOr/9zdzLm2ijYLpTg6FAf7wSYXreSjONEW4EFdpN36JWRmdTAdEQSBqQa36/hxU9HXTBZGNgBmntRl30J/+3lT22XE8ijtbyA= 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 1694699946403589.2218599675647; Thu, 14 Sep 2023 06:59:06 -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-681-uEMLp0GRMm2zcwKoyM_I6g-1; Thu, 14 Sep 2023 09:58:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 C20A41818E4C; Thu, 14 Sep 2023 13:58:06 +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 ACA7C2026D68; Thu, 14 Sep 2023 13:58:06 +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 595DE1949758; Thu, 14 Sep 2023 13:56:51 +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 146E219451C1 for ; Thu, 14 Sep 2023 13:56:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EA15E40C6ECA; Thu, 14 Sep 2023 13:56:32 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.2.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91F9740C6ECD for ; Thu, 14 Sep 2023 13:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694699945; 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=UgskHHsCkHrBtUTeFa1dhsmkFw7R26B6RFHCbv29bIo=; b=g4ct/sUEx5ZKC6bgrlWe3eLwZirDIh5Ne1eVrSVTkqx0WGH35tr6pefbLjlhha9rQwdInm AhuKp60RfwQr/7DFSVRt/60RukX5cFlByu9+4rHHjdUL+Mz0M8t2BqfImnzVSHEccf10ri t8K4FOJgYaIG7yp2NRBB5C+Wj/6hboU= X-MC-Unique: uEMLp0GRMm2zcwKoyM_I6g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 13/20] virDomainControllerDef: Convert 'type' field to proper enum type Date: Thu, 14 Sep 2023 15:56:14 +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.4 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: 1694699946997100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Convert the field and fill in missing cases to switch() statements. Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 26 ++++++++++++++++++-------- src/conf/domain_conf.h | 9 ++++++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 12 +++++++++++- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_validate.c | 2 +- src/vbox/vbox_common.c | 2 +- 8 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35cb14b986..95a71b204f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2473,7 +2473,7 @@ virDomainControllerDefNew(virDomainControllerType typ= e) def->model =3D -1; def->idx =3D -1; =20 - switch ((virDomainControllerType) def->type) { + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: def->opts.vioserial.ports =3D -1; def->opts.vioserial.vectors =3D -1; @@ -8265,7 +8265,7 @@ static int virDomainControllerModelTypeFromString(const virDomainControllerDef *def, const char *model) { - switch ((virDomainControllerType)def->type) { + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeFromString(model); case VIR_DOMAIN_CONTROLLER_TYPE_USB: @@ -8293,7 +8293,7 @@ static const char * virDomainControllerModelTypeToString(virDomainControllerDef *def, int model) { - switch ((virDomainControllerType)def->type) { + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: return virDomainControllerModelSCSITypeToString(model); case VIR_DOMAIN_CONTROLLER_TYPE_USB: @@ -8324,7 +8324,7 @@ virDomainControllerDefParseXML(virDomainXMLOption *xm= lopt, unsigned int flags) { g_autoptr(virDomainControllerDef) def =3D NULL; - virDomainControllerType type =3D 0; + virDomainControllerType type =3D VIR_DOMAIN_CONTROLLER_TYPE_IDE; xmlNodePtr driver =3D NULL; g_autofree xmlNodePtr *targetNodes =3D NULL; int ntargetNodes =3D 0; @@ -8539,6 +8539,13 @@ virDomainControllerDefParseXML(virDomainXMLOption *x= mlopt, break; } =20 + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: default: break; } @@ -16031,7 +16038,10 @@ virDomainEmulatorPinDefParseXML(xmlNodePtr node) =20 =20 virDomainControllerDef * -virDomainDefAddController(virDomainDef *def, int type, int idx, int model) +virDomainDefAddController(virDomainDef *def, + virDomainControllerType type, + int idx, + int model) { virDomainControllerDef *cont; =20 @@ -16106,7 +16116,7 @@ virDomainDefAddUSBController(virDomainDef *def, int= idx, int model) =20 int virDomainDefMaybeAddController(virDomainDef *def, - int type, + virDomainControllerType type, int idx, int model) { @@ -21719,7 +21729,7 @@ virDomainDefCheckABIStability(virDomainDef *src, =20 static int virDomainDefAddDiskControllersForType(virDomainDef *def, - int controllerType, + virDomainControllerType controllerTy= pe, int diskBus) { size_t i; @@ -22981,7 +22991,7 @@ virDomainControllerDefFormat(virBuffer *buf, if (model) virBufferEscapeString(&attrBuf, " model=3D'%s'", model); =20 - switch ((virDomainControllerType) def->type) { + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (def->opts.vioserial.ports !=3D -1) { virBufferAsprintf(&attrBuf, " ports=3D'%d'", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fc612f3adb..9dadda2d1d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -784,7 +784,7 @@ struct _virDomainXenbusControllerOpts { =20 /* Stores the virtual disk controller configuration */ struct _virDomainControllerDef { - int type; + virDomainControllerType type; int idx; int model; /* -1 =3D=3D undef */ unsigned int queues; @@ -4280,12 +4280,15 @@ VIR_ENUM_DECL(virDomainCpuPlacementMode); VIR_ENUM_DECL(virDomainStartupPolicy); =20 virDomainControllerDef * -virDomainDefAddController(virDomainDef *def, int type, int idx, int model); +virDomainDefAddController(virDomainDef *def, + virDomainControllerType type, + int idx, + int model); int virDomainDefAddUSBController(virDomainDef *def, int idx, int model); int virDomainDefMaybeAddController(virDomainDef *def, - int type, + virDomainControllerType type, int idx, int model); int diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 701efd46b4..17d7bfcfd3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2802,7 +2802,7 @@ qemuBuildControllerDevProps(const virDomainDef *domai= nDef, =20 *devprops =3D NULL; =20 - switch ((virDomainControllerType)def->type) { + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: if (!(props =3D qemuBuildControllerSCSIDevProps(def, qemuCaps))) return -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 47c3d69bda..16a8267726 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5540,7 +5540,7 @@ qemuDomainControllerDefPostParse(virDomainControllerD= ef *cont, virQEMUCaps *qemuCaps, unsigned int parseFlags) { - switch ((virDomainControllerType)cont->type) { + switch (cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: /* Set the default SCSI controller model if not already set */ if (qemuDomainSetSCSIControllerModel(def, cont, qemuCaps) < 0) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 00742d3c0e..2e58930eec 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -608,7 +608,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, case VIR_DOMAIN_DEVICE_CONTROLLER: { virDomainControllerDef *cont =3D dev->data.controller; =20 - switch ((virDomainControllerType)cont->type) { + switch (cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_PCI: return virDomainPCIControllerModelToConnectType(cont->model); =20 @@ -1984,6 +1984,16 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDef *de= f, } } break; + + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS: + case VIR_DOMAIN_CONTROLLER_TYPE_ISA: + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + break; } } =20 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 21154892ae..2fbd46325f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5534,7 +5534,7 @@ qemuDomainDiskControllerIsBusy(virDomainObj *vm, continue; =20 /* check whether the disk uses this type controller */ - switch ((virDomainControllerType) detach->type) { + switch (detach->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: if (disk->bus !=3D VIR_DOMAIN_DISK_BUS_IDE) continue; @@ -5599,7 +5599,7 @@ static bool qemuDomainControllerIsBusy(virDomainObj *vm, virDomainControllerDef *detach) { - switch ((virDomainControllerType) detach->type) { + switch (detach->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 315fc676f2..2fcc86bb22 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4036,7 +4036,7 @@ qemuValidateDomainDeviceDefController(const virDomain= ControllerDef *controller, if (qemuValidateDomainDeviceDefControllerAttributes(controller) < 0) return -1; =20 - switch ((virDomainControllerType)controller->type) { + switch (controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_IDE: ret =3D qemuValidateDomainDeviceDefControllerIDE(controller, def); break; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 490f337a56..de3c9989a5 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -467,7 +467,7 @@ vboxSetStorageController(virDomainControllerDef *contro= ller, int ret =3D -1; =20 /* libvirt controller type =3D> vbox bus type */ - switch ((virDomainControllerType) controller->type) { + switch (controller->type) { case VIR_DOMAIN_CONTROLLER_TYPE_FDC: VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_FLOPPY_NAME, &controllerName); vboxBusType =3D StorageBus_Floppy; --=20 2.41.0