[PATCH 4/8] kvm tools: init network devices only when the virtio driver is ready to go
We may need to know what features are supported before we can init the
network on the host side.
Signed-off-by: Sasha Levin sasha.le...@oracle.com
---
tools/kvm/virtio/net.c | 30 --
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index bef0039..2dbca09 100644
--- a/tools/kvm/virtio/net.c
+++ b/tools/kvm/virtio/net.c
@@ -58,6 +58,8 @@ struct net_dev {
struct uip_info info;
struct net_dev_operations *ops;
struct kvm *kvm;
+
+ struct virtio_net_params*params;
};
static LIST_HEAD(ndevs);
@@ -207,13 +209,13 @@ static void virtio_net_handle_callback(struct kvm *kvm,
struct net_dev *ndev, in
mutex_unlock(ndev-io_lock[queue]);
}
-static bool virtio_net__tap_init(const struct virtio_net_params *params,
- struct net_dev *ndev)
+static bool virtio_net__tap_init(struct net_dev *ndev)
{
int sock = socket(AF_INET, SOCK_STREAM, 0);
int pid, status, offload, hdr_len;
struct sockaddr_in sin = {0};
struct ifreq ifr;
+ const struct virtio_net_params *params = ndev-params;
/* Did the user already gave us the FD? */
if (params-fd) {
@@ -496,6 +498,8 @@ static int set_size_vq(struct kvm *kvm, void *dev, u32 vq,
int size)
return size;
}
+static void notify_status(struct kvm *kvm, void *dev, u8 status);
+
static struct virtio_ops net_dev_virtio_ops = (struct virtio_ops) {
.get_config = get_config,
.get_host_features = get_host_features,
@@ -507,6 +511,7 @@ static struct virtio_ops net_dev_virtio_ops = (struct
virtio_ops) {
.notify_vq = notify_vq,
.notify_vq_gsi = notify_vq_gsi,
.notify_vq_eventfd = notify_vq_eventfd,
+ .notify_status = notify_status,
};
static void virtio_net__vhost_init(struct kvm *kvm, struct net_dev *ndev)
@@ -652,6 +657,7 @@ static int virtio_net__init_one(struct virtio_net_params
*params)
list_add_tail(ndev-list, ndevs);
ndev-kvm = params-kvm;
+ ndev-params = params;
mutex_init(ndev-mutex);
ndev-queue_pairs = max(1, min(VIRTIO_NET_NUM_QUEUES, params-mq));
@@ -667,8 +673,6 @@ static int virtio_net__init_one(struct virtio_net_params
*params)
ndev-mode = params-mode;
if (ndev-mode == NET_MODE_TAP) {
- if (!virtio_net__tap_init(params, ndev))
- die_perror(You have requested a TAP device, but
creation of one has failed because);
ndev-ops = tap_ops;
} else {
ndev-info.host_ip =
ntohl(inet_addr(params-host_ip));
@@ -676,7 +680,6 @@ static int virtio_net__init_one(struct virtio_net_params
*params)
ndev-info.guest_netmask=
ntohl(inet_addr(255.255.255.0));
ndev-info.buf_nr = 20,
ndev-info.vnet_hdr_len = sizeof(struct virtio_net_hdr);
- uip_init(ndev-info);
ndev-ops = uip_ops;
}
@@ -696,6 +699,21 @@ static int virtio_net__init_one(struct virtio_net_params
*params)
return 0;
}
+static void notify_status(struct kvm *kvm, void *dev, u8 status)
+{
+ struct net_dev *ndev = dev;
+
+ if (!(status VIRTIO_CONFIG_S_DRIVER_OK))
+ return;
+
+ if (ndev-mode == NET_MODE_TAP) {
+ if (!virtio_net__tap_init(ndev))
+ die_perror(You have requested a TAP device, but
creation of one has failed because);
+ } else {
+ uip_init(ndev-info);
+ }
+}
+
int virtio_net__init(struct kvm *kvm)
{
int i;
@@ -706,7 +724,7 @@ int virtio_net__init(struct kvm *kvm)
}
if (kvm-cfg.num_net_devices == 0 kvm-cfg.no_net == 0) {
- struct virtio_net_params net_params;
+ static struct virtio_net_params net_params;
net_params = (struct virtio_net_params) {
.guest_ip = kvm-cfg.guest_ip,
--
1.8.2.1
--
To unsubscribe from this list: send the line unsubscribe kvm in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] KVM test: Fix command to install virtio driver msi install package
If we are going to use the msi package, we have to tell windows to install it using msiexec /passive /package, so the msi is installed without asking questions. Only executing the msi will prompt questions to the user, which we clearly don't want. Changing it on the default config file so people won't loose time trying to figure out why the msi is not being installed. Signed-off-by: Lucas Meneghel Rodrigues l...@redhat.com --- client/tests/kvm/tests_base.cfg.sample |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 22e9494..e9d4b4e 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1294,7 +1294,7 @@ variants: #drive_index_virtiocd = 3 #virtio_floppy = /usr/share/virtio-win/virtio-drivers.vfd # Some flavors of the virtio drivers have an msi installer -#virtio_network_installer = F:\\RHEV-Network.msi +#virtio_network_installer = ' msiexec /passive /package F:\RHEV-Network64.msi' migrate: migration_test_command = ver vol migration_bg_command = start ping -t localhost -- 1.7.2.2 -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
virtio driver
Hi, My guest (2.6.32 kernel with some patches unrelated to kvm) does not seem to work with virtio driver (model=virtio in qemu-kvm). My rootfs is over nfs. If I change model=pcnet, guest comes up fine. With virtio, I get error as No network devices available. I assume I have to add virtio driver to the kernel i.e CONFIG_VIRTIO_NET=y (Device Drivers - Network device support - Virtio network driver) Is there anything else I should do? Thanks, Nirmal -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: virtio driver
On Friday, August 13, 2010 02:08:07 am Nirmal Guhan wrote: Hi, My guest (2.6.32 kernel with some patches unrelated to kvm) does not seem to work with virtio driver (model=virtio in qemu-kvm). My rootfs is over nfs. If I change model=pcnet, guest comes up fine. With virtio, I get error as No network devices available. I assume I have to add virtio driver to the kernel i.e CONFIG_VIRTIO_NET=y (Device Drivers - Network device support - Virtio network driver) You'll also need to enable Virtio PCI (at least). Is there anything else I should do? Thanks, Nirmal -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 24/39] KVM: ia64: Enable virtio driver for ia64 in Kconfig
From: Xiantao Zhang [EMAIL PROTECTED] kvm/ia64 uses the virtio drivers to optimize its I/O subsytem. Signed-off-by: Xiantao Zhang [EMAIL PROTECTED] Signed-off-by: Avi Kivity [EMAIL PROTECTED] --- arch/ia64/kvm/Kconfig |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 7914e48..8e99fed 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig @@ -46,4 +46,6 @@ config KVM_INTEL config KVM_TRACE bool +source drivers/virtio/Kconfig + endif # VIRTUALIZATION -- 1.6.0.1 -- To unsubscribe from this list: send the line unsubscribe kvm in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] KVM: ia64: Enable virtio driver for ia64 in Kconfig
From: Xiantao Zhang [EMAIL PROTECTED] kvm/ia64 uses the virtio drivers to optimize its I/O subsytem. Signed-off-by: Xiantao Zhang [EMAIL PROTECTED] Signed-off-by: Avi Kivity [EMAIL PROTECTED] diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 7914e48..8e99fed 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig @@ -46,4 +46,6 @@ config KVM_INTEL config KVM_TRACE bool +source drivers/virtio/Kconfig + endif # VIRTUALIZATION -- To unsubscribe from this list: send the line unsubscribe kvm-commits in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
