From: "Nicholas A. Bellinger" <nab@linux-iscsi.org> To: target-devel <target-devel@vger.kernel.org> Cc: lf-virt <virtualization@lists.linux-foundation.org>, kvm-devel <kvm@vger.kernel.org>, qemu-devel <qemu-devel@nongnu.org>, Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>, Zhi Yong Wu <wuzhy@cn.ibm.com>, Anthony Liguori <aliguori@linux.vnet.ibm.com>, Paolo Bonzini <pbonzini@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>, Jan Kiszka <jan.kiszka@siemens.com> Subject: [RFC-v2 2/6] vhost: Pass device path to vhost_dev_init() Date: Mon, 13 Aug 2012 08:35:13 +0000 [thread overview] Message-ID: <1344846917-7411-3-git-send-email-nab@linux-iscsi.org> (raw) In-Reply-To: <1344846917-7411-1-git-send-email-nab@linux-iscsi.org> From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> The path to /dev/vhost-net is currently hardcoded in vhost_dev_init(). This needs to be changed so that /dev/vhost-scsi can be used. Pass in the device path instead of hardcoding it. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> --- hw/vhost.c | 5 +++-- hw/vhost.h | 3 ++- hw/vhost_net.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vhost.c b/hw/vhost.c index 0fd8da8..d0ce5aa 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -747,14 +747,15 @@ static void vhost_eventfd_del(MemoryListener *listener, { } -int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force) +int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, + bool force) { uint64_t features; int r; if (devfd >= 0) { hdev->control = devfd; } else { - hdev->control = open("/dev/vhost-net", O_RDWR); + hdev->control = open(devpath, O_RDWR); if (hdev->control < 0) { return -errno; } diff --git a/hw/vhost.h b/hw/vhost.h index 80e64df..0c47229 100644 --- a/hw/vhost.h +++ b/hw/vhost.h @@ -44,7 +44,8 @@ struct vhost_dev { bool force; }; -int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force); +int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, + bool force); void vhost_dev_cleanup(struct vhost_dev *hdev); bool vhost_dev_query(struct vhost_dev *hdev, VirtIODevice *vdev); int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev); diff --git a/hw/vhost_net.c b/hw/vhost_net.c index ecaa22d..df2c4a3 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -109,7 +109,7 @@ struct vhost_net *vhost_net_init(NetClientState *backend, int devfd, (1 << VHOST_NET_F_VIRTIO_NET_HDR); net->backend = r; - r = vhost_dev_init(&net->dev, devfd, force); + r = vhost_dev_init(&net->dev, devfd, "/dev/vhost-net", force); if (r < 0) { goto fail; } -- 1.7.2.5
WARNING: multiple messages have this Message-ID (diff)
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org> To: target-devel <target-devel@vger.kernel.org> Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>, kvm-devel <kvm@vger.kernel.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jan Kiszka <jan.kiszka@siemens.com>, qemu-devel <qemu-devel@nongnu.org>, Zhi Yong Wu <wuzhy@cn.ibm.com>, Anthony Liguori <aliguori@linux.vnet.ibm.com>, Hannes Reinecke <hare@suse.de>, Paolo Bonzini <pbonzini@redhat.com>, lf-virt <virtualization@lists.linux-foundation.org>, Christoph Hellwig <hch@lst.de> Subject: [Qemu-devel] [RFC-v2 2/6] vhost: Pass device path to vhost_dev_init() Date: Mon, 13 Aug 2012 08:35:13 +0000 [thread overview] Message-ID: <1344846917-7411-3-git-send-email-nab@linux-iscsi.org> (raw) In-Reply-To: <1344846917-7411-1-git-send-email-nab@linux-iscsi.org> From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> The path to /dev/vhost-net is currently hardcoded in vhost_dev_init(). This needs to be changed so that /dev/vhost-scsi can be used. Pass in the device path instead of hardcoding it. Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> --- hw/vhost.c | 5 +++-- hw/vhost.h | 3 ++- hw/vhost_net.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vhost.c b/hw/vhost.c index 0fd8da8..d0ce5aa 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -747,14 +747,15 @@ static void vhost_eventfd_del(MemoryListener *listener, { } -int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force) +int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, + bool force) { uint64_t features; int r; if (devfd >= 0) { hdev->control = devfd; } else { - hdev->control = open("/dev/vhost-net", O_RDWR); + hdev->control = open(devpath, O_RDWR); if (hdev->control < 0) { return -errno; } diff --git a/hw/vhost.h b/hw/vhost.h index 80e64df..0c47229 100644 --- a/hw/vhost.h +++ b/hw/vhost.h @@ -44,7 +44,8 @@ struct vhost_dev { bool force; }; -int vhost_dev_init(struct vhost_dev *hdev, int devfd, bool force); +int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, + bool force); void vhost_dev_cleanup(struct vhost_dev *hdev); bool vhost_dev_query(struct vhost_dev *hdev, VirtIODevice *vdev); int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev); diff --git a/hw/vhost_net.c b/hw/vhost_net.c index ecaa22d..df2c4a3 100644 --- a/hw/vhost_net.c +++ b/hw/vhost_net.c @@ -109,7 +109,7 @@ struct vhost_net *vhost_net_init(NetClientState *backend, int devfd, (1 << VHOST_NET_F_VIRTIO_NET_HDR); net->backend = r; - r = vhost_dev_init(&net->dev, devfd, force); + r = vhost_dev_init(&net->dev, devfd, "/dev/vhost-net", force); if (r < 0) { goto fail; } -- 1.7.2.5
next prev parent reply other threads:[~2012-08-13 8:35 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-13 8:35 [RFC-v2 0/6] vhost-scsi: Add support for host virtualized target Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 8:35 ` [RFC-v2 1/6] msix: Work-around for vhost-scsi with KVM in-kernel MSI injection Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 8:51 ` Michael S. Tsirkin 2012-08-13 8:51 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-13 12:06 ` Jan Kiszka 2012-08-13 12:06 ` Jan Kiszka 2012-08-13 12:06 ` [Qemu-devel] " Jan Kiszka 2012-08-13 18:03 ` Michael S. Tsirkin 2012-08-13 18:03 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-13 18:06 ` Jan Kiszka 2012-08-13 18:06 ` [Qemu-devel] " Jan Kiszka 2012-08-13 18:17 ` Michael S. Tsirkin 2012-08-13 18:17 ` Michael S. Tsirkin 2012-08-13 18:17 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-14 20:10 ` Nicholas A. Bellinger 2012-08-14 20:10 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 19:39 ` Blue Swirl 2012-08-13 19:39 ` Blue Swirl 2012-08-13 19:39 ` Blue Swirl 2012-08-13 8:35 ` Nicholas A. Bellinger [this message] 2012-08-13 8:35 ` [Qemu-devel] [RFC-v2 2/6] vhost: Pass device path to vhost_dev_init() Nicholas A. Bellinger 2012-08-13 8:35 ` Nicholas A. Bellinger 2012-08-13 8:35 ` [RFC-v2 3/6] vhost-scsi: add -vhost-scsi host device for use with tcm-vhost Nicholas A. Bellinger 2012-08-13 8:35 ` Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 8:53 ` Michael S. Tsirkin 2012-08-13 8:53 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-14 20:31 ` Nicholas A. Bellinger 2012-08-14 20:31 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-18 19:12 ` Michael S. Tsirkin 2012-08-18 19:12 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-19 0:36 ` Nicholas A. Bellinger 2012-08-19 0:36 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-19 8:44 ` Michael S. Tsirkin 2012-08-19 8:44 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-20 22:24 ` Nicholas A. Bellinger 2012-08-20 22:24 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 8:59 ` Michael S. Tsirkin 2012-08-13 8:59 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-14 21:12 ` Nicholas A. Bellinger 2012-08-14 21:12 ` Nicholas A. Bellinger 2012-08-14 21:12 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-18 19:10 ` Michael S. Tsirkin 2012-08-18 19:10 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-18 23:38 ` Nicholas A. Bellinger 2012-08-18 23:38 ` Nicholas A. Bellinger 2012-08-18 23:38 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 19:47 ` Blue Swirl 2012-08-13 19:47 ` Blue Swirl 2012-08-13 19:47 ` Blue Swirl 2012-08-14 21:17 ` Nicholas A. Bellinger 2012-08-14 21:17 ` Nicholas A. Bellinger 2012-08-14 21:17 ` Nicholas A. Bellinger 2012-08-20 9:02 ` Paolo Bonzini 2012-08-20 9:02 ` [Qemu-devel] " Paolo Bonzini 2012-08-13 8:35 ` [RFC-v2 4/6] virtio-scsi: Add start/stop functionality for vhost-scsi Nicholas A. Bellinger 2012-08-13 8:35 ` Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-20 9:04 ` Paolo Bonzini 2012-08-20 9:04 ` [Qemu-devel] " Paolo Bonzini 2012-08-20 11:31 ` Stefan Hajnoczi 2012-08-20 11:31 ` [Qemu-devel] " Stefan Hajnoczi 2012-08-20 11:57 ` Michael S. Tsirkin 2012-08-20 11:57 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-20 12:00 ` Paolo Bonzini 2012-08-20 12:00 ` [Qemu-devel] " Paolo Bonzini 2012-08-20 11:31 ` Stefan Hajnoczi 2012-08-13 8:35 ` [RFC-v2 5/6] virtio-scsi: Set max_target=0 during vhost-scsi operation Nicholas A. Bellinger 2012-08-13 8:35 ` Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 8:35 ` [RFC-v2 6/6] virtio-scsi: Fix incorrect VirtIOSCSI->cmd_vqs[0] definition Nicholas A. Bellinger 2012-08-13 8:35 ` Nicholas A. Bellinger 2012-08-13 8:35 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 9:02 ` Michael S. Tsirkin 2012-08-13 9:02 ` [Qemu-devel] " Michael S. Tsirkin 2012-08-14 20:20 ` Nicholas A. Bellinger 2012-08-14 20:20 ` Nicholas A. Bellinger 2012-08-14 20:20 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-18 18:52 ` Paolo Bonzini 2012-08-18 18:52 ` [Qemu-devel] " Paolo Bonzini 2012-08-18 21:47 ` Nicholas A. Bellinger 2012-08-18 21:47 ` Nicholas A. Bellinger 2012-08-18 21:47 ` [Qemu-devel] " Nicholas A. Bellinger 2012-08-13 9:04 ` [RFC-v2 0/6] vhost-scsi: Add support for host virtualized target Michael S. Tsirkin 2012-08-13 9:04 ` [Qemu-devel] " 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=1344846917-7411-3-git-send-email-nab@linux-iscsi.org \ --to=nab@linux-iscsi.org \ --cc=aliguori@linux.vnet.ibm.com \ --cc=hare@suse.de \ --cc=hch@lst.de \ --cc=jan.kiszka@siemens.com \ --cc=kvm@vger.kernel.org \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@linux.vnet.ibm.com \ --cc=target-devel@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=wuzhy@cn.ibm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.