| commit | 5f261285e88c1ca556ea561364a2b1d49474c577 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:23:58 +0000 (28 11:23 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:23:58 +0000 (28 11:23 +0000) | ||
| tree | 96e42dbbd16ff66b2216fab78845a0d20f551923 | treesnapshot (tar.gz zip) |
| parent | 20662ae7e254bcf004fc205d208af66b6b99e5a7 | commitdiff |
stellaris_enet: intermediate merge fixup
This commit doesn't build:
commit 540f006a23085230c12c3cbcbd2bd774be0eb28e
stellaris_enet: use qdev properties for configuration.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
because NET_CLIENT_TYPE_NIC isn't yet defined and qemu_new_vlan_client()
doesn't yet have a receive_raw parameter.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
This commit doesn't build:
commit 540f006a23085230c12c3cbcbd2bd774be0eb28e
stellaris_enet: use qdev properties for configuration.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
because NET_CLIENT_TYPE_NIC isn't yet defined and qemu_new_vlan_client()
doesn't yet have a receive_raw parameter.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| hw/stellaris_enet.c | diffblobblamehistory |