]> Git Repo - qemu.git/commit - hw/virtio/virtio.c
virtio-bus: cleanup plug/unplug interface
authorPaolo Bonzini <[email protected]>
Fri, 20 Sep 2013 11:59:08 +0000 (13:59 +0200)
committerPaolo Bonzini <[email protected]>
Mon, 9 Dec 2013 20:46:48 +0000 (21:46 +0100)
commit5e96f5d2f8d2696ef7d2d8d7282c18fa6023470b
treee90b205656defa4bd7f36a22e37730ff060b2afd
parenta3fc66d9fd37acbfcee013692246a8ae42bd93bb
virtio-bus: cleanup plug/unplug interface

Right now we have these pairs:

- virtio_bus_plug_device/virtio_bus_destroy_device.  The first
  takes a VirtIODevice, the second takes a VirtioBusState

- device_plugged/device_unplug callbacks in the VirtioBusClass
  (here it's just the naming that is inconsistent)

- virtio_bus_destroy_device is not called by anyone (and since
  it calls qdev_free, it would be called by the proxies---but
  then the callback is useless since the proxies can do whatever
  they want before calling virtio_bus_destroy_device)

And there is a k->init but no k->exit, hence virtio_device_exit is
overwritten by subclasses (except virtio-9p).  This cleans it up by:

- renaming the device_unplug callback to device_unplugged

- renaming virtio_bus_plug_device to virtio_bus_device_plugged,
  matching the callback name

- renaming virtio_bus_destroy_device to virtio_bus_device_unplugged,
  removing the qdev_free, making it take a VirtIODevice and calling it
  from virtio_device_exit

- adding a k->exit callback

virtio_device_exit is still overwritten, the next patches will fix that.

Cc: [email protected]
Acked-by: Andreas Faerber <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
hw/virtio/virtio-bus.c
hw/virtio/virtio.c
include/hw/virtio/virtio-bus.h
include/hw/virtio/virtio.h
This page took 0.026395 seconds and 4 git commands to generate.