net/virtio: return error when device_opts arg is NULL
This fixes CID 1407222.
Fixes: 9711cd0dfc
("net/virtio: add failover support")
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
parent
150ab54aa6
commit
4d0e59ace2
|
@ -2880,9 +2880,12 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
|
||||||
QemuOpts *device_opts)
|
QemuOpts *device_opts)
|
||||||
{
|
{
|
||||||
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
|
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
|
||||||
bool match_found;
|
bool match_found = false;
|
||||||
bool hide;
|
bool hide = false;
|
||||||
|
|
||||||
|
if (!device_opts) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
n->primary_device_dict = qemu_opts_to_qdict(device_opts,
|
n->primary_device_dict = qemu_opts_to_qdict(device_opts,
|
||||||
n->primary_device_dict);
|
n->primary_device_dict);
|
||||||
if (n->primary_device_dict) {
|
if (n->primary_device_dict) {
|
||||||
|
@ -2890,7 +2893,7 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
|
||||||
n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
|
n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
|
||||||
"failover_pair_id"));
|
"failover_pair_id"));
|
||||||
}
|
}
|
||||||
if (device_opts && g_strcmp0(n->standby_id, n->netclient_name) == 0) {
|
if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
|
||||||
match_found = true;
|
match_found = true;
|
||||||
} else {
|
} else {
|
||||||
match_found = false;
|
match_found = false;
|
||||||
|
|
Loading…
Reference in a new issue