fixup pci: switch from subsystem id to device id

Patch sent to list (and applied by Rusty in
commit fffcbe327c69e510239fff5627034aa2ab4b2d84
    pci: switch from subsystem id to device id
) did not actually implement what commit log said
it implements.

The result is wrong for transitional devices:
Adding 0xfff works for for net+block only;
for transitional pci devices there is no fixed scheme:

~/projects/qemu/include # grep VIRTIO_ID hw/virtio/*.h
hw/virtio/virtio-balloon.h:#define VIRTIO_ID_BALLOON 5
hw/virtio/virtio-blk.h:#define VIRTIO_ID_BLOCK 2
hw/virtio/virtio-net.h:#define VIRTIO_ID_NET   1
hw/virtio/virtio-rng.h:#define VIRTIO_ID_RNG    4
hw/virtio/virtio-scsi.h:#define VIRTIO_ID_SCSI  8
hw/virtio/virtio-serial.h:#define VIRTIO_ID_CONSOLE             3

~/projects/qemu/include # grep VIRTIO hw/pci/*.h
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_NET         0x1000
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_BLOCK       0x1001
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_BALLOON     0x1002
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_CONSOLE     0x1003
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_SCSI        0x1004
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_RNG         0x1005
hw/pci/pci.h:#define PCI_DEVICE_ID_VIRTIO_9P          0x1009

I am guessing TC went by commit log when it approved the change,
so fixing it up directly.

Cc: Andrew Thornton <andrewth@google.com>
Cc: Rusty Russell <rusty@ozlabs.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio@385 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652

0 files changed, 0 insertions, 0 deletions