Commit b356f76d authored by Jason Wang's avatar Jason Wang Committed by Anthony Liguori
Browse files

net: introduce qemu_get_queue() 



To support multiqueue, the patch introduce a helper qemu_get_queue()
which is used to get the NetClientState of a device. The following patches would
refactor this helper to support multiqueue.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 28a65891

hw/cadence_gem.c

+5 −4
Original line number Diff line number Diff line
@@ -389,10 +389,10 @@ static void gem_init_register_masks(GemState *s) 
 */

static void phy_update_link(GemState *s)

{

    DB_PRINT("down %d\n", s->nic->nc.link_down);

    DB_PRINT("down %d\n", qemu_get_queue(s->nic)->link_down);



    /* Autonegotiation status mirrors link status.  */

    if (s->nic->nc.link_down) {

    if (qemu_get_queue(s->nic)->link_down) {

        s->phy_regs[PHY_REG_STATUS] &= ~(PHY_REG_STATUS_ANEGCMPL |

                                         PHY_REG_STATUS_LINK);

        s->phy_regs[PHY_REG_INT_ST] |= PHY_REG_INT_ST_LINKC;
@@ -908,9 +908,10 @@ static void gem_transmit(GemState *s) 


            /* Send the packet somewhere */

            if (s->phy_loop) {

                gem_receive(&s->nic->nc, tx_packet, total_bytes);

                gem_receive(qemu_get_queue(s->nic), tx_packet, total_bytes);

            } else {

                qemu_send_packet(&s->nic->nc, tx_packet, total_bytes);

                qemu_send_packet(qemu_get_queue(s->nic), tx_packet,

                                 total_bytes);

            }



            /* Prepare for next packet */

hw/dp8393x.c

+5 −4
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ static void do_receiver_disable(dp8393xState *s) 


static void do_transmit_packets(dp8393xState *s)

{

    NetClientState *nc = qemu_get_queue(s->nic);

    uint16_t data[12];

    int width, size;

    int tx_len, len;
@@ -408,13 +409,13 @@ static void do_transmit_packets(dp8393xState *s) 
        if (s->regs[SONIC_RCR] & (SONIC_RCR_LB1 | SONIC_RCR_LB0)) {

            /* Loopback */

            s->regs[SONIC_TCR] |= SONIC_TCR_CRSL;

            if (s->nic->nc.info->can_receive(&s->nic->nc)) {

            if (nc->info->can_receive(nc)) {

                s->loopback_packet = 1;

                s->nic->nc.info->receive(&s->nic->nc, s->tx_buffer, tx_len);

                nc->info->receive(nc, s->tx_buffer, tx_len);

            }

        } else {

            /* Transmit packet */

            qemu_send_packet(&s->nic->nc, s->tx_buffer, tx_len);

            qemu_send_packet(nc, s->tx_buffer, tx_len);

        }

        s->regs[SONIC_TCR] |= SONIC_TCR_PTX;
@@ -903,7 +904,7 @@ void dp83932_init(NICInfo *nd, hwaddr base, int it_shift, 


    s->nic = qemu_new_nic(&net_dp83932_info, &s->conf, nd->model, nd->name, s);



    qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);

    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);

    qemu_register_reset(nic_reset, s);

    nic_reset(s);

hw/e1000.c

+12 −10
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void 
set_phy_ctrl(E1000State *s, int index, uint16_t val)

{

    if ((val & MII_CR_AUTO_NEG_EN) && (val & MII_CR_RESTART_AUTO_NEG)) {

        s->nic->nc.link_down = true;

        qemu_get_queue(s->nic)->link_down = true;

        e1000_link_down(s);

        s->phy_reg[PHY_STATUS] &= ~MII_SR_AUTONEG_COMPLETE;

        DBGOUT(PHY, "Start link auto negotiation\n");
@@ -178,7 +178,7 @@ static void 
e1000_autoneg_timer(void *opaque)

{

    E1000State *s = opaque;

    s->nic->nc.link_down = false;

    qemu_get_queue(s->nic)->link_down = false;

    e1000_link_up(s);

    s->phy_reg[PHY_STATUS] |= MII_SR_AUTONEG_COMPLETE;

    DBGOUT(PHY, "Auto negotiation is completed\n");
@@ -291,7 +291,7 @@ static void e1000_reset(void *opaque) 
    d->rxbuf_min_shift = 1;

    memset(&d->tx, 0, sizeof d->tx);



    if (d->nic->nc.link_down) {

    if (qemu_get_queue(d->nic)->link_down) {

        e1000_link_down(d);

    }
@@ -319,7 +319,7 @@ set_rx_control(E1000State *s, int index, uint32_t val) 
    s->rxbuf_min_shift = ((val / E1000_RCTL_RDMTS_QUAT) & 3) + 1;

    DBGOUT(RX, "RCTL: %d, mac_reg[RCTL] = 0x%x\n", s->mac_reg[RDT],

           s->mac_reg[RCTL]);

    qemu_flush_queued_packets(&s->nic->nc);

    qemu_flush_queued_packets(qemu_get_queue(s->nic));

}



static void
@@ -470,10 +470,11 @@ fcs_len(E1000State *s) 
static void

e1000_send_packet(E1000State *s, const uint8_t *buf, int size)

{

    NetClientState *nc = qemu_get_queue(s->nic);

    if (s->phy_reg[PHY_CTRL] & MII_CR_LOOPBACK) {

        s->nic->nc.info->receive(&s->nic->nc, buf, size);

        nc->info->receive(nc, buf, size);

    } else {

        qemu_send_packet(&s->nic->nc, buf, size);

        qemu_send_packet(nc, buf, size);

    }

}
@@ -958,7 +959,7 @@ set_rdt(E1000State *s, int index, uint32_t val) 
{

    s->mac_reg[index] = val & 0xffff;

    if (e1000_has_rxbufs(s, 1)) {

        qemu_flush_queued_packets(&s->nic->nc);

        qemu_flush_queued_packets(qemu_get_queue(s->nic));

    }

}
@@ -1112,10 +1113,11 @@ static bool is_version_1(void *opaque, int version_id) 
static int e1000_post_load(void *opaque, int version_id)

{

    E1000State *s = opaque;

    NetClientState *nc = qemu_get_queue(s->nic);



    /* nc.link_down can't be migrated, so infer link_down according

     * to link status bit in mac_reg[STATUS] */

    s->nic->nc.link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0;

    nc->link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0;



    return 0;

}
@@ -1247,7 +1249,7 @@ pci_e1000_uninit(PCIDevice *dev) 
    qemu_free_timer(d->autoneg_timer);

    memory_region_destroy(&d->mmio);

    memory_region_destroy(&d->io);

    qemu_del_net_client(&d->nic->nc);

    qemu_del_net_client(qemu_get_queue(d->nic));

}



static NetClientInfo net_e1000_info = {
@@ -1294,7 +1296,7 @@ static int pci_e1000_init(PCIDevice *pci_dev) 
    d->nic = qemu_new_nic(&net_e1000_info, &d->conf,

                          object_get_typename(OBJECT(d)), d->dev.qdev.id, d);



    qemu_format_nic_info_str(&d->nic->nc, macaddr);

    qemu_format_nic_info_str(qemu_get_queue(d->nic), macaddr);



    add_boot_device_path(d->conf.bootindex, &pci_dev->qdev, "/ethernet-phy@0");

hw/eepro100.c

+6 −6
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static void tx_command(EEPRO100State *s) 
        }

    }

    TRACE(RXTX, logout("%p sending frame, len=%d,%s\n", s, size, nic_dump(buf, size)));

    qemu_send_packet(&s->nic->nc, buf, size);

    qemu_send_packet(qemu_get_queue(s->nic), buf, size);

    s->statistics.tx_good_frames++;

    /* Transmit with bad status would raise an CX/TNO interrupt.

     * (82557 only). Emulation never has bad status. */
@@ -1036,7 +1036,7 @@ static void eepro100_ru_command(EEPRO100State * s, uint8_t val) 
        }

        set_ru_state(s, ru_ready);

        s->ru_offset = e100_read_reg4(s, SCBPointer);

        qemu_flush_queued_packets(&s->nic->nc);

        qemu_flush_queued_packets(qemu_get_queue(s->nic));

        TRACE(OTHER, logout("val=0x%02x (rx start)\n", val));

        break;

    case RX_RESUME:
@@ -1849,7 +1849,7 @@ static void pci_nic_uninit(PCIDevice *pci_dev) 
    memory_region_destroy(&s->flash_bar);

    vmstate_unregister(&pci_dev->qdev, s->vmstate, s);

    eeprom93xx_free(&pci_dev->qdev, s->eeprom);

    qemu_del_net_client(&s->nic->nc);

    qemu_del_net_client(qemu_get_queue(s->nic));

}



static NetClientInfo net_eepro100_info = {
@@ -1895,14 +1895,14 @@ static int e100_nic_init(PCIDevice *pci_dev) 
    s->nic = qemu_new_nic(&net_eepro100_info, &s->conf,

                          object_get_typename(OBJECT(pci_dev)), pci_dev->qdev.id, s);



    qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);

    TRACE(OTHER, logout("%s\n", s->nic->nc.info_str));

    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);

    TRACE(OTHER, logout("%s\n", qemu_get_queue(s->nic)->info_str));



    qemu_register_reset(nic_reset, s);



    s->vmstate = g_malloc(sizeof(vmstate_eepro100));

    memcpy(s->vmstate, &vmstate_eepro100, sizeof(vmstate_eepro100));

    s->vmstate->name = s->nic->nc.model;

    s->vmstate->name = qemu_get_queue(s->nic)->model;

    vmstate_register(&pci_dev->qdev, -1, s->vmstate, s);



    add_boot_device_path(s->conf.bootindex, &pci_dev->qdev, "/ethernet-phy@0");

hw/etraxfs_eth.c

+3 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int eth_tx_push(void *opaque, unsigned char *buf, int len, bool eop) 
    struct fs_eth *eth = opaque;



    D(printf("%s buf=%p len=%d\n", __func__, buf, len));

    qemu_send_packet(&eth->nic->nc, buf, len);

    qemu_send_packet(qemu_get_queue(eth->nic), buf, len);

    return len;

}
@@ -616,7 +616,8 @@ static int fs_eth_init(SysBusDevice *dev) 
    qemu_macaddr_default_if_unset(&s->conf.macaddr);

    s->nic = qemu_new_nic(&net_etraxfs_info, &s->conf,

                          object_get_typename(OBJECT(s)), dev->qdev.id, s);

    qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);

    qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);





    tdk_init(&s->phy);

    mdio_attach(&s->mdio_bus, &s->phy, s->phyaddr);