Re: [Qemu-devel] [PATCH 4/5] ivshmem: use symbolic constant for PCI ID, add to pci-ids.txt

[Paolo Bonzini <pbonzini@redhat.com>]

Il 12/12/2012 15:22, Michael S. Tsirkin ha scritto:
>> > @@ -29,4 +29,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..8adeb2c 100644
>> > --- a/hw/ivshmem.c
>> > +++ b/hw/ivshmem.c
>> > @@ -800,7 +800,7 @@ 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->device_id = PCI_DEVICE_ID_QUMRANET_IVSHMEM;
>> >      k->class_id = PCI_CLASS_MEMORY_RAM;
>> >      dc->reset = ivshmem_reset;
>> >      dc->props = ivshmem_properties;
>> > diff --git a/hw/pci.h b/hw/pci.h
>> > index 0719521..3704d5f 100644
>> > --- a/hw/pci.h
>> > +++ b/hw/pci.h
>> > @@ -78,6 +78,7 @@
>> >  #define PCI_DEVICE_ID_VIRTIO_SCSI        0x1004
>> >  #define PCI_DEVICE_ID_VIRTIO_RNG         0x1005
>> >  #define PCI_DEVICE_ID_VIRTIO_9P          0x1009
>> > +#define PCI_DEVICE_ID_QUMRANET_IVSHMEM   0x1110
>> >  
>> >  #define FMT_PCIBUS                      PRIx64
> Why _QUMRANET I wonder?
> 

Because it's under 0x1af4 (PCI_VENDOR_ID_REDHAT_QUMRANET), not 0x1b36
(PCI_VENDOR_ID_REDHAT).

Paolo