[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/34] pcnet: add bootindex to qom property
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 12/34] pcnet: add bootindex to qom property |
Date: |
Wed, 15 Oct 2014 11:05:45 +0200 |
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>
Reviewed-by: Gerd Hoffmann <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/net/lance.c | 12 ++++++++++++
hw/net/pcnet-pci.c | 12 ++++++++++++
hw/net/pcnet.h | 1 -
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/hw/net/lance.c b/hw/net/lance.c
index 7811a9e..a1c49f1 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -42,6 +42,7 @@
#include "hw/sparc/sun4m.h"
#include "pcnet.h"
#include "trace.h"
+#include "sysemu/sysemu.h"
#define TYPE_LANCE "lance"
#define SYSBUS_PCNET(obj) \
@@ -143,6 +144,16 @@ static void lance_reset(DeviceState *dev)
pcnet_h_reset(&d->state);
}
+static void lance_instance_init(Object *obj)
+{
+ SysBusPCNetState *d = SYSBUS_PCNET(obj);
+ PCNetState *s = &d->state;
+
+ device_add_bootindex_property(obj, &s->conf.bootindex,
+ "bootindex", "/address@hidden",
+ DEVICE(obj), NULL);
+}
+
static Property lance_properties[] = {
DEFINE_PROP_PTR("dma", SysBusPCNetState, state.dma_opaque),
DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf),
@@ -169,6 +180,7 @@ static const TypeInfo lance_info = {
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusPCNetState),
.class_init = lance_class_init,
+ .instance_init = lance_instance_init,
};
static void lance_register_types(void)
diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index 50ffe91..fb5f5d6 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -32,6 +32,7 @@
#include "hw/loader.h"
#include "qemu/timer.h"
#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
#include "pcnet.h"
@@ -344,6 +345,16 @@ static void pci_reset(DeviceState *dev)
pcnet_h_reset(&d->state);
}
+static void pcnet_instance_init(Object *obj)
+{
+ PCIPCNetState *d = PCI_PCNET(obj);
+ PCNetState *s = &d->state;
+
+ device_add_bootindex_property(obj, &s->conf.bootindex,
+ "bootindex", "/address@hidden",
+ DEVICE(obj), NULL);
+}
+
static Property pcnet_properties[] = {
DEFINE_NIC_PROPERTIES(PCIPCNetState, state.conf),
DEFINE_PROP_END_OF_LIST(),
@@ -372,6 +383,7 @@ static const TypeInfo pcnet_info = {
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIPCNetState),
.class_init = pcnet_class_init,
+ .instance_init = pcnet_instance_init,
};
static void pci_pcnet_register_types(void)
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index 9dee6f3..f8e8a6f 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -66,5 +66,4 @@ void pcnet_set_link_status(NetClientState *nc);
void pcnet_common_cleanup(PCNetState *d);
int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info);
extern const VMStateDescription vmstate_pcnet;
-
#endif
--
1.8.3.1
- [Qemu-devel] [PULL 06/34] bootindex: support to set a existent device's bootindex to -1, (continued)
- [Qemu-devel] [PULL 06/34] bootindex: support to set a existent device's bootindex to -1, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 17/34] net: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 08/34] virtio-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 11/34] ne2000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 15/34] vmxnet3: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 31/34] ide: add calling add_boot_device_patch in bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 18/34] virtio-net: alias bootindex property explicitly for virt-net-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 14/34] spapr_lian: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 09/34] e1000: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 07/34] bootindex: add a setter/getter functions wrapper for bootindex property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 12/34] pcnet: add bootindex to qom property,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 04/34] fw_cfg: add fw_cfg_machine_reset function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 22/34] redirect: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 30/34] nvma: ide: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 32/34] bootindex: move calling add_boot_device_patch to bootindex setter function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 34/34] bootindex: change fprintf to error_report, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 05/34] bootindex: rework add_boot_device_path function, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 28/34] virtio-blk: alias bootindex property explicitly for virt-blk-pci/ccw/s390, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 10/34] eepro100: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 16/34] usb-net: add bootindex to qom property, Gerd Hoffmann, 2014/10/15
- [Qemu-devel] [PULL 20/34] pci-assign: remove bootindex property from qdev to qom, Gerd Hoffmann, 2014/10/15