From 8954b0306e2179987cd097d203057e780808b0ba Mon Sep 17 00:00:00 2001

From: Peter Xu <peterx@redhat.com>

Date: Wed, 9 Oct 2019 12:39:43 +0100

Subject: [PATCH 17/22] intel_iommu: Correct caching-mode error message

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Peter Xu <peterx@redhat.com>

Message-id: <20191009123947.21505-2-peterx@redhat.com>

Patchwork-id: 91350

O-Subject: [RHEL-8.2.0 qemu-kvm PATCH 1/5] intel_iommu: Correct caching-mode error message

Bugzilla: 1738440

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Auger Eric <eric.auger@redhat.com>

RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>

From: Alex Williamson <alex.williamson@redhat.com>

If we try to use the intel-iommu device with vfio-pci devices without

caching mode enabled, we're told:

  qemu-system-x86_64: We need to set caching-mode=1 for intel-iommu to enable

  device assignment with IOMMU protection.

But to enable caching mode, the option is actually "caching-mode=on".

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Message-Id: <155364147432.16467.15898335025013220939.stgit@gimli.home>

Reviewed-by: Peter Xu <peterx@redhat.com>

Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit 75c5626c88a9675010018849ca9abc8d56045425)

Signed-off-by: Peter Xu <peterx@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/i386/intel_iommu.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c

index e827c5a..22d2e52 100644

--- a/hw/i386/intel_iommu.c

+++ b/hw/i386/intel_iommu.c

@@ -2554,7 +2554,7 @@ static void vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu,

     IntelIOMMUState *s = vtd_as->iommu_state;

     if (!s->caching_mode && new & IOMMU_NOTIFIER_MAP) {

-        error_report("We need to set caching-mode=1 for intel-iommu to enable "

+        error_report("We need to set caching-mode=on for intel-iommu to enable "

                      "device assignment with IOMMU protection.");

         exit(1);

     }

-- 

1.8.3.1