diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2013-02-10 18:59:02 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-03-08 21:04:44 +0100 |
| commit | 156dfaded87d718a9ea798083e1c3e5ea7526713 (patch) | |
| tree | 3a0d92cc3bf077a35f23d777cb01784917caa739 /hw | |
| parent | 0bc472a9d6b80567c212023c5eae413f4dfb53ad (diff) | |
| download | hqemu-156dfaded87d718a9ea798083e1c3e5ea7526713.zip hqemu-156dfaded87d718a9ea798083e1c3e5ea7526713.tar.gz | |
pseries: Add cleanup hook for PAPR virtual LAN device
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/spapr_llan.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c index 6ef2936..0ace2eb 100644 --- a/hw/spapr_llan.c +++ b/hw/spapr_llan.c @@ -175,11 +175,19 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf, 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 = { .type = NET_CLIENT_OPTIONS_KIND_NIC, .size = sizeof(NICState), .can_receive = spapr_vlan_can_receive, .receive = spapr_vlan_receive, + .cleanup = spapr_vlan_cleanup, }; static void spapr_vlan_reset(VIOsPAPRDevice *sdev) |
