cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
b38b0f
From 263ca3b7c89b7fd10aa03547624fe37e9a5dca32 Mon Sep 17 00:00:00 2001
b38b0f
From: David Gibson <dgibson@redhat.com>
b38b0f
Date: Thu, 30 May 2019 04:37:25 +0100
b38b0f
Subject: [PATCH 4/8] pci: Move NVIDIA vendor id to the rest of ids
b38b0f
MIME-Version: 1.0
b38b0f
Content-Type: text/plain; charset=UTF-8
b38b0f
Content-Transfer-Encoding: 8bit
b38b0f
b38b0f
RH-Author: David Gibson <dgibson@redhat.com>
b38b0f
Message-id: <20190530043728.32575-4-dgibson@redhat.com>
b38b0f
Patchwork-id: 88419
b38b0f
O-Subject: [RHEL-8.1 qemu-kvm PATCH 3/6] pci: Move NVIDIA vendor id to the rest of ids
b38b0f
Bugzilla: 1710662
b38b0f
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
b38b0f
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
b38b0f
RH-Acked-by: Auger Eric <eric.auger@redhat.com>
b38b0f
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
b38b0f
b38b0f
From: Alexey Kardashevskiy <aik@ozlabs.ru>
b38b0f
b38b0f
sPAPR code will use it too so move it from VFIO to the common code.
b38b0f
b38b0f
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
b38b0f
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
b38b0f
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
b38b0f
Message-Id: <20190214051440.59167-1-aik@ozlabs.ru>
b38b0f
Acked-by: Alex Williamson <alex.williamson@redhat.com>
b38b0f
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
b38b0f
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
b38b0f
(cherry picked from commit ee1cd0099ab04f748c6d839e4f4d9a41b21e7399)
b38b0f
b38b0f
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1710662
b38b0f
b38b0f
Signed-off-by: David Gibson <dgibson@redhat.com>
b38b0f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
b38b0f
---
b38b0f
 hw/vfio/pci-quirks.c     | 2 --
b38b0f
 include/hw/pci/pci_ids.h | 2 ++
b38b0f
 2 files changed, 2 insertions(+), 2 deletions(-)
b38b0f
b38b0f
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
b38b0f
index cb2f79c..90859d1 100644
b38b0f
--- a/hw/vfio/pci-quirks.c
b38b0f
+++ b/hw/vfio/pci-quirks.c
b38b0f
@@ -397,8 +397,6 @@ static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr)
b38b0f
  * note it for future reference.
b38b0f
  */
b38b0f
 
b38b0f
-#define PCI_VENDOR_ID_NVIDIA                    0x10de
b38b0f
-
b38b0f
 /*
b38b0f
  * Nvidia has several different methods to get to config space, the
b38b0f
  * nouveu project has several of these documented here:
b38b0f
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
b38b0f
index 63acc72..3ed7d10 100644
b38b0f
--- a/include/hw/pci/pci_ids.h
b38b0f
+++ b/include/hw/pci/pci_ids.h
b38b0f
@@ -271,4 +271,6 @@
b38b0f
 
b38b0f
 #define PCI_VENDOR_ID_SYNOPSYS           0x16C3
b38b0f
 
b38b0f
+#define PCI_VENDOR_ID_NVIDIA             0x10de
b38b0f
+
b38b0f
 #endif
b38b0f
-- 
b38b0f
1.8.3.1
b38b0f