Patchwork [v2,4/5] ivshmem: use symbolic constant for PCI ID, add to pci-ids.txt

login
register
mail settings
Submitter Paolo Bonzini
Date Dec. 13, 2012, 9:19 a.m.
Message ID <1355390378-16692-5-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/205787/
State New
Headers show

Comments

Paolo Bonzini - Dec. 13, 2012, 9:19 a.m.
Due to disagreement on a name that is generic enough for hw/pci.h,
the symbolic constants are placed in the .c files.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 docs/specs/pci-ids.txt | 2 ++
 hw/ivshmem.c           | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt
index 2d5329a..e76b196 100644
--- a/docs/specs/pci-ids.txt
+++ b/docs/specs/pci-ids.txt
@@ -30,4 +30,6 @@  maintained as part of the virtio specification.
 1af4:1100  Used as PCI Subsystem ID for existing hardware devices emulated
            by qemu.
 
+1af4:1110  ivshmem device (shared memory, docs/specs/ivshmem_device_spec.txt)
+
 All other device IDs are reserved.
diff --git a/hw/ivshmem.c b/hw/ivshmem.c
index f6dbb21..9520daa 100644
--- a/hw/ivshmem.c
+++ b/hw/ivshmem.c
@@ -28,6 +28,9 @@ 
 #include <sys/mman.h>
 #include <sys/types.h>
 
+#define PCI_VENDOR_ID_IVSHMEM   PCI_VENDOR_ID_REDHAT_QUMRANET
+#define PCI_DEVICE_ID_IVSHMEM   0x1110
+
 #define IVSHMEM_IOEVENTFD   0
 #define IVSHMEM_MSI     1
 
@@ -799,8 +802,8 @@  static void ivshmem_class_init(ObjectClass *klass, void *data)
 
     k->init = pci_ivshmem_init;
     k->exit = pci_ivshmem_uninit;
-    k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;
-    k->device_id = 0x1110;
+    k->vendor_id = PCI_VENDOR_ID_IVSHMEM;
+    k->device_id = PCI_DEVICE_ID_IVSHMEM;
     k->class_id = PCI_CLASS_MEMORY_RAM;
     dc->reset = ivshmem_reset;
     dc->props = ivshmem_properties;