[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] qdev/class: tag network
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 3/5] qdev/class: tag network |
Date: |
Thu, 9 Jul 2009 15:02:22 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/e1000.c | 7 ++++---
hw/eepro100.c | 21 ++++++++++++---------
hw/ne2000.c | 7 ++++---
hw/pcnet.c | 8 +++++---
hw/rtl8139.c | 7 ++++---
hw/virtio-pci.c | 7 ++++---
6 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/hw/e1000.c b/hw/e1000.c
index 4ac8918..8f53e00 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1126,9 +1126,10 @@ static void pci_e1000_init(PCIDevice *pci_dev)
}
static PCIDeviceInfo e1000_info = {
- .qdev.name = "e1000",
- .qdev.size = sizeof(E1000State),
- .init = pci_e1000_init,
+ .qdev.name = "e1000",
+ .qdev.size = sizeof(E1000State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_e1000_init,
};
static void e1000_register_devices(void)
diff --git a/hw/eepro100.c b/hw/eepro100.c
index 85446ed..a64c997 100644
--- a/hw/eepro100.c
+++ b/hw/eepro100.c
@@ -1794,17 +1794,20 @@ static void pci_i82559er_init(PCIDevice *dev)
static PCIDeviceInfo eepro100_info[] = {
{
- .qdev.name = "i82551",
- .qdev.size = sizeof(PCIEEPRO100State),
- .init = pci_i82551_init,
+ .qdev.name = "i82551",
+ .qdev.size = sizeof(PCIEEPRO100State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_i82551_init,
},{
- .qdev.name = "i82557b",
- .qdev.size = sizeof(PCIEEPRO100State),
- .init = pci_i82557b_init,
+ .qdev.name = "i82557b",
+ .qdev.size = sizeof(PCIEEPRO100State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_i82557b_init,
},{
- .qdev.name = "i82559er",
- .qdev.size = sizeof(PCIEEPRO100State),
- .init = pci_i82559er_init,
+ .qdev.name = "i82559er",
+ .qdev.size = sizeof(PCIEEPRO100State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_i82559er_init,
},{
/* end of list */
}
diff --git a/hw/ne2000.c b/hw/ne2000.c
index 66ff29d..a532ae3 100644
--- a/hw/ne2000.c
+++ b/hw/ne2000.c
@@ -833,9 +833,10 @@ static void pci_ne2000_init(PCIDevice *pci_dev)
}
static PCIDeviceInfo ne2000_info = {
- .qdev.name = "ne2k_pci",
- .qdev.size = sizeof(PCINE2000State),
- .init = pci_ne2000_init,
+ .qdev.name = "ne2k_pci",
+ .qdev.size = sizeof(PCINE2000State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_ne2000_init,
};
static void ne2000_register_devices(void)
diff --git a/hw/pcnet.c b/hw/pcnet.c
index 22ab6be..fc84bc0 100644
--- a/hw/pcnet.c
+++ b/hw/pcnet.c
@@ -2144,6 +2144,7 @@ static SysBusDeviceInfo lance_info = {
.init = lance_init,
.qdev.name = "lance",
.qdev.size = sizeof(SysBusPCNetState),
+ .qdev.class = DEV_CLASS_NETWORK,
.qdev.props = (Property[]) {
{
.name = "dma",
@@ -2157,9 +2158,10 @@ static SysBusDeviceInfo lance_info = {
#endif /* TARGET_SPARC */
static PCIDeviceInfo pcnet_info = {
- .qdev.name = "pcnet",
- .qdev.size = sizeof(PCIPCNetState),
- .init = pci_pcnet_init,
+ .qdev.name = "pcnet",
+ .qdev.size = sizeof(PCIPCNetState),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_pcnet_init,
};
static void pcnet_register_devices(void)
diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index 91165db..d16269c 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -3500,9 +3500,10 @@ static void pci_rtl8139_init(PCIDevice *dev)
}
static PCIDeviceInfo rtl8139_info = {
- .qdev.name = "rtl8139",
- .qdev.size = sizeof(PCIRTL8139State),
- .init = pci_rtl8139_init,
+ .qdev.name = "rtl8139",
+ .qdev.size = sizeof(PCIRTL8139State),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = pci_rtl8139_init,
};
static void rtl8139_register_devices(void)
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 39e290d..d28d7b3 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -472,9 +472,10 @@ static PCIDeviceInfo virtio_info[] = {
.qdev.size = sizeof(VirtIOPCIProxy),
.init = virtio_blk_init_pci,
},{
- .qdev.name = "virtio-net-pci",
- .qdev.size = sizeof(VirtIOPCIProxy),
- .init = virtio_net_init_pci,
+ .qdev.name = "virtio-net-pci",
+ .qdev.size = sizeof(VirtIOPCIProxy),
+ .qdev.class = DEV_CLASS_NETWORK,
+ .init = virtio_net_init_pci,
},{
.qdev.name = "virtio-console-pci",
.qdev.size = sizeof(VirtIOPCIProxy),
--
1.6.2.5
- [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Gerd Hoffmann, 2009/07/09
- [Qemu-devel] [PATCH 2/5] qdev/class: tag sound, Gerd Hoffmann, 2009/07/09
- [Qemu-devel] [PATCH 4/5] qdev/class: helper function to get a list of drivers., Gerd Hoffmann, 2009/07/09
- [Qemu-devel] [PATCH 3/5] qdev/class: tag network,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 1/5] qdev/class: core, Gerd Hoffmann, 2009/07/09
- [Qemu-devel] [PATCH 5/5] qdev/class: make pci_nic_init() use qdev's device list., Gerd Hoffmann, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Paul Brook, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Gerd Hoffmann, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Paul Brook, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Gerd Hoffmann, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Anthony Liguori, 2009/07/09
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Gerd Hoffmann, 2009/07/10
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Paul Brook, 2009/07/10
- Re: [Qemu-devel] [PATCH 0/5] qdev: add driver class support., Gerd Hoffmann, 2009/07/10