[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] ivshmem: use symbolic constant for PCI ID, a
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 4/5] ivshmem: use symbolic constant for PCI ID, add to pci-ids.txt |
Date: |
Thu, 13 Dec 2012 10:19:37 +0100 |
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 <address@hidden>
---
docs/specs/pci-ids.txt | 2 ++
hw/ivshmem.c | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
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;
--
1.8.0.1
- [Qemu-devel] [PATCH v2 0/5] Improve consistency of pci-ids.txt, use symbolic constants for QEMU devices, Paolo Bonzini, 2012/12/13
- [Qemu-devel] [PATCH v2 2/5] reorganize pci-ids.txt, Paolo Bonzini, 2012/12/13
- [Qemu-devel] [PATCH v2 1/5] docs: move pci-ids.txt to docs/specs/, Paolo Bonzini, 2012/12/13
- [Qemu-devel] [PATCH v2 4/5] ivshmem: use symbolic constant for PCI ID, add to pci-ids.txt,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 3/5] virtio-9p: use symbolic constant, add to pci-ids.txt, Paolo Bonzini, 2012/12/13
- [Qemu-devel] [PATCH v2 5/5] pci: use constants for devices under the 1B36 device ID, document them, Paolo Bonzini, 2012/12/13
- Re: [Qemu-devel] [PATCH v2 0/5] Improve consistency of pci-ids.txt, use symbolic constants for QEMU devices, Paolo Bonzini, 2012/12/27