cryptospore / rpms / qemu-kvm

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