Commit 5e15d79b authored by Alex Williamson's avatar Alex Williamson
Browse files

vfio: Change polarity of our no-mmap option 



The default should be to allow mmap and new drivers shouldn't need to
expose an option or set it to other than the allocation default in
their initfn.  Take advantage of the experimental flag to change this
option to the correct polarity.

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 46746dba

hw/vfio/common.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ int vfio_mmap_region(Object *obj, VFIORegion *region, 
    int ret = 0;

    VFIODevice *vbasedev = region->vbasedev;



    if (vbasedev->allow_mmap && size && region->flags &

    if (!vbasedev->no_mmap && size && region->flags &

        VFIO_REGION_INFO_FLAG_MMAP) {

        int prot = 0;

hw/vfio/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -3730,7 +3730,7 @@ static Property vfio_pci_dev_properties[] = { 
                    VFIO_FEATURE_ENABLE_VGA_BIT, false),

    DEFINE_PROP_BIT("x-req", VFIOPCIDevice, features,

                    VFIO_FEATURE_ENABLE_REQ_BIT, true),

    DEFINE_PROP_BOOL("x-mmap", VFIOPCIDevice, vbasedev.allow_mmap, true),

    DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false),

    DEFINE_PROP_BOOL("x-no-kvm-intx", VFIOPCIDevice, no_kvm_intx, false),

    DEFINE_PROP_BOOL("x-no-kvm-msi", VFIOPCIDevice, no_kvm_msi, false),

    DEFINE_PROP_BOOL("x-no-kvm-msix", VFIOPCIDevice, no_kvm_msix, false),

hw/vfio/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static const VMStateDescription vfio_platform_vmstate = { 


static Property vfio_platform_dev_properties[] = {

    DEFINE_PROP_STRING("host", VFIOPlatformDevice, vbasedev.name),

    DEFINE_PROP_BOOL("x-mmap", VFIOPlatformDevice, vbasedev.allow_mmap, true),

    DEFINE_PROP_BOOL("x-no-mmap", VFIOPlatformDevice, vbasedev.no_mmap, false),

    DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice,

                       mmap_timeout, 1100),

    DEFINE_PROP_BOOL("x-irqfd", VFIOPlatformDevice, irqfd_allowed, true),

include/hw/vfio/vfio-common.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ typedef struct VFIODevice { 
    int type;

    bool reset_works;

    bool needs_reset;

    bool allow_mmap;

    bool no_mmap;

    VFIODeviceOps *ops;

    unsigned int num_irqs;

    unsigned int num_regions;