ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the virtio-{blk, console}-pci-0-10 device types 

These are now unused.

However, perhaps the idea is that when we add -device, they will be
useful? In that case, we should add virtio-net-pci-0-10 too.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Mark McLoughlin 2009-07-30 11:29:13 +01:00 committed by Anthony Liguori
parent caea79a9db
commit 85c2c7359b
1 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
hw/virtio-pci.c
View File

@ -423,63 +423,37 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
virtio_bind_device(vdev, &virtio_pci_bindings, proxy); virtio_bind_device(vdev, &virtio_pci_bindings, proxy);
} }
static void virtio_blk_init_pci_with_class(PCIDevice *pci_dev,
uint16_t class_code)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev;
vdev = virtio_blk_init(&pci_dev->qdev);
virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_BLOCK,
class_code, 0x00);
}
static void virtio_blk_init_pci(PCIDevice *pci_dev) static void virtio_blk_init_pci(PCIDevice *pci_dev)
{ {
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev;
if (proxy->class_code != PCI_CLASS_STORAGE_SCSI && if (proxy->class_code != PCI_CLASS_STORAGE_SCSI &&
proxy->class_code != PCI_CLASS_STORAGE_OTHER) proxy->class_code != PCI_CLASS_STORAGE_OTHER)
proxy->class_code = PCI_CLASS_STORAGE_SCSI; proxy->class_code = PCI_CLASS_STORAGE_SCSI;
virtio_blk_init_pci_with_class(pci_dev, proxy->class_code); vdev = virtio_blk_init(&pci_dev->qdev);
}
static void virtio_blk_init_pci_0_10(PCIDevice *pci_dev)
{
virtio_blk_init_pci_with_class(pci_dev, PCI_CLASS_STORAGE_OTHER);
}
static void virtio_console_init_pci_with_class(PCIDevice *pci_dev,
uint16_t class_code)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev;
vdev = virtio_console_init(&pci_dev->qdev);
virtio_init_pci(proxy, vdev, virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET, PCI_VENDOR_ID_REDHAT_QUMRANET,
PCI_DEVICE_ID_VIRTIO_CONSOLE, PCI_DEVICE_ID_VIRTIO_BLOCK,
class_code, 0x00); proxy->class_code, 0x00);
} }
static void virtio_console_init_pci(PCIDevice *pci_dev) static void virtio_console_init_pci(PCIDevice *pci_dev)
{ {
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
VirtIODevice *vdev;
if (proxy->class_code != PCI_CLASS_COMMUNICATION_OTHER && if (proxy->class_code != PCI_CLASS_COMMUNICATION_OTHER &&
proxy->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */ proxy->class_code != PCI_CLASS_DISPLAY_OTHER && /* qemu 0.10 */
proxy->class_code != PCI_CLASS_OTHERS) /* qemu-kvm */ proxy->class_code != PCI_CLASS_OTHERS) /* qemu-kvm */
proxy->class_code = PCI_CLASS_COMMUNICATION_OTHER; proxy->class_code = PCI_CLASS_COMMUNICATION_OTHER;
virtio_console_init_pci_with_class(pci_dev, proxy->class_code); vdev = virtio_console_init(&pci_dev->qdev);
} virtio_init_pci(proxy, vdev,
PCI_VENDOR_ID_REDHAT_QUMRANET,
static void virtio_console_init_pci_0_10(PCIDevice *pci_dev) PCI_DEVICE_ID_VIRTIO_CONSOLE,
{ proxy->class_code, 0x00);
virtio_console_init_pci_with_class(pci_dev, PCI_CLASS_DISPLAY_OTHER);
} }
static void virtio_net_init_pci(PCIDevice *pci_dev) static void virtio_net_init_pci(PCIDevice *pci_dev)
@ -560,15 +534,6 @@ static PCIDeviceInfo virtio_info[] = {
.qdev.name = "virtio-balloon-pci", .qdev.name = "virtio-balloon-pci",
.qdev.size = sizeof(VirtIOPCIProxy), .qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_balloon_init_pci, .init = virtio_balloon_init_pci,
},{
/* For compatibility with 0.10 */
.qdev.name = "virtio-blk-pci-0-10",
.qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_blk_init_pci_0_10,
},{
.qdev.name = "virtio-console-pci-0-10",
.qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_console_init_pci_0_10,
},{ },{
/* end of list */ /* end of list */
} }