| commit | aa2623e36a91f5ded5a7b8bead23f5737a7b1855 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:13:47 +0000 (28 11:13 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:13:47 +0000 (28 11:13 +0000) | ||
| tree | 596737df1fb082be3ed614faae489831156635ec | treesnapshot (tar.gz zip) |
| parent | 73381a9478b9c1d761bfaa882de82d71c75ee7df | commitdiff |
pcnet: intermediate merge fixup
This commit doesn't build:
commit 76224833
pcnet: 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 76224833
pcnet: 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/pcnet.c | diffblobblamehistory |