From nobody Mon Feb 9 04:03:18 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=1633623184; cv=none; d=zohomail.com; s=zohoarc; b=RSkMqbo5EgW5klvJrJAqNr9tXia4DJFvE+fgtvv1PkqwJWPzpk4pSs8e70twrKL5Bj1uLAykIl6iqK3RiVttNAlg4qGbYl6rHxdS/hErAz6wclteaS+QcpmgiyC314vyJD2NbO8rkT55CbzlBxr90OjbiRU3R3njTIbOOOtT1hE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633623184; 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=gPtK0C0sqZu/TS+Run9ss2G56bVkz/jP/k7gahGIgrQ=; b=DPm2b67LLqM2H7BoIPhktvtTt3dX9Y4b9NFKZr6t1Wqz4M2z/QqMNwV6Iucsu+qZfKY1mxigRRac5rd3QJwhbM4YOOO6YGXDc6T3avOA/9GZVvW118PkDY0SzTimX1yf0U418/e8LIqTRneU5NZ/Jx3pHknNOnN8pDKU15IAMSs= 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 1633623184820507.0743174093001; Thu, 7 Oct 2021 09:13:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-250-goFh9mzaNvWk6jYqQNjxuw-1; Thu, 07 Oct 2021 12:12:59 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A2BAFB2AED; Thu, 7 Oct 2021 15:58:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0161D152C; Thu, 7 Oct 2021 15:58:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C18CB1803B30; Thu, 7 Oct 2021 15:58:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FLN7c024622 for ; Thu, 7 Oct 2021 11:21:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 818C96F166; Thu, 7 Oct 2021 15:21:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 804766F136 for ; Thu, 7 Oct 2021 15:21:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623183; 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=gPtK0C0sqZu/TS+Run9ss2G56bVkz/jP/k7gahGIgrQ=; b=C3TdBEmHaHtvDriBSWUzvcaMhXSuWth4E13oaFrczsvCIP61D9+H+zLGKYphTSoHz2fo4C jqketaF/55ZcgknCv68Pjd4J3WJUkFbbZBIIlNH3UmUAUjiWrcx0ETtK92cDxXiVfRrHwt qiggGT06jU3NWITRjNWQ+TFCa0zj/tQ= X-MC-Unique: goFh9mzaNvWk6jYqQNjxuw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 098/103] qemu: Command remove unused 'qemuBuildVirtioDevStr' Date: Thu, 7 Oct 2021 17:18:26 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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: 1633623186113100001 Content-Type: text/plain; charset="utf-8" All virtio devices were converted to the new JSON formatter so we can remove the old one. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 65 +---------------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b9c9027748..324da4adc5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1182,7 +1182,7 @@ qemuBuildVirtioDevGetConfig(virDomainDeviceDef *devic= e, * * Build the qemu virtio -device JSON properties name from the passed para= meters. */ -static G_GNUC_UNUSED virJSONValue * +static virJSONValue * qemuBuildVirtioDevProps(virDomainDeviceType devtype, void *devdata, virQEMUCaps *qemuCaps) @@ -1220,69 +1220,6 @@ qemuBuildVirtioDevProps(virDomainDeviceType devtype, } -/** - * qemuBuildVirtioDevStr - * @buf: virBuffer * to append the built string - * @qemuCaps: virQEMUCapPtr - * @devtype: virDomainDeviceType of the device. Ex: VIR_DOMAIN_DEVICE_TYPE= _RNG - * @devdata: *Def * of the device definition - * - * Build the qemu virtio -device name from the passed parameters. Currently - * this is mostly about attaching the correct string prefix to @baseName f= or - * the passed @type. So for @baseName "virtio-rng" and devdata->info.type - * VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI, generate "virtio-rng-pci" - * - * Returns: -1 on failure, 0 on success - */ -static G_GNUC_UNUSED int -qemuBuildVirtioDevStr(virBuffer *buf, - virQEMUCaps *qemuCaps, - virDomainDeviceType devtype, - void *devdata) -{ - virDomainDeviceDef device =3D { .type =3D devtype }; - g_autofree char *model =3D NULL; - virTristateSwitch disableLegacy =3D VIR_TRISTATE_SWITCH_ABSENT; - virTristateSwitch disableModern =3D VIR_TRISTATE_SWITCH_ABSENT; - virDomainVirtioOptions *virtioOptions =3D NULL; - - virDomainDeviceSetData(&device, devdata); - - if (qemuBuildVirtioDevGetConfig(&device, qemuCaps, &model, &virtioOpti= ons, - &disableLegacy, &disableModern) < 0) - return -1; - - virBufferAdd(buf, model, -1); - - if (disableLegacy !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, ",disable-legacy=3D%s", - virTristateSwitchTypeToString(disableLegacy)); - } - - if (disableModern !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, ",disable-modern=3D%s", - virTristateSwitchTypeToString(disableModern)); - } - - if (virtioOptions) { - if (virtioOptions->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, ",iommu_platform=3D%s", - virTristateSwitchTypeToString(virtioOptions-= >iommu)); - } - if (virtioOptions->ats !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, ",ats=3D%s", - virTristateSwitchTypeToString(virtioOptions-= >ats)); - } - if (virtioOptions->packed !=3D VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, ",packed=3D%s", - virTristateSwitchTypeToString(virtioOptions-= >packed)); - } - } - - return 0; -} - - static int qemuBuildRomProps(virJSONValue *props, virDomainDeviceInfo *info) --=20 2.31.1