I suspect then that how it's used in the kvm-unit-tests isn't correct. Or at least it's not how it's used in the Linux source code. Would it be better to cast all uses of these masks to uint32_t? -bw On Tue, Feb 25, 2020 at 11:59 PM Andrew Jones <drjones@xxxxxxxxxx> wrote: > > On Tue, Feb 25, 2020 at 11:44:22PM -0800, morbo@xxxxxxxxxx wrote: > > From: Bill Wendling <morbo@xxxxxxxxxx> > > > > The "pci_bar_*" functions use 64-bit masks, but the results are assigned > > to 32-bit variables. Use 32-bit masks, since we're interested only in > > the least significant 4-bits. > > > > Signed-off-by: Bill Wendling <morbo@xxxxxxxxxx> > > --- > > lib/linux/pci_regs.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/lib/linux/pci_regs.h b/lib/linux/pci_regs.h > > index 1becea8..3bc2b92 100644 > > --- a/lib/linux/pci_regs.h > > +++ b/lib/linux/pci_regs.h > > @@ -96,8 +96,8 @@ > > #define PCI_BASE_ADDRESS_MEM_TYPE_1M 0x02 /* Below 1M [obsolete] */ > > #define PCI_BASE_ADDRESS_MEM_TYPE_64 0x04 /* 64 bit address */ > > #define PCI_BASE_ADDRESS_MEM_PREFETCH 0x08 /* prefetchable? */ > > -#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fUL) > > -#define PCI_BASE_ADDRESS_IO_MASK (~0x03UL) > > +#define PCI_BASE_ADDRESS_MEM_MASK (~0x0fU) > > +#define PCI_BASE_ADDRESS_IO_MASK (~0x03U) > > /* bit 1 is reserved if address_space = 1 */ > > > > /* Header type 0 (normal devices) */ > > -- > > 2.25.0.265.gbab2e86ba0-goog > > > > This file comes directly from the Linux source. If it's not changed > there, then it shouldn't change here. > > Thanks, > drew >
