From nobody Mon Feb 9 05:40:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1547822571719199.49830207068862; Fri, 18 Jan 2019 06:42:51 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B571C0587EC; Fri, 18 Jan 2019 14:42:49 +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 BE63D1048115; Fri, 18 Jan 2019 14:42:48 +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 2BC591803395; Fri, 18 Jan 2019 14:42:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0IEgiin030453 for ; Fri, 18 Jan 2019 09:42:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id BADB21048115; Fri, 18 Jan 2019 14:42:44 +0000 (UTC) Received: from unknown0050b6a41c42.attlocal.net.com (ovpn-116-100.phx2.redhat.com [10.3.116.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 740171019627 for ; Fri, 18 Jan 2019 14:42:44 +0000 (UTC) From: John Ferlan To: libvir-list@redhat.com Date: Fri, 18 Jan 2019 09:42:35 -0500 Message-Id: <20190118144237.4434-3-jferlan@redhat.com> In-Reply-To: <20190118144237.4434-1-jferlan@redhat.com> References: <20190118144237.4434-1-jferlan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/4] storage: Rework virStorageBackendSCSISerial 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 18 Jan 2019 14:42:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Alter the code to use the virStorageFileGetSCSIKey helper to fetch the unique key for the SCSI disk. Alter the logic to follow the former code which would return a duplicate of @dev when either the virCommandRun succeeded, but returned an empty string or when WITH_UDEV was not true. Signed-off-by: John Ferlan Reviewed-by: J=C3=A1n Tomko --- src/storage/storage_util.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index a84ee5b600..aa1af434de 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3758,36 +3758,18 @@ virStorageBackendRefreshLocal(virStoragePoolObjPtr = pool) static char * virStorageBackendSCSISerial(const char *dev) { + int rc; char *serial =3D NULL; -#ifdef WITH_UDEV - virCommandPtr cmd =3D virCommandNewArgList( - "/lib/udev/scsi_id", - "--replace-whitespace", - "--whitelisted", - "--device", dev, - NULL - ); - - /* Run the program and capture its output */ - virCommandSetOutputBuffer(cmd, &serial); - if (virCommandRun(cmd, NULL) < 0) - goto cleanup; -#endif =20 - if (serial && STRNEQ(serial, "")) { - char *nl =3D strchr(serial, '\n'); - if (nl) - *nl =3D '\0'; - } else { - VIR_FREE(serial); - ignore_value(VIR_STRDUP(serial, dev)); - } + rc =3D virStorageFileGetSCSIKey(dev, &serial); + if (rc =3D=3D 0 && serial) + return serial; =20 -#ifdef WITH_UDEV - cleanup: - virCommandFree(cmd); -#endif + if (rc =3D=3D -2) + return NULL; =20 + virResetLastError(); + ignore_value(VIR_STRDUP(serial, dev)); return serial; } =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list