From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm493-0006f6-UV for qemu-devel@nongnu.org; Wed, 05 Nov 2014 12:13:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xm48z-0002Zn-9U for qemu-devel@nongnu.org; Wed, 05 Nov 2014 12:13:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xm48z-0002Zd-10 for qemu-devel@nongnu.org; Wed, 05 Nov 2014 12:13:17 -0500 Message-ID: <1415207535.14389.9.camel@localhost.localdomain> From: Marcel Apfelbaum Date: Wed, 05 Nov 2014 19:12:15 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/5] pci: reorganize QEMU_PCI_CAP_* List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hu Tao Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" On Wed, 2014-11-05 at 17:02 +0800, Hu Tao wrote: > This makes code more readable. > > Signed-off-by: Hu Tao > --- > include/hw/pci/pci.h | 39 ++++++++++++++++++++------------------- > 1 file changed, 20 insertions(+), 19 deletions(-) > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index c352c7b..b18759a 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -142,25 +142,26 @@ enum { > > /* Bits in cap_present field. */ > enum { > - QEMU_PCI_CAP_MSI = 0x1, > - QEMU_PCI_CAP_MSIX = 0x2, > - QEMU_PCI_CAP_EXPRESS = 0x4, > - > - /* multifunction capable device */ > -#define QEMU_PCI_CAP_MULTIFUNCTION_BITNR 3 > - QEMU_PCI_CAP_MULTIFUNCTION = (1 << QEMU_PCI_CAP_MULTIFUNCTION_BITNR), > - > - /* command register SERR bit enabled */ > -#define QEMU_PCI_CAP_SERR_BITNR 4 > - QEMU_PCI_CAP_SERR = (1 << QEMU_PCI_CAP_SERR_BITNR), > - /* Standard hot plug controller. */ > -#define QEMU_PCI_SHPC_BITNR 5 > - QEMU_PCI_CAP_SHPC = (1 << QEMU_PCI_SHPC_BITNR), > -#define QEMU_PCI_SLOTID_BITNR 6 > - QEMU_PCI_CAP_SLOTID = (1 << QEMU_PCI_SLOTID_BITNR), > - /* PCI Express capability - Power Controller Present */ > -#define QEMU_PCIE_SLTCAP_PCP_BITNR 7 > - QEMU_PCIE_SLTCAP_PCP = (1 << QEMU_PCIE_SLTCAP_PCP_BITNR), > + QEMU_PCI_CAP_MSI_BITNR = 0, > + QEMU_PCI_CAP_MSIX_BITNR, > + QEMU_PCI_CAP_EXPRESS_BITNR, > + QEMU_PCI_CAP_MULTIFUNCTION_BITNR, /* multifunction capable device */ > + QEMU_PCI_CAP_SERR_BITNR, /* command register SERR bit enabled */ > + QEMU_PCI_SHPC_BITNR, /* Standard hot plug controller */ > + QEMU_PCI_SLOTID_BITNR, > + QEMU_PCIE_SLTCAP_PCP_BITNR, /* PCI Express capability - Power Controller > + Present */ > +}; > + > +enum { > + QEMU_PCI_CAP_MSI = (1 << QEMU_PCI_CAP_MSI_BITNR), > + QEMU_PCI_CAP_MSIX = (1 << QEMU_PCI_CAP_MSIX_BITNR), > + QEMU_PCI_CAP_EXPRESS = (1 << QEMU_PCI_CAP_EXPRESS_BITNR), > + QEMU_PCI_CAP_MULTIFUNCTION = (1 << QEMU_PCI_CAP_MULTIFUNCTION_BITNR), > + QEMU_PCI_CAP_SERR = (1 << QEMU_PCI_CAP_SERR_BITNR), > + QEMU_PCI_CAP_SHPC = (1 << QEMU_PCI_SHPC_BITNR), > + QEMU_PCI_CAP_SLOTID = (1 << QEMU_PCI_SLOTID_BITNR), > + QEMU_PCIE_SLTCAP_PCP = (1 << QEMU_PCIE_SLTCAP_PCP_BITNR), > }; > > #define TYPE_PCI_DEVICE "pci-device" Definitely more readable. Reviewed-by: Marcel Apfelbaum