From: Asias He Date: Mon, 31 Oct 2011 14:39:41 +0000 (+0800) Subject: kvm tools: Fix ndev mutex and condition variable initialization X-Git-Tag: next-20111101~5^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69cc462c90491ae54d7cc9463531781d4334e845;p=karo-tx-linux.git kvm tools: Fix ndev mutex and condition variable initialization This patch fixes the initialization of the following variables: ndev->io_tx_lock ndev->io_rx_lock ndev->io_tx_cond ndev->io_rx_cond Signed-off-by: Asias He Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c index 1b59972e18fd..7cd6794f941f 100644 --- a/tools/kvm/virtio/net.c +++ b/tools/kvm/virtio/net.c @@ -248,14 +248,14 @@ fail: static void virtio_net__io_thread_init(struct kvm *kvm, struct net_dev *ndev) { + pthread_mutex_init(&ndev->io_tx_lock, NULL); pthread_mutex_init(&ndev->io_rx_lock, NULL); - pthread_cond_init(&ndev->io_tx_cond, NULL); - pthread_mutex_init(&ndev->io_rx_lock, NULL); pthread_cond_init(&ndev->io_tx_cond, NULL); + pthread_cond_init(&ndev->io_rx_cond, NULL); - pthread_create(&ndev->io_rx_thread, NULL, virtio_net_rx_thread, ndev); pthread_create(&ndev->io_tx_thread, NULL, virtio_net_tx_thread, ndev); + pthread_create(&ndev->io_rx_thread, NULL, virtio_net_rx_thread, ndev); } static inline int tap_ops_tx(struct iovec *iov, u16 out, struct net_dev *ndev)