From nobody Sat Feb 7 08:53:48 2026 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=1678094524; cv=none; d=zohomail.com; s=zohoarc; b=mzgeATf48VBfS4iTv4IXsrPzTX/65qk1ggku1DtzOdMfj4+6FHwwaSD5sC0rL8CMO01YeWKho8KmRxZkGys5/ydG/LOq+k9D75GecwLWiWYg2AYMtqaEUrj5nzBP8Y0mONA8Xk5X7Ae0TRhRapYbyHI5OTGq/+xbCkXLzJC5F/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678094524; 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=eG7tCMEG9AyK5XV0NXdRSVHOIa8Y+oC7GQfNZhSyxUA=; b=XwRPBrFVkOAUR6xv0Ju33sRDq9QLP6mywgbX8PqTfYzuKy7bk+6ey+79i37B2501s2KOV1uSm647/xIsJw0D+5XkhJlPnNyiuOeku3y0Ft5F6xcfb8snhe7LvT0EZ0V8H8pe/eGV95ZShpH2nTrnYhZ7cZZ3o9Qzk0rpxB+184I= 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 1678094524798880.6488001515918; Mon, 6 Mar 2023 01:22:04 -0800 (PST) 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-646-uAsOGPpxNIS4O0HdcZKo5g-1; Mon, 06 Mar 2023 04:20:43 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1A0DD100F919; Mon, 6 Mar 2023 09:20:40 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00D4C440DE; Mon, 6 Mar 2023 09:20:40 +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 A00D619465B8; Mon, 6 Mar 2023 09:20:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0864A1946586 for ; Mon, 6 Mar 2023 09:20:39 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id D3F4B112132D; Mon, 6 Mar 2023 09:20:38 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5ADF91121314 for ; Mon, 6 Mar 2023 09:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678094523; 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=eG7tCMEG9AyK5XV0NXdRSVHOIa8Y+oC7GQfNZhSyxUA=; b=bPhkcLfqBYoKavE7kftevLNQOJq81/+Y1hnt+bc+I+82XzVa8wbDysIAf2tECEaNNg1/TU 6a4/yxI3VAHo6m8vbED1QUbVpppI6desSOJsDdMzfFFuxj5g68dD/LeGusFN4LJA72ayHH wuJRBhsZ6308fPtB+obpbchDGKsNrfs= X-MC-Unique: uAsOGPpxNIS4O0HdcZKo5g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/6] qemuBuildHostNetProps: Don't use virJSONValueObjectAppendStringPrintf to format address Date: Mon, 6 Mar 2023 10:20:31 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.5 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: 1678094525969100001 Content-Type: text/plain; charset="utf-8" Prefer virJSONValueObjectAdd which we already use internally combined with local formatting of the string. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 68 +++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 589ec3e639..784003fbf5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3804,6 +3804,15 @@ qemuBuildNicDevProps(virDomainDef *def, } +static char * +qemuBuildHostNetSocketAddr(virDomainNetDef *net) +{ + return g_strdup_printf("%s:%d", + NULLSTR_EMPTY(net->data.socket.address), + net->data.socket.port); +} + + virJSONValue * qemuBuildHostNetProps(virDomainObj *vm, virDomainNetDef *net) @@ -3885,40 +3894,53 @@ qemuBuildHostNetProps(virDomainObj *vm, } break; - case VIR_DOMAIN_NET_TYPE_CLIENT: - if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || - virJSONValueObjectAppendStringPrintf(netprops, "connect", "%s:= %d", - net->data.socket.address, - net->data.socket.port) < = 0) + case VIR_DOMAIN_NET_TYPE_CLIENT: { + g_autofree char *addr =3D qemuBuildHostNetSocketAddr(net); + + if (virJSONValueObjectAdd(&netprops, + "s:type", "socket", + "s:connect", addr, + NULL) < 0) return NULL; break; + } - case VIR_DOMAIN_NET_TYPE_SERVER: - if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || - virJSONValueObjectAppendStringPrintf(netprops, "listen", "%s:%= d", - NULLSTR_EMPTY(net->data.s= ocket.address), - net->data.socket.port) < = 0) + case VIR_DOMAIN_NET_TYPE_SERVER: { + g_autofree char *addr =3D qemuBuildHostNetSocketAddr(net); + + if (virJSONValueObjectAdd(&netprops, + "s:type", "socket", + "s:listen", addr, + NULL) < 0) return NULL; break; + } - case VIR_DOMAIN_NET_TYPE_MCAST: - if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || - virJSONValueObjectAppendStringPrintf(netprops, "mcast", "%s:%d= ", - net->data.socket.address, - net->data.socket.port) < = 0) + case VIR_DOMAIN_NET_TYPE_MCAST: { + g_autofree char *addr =3D qemuBuildHostNetSocketAddr(net); + + if (virJSONValueObjectAdd(&netprops, + "s:type", "socket", + "s:mcast", addr, + NULL) < 0) return NULL; break; + } - case VIR_DOMAIN_NET_TYPE_UDP: - if (virJSONValueObjectAdd(&netprops, "s:type", "socket", NULL) < 0= || - virJSONValueObjectAppendStringPrintf(netprops, "udp", "%s:%d", - net->data.socket.address, - net->data.socket.port) < = 0 || - virJSONValueObjectAppendStringPrintf(netprops, "localaddr", "%= s:%d", - net->data.socket.localadd= r, - net->data.socket.localpor= t) < 0) + case VIR_DOMAIN_NET_TYPE_UDP: { + g_autofree char *addr =3D qemuBuildHostNetSocketAddr(net); + g_autofree char *localaddr =3D g_strdup_printf("%s:%d", + net->data.socket.loca= laddr, + net->data.socket.loca= lport); + + if (virJSONValueObjectAdd(&netprops, + "s:type", "socket", + "s:udp", addr, + "s:localaddr", localaddr, + NULL) < 0) return NULL; break; + } case VIR_DOMAIN_NET_TYPE_USER: if (net->backend.type =3D=3D VIR_DOMAIN_NET_BACKEND_PASST) { --=20 2.39.2