From nobody Tue Oct 22 23:34:12 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=1694699885; cv=none; d=zohomail.com; s=zohoarc; b=E6HHfu2C6QaRC/UnLglrd8DDhZ30Ro2+9oyDK3iXjHY6gvwVJm9h38pl/Bbd7wqpiStJt5u78/sDv3ed/HyIs7Krt38O8yfmRfJPn8wGwmHTDyJk/l7O1+Ai5oU3E7hf3mfvfDMD5BlGINf6gQpMaLcV0T55+KKnFr9Wwrj4HAk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694699885; 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=SYG3se9NqE3hiaug9zduZZBooeQxQpLyao29U+djihc=; b=ho0VTjZ+lJMnVaVvbLXgV817fdqfNBmfjrmnieQsSQDdMZY+ugQNuhwLM/JuLT2RtxJs2B5Asdynm+fY5/LX2qzko0zc24RiaUhtfzze/qs4QDoPZQw6NRsVDLqHNnlcGu3cIEFEgoAaJefnKKyFdr81G9kDyLwcCZCxXXeWs64= 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 1694699885897236.99438437475965; Thu, 14 Sep 2023 06:58:05 -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-163-I97dJC7aPqaoB8fkcT6PWA-1; Thu, 14 Sep 2023 09:57:48 -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 89D929291F3; Thu, 14 Sep 2023 13:57:45 +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 7409B40C2009; Thu, 14 Sep 2023 13:57:45 +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 B7AC51946A4F; Thu, 14 Sep 2023 13:56:48 +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 ACAF019465B9 for ; Thu, 14 Sep 2023 13:56:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A884740C6EC0; 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 501A340C6ECE for ; Thu, 14 Sep 2023 13:56:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694699885; 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=SYG3se9NqE3hiaug9zduZZBooeQxQpLyao29U+djihc=; b=fnkxz0PRkk0Ssjapzzv2FnmgnJXm3Rs7nNogcHbqrHzFIcHFtOmTbcR+QfHkgWpUa/HDKn rA0T9TLoFnzsgb5vvA6zZxxu1rZEcSBtYSK3N/ZqRnwE49g/t7yKjqn+dn3yM9HeRcO/Pu LtfbkBWUzr8XK8tviVmgbv00DlFJ3EU= X-MC-Unique: I97dJC7aPqaoB8fkcT6PWA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 19/20] virStorageNetHostDef: Convert 'transport' field to proper enum type Date: Thu, 14 Sep 2023 15:56:20 +0200 Message-ID: <9bcd590ca8d550ee09220b951232af0ef022b15e.1694699683.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.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: 1694699887017100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Convert the field and adjust the XML parsers to use virXMLPropEnumDefault(). Signed-off-by: Michal Privoznik --- src/conf/domain_conf.c | 16 ++++++---------- src/conf/storage_source_conf.h | 2 +- src/qemu/qemu_backup.c | 2 +- src/qemu/qemu_block.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/storage_file/storage_file_backend_gluster.c | 2 +- src/storage_file/storage_source_backingstore.c | 15 +++++++++------ 7 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a743a0628c..5f4146b4e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5834,17 +5834,13 @@ virDomainStorageNetworkParseHost(xmlNodePtr hostnod= e, g_autofree char *port =3D NULL; =20 memset(host, 0, sizeof(*host)); - host->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; =20 - /* transport can be tcp (default), unix or rdma. */ - if ((transport =3D virXMLPropString(hostnode, "transport"))) { - host->transport =3D virStorageNetHostTransportTypeFromString(trans= port); - if (host->transport < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown protocol transport type '%1$s'"), - transport); - goto cleanup; - } + if (virXMLPropEnumDefault(hostnode, "transport", + virStorageNetHostTransportTypeFromString, + VIR_XML_PROP_NONE, + &host->transport, + VIR_STORAGE_NET_HOST_TRANS_TCP) < 0) { + goto cleanup; } =20 host->socket =3D virXMLPropString(hostnode, "socket"); diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index f99579bce2..9791fb25ee 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -151,7 +151,7 @@ typedef struct _virStorageNetHostDef virStorageNetHostD= ef; struct _virStorageNetHostDef { char *name; unsigned int port; - int transport; /* virStorageNetHostTransport */ + virStorageNetHostTransport transport; char *socket; /* path to unix socket */ }; =20 diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index a94869522d..e4db967e2c 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -68,7 +68,7 @@ qemuBackupPrepare(virDomainBackupDef *def) def->server->name =3D g_strdup("localhost"); } =20 - switch ((virStorageNetHostTransport) def->server->transport) { + switch (def->server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: /* TODO: Update qemu.conf to provide a port range, * probably starting at 10809, for obtaining automatic diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index d31bbde0f4..97f03002fd 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -130,7 +130,7 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorage= NetHostDef *host) g_autoptr(virJSONValue) server =3D NULL; g_autofree char *port =3D NULL; =20 - switch ((virStorageNetHostTransport) host->transport) { + switch (host->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: port =3D g_strdup_printf("%u", host->port); =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5b9edadcf7..137cb4e293 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6176,7 +6176,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitor *mon, g_autoptr(virJSONValue) addr =3D NULL; g_autofree char *port_str =3D NULL; =20 - switch ((virStorageNetHostTransport)server->transport) { + switch (server->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: port_str =3D g_strdup_printf("%u", server->port); addr =3D qemuMonitorJSONBuildInetSocketAddress(server->name, port_= str); diff --git a/src/storage_file/storage_file_backend_gluster.c b/src/storage_= file/storage_file_backend_gluster.c index d018d5422e..950f8e81fe 100644 --- a/src/storage_file/storage_file_backend_gluster.c +++ b/src/storage_file/storage_file_backend_gluster.c @@ -63,7 +63,7 @@ virStorageFileBackendGlusterInitServer(virStorageFileBack= endGlusterPriv *priv, const char *hoststr =3D NULL; int port =3D 0; =20 - switch ((virStorageNetHostTransport) host->transport) { + switch (host->transport) { case VIR_STORAGE_NET_HOST_TRANS_RDMA: case VIR_STORAGE_NET_HOST_TRANS_TCP: hoststr =3D host->name; diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_f= ile/storage_source_backingstore.c index 00fcfe9fd7..80681924ea 100644 --- a/src/storage_file/storage_source_backingstore.c +++ b/src/storage_file/storage_source_backingstore.c @@ -42,6 +42,7 @@ virStorageSourceParseBackingURI(virStorageSource *src, { g_autoptr(virURI) uri =3D NULL; const char *path =3D NULL; + int transport =3D 0; g_auto(GStrv) scheme =3D NULL; =20 if (!(uri =3D virURIParse(uristr))) { @@ -65,12 +66,14 @@ virStorageSourceParseBackingURI(virStorageSource *src, return -1; } =20 - if (scheme[1] && - (src->hosts->transport =3D virStorageNetHostTransportTypeFromStrin= g(scheme[1])) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid protocol transport type '%1$s'"), - scheme[1]); - return -1; + if (scheme[1]) { + if ((transport =3D virStorageNetHostTransportTypeFromString(scheme= [1])) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("invalid protocol transport type '%1$s'"), + scheme[1]); + return -1; + } + src->hosts->transport =3D transport; } =20 if (uri->query) { --=20 2.41.0