virtio-net-x: forward the netclient name and type.
This forwards the name and the type of virtio-net-x to fix the bad behaviour of "info network" command. Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Message-id: 1368619970-23892-3-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
8a253ec26e
commit
800ced8cac
|
@ -152,10 +152,13 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev)
|
||||||
|
|
||||||
static int s390_virtio_net_init(VirtIOS390Device *s390_dev)
|
static int s390_virtio_net_init(VirtIOS390Device *s390_dev)
|
||||||
{
|
{
|
||||||
|
DeviceState *qdev = DEVICE(s390_dev);
|
||||||
VirtIONetS390 *dev = VIRTIO_NET_S390(s390_dev);
|
VirtIONetS390 *dev = VIRTIO_NET_S390(s390_dev);
|
||||||
DeviceState *vdev = DEVICE(&dev->vdev);
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
|
||||||
virtio_net_set_config_size(&dev->vdev, s390_dev->host_features);
|
virtio_net_set_config_size(&dev->vdev, s390_dev->host_features);
|
||||||
|
virtio_net_set_netclient_name(&dev->vdev, qdev->id,
|
||||||
|
object_get_typename(OBJECT(qdev)));
|
||||||
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&s390_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -550,10 +550,13 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev)
|
||||||
|
|
||||||
static int virtio_ccw_net_init(VirtioCcwDevice *ccw_dev)
|
static int virtio_ccw_net_init(VirtioCcwDevice *ccw_dev)
|
||||||
{
|
{
|
||||||
|
DeviceState *qdev = DEVICE(ccw_dev);
|
||||||
VirtIONetCcw *dev = VIRTIO_NET_CCW(ccw_dev);
|
VirtIONetCcw *dev = VIRTIO_NET_CCW(ccw_dev);
|
||||||
DeviceState *vdev = DEVICE(&dev->vdev);
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
|
||||||
virtio_net_set_config_size(&dev->vdev, ccw_dev->host_features[0]);
|
virtio_net_set_config_size(&dev->vdev, ccw_dev->host_features[0]);
|
||||||
|
virtio_net_set_netclient_name(&dev->vdev, qdev->id,
|
||||||
|
object_get_typename(OBJECT(qdev)));
|
||||||
qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -1398,10 +1398,13 @@ static Property virtio_net_properties[] = {
|
||||||
|
|
||||||
static int virtio_net_pci_init(VirtIOPCIProxy *vpci_dev)
|
static int virtio_net_pci_init(VirtIOPCIProxy *vpci_dev)
|
||||||
{
|
{
|
||||||
|
DeviceState *qdev = DEVICE(vpci_dev);
|
||||||
VirtIONetPCI *dev = VIRTIO_NET_PCI(vpci_dev);
|
VirtIONetPCI *dev = VIRTIO_NET_PCI(vpci_dev);
|
||||||
DeviceState *vdev = DEVICE(&dev->vdev);
|
DeviceState *vdev = DEVICE(&dev->vdev);
|
||||||
|
|
||||||
virtio_net_set_config_size(&dev->vdev, vpci_dev->host_features);
|
virtio_net_set_config_size(&dev->vdev, vpci_dev->host_features);
|
||||||
|
virtio_net_set_netclient_name(&dev->vdev, qdev->id,
|
||||||
|
object_get_typename(OBJECT(qdev)));
|
||||||
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
|
qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));
|
||||||
if (qdev_init(vdev) < 0) {
|
if (qdev_init(vdev) < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in a new issue