Merge commit '97b156213e0e38b29da4480a32d4ec33d14d3012' into upstream-merge
commitb4aeab9644202271640c43e915a1f38240bfa7d1
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:16:45 +0000 (28 11:16 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:16:45 +0000 (28 11:16 +0000)
treeee38956c5e3d551154a5b587d8b8cdbab383db55
parent68e74b1e620c31faabd9d8ef72d13700c6640858
parent97b156213e0e38b29da4480a32d4ec33d14d3012
Merge commit '97b156213e0e38b29da4480a32d4ec33d14d3012' into upstream-merge

* commit '97b156213e0e38b29da4480a32d4ec33d14d3012':
  virtio: use qdev properties for configuration.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
hw/virtio-net.c