From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 214B7A0583; Thu, 19 Mar 2020 15:47:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D46FDF90; Thu, 19 Mar 2020 15:47:17 +0100 (CET) Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by dpdk.org (Postfix) with ESMTP id EB0D6CF3 for ; Thu, 19 Mar 2020 15:47:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584629236; h=from:from: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; bh=8boQ7GeUL1Dp39Nbk0v0QvU0MlK9RVeUyDdQ2xcCUUY=; b=ZEx+QLMVRdWTf7pIflTX0uUgBD5vJVAPiSFVr+W9G/m5RI+9XRgoXKwmwY9Z8qY92M7fOq S3OYVHsPTC7UAepb/Zttyy10yLX5N3WsISBwW6a9x3ES6fsy1vBT5ViTP45UnJkPQNuz3/ hu0/vpb8qzZD4wY0K0QV6F3GTVCP/YA= Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-241-6fiuSl5rOKOHBbuBH9T__g-1; Thu, 19 Mar 2020 10:47:14 -0400 X-MC-Unique: 6fiuSl5rOKOHBbuBH9T__g-1 Received: by mail-vs1-f72.google.com with SMTP id r185so379415vsr.9 for ; Thu, 19 Mar 2020 07:47:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mcOLNdVd3a2lGFe/BAq47zPqOfbJWoOWAbhZj2w2dOk=; b=ii2WqLZ1eLle+8vsLTNGbg2lQiO3CsUQYFz1rdws6HNHANvBOZY5KrpApkAxi7/pNR SC0qume1YJcWSD5NJC2n8Uh3IOvuhpKnFwK5Li1rt0rZI86YeF8oRXu/W0TxCvHwdCbO QReC9kJUB+7Vbw8zhlSakcsJo2a8HvCTsad3pqWaAmCwCsmDf/1m2/gIora5r8S9Xe+1 xmfGo6RYDmKXww3UU2AmQmHQfc1IREVNhtFWT8fedtsYCTMoa4xamm5yvRBJ87VBXNSq wHffbpKxqhmMQNzD57XvjDq45JMwTlToTzqdCRnxerjz4l8jWfndjzzoA/7xMlSG7Jgw tKmw== X-Gm-Message-State: ANhLgQ1FCSe9n6nW+I3XabvnQmnz5IiSlsRFjPEUcE+M5nYqECbrMfT4 OsPe0Ex6S39jSlxp3HZZd1d+xGqxJ7d5uvLHNb3ob4al/JKGtgGdQxeELYf+MPp3zyCqOd686fD fc+uTyJKBZGh4h04SvWQ= X-Received: by 2002:ab0:77c8:: with SMTP id y8mr1962438uar.126.1584629234230; Thu, 19 Mar 2020 07:47:14 -0700 (PDT) X-Google-Smtp-Source: ADFU+vspCfzMvcZyfkDAh2DVw4PAuu9Wo0asF6S6YZHwhPGa4L6yGUoyoMt0DCCL9I2mrApH8OGS3UJ7KkLGg6cC2Yo= X-Received: by 2002:ab0:77c8:: with SMTP id y8mr1962414uar.126.1584629233921; Thu, 19 Mar 2020 07:47:13 -0700 (PDT) MIME-Version: 1.0 References: <20200312163027.20760-1-luca.boccassi@gmail.com> In-Reply-To: <20200312163027.20760-1-luca.boccassi@gmail.com> From: David Marchand Date: Thu, 19 Mar 2020 15:47:02 +0100 Message-ID: To: Luca Boccassi Cc: dev , Christian Ehrhardt X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH] pmdinfo: check for pci.ids in /usr/share/misc X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Thu, Mar 12, 2020 at 5:30 PM wrote: > > From: Luca Boccassi > > Debian and Ubuntu switched years ago from /usr/share/hwdata to /usr/share= /misc, > and the former is just a compat symlink now. > We are starting to get bug reports to nudge us into changing. > So check the new path first, and the old one as a fallback. > > Cc: stable@dpdk.org > > Signed-off-by: Luca Boccassi > --- > usertools/dpdk-pmdinfo.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py > index 9d5c6369a0..12f20735e0 100755 > --- a/usertools/dpdk-pmdinfo.py > +++ b/usertools/dpdk-pmdinfo.py > @@ -561,7 +561,10 @@ def main(stream=3DNone): > > pcifile_default =3D "./pci.ids" # For unknown OS's assume local fil= e > if platform.system() =3D=3D 'Linux': > - pcifile_default =3D "/usr/share/hwdata/pci.ids" > + # hwdata is the legacy location, misc is supported going forward > + pcifile_default =3D "/usr/share/misc/pci.ids" > + if not os.path.exists(pcifile_default): > + pcifile_default =3D "/usr/share/hwdata/pci.ids" > elif platform.system() =3D=3D 'FreeBSD': > pcifile_default =3D "/usr/local/share/pciids/pci.ids" > if not os.path.exists(pcifile_default): > -- > 2.20.1 > LGTM. Acked-by: David Marchand --=20 David Marchand