public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Rusty Russell <rusty@rustcorp.com.au>,
	virtualization@lists.linux-foundation.org,
	Anthony Liguori <anthony@codemonkey.ws>,
	kvm@vger.kernel.org, avi@redhat.com
Subject: [PATCH 6/8] virtio_balloon: add request_vqs/free_vqs calls
Date: Mon, 27 Apr 2009 15:33:02 +0300	[thread overview]
Message-ID: <20090427123302.GA1186@redhat.com> (raw)
In-Reply-To: <cover.1240832196.git.mst@redhat.com>

Add request_vqs/free_vqs calls to virtio_balloon.
These will be required for MSI support.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/virtio/virtio_balloon.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 5926826..77eac2b 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -217,10 +217,14 @@ static int virtballoon_probe(struct virtio_device *vdev)
 	vb->vdev = vdev;
 
 	/* We expect two virtqueues. */
+	err = virtio_request_vqs(vdev, 2);
+	if (err)
+		goto out_free_vb;
+
 	vb->inflate_vq = vdev->config->find_vq(vdev, 0, balloon_ack);
 	if (IS_ERR(vb->inflate_vq)) {
 		err = PTR_ERR(vb->inflate_vq);
-		goto out_free_vb;
+		goto out_free_vqs;
 	}
 
 	vb->deflate_vq = vdev->config->find_vq(vdev, 1, balloon_ack);
@@ -244,6 +248,8 @@ out_del_deflate_vq:
 	vdev->config->del_vq(vb->deflate_vq);
 out_del_inflate_vq:
 	vdev->config->del_vq(vb->inflate_vq);
+out_free_vqs:
+	virtio_free_vqs(vdev);
 out_free_vb:
 	kfree(vb);
 out:
@@ -265,6 +271,7 @@ static void virtballoon_remove(struct virtio_device *vdev)
 
 	vdev->config->del_vq(vb->deflate_vq);
 	vdev->config->del_vq(vb->inflate_vq);
+	virtio_free_vqs(vdev);
 	kfree(vb);
 }
 
-- 
1.6.0.6


  parent reply	other threads:[~2009-04-27 12:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1240832196.git.mst@redhat.com>
2009-04-27 12:31 ` [PATCH 1/8] virtio: add request_vqs/free_vqs operations Michael S. Tsirkin
2009-05-04 11:32   ` Rusty Russell
2009-05-04 11:51     ` Michael S. Tsirkin
2009-04-27 12:32 ` [PATCH 2/8] virtio_blk: add request_vqs/free_vqs calls Michael S. Tsirkin
2009-04-27 12:32 ` [PATCH 3/8] virtio-rng: " Michael S. Tsirkin
2009-04-27 12:32 ` [PATCH 4/8] virtio_console: " Michael S. Tsirkin
2009-04-27 12:32 ` [PATCH 5/8] virtio_net: " Michael S. Tsirkin
2009-04-27 12:33 ` Michael S. Tsirkin [this message]
2009-04-27 12:33 ` [PATCH 7/8] virtio_pci: split up vp_interrupt Michael S. Tsirkin
2009-04-27 12:33 ` [PATCH 8/8] virtio_pci: optional MSI-X support Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090427123302.GA1186@redhat.com \
    --to=mst@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox