| commit | f7acc077ba7b660db6e54c48fecdecfe77e5a01a | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:22:57 +0000 (28 11:22 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:22:57 +0000 (28 11:22 +0000) | ||
| tree | 873f8a1916a6385c4fefe32425c26fe98eb699d3 | treesnapshot (tar.gz zip) |
| parent | f533221d07e6af7d82d0265dda4e79b74bcf4df2 | commitdiff |
xilinx_ethlite: intermediate merge fixup
This commit doesn't build:
commit 17d1ae3cec597ac4642d504648203e3caef0fe45
xilinx_ethlite: 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 17d1ae3cec597ac4642d504648203e3caef0fe45
xilinx_ethlite: 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/xilinx_ethlite.c | diffblobblamehistory |