[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 08/28] virtio-net: add bootindex to qom property
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH v7 08/28] virtio-net: add bootindex to qom property |
Date: |
Fri, 5 Sep 2014 16:37:16 +0800 |
From: Gonglei <address@hidden>
Add a qom property with the same name 'bootindex',
when we remove it form qdev property, things will
continue to work just fine, and we can use qom features
which are not supported by qdev property.
Signed-off-by: Gonglei <address@hidden>
---
hw/net/virtio-net.c | 3 +++
hw/virtio/virtio-pci.c | 11 ++++++++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 826a2a5..f5f6bf7 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1716,6 +1716,9 @@ static void virtio_net_instance_init(Object *obj)
* Can be overriden with virtio_net_set_config_size.
*/
n->config_size = sizeof(struct virtio_net_config);
+ device_add_bootindex_property(obj, &n->nic_conf.bootindex,
+ "bootindex", "/address@hidden",
+ DEVICE(n), NULL);
}
static Property virtio_net_properties[] = {
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 78dcd68..0779d28 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1454,9 +1454,14 @@ static void virtio_net_pci_class_init(ObjectClass
*klass, void *data)
static void virtio_net_pci_instance_init(Object *obj)
{
VirtIONetPCI *dev = VIRTIO_NET_PCI(obj);
- object_initialize(&dev->vdev, sizeof(dev->vdev), TYPE_VIRTIO_NET);
- object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
- object_unref(OBJECT(&dev->vdev));
+ VirtIONet *n = &dev->vdev;
+
+ object_initialize(n, sizeof(dev->vdev), TYPE_VIRTIO_NET);
+ object_property_add_child(obj, "virtio-backend", OBJECT(n), NULL);
+ object_unref(OBJECT(n));
+ device_add_bootindex_property(obj, &n->nic_conf.bootindex,
+ "bootindex", "/address@hidden",
+ DEVICE(n), NULL);
}
static const TypeInfo virtio_net_pci_info = {
--
1.7.12.4
- [Qemu-devel] [PATCH v7 26/28] block: remove bootindex property from qdev to qom, (continued)
- [Qemu-devel] [PATCH v7 25/28] virtio-blk: add bootindex to qom property, arei.gonglei, 2014/09/05
- [Qemu-devel] [PATCH v7 28/28] bootindex: delete bootindex when device is removed, arei.gonglei, 2014/09/05
- [Qemu-devel] [PATCH v7 02/28] bootindex: add check bootindex function, arei.gonglei, 2014/09/05
- [Qemu-devel] [PATCH v7 04/28] fw_cfg: add fw_cfg_machine_reset function, arei.gonglei, 2014/09/05
- [Qemu-devel] [PATCH v7 08/28] virtio-net: add bootindex to qom property,
arei.gonglei <=
[Qemu-devel] [PATCH v7 06/28] bootindex: support to set a existent device's bootindex to -1, arei.gonglei, 2014/09/05
[Qemu-devel] [PATCH v7 01/28] bootdevice: move bootdevice related code to new file bootdevice.c, arei.gonglei, 2014/09/05
[Qemu-devel] [PATCH v7 10/28] eepro100: add bootindex to qom property, arei.gonglei, 2014/09/05
[Qemu-devel] [PATCH v7 12/28] pcnet: add bootindex to qom property, arei.gonglei, 2014/09/05
[Qemu-devel] [PATCH v7 27/28] bootindex: move calling add_boot_device_patch to bootindex setter function, arei.gonglei, 2014/09/05
[Qemu-devel] [PATCH v7 05/28] bootindex: rework add_boot_device_path function, arei.gonglei, 2014/09/05