diff options
| -rw-r--r-- | net.c | 39 |
1 files changed, 22 insertions, 17 deletions
@@ -748,12 +748,15 @@ int net_handle_fd_param(Monitor *mon, const char *param) return fd; } -static int net_init_nic(QemuOpts *opts, const NetClientOptions *new_opts, +static int net_init_nic(QemuOpts *old_opts, const NetClientOptions *opts, const char *name, VLANState *vlan) { int idx; NICInfo *nd; - const char *netdev; + const NetLegacyNicOptions *nic; + + assert(opts->kind == NET_CLIENT_OPTIONS_KIND_NIC); + nic = opts->nic; idx = nic_get_free_idx(); if (idx == -1 || nb_nics >= MAX_NICS) { @@ -765,10 +768,10 @@ static int net_init_nic(QemuOpts *opts, const NetClientOptions *new_opts, memset(nd, 0, sizeof(*nd)); - if ((netdev = qemu_opt_get(opts, "netdev"))) { - nd->netdev = qemu_find_netdev(netdev); + if (nic->has_netdev) { + nd->netdev = qemu_find_netdev(nic->netdev); if (!nd->netdev) { - error_report("netdev '%s' not found", netdev); + error_report("netdev '%s' not found", nic->netdev); return -1; } } else { @@ -778,26 +781,28 @@ static int net_init_nic(QemuOpts *opts, const NetClientOptions *new_opts, if (name) { nd->name = g_strdup(name); } - if (qemu_opt_get(opts, "model")) { - nd->model = g_strdup(qemu_opt_get(opts, "model")); + if (nic->has_model) { + nd->model = g_strdup(nic->model); } - if (qemu_opt_get(opts, "addr")) { - nd->devaddr = g_strdup(qemu_opt_get(opts, "addr")); + if (nic->has_addr) { + nd->devaddr = g_strdup(nic->addr); } - if (qemu_opt_get(opts, "macaddr") && - net_parse_macaddr(nd->macaddr.a, qemu_opt_get(opts, "macaddr")) < 0) { + if (nic->has_macaddr && + net_parse_macaddr(nd->macaddr.a, nic->macaddr) < 0) { error_report("invalid syntax for ethernet address"); return -1; } qemu_macaddr_default_if_unset(&nd->macaddr); - nd->nvectors = qemu_opt_get_number(opts, "vectors", - DEV_NVECTORS_UNSPECIFIED); - if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED && - (nd->nvectors < 0 || nd->nvectors > 0x7ffffff)) { - error_report("invalid # of vectors: %d", nd->nvectors); - return -1; + if (nic->has_vectors) { + if (nic->vectors > 0x7ffffff) { + error_report("invalid # of vectors: %"PRIu32, nic->vectors); + return -1; + } + nd->nvectors = nic->vectors; + } else { + nd->nvectors = DEV_NVECTORS_UNSPECIFIED; } nd->used = 1; |