diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:35:37 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-05-23 22:35:37 +0200 |
| commit | 5db070eb1ab902572e46ed09e5947ffe504522bc (patch) | |
| tree | 6bfd837872aad6fb3f07a283208befa1dbba1c39 /hw/spapr_llan.c | |
| parent | 05c8a1e423736006580e4dd2bd94d0faafc9afdc (diff) | |
| parent | decb471488dd9e7e7ab9957f120cb501c4489f63 (diff) | |
| download | qemu-5db070eb1ab902572e46ed09e5947ffe504522bc.zip qemu-5db070eb1ab902572e46ed09e5947ffe504522bc.tar.gz qemu-5db070eb1ab902572e46ed09e5947ffe504522bc.tar.bz2 | |
Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
* 'ppc-next' of git://repo.or.cz/qemu/agraf:
Fix a bug in mtsr/mtsrin emulation on ppc64
pSeries: Clean up write-only variables
w32: Fix compilation and replace non-portable usage of ulong
Diffstat (limited to 'hw/spapr_llan.c')
| -rw-r--r-- | hw/spapr_llan.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c index ff3a78f..c18efc7 100644 --- a/hw/spapr_llan.c +++ b/hw/spapr_llan.c @@ -185,9 +185,6 @@ static NetClientInfo net_spapr_vlan_info = { static int spapr_vlan_init(VIOsPAPRDevice *sdev) { VIOsPAPRVLANDevice *dev = (VIOsPAPRVLANDevice *)sdev; - VIOsPAPRBus *bus; - - bus = DO_UPCAST(VIOsPAPRBus, bus, sdev->qdev.parent_bus); qemu_macaddr_default_if_unset(&dev->nicconf.macaddr); |