haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

pseries: Add cleanup hook for PAPR virtual LAN device

Browse source 
Currently the spapr-vlan device does not supply a cleanup call for its
NetClientInfo structure.  With current qemu versions, that leads to a SEGV
on exit, when net_cleanup() attempts to call the cleanup handlers on all
net clients.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
David Gibson 2013-02-10 18:59:02 +00:00 committed by Alexander Graf
parent 0bc472a9d6
commit 156dfaded8
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hw/spapr_llan.c
View file

@ -175,11 +175,19 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf,
return size; return size;
} }
static void spapr_vlan_cleanup(NetClientState *nc)
{
VIOsPAPRVLANDevice *dev = qemu_get_nic_opaque(nc);
dev->nic = NULL;
}
static NetClientInfo net_spapr_vlan_info = { static NetClientInfo net_spapr_vlan_info = {
.type = NET_CLIENT_OPTIONS_KIND_NIC, .type = NET_CLIENT_OPTIONS_KIND_NIC,
.size = sizeof(NICState), .size = sizeof(NICState),
.can_receive = spapr_vlan_can_receive, .can_receive = spapr_vlan_can_receive,
.receive = spapr_vlan_receive, .receive = spapr_vlan_receive,
.cleanup = spapr_vlan_cleanup,
}; };
static void spapr_vlan_reset(VIOsPAPRDevice *sdev) static void spapr_vlan_reset(VIOsPAPRDevice *sdev)