| commit | c04d0cc462b46fc84c5337ebd0eb5c49262be487 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:18:25 +0000 (28 11:18 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:18:25 +0000 (28 11:18 +0000) | ||
| tree | 34fcf8f087a9e3d1bda1cd8f9f69237b5c000fba | treesnapshot (tar.gz zip) |
| parent | 1368a6992925d51e48535ee9cc40fd6094d8acc2 | commitdiff |
eepro100: intermediate merge fixup
This commit doesn't build:
commit 508ef936
eepro100: 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 508ef936
eepro100: 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/eepro100.c | diffblobblamehistory |