From nobody Thu Dec 18 03:58:50 2025 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=1658846526; cv=none; d=zohomail.com; s=zohoarc; b=eKwYZ3qzUGzHEonxrGKzGIwb2Iy2Up15Fp+kukvQblKOLzxRJ1WeEihaLH7Br7bsG8UDl+Q/fc6BcS8432CgxoXVFkNVH45a89w6dmGsLZxVj0hI/HDyBBquuhtuioKbwrs2Zwg1FIy2KfqeknFm+baT7WM/GT8XABbbY4kDSTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846526; 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=2zd26MfQfkFeTx9hnGFX2azdCkSxpuqRQM4/xwH16sE=; b=BXGlFwvP0MF5Mh6cDXjJg7x86YFX4MKg7uCa1NxeurhEYfzf6PmvGKBbSS/Ia/P+UwZTWRk6Dxcsi2OoZZkP3EbwFsaWvK+u+x5d9uuOyTQX2wuKDrI4T9riSiRviZTzgRCMl65rFKRE2t+ahB01+2Zr6EoxLE5JWe5BHjLur10= 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 1658846526354321.46895132839904; Tue, 26 Jul 2022 07:42: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-367-stk6YUQIONmbWXNTs9umDQ-1; Tue, 26 Jul 2022 10:38:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 859908115B1; Tue, 26 Jul 2022 14:38:26 +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 70C0A1415122; Tue, 26 Jul 2022 14:38:26 +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 242D01945DBC; Tue, 26 Jul 2022 14:38:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 135E51945DBD for ; Tue, 26 Jul 2022 14:38:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D9440400DFD7; Tue, 26 Jul 2022 14:38:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5FC95400EA8E for ; Tue, 26 Jul 2022 14:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846525; 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=2zd26MfQfkFeTx9hnGFX2azdCkSxpuqRQM4/xwH16sE=; b=BFZlZ1z+Uc9XfeUK3mOA0D0csYrZZhS6JNUPuLn2eDj8fCM1mJHY9B4ZarpeYtDB9WysOF 19mFthEQnZJ5qLiVTQUCurskeWjeRWMfzAqrlQD/YZ1+GJH8qVRRPhzTsUf7jRWUsKW1pK 7xTpAAwwhgYEHF0eZPpzB24KtU54GT0= X-MC-Unique: stk6YUQIONmbWXNTs9umDQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/80] qemu: block: Remove legacy spellings for InetSocketAddress Date: Tue, 26 Jul 2022 16:36:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1658846528212100003 Content-Type: text/plain; charset="utf-8" In one of early iterations of the gluster driver 'tcp' was used instead of 'inet' and 'socket' instead of 'path' for unix sockets. All of this can be now removed. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_block.c | 44 ++++++++++--------------------------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 9fe22f18f2..870d44ecd5 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -432,36 +432,24 @@ qemuBlockStorageSourceGetURI(virStorageSource *src) /** * qemuBlockStorageSourceBuildJSONSocketAddress * @host: the virStorageNetHostDef * definition to build - * @legacy: use old field names/values * * Formats @hosts into a json object conforming to the 'SocketAddress' type * in qemu. * - * For compatibility with old approach used in the gluster driver of old q= emus - * use the old spelling for TCP transport and, the path field of the unix = socket. - * * Returns a virJSONValue * for a single server. */ static virJSONValue * -qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host, - bool legacy) +qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host) { g_autoptr(virJSONValue) server =3D NULL; - const char *transport; - const char *field; g_autofree char *port =3D NULL; switch ((virStorageNetHostTransport) host->transport) { case VIR_STORAGE_NET_HOST_TRANS_TCP: - if (legacy) - transport =3D "tcp"; - else - transport =3D "inet"; - port =3D g_strdup_printf("%u", host->port); if (virJSONValueObjectAdd(&server, - "s:type", transport, + "s:type", "inet", "s:host", host->name, "s:port", port, NULL) < 0) @@ -469,14 +457,9 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorag= eNetHostDef *host, break; case VIR_STORAGE_NET_HOST_TRANS_UNIX: - if (legacy) - field =3D "s:socket"; - else - field =3D "s:path"; - if (virJSONValueObjectAdd(&server, "s:type", "unix", - field, host->socket, + "s:path", host->socket, NULL) < 0) return NULL; break; @@ -496,14 +479,12 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStora= geNetHostDef *host, /** * qemuBlockStorageSourceBuildHostsJSONSocketAddress: * @src: disk storage source - * @legacy: use 'tcp' instead of 'inet' for compatibility reasons * * Formats src->hosts into a json object conforming to the 'SocketAddress'= type * in qemu. */ static virJSONValue * -qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src, - bool legacy) +qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src) { g_autoptr(virJSONValue) servers =3D NULL; g_autoptr(virJSONValue) server =3D NULL; @@ -515,7 +496,7 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virSt= orageSource *src, for (i =3D 0; i < src->nhosts; i++) { host =3D src->hosts + i; - if (!(server =3D qemuBlockStorageSourceBuildJSONSocketAddress(host= , legacy))) + if (!(server =3D qemuBlockStorageSourceBuildJSONSocketAddress(host= ))) return NULL; if (virJSONValueArrayAppend(servers, &server) < 0) @@ -614,13 +595,12 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress= (virStorageSource *src) static virJSONValue * qemuBlockStorageSourceGetGlusterProps(virStorageSource *src, - bool legacy, bool onlytarget) { g_autoptr(virJSONValue) servers =3D NULL; g_autoptr(virJSONValue) props =3D NULL; - if (!(servers =3D qemuBlockStorageSourceBuildHostsJSONSocketAddress(sr= c, legacy))) + if (!(servers =3D qemuBlockStorageSourceBuildHostsJSONSocketAddress(sr= c))) return NULL; /* { driver:"gluster", @@ -851,9 +831,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src, return NULL; } - serverprops =3D qemuBlockStorageSourceBuildJSONSocketAddress(&src->hos= ts[0], - false); - if (!serverprops) + if (!(serverprops =3D qemuBlockStorageSourceBuildJSONSocketAddress(&sr= c->hosts[0]))) return NULL; if (onlytarget) { @@ -952,9 +930,7 @@ qemuBlockStorageSourceGetSheepdogProps(virStorageSource= *src) return NULL; } - serverprops =3D qemuBlockStorageSourceBuildJSONSocketAddress(&src->hos= ts[0], - false); - if (!serverprops) + if (!(serverprops =3D qemuBlockStorageSourceBuildJSONSocketAddress(&sr= c->hosts[0]))) return NULL; /* libvirt does not support the 'snap-id' and 'tag' properties */ @@ -1192,7 +1168,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourc= e *src, switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_GLUSTER: driver =3D "gluster"; - if (!(fileprops =3D qemuBlockStorageSourceGetGlusterProps(src,= legacy, onlytarget))) + if (!(fileprops =3D qemuBlockStorageSourceGetGlusterProps(src,= onlytarget))) return NULL; break; @@ -2613,7 +2589,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorag= eSource *src, switch ((virStorageNetProtocol) src->protocol) { case VIR_STORAGE_NET_PROTOCOL_GLUSTER: driver =3D "gluster"; - if (!(location =3D qemuBlockStorageSourceGetGlusterProps(src, = false, false))) + if (!(location =3D qemuBlockStorageSourceGetGlusterProps(src, = false))) return -1; break; --=20 2.36.1