kvm tools: Introduce trans=mmio parameter for virtio-net

To select virtio-mmio instead of virito-pci transport:

   lkvm run --network trans=mmio

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 33be3bd636cce09efc49b854a7344bd3a096433a..97f61d0ef5d5cd816e37379ae70334ad0238c8f4 100644 (file)
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -244,6 +244,8 @@ static int set_net_param(struct virtio_net_params *p, const char *param,
                p->guest_ip = strdup(val);
        } else if (strcmp(param, "host_ip") == 0) {
                p->host_ip = strdup(val);
+       } else if (strcmp(param, "trans") == 0) {
+               p->trans = strdup(val);
        } else if (strcmp(param, "vhost") == 0) {
                p->vhost = atoi(val);
        } else if (strcmp(param, "fd") == 0) {

diff --git a/tools/kvm/include/kvm/virtio-net.h b/tools/kvm/include/kvm/virtio-net.h
index a3219b65b6c6e47616f29339fde2591bbfd98e86..ebcd77ffdfbff3095b3785f487d9d2f0212e32fd 100644 (file)
--- a/tools/kvm/include/kvm/virtio-net.h
+++ b/tools/kvm/include/kvm/virtio-net.h
@@ -7,6 +7,7 @@ struct virtio_net_params {
        const char *guest_ip;
        const char *host_ip;
        const char *script;
+       const char *trans;
        char guest_mac[6];
        char host_mac[6];
        struct kvm *kvm;

diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index 33bf6238e81a9c6b8bd52d537ca692ea7199ed59..d523f61ba4e4ae2fffa0cc57e7f93f4d53c6be77 100644 (file)
--- a/tools/kvm/virtio/net.c
+++ b/tools/kvm/virtio/net.c
@@ -526,8 +526,12 @@ void virtio_net__init(const struct virtio_net_params *params)
                ndev->ops = &uip_ops;
        }
 
-       virtio_init(kvm, ndev, &ndev->vdev, &net_dev_virtio_ops,
-                   VIRTIO_PCI, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET, PCI_CLASS_NET);
+       if (params->trans && strcmp(params->trans, "mmio") == 0)
+               virtio_init(kvm, ndev, &ndev->vdev, &net_dev_virtio_ops,
+                           VIRTIO_MMIO, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET, PCI_CLASS_NET);
+       else
+               virtio_init(kvm, ndev, &ndev->vdev, &net_dev_virtio_ops,
+                           VIRTIO_PCI, PCI_DEVICE_ID_VIRTIO_NET, VIRTIO_ID_NET, PCI_CLASS_NET);
 
        if (params->vhost)
                virtio_net__vhost_init(params->kvm, ndev);