Use macros for virtio-net PCI vendor/device IDs
PATCH 1/3 Use macros for virtio-net PCI vendor/device IDs
Gerd added these macros a while back.
--- hw/virtio-net.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
hw/virtio-net.c +3 -1
@@ -320,7 +320,9 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn)VirtIONet *n;static int virtio_net_id; - n = (VirtIONet *)virtio_init_pci(bus, "virtio-net", 6900, 0x1000, + n = (VirtIONet *)virtio_init_pci(bus, "virtio-net", + PCI_VENDOR_ID_REDHAT_QUMRANET, + PCI_DEVICE_ID_VIRTIO_NET, 0, VIRTIO_ID_NET, 0x02, 0x00, 0x00, sizeof(struct virtio_net_config),
Signature · 1 line
1.6.0.6
PATCH 2/3 Add macro for virtio-console PCI device ID
Also use the existing macro for the PCI vendor ID
--- hw/pci.h | 1 + hw/virtio-console.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-)
hw/pci.h +1 -0
@@ -16,6 +16,7 @@ extern target_phys_addr_t pci_mem_base;#define PCI_DEVICE_ID_VIRTIO_NET 0x1000#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001#define PCI_DEVICE_ID_VIRTIO_BALLOON 0x1002 +#define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003typedef void PCIConfigWriteFunc (PCIDevice *pci_dev,uint32_t address,uint32_t data,int len);
hw/virtio-console.c +2 -1
@@ -126,7 +126,8 @@ void *virtio_console_init(PCIBus *bus, CharDriverState *chr)VirtIOConsole *s; s = (VirtIOConsole *)virtio_init_pci (bus,"virtio-console" , -6900 ,0x1003 , +PCI_VENDOR_ID_REDHAT_QUMRANET , +PCI_DEVICE_ID_VIRTIO_CONSOLE ,0 ,VIRTIO_ID_CONSOLE ,0x03 ,0x80 ,0x00 ,0 ,sizeof (VirtIOConsole));
Signature · 1 line
1.6.0.6
PATCH 3/3 Use the default subsystem vendor ID for virtio devices
A subsystem vendor ID of zero isn't allowed, so we use our default ID.
Gerd points out that although the PCI subsystem vendor ID is treated by the guest as the virtio vendor ID:
/* we use the subsystem vendor/device id as the virtio vendor/device
* id. this allows us to use the same PCI vendor/device id for all
* virtio devices and to identify the particular virtio driver by
* the subsytem ids */
vp_dev->vdev.id.vendor = pci_dev->subsystem_vendor; vp_dev->vdev.id.device = pci_dev->subsystem_device;
it looks like only the device ID is used right now:
# grep virtio modules.alias alias virtio:d00000001v* virtio_net alias virtio:d00000002v* virtio_blk alias virtio:d00000003v* virtio_console alias virtio:d00000004v* virtio-rng alias virtio:d00000005v* virtio_balloon alias pci:v00001AF4d*sv*sd*bc*sc*i* virtio_pci alias virtio:d00000009v* 9pnet_virtio
so setting the subsystem vendor id to something != zero shouldn't cause trouble.
--- hw/virtio-balloon.c | 3 ++- hw/virtio-blk.c | 3 ++- hw/virtio-console.c | 3 ++- hw/virtio-net.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)
hw/virtio-balloon.c +2 -1
@@ -174,7 +174,8 @@ void *virtio_balloon_init(PCIBus *bus) s = (VirtIOBalloon *)virtio_init_pci (bus,"virtio-balloon" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_BALLOON , -0 ,VIRTIO_ID_BALLOON , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_BALLOON ,0x05 ,0x00 ,0x00 ,8 ,sizeof (VirtIOBalloon));if (s ==NULL )
hw/virtio-blk.c +2 -1
@@ -227,7 +227,8 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) s = (VirtIOBlock *)virtio_init_pci (bus,"virtio-blk" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_BLOCK , -0 ,VIRTIO_ID_BLOCK , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_BLOCK ,0x01 ,0x80 ,0x00 ,sizeof (struct virtio_blk_config ),sizeof (VirtIOBlock));if (!s)
hw/virtio-console.c +2 -1
@@ -128,7 +128,8 @@ void *virtio_console_init(PCIBus *bus, CharDriverState *chr) s = (VirtIOConsole *)virtio_init_pci (bus,"virtio-console" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_CONSOLE , -0 ,VIRTIO_ID_CONSOLE , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_CONSOLE ,0x03 ,0x80 ,0x00 ,0 ,sizeof (VirtIOConsole));if (s ==NULL )
hw/virtio-net.c +2 -1
@@ -323,7 +323,8 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n = (VirtIONet *)virtio_init_pci (bus,"virtio-net" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_NET , -0 ,VIRTIO_ID_NET , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_NET ,0x02 ,0x00 ,0x00 ,sizeof (struct virtio_net_config ),sizeof (VirtIONet));
Signature · 1 line
1.6.0.6
Re: [Qemu-devel] [PATCH 2/3] Add macro for virtio-console PCI device ID
In reply to Mark McLoughlinQuoted 1 line
+#define
PCI_DEVICE_ID_VIRTIO_CONSOLE0x1003
pci-ids.txt needs an update too (as vmchannel goes another route now reassigning 1af4:1003 to the console is fine).
cheers,
Gerd
A message that is not in the archive (sent off-list or not yet received): 1232977378.3724.85.camel@blaa
[Qemu-devel] Re: [PATCH 3/3][RESEND] Use the default subsystem vendor ID for virtio devices
Quoted 6 lines · Mark McLoughlin
A subsystem vendor ID of zero isn't allowed, so we use our default ID.
Gerd points out that although the PCI subsystem vendor ID is treated by the guest as the virtio vendor ID:
The thinking was to allow the subsystem vendor ID to be a virtio specific vendor ID.
If it's required to be a PCI vendor ID, then I guess that's what we'll have to do.
Regards,
Anthony Liguori
Quoted 86 lines
/* we use the subsystem vendor/device id as the virtio vendor/device
* id. this allows us to use the same PCI vendor/device id for all
* virtio devices and to identify the particular virtio driver by
* the subsytem ids */
vp_dev->vdev.id.vendor=pci_dev->subsystem_vendor;vp_dev->vdev.id.device=pci_dev->subsystem_device;it looks like only the device ID is used right now:
# grep virtio modules.alias alias virtio:d00000001v* virtio_net alias virtio:d00000002v* virtio_blk alias virtio:d00000003v* virtio_console alias virtio:d00000004v* virtio-rng alias virtio:d00000005v* virtio_balloon alias pci:v00001AF4d*sv*sd*bc*sc*i* virtio_pci alias virtio:d00000009v* 9pnet_virtioso setting the subsystem vendor id to something != zero shouldn't cause trouble.
Signed-off-by Mark McLoughlin <[email protected]>--- hw/virtio-balloon.c | 3 ++- hw/virtio-blk.c | 3 ++- hw/virtio-console.c | 3 ++- hw/virtio-net.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-)hw/virtio-balloon.c +2
-1@@ -174,7 +174,8 @@ void *virtio_balloon_init(PCIBus *bus) s = (VirtIOBalloon *)virtio_init_pci (bus,"virtio-balloon" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_BALLOON , -0 ,VIRTIO_ID_BALLOON , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_BALLOON ,0x05 ,0x00 ,0x00 ,8 ,sizeof (VirtIOBalloon));if (s ==NULL )hw/virtio-blk.c +2
-1@@ -227,7 +227,8 @@ void *virtio_blk_init(PCIBus *bus, BlockDriverState *bs) s = (VirtIOBlock *)virtio_init_pci (bus,"virtio-blk" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_BLOCK , -0 ,VIRTIO_ID_BLOCK , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_BLOCK ,0x01 ,0x80 ,0x00 ,sizeof (struct virtio_blk_config ),sizeof (VirtIOBlock));if (!s)hw/virtio-console.c +2
-1@@ -128,7 +128,8 @@ void *virtio_console_init(PCIBus *bus, CharDriverState *chr) s = (VirtIOConsole *)virtio_init_pci (bus,"virtio-console" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_CONSOLE , -0 ,VIRTIO_ID_CONSOLE , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_CONSOLE ,0x03 ,0x80 ,0x00 ,0 ,sizeof (VirtIOConsole));if (s ==NULL )hw/virtio-net.c +2
-1@@ -323,7 +323,8 @@ void virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n = (VirtIONet *)virtio_init_pci (bus,"virtio-net" ,PCI_VENDOR_ID_REDHAT_QUMRANET ,PCI_DEVICE_ID_VIRTIO_NET , -0 ,VIRTIO_ID_NET , +PCI_VENDOR_ID_REDHAT_QUMRANET , +VIRTIO_ID_NET ,0x02 ,0x00 ,0x00 ,sizeof (struct virtio_net_config ),sizeof (VirtIONet));