From nobody Mon Feb 9 12:11:36 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=1633624238; cv=none; d=zohomail.com; s=zohoarc; b=Hc3uEB5yQFo2WG5ekV7Fc1ZQ7nTR0K5oaevGtCuSaAFrtLWYjok3G/aSCofBWeKiBiXHD6tP0wyxOsA3bZQZNF41BFXUKSF2u2PYF/hA3YzfpBwQ27reupQx7ytUsTra5FTcemkz0ZDx8PjpIc2tqL8pufMPsm/2OPuAjcWARJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633624238; 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=TEeutF7Y/ReN+vA4gwWUQXuCT6BlT/P72MfsX+WY6EQ=; b=M4IRU8fBNo+1v59rFwK/+fx5MyRUjdkbWUfJJcOWEqJoECxfLQBxcLp+Ga1C0rAO07ulaGViTqZdIEx7RdVlmfeDVvimKio8hstW+nYPaN5fCrK1fnh5KouEwTZY12+/L8wPRfwc9vUvTcm7Q7bD/7jaUnknQNES9E7AqUNqiaA= 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 1633624238725753.2383498570146; Thu, 7 Oct 2021 09:30:38 -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-552-3iUgKSLrM5iz87zBpnlKvQ-1; Thu, 07 Oct 2021 12:30:35 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4DD91207773; Thu, 7 Oct 2021 16:01:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 97A7015B7D9; Thu, 7 Oct 2021 15:58:59 +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 331E14EA2A; Thu, 7 Oct 2021 15:58:59 +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 197FLTY5024689 for ; Thu, 7 Oct 2021 11:21:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 504BC70E89; Thu, 7 Oct 2021 15:21:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id D923D6ED8C for ; Thu, 7 Oct 2021 15:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633624237; 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=TEeutF7Y/ReN+vA4gwWUQXuCT6BlT/P72MfsX+WY6EQ=; b=F/V8sH8699HGNEOJMKlVivkrASgAwCPtBaL8iQWn+tu0WpG6PE4grUVmcnzuNDbkrr4n3L 12cRf6GBM544K7Lvu9ZchW1zwbP5VcoChhAXQhZ7gpc3mVkhMVptPgdKnin7CLb8OpC3/4 YQGTl+H5dKwOrHM8ABOamAvcBEO6N40= X-MC-Unique: 3iUgKSLrM5iz87zBpnlKvQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 103/103] qemu: command: Remove unused 'qemuBuildDeviceAddressStr' Date: Thu, 7 Oct 2021 17:18:31 +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.11 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: 1633624239221100001 Content-Type: text/plain; charset="utf-8" All users were converted to the JSON counterpart. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 99 +---------------------------------------- 1 file changed, 1 insertion(+), 98 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 53f38ff306..bfba69a974 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -424,103 +424,6 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *d= omainDef, } -static int -qemuBuildDeviceAddressPCIStr(virBuffer *buf, - const virDomainDef *domainDef, - virDomainDeviceInfo *info) -{ - g_autofree char *bus =3D NULL; - - if (!(bus =3D qemuBuildDeviceAddressPCIGetBus(domainDef, info))) - return -1; - - virBufferStrcat(buf, ",bus=3D", bus, NULL); - - if (info->addr.pci.multi =3D=3D VIR_TRISTATE_SWITCH_ON) - virBufferAddLit(buf, ",multifunction=3Don"); - else if (info->addr.pci.multi =3D=3D VIR_TRISTATE_SWITCH_OFF) - virBufferAddLit(buf, ",multifunction=3Doff"); - - virBufferAsprintf(buf, ",addr=3D0x%x", info->addr.pci.slot); - - if (info->addr.pci.function !=3D 0) - virBufferAsprintf(buf, ".0x%x", info->addr.pci.function); - - if (info->acpiIndex !=3D 0) - virBufferAsprintf(buf, ",acpi-index=3D%u", info->acpiIndex); - - return 0; -} - - -static int G_GNUC_UNUSED -qemuBuildDeviceAddressStr(virBuffer *buf, - const virDomainDef *domainDef, - virDomainDeviceInfo *info) -{ - const char *contAlias =3D NULL; - - switch ((virDomainDeviceAddressType)info->type) { - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI: - if (qemuBuildDeviceAddressPCIStr(buf, domainDef, info) < 0) - return -1; - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB: - if (!(contAlias =3D virDomainControllerAliasFind(domainDef, - VIR_DOMAIN_CONTROLL= ER_TYPE_USB, - info->addr.usb.bus)= )) - return -1; - virBufferAsprintf(buf, ",bus=3D%s.0", contAlias); - if (virDomainUSBAddressPortIsValid(info->addr.usb.port)) { - virBufferAddLit(buf, ",port=3D"); - virDomainUSBAddressPortFormatBuf(buf, info->addr.usb.port); - } - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: - if (info->addr.spaprvio.has_reg) - virBufferAsprintf(buf, ",reg=3D0x%08llx", info->addr.spaprvio.= reg); - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: - if (info->addr.ccw.assigned) - virBufferAsprintf(buf, ",devno=3D%x.%x.%04x", - info->addr.ccw.cssid, - info->addr.ccw.ssid, - info->addr.ccw.devno); - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA: - virBufferAsprintf(buf, ",iobase=3D0x%x,irq=3D0x%x", - info->addr.isa.iobase, - info->addr.isa.irq); - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: - virBufferAsprintf(buf, ",slot=3D%d", info->addr.dimm.slot); - if (info->addr.dimm.base) - virBufferAsprintf(buf, ",addr=3D%llu", info->addr.dimm.base); - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO: - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED: - break; - - case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST: - virReportEnumRangeError(virDomainDeviceAddressType, info->type); - return -1; - } - - return 0; -} - - static int qemuBuildDeviceAddresDriveProps(virJSONValue *props, const virDomainDef *domainDef, @@ -657,7 +560,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, } -static int G_GNUC_UNUSED +static int qemuBuildDeviceAddressProps(virJSONValue *props, const virDomainDef *domainDef, virDomainDeviceInfo *info) --=20 2.31.1