Revision 4e68f7a0 hw/qdev-properties.c

b/hw/qdev-properties.c
584 584

  
585 585
static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
586 586
{
587
    VLANClientState *netdev = qemu_find_netdev(str);
587
    NetClientState *netdev = qemu_find_netdev(str);
588 588

  
589 589
    if (netdev == NULL) {
590 590
        return -ENOENT;
......
598 598

  
599 599
static const char *print_netdev(void *ptr)
600 600
{
601
    VLANClientState *netdev = ptr;
601
    NetClientState *netdev = ptr;
602 602

  
603 603
    return netdev->name ? netdev->name : "";
604 604
}
......
625 625

  
626 626
static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)
627 627
{
628
    VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
628
    NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
629 629

  
630 630
    if (*ptr) {
631 631
        int id;
......
642 642
{
643 643
    DeviceState *dev = DEVICE(obj);
644 644
    Property *prop = opaque;
645
    VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
645
    NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
646 646
    int32_t id = -1;
647 647

  
648 648
    if (*ptr) {
......
660 660
{
661 661
    DeviceState *dev = DEVICE(obj);
662 662
    Property *prop = opaque;
663
    VLANClientState **ptr = qdev_get_prop_ptr(dev, prop);
663
    NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
664 664
    Error *local_err = NULL;
665 665
    int32_t id;
666
    VLANClientState *hubport;
666
    NetClientState *hubport;
667 667

  
668 668
    if (dev->state != DEV_STATE_CREATED) {
669 669
        error_set(errp, QERR_PERMISSION_DENIED);
......
1186 1186
    assert_no_error(errp);
1187 1187
}
1188 1188

  
1189
void qdev_prop_set_netdev(DeviceState *dev, const char *name, VLANClientState *value)
1189
void qdev_prop_set_netdev(DeviceState *dev, const char *name, NetClientState *value)
1190 1190
{
1191 1191
    Error *errp = NULL;
1192 1192
    assert(!value || value->name);

Also available in: Unified diff