qemu/qdev: type safety in reset handler
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 qemu/qdev: type safety in reset handler
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
--- hw/qdev.c | 10 ++++++++-- hw/qdev.h | 3 ++- hw/rtl8139.c | 10 +++++++--- hw/tcx.c | 11 +++++++---- 4 files changed, 24 insertions(+), 10 deletions(-)
hw/qdev.c +8 -2
@@ -209,6 +209,12 @@ DeviceState *qdev_device_add(QemuOpts *opts)return qdev; } +static void qdev_reset (void *opaque) +{ +DeviceState *dev = opaque; + dev->info->reset (dev); +} +/* Initialize a device. Device properties should be set before calling this function. IRQs and MMIO regions should be connected/mapped after calling this function. */
@@ -220,7 +226,7 @@ int qdev_init(DeviceState *dev)if (rc <0 )return rc;if (dev->info->reset) -qemu_register_reset (dev->info->reset, dev); +qemu_register_reset (qdev_reset, dev);if (dev->info->vmsd)vmstate_register (-1 , dev->info->vmsd, dev);return 0 ;
@@ -234,7 +240,7 @@ void qdev_free(DeviceState *dev)vmstate_unregister (dev->info->vmsd, dev);#endif if (dev->info->reset) -qemu_unregister_reset (dev->info->reset, dev); +qemu_unregister_reset (qdev_reset, dev);QLIST_REMOVE (dev, sibling);qemu_free (dev); }
hw/qdev.h +2 -1
@@ -100,6 +100,7 @@ BusState *qdev_get_child_bus(DeviceState *dev, const char *name);/*** Device API. ***/ typedef int (*qdev_initfn )(DeviceState *dev,DeviceInfo *info); +typedef void (*qdev_resetfn )(DeviceState *dev);struct DeviceInfo {const char *name;
@@ -110,7 +111,7 @@ struct DeviceInfo {int no_user;/* callbacks */ -QEMUResetHandler *reset; +qdev_resetfn reset;/* device state */ const VMStateDescription *vmsd;
hw/rtl8139.c +7 -3
@@ -1173,9 +1173,8 @@ static void rtl8139_reset_rxring(RTL8139State *s, uint32_t bufferSize) s->RxBufAddr =0 ; } -static void rtl8139_reset (void *opaque) +static void rtl8139_reset (RTL8139State *s) { -RTL8139State *s = opaque;int i;/* restore MAC address */
@@ -3488,10 +3487,15 @@ static int pci_rtl8139_init(PCIDevice *dev)return 0 ; } +static void pci_rtl8139_reset (struct DeviceState *d) +{ +rtl8139_reset (container_of (d, RTL8139State, dev.qdev)); +} +static PCIDeviceInfo rtl8139_info = { .qdev.name ="rtl8139" , .qdev.size =sizeof (RTL8139State), - .qdev.reset = rtl8139_reset, + .qdev.reset = pci_rtl8139_reset, .init = pci_rtl8139_init, };
hw/tcx.c +7 -4
@@ -411,10 +411,8 @@ static const VMStateDescription vmstate_tcx = { } }; -static void tcx_reset (void *opaque) +static void tcx_reset (TCXState *s) { -TCXState *s = opaque; -/* Initialize palette */ memset (s->r,0 ,256 );memset (s->g,0 ,256 );
@@ -628,11 +626,16 @@ static void tcx24_screen_dump(void *opaque, const char *filename)return ; } +static void reset_tcx (struct DeviceState *d) +{ +tcx_reset (container_of (d, TCXState, busdev.qdev)); +} +static SysBusDeviceInfo tcx_info = { .init = tcx_init1, .qdev.name ="SUNW,tcx" , .qdev.size =sizeof (TCXState), - .qdev.reset = tcx_reset, + .qdev.reset = reset_tcx, .qdev.vmsd = &vmstate_tcx, .qdev.props = (Property []) {DEFINE_PROP_TADDR ("addr" , TCXState, addr,-1 ),
Signature · 1 line
1.6.2.5
Quoted 4 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
Signed-off-by Michael S. Tsirkin<[email protected]>
Nice.
cheers,
Gerd
Quoted 2 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
The function seems a bit unnecessary, how about instead:
static void rtl8139_reset(struct DeviceState *d)
{
RTL8139State *s = container_of(d, RTL8139State, dev.qdev);?
Quoted 5 lines · Blue Swirl
Quoted 2 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
The function seems a bit unnecessary,
which function?
Quoted 1 line
how about instead:
instead of which one?
Quoted 5 lines
static void
rtl8139_reset(struct DeviceState *d){ RTL8139State *s = container_of(d, RTL8139State, dev.qdev);?
Quoted 5 lines · Michael S. Tsirkin
Quoted 4 lines · Blue Swirl
Quoted 2 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
Quoted 11 lines
Quoted 1 line
The function seems a bit unnecessary,
which function?
Quoted 1 line
how about instead:
instead of which one?
Quoted 3 lines
static void
rtl8139_reset(struct DeviceState *d){ RTL8139State *s = container_of(d, RTL8139State, dev.qdev);
He means not introducing pci_rtl8139_reset.
Paolo
Quoted 14 lines · Paolo Bonzini
Quoted 13 lines · Michael S. Tsirkin
Quoted 5 lines · Blue Swirl
Quoted 2 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
The function seems a bit unnecessary,
which function?
Quoted 1 line
how about instead:
instead of which one?
Quoted 7 lines
Quoted 3 lines
Quoted 3 lines
static void
rtl8139_reset(struct DeviceState *d){ RTL8139State *s = container_of(d, RTL8139State, dev.qdev);He means not introducing
pci_rtl8139_reset.Paolo
Several places in this file use the variant that gets RTL8139State, to me it seems nicer to have that in a single place.
Signature · 1 line
MST
Quoted 8 lines · Michael S. Tsirkin
Quoted 4 lines · Paolo Bonzini
He means not introducing
pci_rtl8139_reset.Paolo
Several places in this file use the variant that gets RTL8139State, to me it seems nicer to have that in a single place.
How about creating a helper macro to go from ${device}State to DeviceState, then kill the wrapper function? i.e something like this:
#define TO_QDEV_STATE(state) (&((state)->dev.qdev))
Then have one reset function which accepts DeviceState. The call sites which have RTL8139State at hand can use rtl8139_reset(TO_QDEV_STATE(s));
cheers,
Gerd
Quoted 13 lines · Gerd Hoffmann
Quoted 8 lines · Michael S. Tsirkin
Quoted 4 lines · Paolo Bonzini
He means not introducing
pci_rtl8139_reset.Paolo
Several places in this file use the variant that gets RTL8139State, to me it seems nicer to have that in a single place.
How about creating a helper macro to go from ${device}State to DeviceState, then kill the wrapper function? i.e something like this:
Quoted 7 lines
#define
TO_QDEV_STATE(state)(&((state)->dev.qdev))Then have one reset function which accepts DeviceState. The call sites which have RTL8139State at hand can use rtl8139_reset(TO_QDEV_STATE(s));
cheers,
Gerd
OK, since people feel strongly about it,
I killed the reset function.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 20 lines · Juan Quintela
Quoted 19 lines · Michael S. Tsirkin
Add type safety to qdev reset handlers, by declaring them as DeviceState * rather than void *.
Signed-off-by Michael S. Tsirkin <[email protected]>--- hw/qdev.c | 10 ++++++++-- hw/qdev.h | 3 ++- hw/rtl8139.c | 10 +++++++--- hw/tcx.c | 11 +++++++---- 4 files changed, 24 insertions(+), 10 deletions(-)hw/qdev.c +0
-0@@ -209,6 +209,12 @@ DeviceState *qdev_device_add(QemuOpts *opts)return qdev; }
Quoted 8 lines
hw/qdev.c DeviceState *qdev_device_add(QemuOpts *opts) · line 217
Quoted 6 lines
hw/qdev.c +6
-0+static void qdev_reset (void *opaque) +{ +DeviceState *dev = opaque; + dev->info->reset (dev); +} +Is there a plan to remove
qdev_resetin the future?
When all devices are converted to qdev,
we can convert opaque to DeviceState.
Quoted 6 lines
Quoted 6 lines
hw/qdev.c +0
-0/* Initialize a device. Device properties should be set before calling this function. IRQs and MMIO regions should be connected/mapped after calling this function. */ @@ -220,7 +226,7 @@ int qdev_init(DeviceState *dev)if (rc <0 )return rc;
Quoted 8 lines
hw/qdev.c int qdev_init(DeviceState *dev) · line 229
Quoted 3 lines
hw/qdev.c +1
-1if (dev->info->reset) -qemu_register_reset (dev->info->reset, dev); +qemu_register_reset (qdev_reset, dev);Otherwise, I prefer the old version. We test if there exist
dev->info->reset
and just after that, we use
dev->info->reset()
Good point. I think I'll just move the if (dev->info->reset) into qdev_reset.
Quoted 9 lines
If the plan is to add type checking to the system, they I would like to do something like the patch attached (not compiled, just the idea).
Add a
qdev_register_reset()that takes a dev.
And at reset time, if there is a dev parameter, we call its reset function (all with typecheking), and we maintain the func + opaque until everyting is ported (no, I don't now if that will ever happens either)For users, normal
DO_UPCAST()will do the trick on the reset handler.
As you say, we don't know if everything will ever be ported to your proposed way. Keeping both around seems much worse than using a void *.
vl.c typedef struct QEMUResetEntry { · line 3201
Quoted 10 lines
Later, Juan.
vl.c +1
-0@@ -3198,6 +3198,7 @@ typedef struct QEMUResetEntry {QTAILQ_ENTRY (QEMUResetEntry) entry;QEMUResetHandler *func;void *opaque; +DeviceState *dev;
So we have both opaque and dev, pointing to the same device. dev is used only for reset, and opaque for everything else. And dev takes precedence if it is set, opaque is ignored on reset, but if not, opaque is used. At a minimum, all these rules should be documented?
Quoted 34 lines
vl.c +16
-1} QEMUResetEntry; static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =@@ -3259,6 +3260,18 @@ void qemu_register_reset(QEMUResetHandler *func, void *opaque) re->func = func; re->opaque = opaque; + re->dev =NULL ; +QTAILQ_INSERT_TAIL (&reset_handlers, re, entry); +} + +void qdev_register_reset (DeviceState *dev) +{ +QEMUResetEntry *re =qemu_mallocz (sizeof (QEMUResetEntry)); + + re->func =NULL ; + re->opaque =NULL ; + re->dev = dev; +QTAILQ_INSERT_TAIL (&reset_handlers, re, entry); }@@ -3281,7 +3294,10 @@ void qemu_system_reset(void)/* reset all devices */ QTAILQ_FOREACH_SAFE(re, &reset_handlers, entry, nre) { - re->func (re->opaque); +if (re->dev) + re->dev->info->reset (re->dev); +else + re->func (re->opaque); } }
Hi,
Quoted 7 lines
Quoted 4 lines
Otherwise, I prefer the old version. We test if there exist
dev->info->reset
and just after that, we use
dev->info->reset()Good point. I think I'll just move the if (
dev->info->reset) intoqdev_reset.
How about going one step further? Register *one* qdev_reset instance which then walks the qdev tree and calls ->reset() for every device?
cheers,
Gerd
Quoted 7 lines · Gerd Hoffmann
Hi,
Quoted 5 lines
Quoted 4 lines
Otherwise, I prefer the old version. We test if there exist
dev->info->reset
and just after that, we use
dev->info->reset()
Quoted 5 lines
Quoted 2 lines
Good point. I think I'll just move the if (
dev->info->reset) intoqdev_reset.How about going one step further? Register *one*
qdev_resetinstance which then walks the qdev tree and calls ->reset() for every device?
Will be much more code. Why not reuse the existing queue?
Quoted 2 lines
cheers,
Gerd
Quoted 4 lines · Michael S. Tsirkin
Quoted 2 lines
How about going one step further? Register *one*
qdev_resetinstance which then walks the qdev tree and calls ->reset() for every device?Will be much more code. Why not reuse the existing queue?
I think we'll need such a tree walker anyway sooner or later. Thus you'll get bonus points for making it generic, so it could be used for a -- say -- late_init() callback too.
Also the reset() callbacks order will be based on the position of the device in the tree instead of being more or less random.
cheers,
Gerd
Quoted 10 lines · Gerd Hoffmann
Quoted 4 lines · Michael S. Tsirkin
Quoted 2 lines
How about going one step further? Register *one*
qdev_resetinstance which then walks the qdev tree and calls ->reset() for every device?Will be much more code. Why not reuse the existing queue?
I think we'll need such a tree walker anyway sooner or later. Thus you'll get bonus points for making it generic, so it could be used for a -- say --
late_init()callback too.
Quoted 5 lines
Also the
reset()callbacks order will be based on the position of the device in the tree instead of being more or less random.cheers,
Gerd
Better make it a separate patch, later.
For now, I'm just addressing the type safety.
Signature · 1 line
MST
Quoted 11 lines · Michael S. Tsirkin
Quoted 10 lines · Gerd Hoffmann
Quoted 4 lines · Michael S. Tsirkin
Quoted 2 lines
How about going one step further? Register *one*
qdev_resetinstance which then walks the qdev tree and calls ->reset() for every device?Will be much more code. Why not reuse the existing queue?
I think we'll need such a tree walker anyway sooner or later. Thus you'll get bonus points for making it generic, so it could be used for a -- say --
late_init()callback too.
Quoted 8 lines
Quoted 5 lines
Also the
reset()callbacks order will be based on the position of the device in the tree instead of being more or less random.cheers,
GerdBetter make it a separate patch, later.
For now, I'm just addressing the type safety.
To clarify: I don't know enough about qdev to see how easy it is. Care to send a patch on top of mine?
Quoted 2 lines
Signature · 1 line
MST
Quoted 9 lines · Gerd Hoffmann
Quoted 4 lines · Michael S. Tsirkin
Quoted 2 lines
How about going one step further? Register *one*
qdev_resetinstance which then walks the qdev tree and calls ->reset() for every device?Will be much more code. Why not reuse the existing queue?
I think we'll need such a tree walker anyway sooner or later. Thus you'll get bonus points for making it generic, so it could be used for a -- say --
late_init()callback too.
By the way, for save/restore, we have there:
void qdev_free(DeviceState *dev)
{
#if 0 /* FIXME: need sane vmstate_unregister function */
if (dev->info->vmsd)
vmstate_unregister(dev->info->vmsd, dev);
#endif
QLIST_REMOVE(dev, sibling);
qemu_free(dev);
}which likely means that qemu will crash on migration if a qdev device has been removed. Anyone looking at fixing this?
Quoted 3 lines
Also the
reset()callbacks order will be based on the position of the device in the tree instead of being more or less random.
Not sure whether this can break anything. If no because no one cares about the order, why change it now?
Quoted 2 lines
cheers,
Gerd
PATCH 2/2 qemu/virtio: fix reset with device removal
In reply to a message not in the archivevirtio pci registers its own reset handler, but fails to unregister it, which will lead to crashes after device removal. Solve this problem by switching to qdev reset handler, which is automatically unregistered.
--- hw/virtio-pci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
hw/virtio-pci.c +10 -4
@@ -155,9 +155,8 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f)return 0 ; } -static void virtio_pci_reset (void *opaque) +static void virtio_pci_reset (VirtIOPCIProxy *proxy) { -VirtIOPCIProxy *proxy = opaque;virtio_reset (proxy->vdev);msix_reset (&proxy->pci_dev); }
@@ -429,8 +428,6 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,pci_register_bar (&proxy->pci_dev,0 , size,PCI_ADDRESS_SPACE_IO , virtio_map); -qemu_register_reset (virtio_pci_reset, proxy); -virtio_bind_device (vdev, &virtio_pci_bindings, proxy); }
@@ -514,6 +511,11 @@ static int virtio_balloon_init_pci(PCIDevice *pci_dev)return 0 ; } +static void virtio_reset_pci (DeviceState *d) +{ +virtio_pci_reset (container_of (d, VirtIOPCIProxy, pci_dev.qdev)); +} +static PCIDeviceInfo virtio_info[] = { { .qdev.name ="virtio-blk-pci" ,
@@ -525,6 +527,7 @@ static PCIDeviceInfo virtio_info[] = {DEFINE_PROP_UINT32 ("vectors" , VirtIOPCIProxy, nvectors,2 ), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name ="virtio-net-pci" , .qdev.size = sizeof(VirtIOPCIProxy),
@@ -534,6 +537,7 @@ static PCIDeviceInfo virtio_info[] = { NIC_NVECTORS_UNSPECIFIED), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name = "virtio-console-pci", .qdev.size = sizeof(VirtIOPCIProxy),
@@ -542,10 +546,12 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name = "virtio-balloon-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, + .qdev.reset = virtio_reset_pci, },{/* end of list */ }
Signature · 1 line
1.6.2.5
[Qemu-devel] Re: [PATCH 2/2] qemu/virtio: fix reset with device removal
Quoted 3 lines · Michael S. Tsirkin
virtio pci registers its own reset handler, but fails to unregister it, which will lead to crashes after device removal. Solve this problem by switching to qdev reset handler, which is automatically unregistered.
Looks good.
cheers,
Gerd