[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/17] vfio: Change polarity of our no-mmap option
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PATCH 04/17] vfio: Change polarity of our no-mmap option |
Date: |
Wed, 09 Sep 2015 12:30:01 -0600 |
User-agent: |
StGit/0.17.1-dirty |
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: Alex Williamson <address@hidden>
---
hw/vfio/common.c | 2 +-
hw/vfio/pci.c | 2 +-
hw/vfio/platform.c | 2 +-
include/hw/vfio/vfio-common.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 85ee9b0..8b09c21 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -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;
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 2c9eae2..0cce31f 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3731,7 +3731,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),
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 60365d1..e0f4237 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -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),
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 100873e..9b9901f 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -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;
- [Qemu-devel] [PATCH 00/17] vfio: quirks & tracing refactoring, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 01/17] vfio/pci: Rename INTx functions for easier tracing, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 02/17] vfio/pci: Rename MSI/X functions for easier tracing, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 03/17] vfio/pci: Make interrupt bypass runtime configurable, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 04/17] vfio: Change polarity of our no-mmap option,
Alex Williamson <=
- [Qemu-devel] [PATCH 05/17] vfio/pci: Extract PCI structures to a separate header, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 07/17] vfio/pci: Cleanup ROM blacklist quirk, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 06/17] vfio/pci: Split quirks to a separate file, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 08/17] vfio/pci: Foundation for new quirk structure, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 09/17] vfio/pci: Cleanup ATI 0x3c3 quirk, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 10/17] vfio/pci: Cleanup Nvidia 0x3d0 quirk, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 11/17] vfio/pci: Rework RTL8168 quirk, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 12/17] vfio/pci: Config window quirks, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 13/17] vfio/pci: Config mirror quirk, Alex Williamson, 2015/09/09
- [Qemu-devel] [PATCH 14/17] vfio/pci: Remove old config window and mirror quirks, Alex Williamson, 2015/09/09