| commit | 3c7de1079d1b86fde83af0e70f346d3b5eac3f4d | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:17:07 +0000 (28 11:17 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:17:07 +0000 (28 11:17 +0000) | ||
| tree | f3334c5bd6305fdac1c7efb05e4fe108b90f6ced | treesnapshot (tar.gz zip) |
| parent | b4aeab9644202271640c43e915a1f38240bfa7d1 | commitdiff |
virtio: intermediate merge fixup
This commit doesn't build:
commit 97b15621
virtio: 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 97b15621
virtio: 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/virtio-net.c | diffblobblamehistory |