From nobody Mon Feb 9 12:29:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605803216; cv=none; d=zohomail.com; s=zohoarc; b=a8FsAdMaUUKRwznvcjEE+vgNCBbLjBshXE1ydgs4XlN4FFAxMMbDmk9OeAmS/v3yNGPpozirdcG/HdJorPJ/BQrszNaVtVxeppjhNjqfGzgO3R+WcEIqkcxGK+xMhzLLA+A3AmNu7WZleXBYqwLMWo+LwiHXADnNZ+I9YRK5gkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605803216; h=Content-Type:Content-Transfer-Encoding:Cc: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=c706uelbTC68AEgRcWrXU5tX6o+6sKcGnito3EEDCCs=; b=E7McPaFupROz7CstTJ1ONkOV071O0EyLYpOHqNrohU0NNs7ofoTq5tCUG+KIJArsfqXY3S/ybFfw6dueSUWtx/hh4ylu7witYzC6V9U/SiZ7/veRNjzj7b7NUOMKr+FCQGnFKQR9hk8mHPkVukoL7cLukTZPeF7qlO5ZylSrXcA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605803216016770.027218002064; Thu, 19 Nov 2020 08:26:56 -0800 (PST) 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-234-Ljr0oh15MbSSUdWuXRBwUQ-1; Thu, 19 Nov 2020 11:26:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE5B6809AC7; Thu, 19 Nov 2020 16:26:43 +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 C256B19D7D; Thu, 19 Nov 2020 16:26:43 +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 8913150036; Thu, 19 Nov 2020 16:26:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AJGQeqi030732 for ; Thu, 19 Nov 2020 11:26:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id B7E285C1B4; Thu, 19 Nov 2020 16:26:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF7215C1A1; Thu, 19 Nov 2020 16:26:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605803213; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=c706uelbTC68AEgRcWrXU5tX6o+6sKcGnito3EEDCCs=; b=UesH2aF1fd1aLDoHCkUZXxd+/7AFoyTcsBVVaFwxqaSFAs5kauZfwVosqA+wAmX0+RGKU3 ZzjPrpBdN+BTh5xQuAYriQddC7loOkawKbAfMJ/pFmAhcJvQsXHQ74/kZWGknfC4L7ma6E b1SstMgavNhA6FVxpRwVU+5N7XKzZkY= X-MC-Unique: Ljr0oh15MbSSUdWuXRBwUQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/16] virsh: Refactor str2DiskAddress Date: Thu, 19 Nov 2020 17:26:15 +0100 Message-Id: <95b01b2761deec3810a7f955625a387cc488f349.1605802531.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Ryan Gahagan 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.84 on 10.5.11.23 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) Content-Type: text/plain; charset="utf-8" Rewrite and rename the address parser. As a fallout the use of the removed 'str2PCIAddress' is replaced by virshAddressParse and virshAddressFormat. Signed-off-by: Peter Krempa --- tools/virsh-domain.c | 207 ++++++++++++++----------------------------- 1 file changed, 67 insertions(+), 140 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 942974fd39..57b17f3b5c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -306,15 +306,26 @@ static const vshCmdOptDef opts_attach_disk[] =3D { }; enum diskAddrType { - DISK_ADDR_TYPE_INVALID, DISK_ADDR_TYPE_PCI, DISK_ADDR_TYPE_SCSI, DISK_ADDR_TYPE_IDE, DISK_ADDR_TYPE_CCW, DISK_ADDR_TYPE_USB, DISK_ADDR_TYPE_SATA, + + DISK_ADDR_TYPE_LAST }; +VIR_ENUM_DECL(diskAddr); +VIR_ENUM_IMPL(diskAddr, + DISK_ADDR_TYPE_LAST, + "pci", + "scsi", + "ide", + "ccw", + "usb", + "sata"); + struct PCIAddress { unsigned int domain; unsigned int bus; @@ -350,105 +361,6 @@ struct DiskAddress { } addr; }; -static int str2PCIAddress(const char *str, struct PCIAddress *pciAddr) -{ - char *domain, *bus, *slot, *function; - - if (!pciAddr) - return -1; - if (!str) - return -1; - - domain =3D (char *)str; - - if (virStrToLong_uip(domain, &bus, 16, &pciAddr->domain) !=3D 0) - return -1; - - bus++; - if (virStrToLong_uip(bus, &slot, 16, &pciAddr->bus) !=3D 0) - return -1; - - slot++; - if (virStrToLong_uip(slot, &function, 16, &pciAddr->slot) !=3D 0) - return -1; - - function++; - if (virStrToLong_uip(function, NULL, 16, &pciAddr->function) !=3D 0) - return -1; - - return 0; -} - -static int str2DriveAddress(const char *str, struct DriveAddress *scsiAddr) -{ - char *controller, *bus, *unit; - - if (!scsiAddr) - return -1; - if (!str) - return -1; - - controller =3D (char *)str; - - if (virStrToLong_uip(controller, &bus, 10, &scsiAddr->controller) !=3D= 0) - return -1; - - bus++; - if (virStrToLong_uip(bus, &unit, 10, &scsiAddr->bus) !=3D 0) - return -1; - - unit++; - if (virStrToLong_ullp(unit, NULL, 10, &scsiAddr->unit) !=3D 0) - return -1; - - return 0; -} - -static int str2CCWAddress(const char *str, struct CCWAddress *ccwAddr) -{ - char *cssid, *ssid, *devno; - - if (!ccwAddr) - return -1; - if (!str) - return -1; - - cssid =3D (char *)str; - - if (virStrToLong_uip(cssid, &ssid, 16, &ccwAddr->cssid) !=3D 0) - return -1; - - ssid++; - if (virStrToLong_uip(ssid, &devno, 16, &ccwAddr->ssid) !=3D 0) - return -1; - - devno++; - if (virStrToLong_uip(devno, NULL, 16, &ccwAddr->devno) !=3D 0) - return -1; - - return 0; -} - -static int str2USBAddress(const char *str, struct USBAddress *usbAddr) -{ - char *bus, *port; - - if (!usbAddr) - return -1; - if (!str) - return -1; - - bus =3D (char *)str; - - if (virStrToLong_uip(bus, &port, 10, &usbAddr->bus) !=3D 0) - return -1; - - port++; - if (virStrToLong_uip(port, NULL, 10, &usbAddr->port) !=3D 0) - return -1; - - return 0; -} /* pci address pci:0000.00.0x0a.0 (domain:bus:slot:function) * ide disk address: ide:00.00.0 (controller:bus:unit) @@ -457,43 +369,60 @@ static int str2USBAddress(const char *str, struct USB= Address *usbAddr) * usb disk address: usb:00.00 (bus:port) * sata disk address: sata:00.00.0 (controller:bus:unit) */ - -static int str2DiskAddress(const char *str, struct DiskAddress *diskAddr, = bool multifunction) +static int +virshAddressParse(const char *str, + bool multifunction, + struct DiskAddress *addr) { - char *type, *addr; + g_autofree char *type =3D g_strdup(str); + char *a =3D strchr(type, ':'); - if (!diskAddr) - return -1; - if (!str) - return -1; - - type =3D (char *)str; - addr =3D strchr(type, ':'); if (!addr) return -1; - if (STREQLEN(type, "pci", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_PCI; - diskAddr->addr.pci.multifunction =3D multifunction; - return str2PCIAddress(addr + 1, &diskAddr->addr.pci); - } else if (STREQLEN(type, "scsi", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_SCSI; - return str2DriveAddress(addr + 1, &diskAddr->addr.drive); - } else if (STREQLEN(type, "ide", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_IDE; - return str2DriveAddress(addr + 1, &diskAddr->addr.drive); - } else if (STREQLEN(type, "ccw", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_CCW; - return str2CCWAddress(addr + 1, &diskAddr->addr.ccw); - } else if (STREQLEN(type, "usb", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_USB; - return str2USBAddress(addr + 1, &diskAddr->addr.usb); - } else if (STREQLEN(type, "sata", addr - type)) { - diskAddr->type =3D DISK_ADDR_TYPE_SATA; - return str2DriveAddress(addr + 1, &diskAddr->addr.drive); + *a =3D '\0'; + + addr->type =3D diskAddrTypeFromString(type); + + switch ((enum diskAddrType) addr->type) { + case DISK_ADDR_TYPE_PCI: + addr->addr.pci.multifunction =3D multifunction; + + if (virStrToLong_uip(++a, &a, 16, &addr->addr.pci.domain) < 0 || + virStrToLong_uip(++a, &a, 16, &addr->addr.pci.bus) < 0 || + virStrToLong_uip(++a, &a, 16, &addr->addr.pci.slot) < 0 || + virStrToLong_uip(++a, &a, 16, &addr->addr.pci.function) < 0) + return -1; + break; + + case DISK_ADDR_TYPE_SATA: + case DISK_ADDR_TYPE_IDE: + case DISK_ADDR_TYPE_SCSI: + if (virStrToLong_uip(++a, &a, 10, &addr->addr.drive.controller) < = 0 || + virStrToLong_uip(++a, &a, 10, &addr->addr.drive.bus) < 0 || + virStrToLong_ullp(++a, &a, 10, &addr->addr.drive.unit) < 0) + return -1; + break; + + case DISK_ADDR_TYPE_CCW: + if (virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.cssid) < 0 || + virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.ssid) < 0 || + virStrToLong_uip(++a, &a, 16, &addr->addr.ccw.devno) < 0) + return -1; + break; + + case DISK_ADDR_TYPE_USB: + if (virStrToLong_uip(++a, &a, 10, &addr->addr.usb.bus) < 0 || + virStrToLong_uip(++a, &a, 10, &addr->addr.usb.port) < 0) + return -1; + break; + + case DISK_ADDR_TYPE_LAST: + default: + return -1; } - return -1; + return 0; } @@ -541,7 +470,7 @@ virshAddressFormat(virBufferPtr buf, addr->addr.usb.port); break; - case DISK_ADDR_TYPE_INVALID: + case DISK_ADDR_TYPE_LAST: default: return; } @@ -557,7 +486,7 @@ cmdAttachDiskFormatAddress(vshControl *ctl, { struct DiskAddress diskAddr; - if (str2DiskAddress(straddr, &diskAddr, multifunction) !=3D 0) { + if (virshAddressParse(straddr, multifunction, &diskAddr) < 0) { vshError(ctl, _("Invalid address.")); return -1; } @@ -962,20 +891,18 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: { - struct PCIAddress pciAddr =3D {0, 0, 0, 0, false}; + g_autofree char *pciaddrstr =3D g_strdup_printf("pci:%s", source); + struct DiskAddress addr =3D { 0 }; - if (str2PCIAddress(source, &pciAddr) < 0) { - vshError(ctl, _("cannot parse pci address '%s' for network " - "interface"), source); + if (virshAddressParse(pciaddrstr, false, &addr) < 0) { + vshError(ctl, _("cannot parse pci address '%s' for network int= erface"), + source); goto cleanup; } virBufferAddLit(&buf, "\n"); virBufferAdjustIndent(&buf, 2); - virBufferAsprintf(&buf, "
\n", - pciAddr.domain, pciAddr.bus, - pciAddr.slot, pciAddr.function); + virshAddressFormat(&buf, &addr); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "\n"); break; --=20 2.28.0