diff options
| author | Robert Mustacchi <rm@joyent.com> | 2011-06-27 18:44:04 -0700 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2011-06-27 18:44:04 -0700 |
| commit | e13dcf133d73cda45c3e56d776664d2e62e915f9 (patch) | |
| tree | 3d77854fd4a451be6b5cebc7ac5a9aab41460cc2 | |
| parent | 4e523287a04836b483d1d858ae94078c95ae1038 (diff) | |
| download | illumos-kvm-cmd-e13dcf133d73cda45c3e56d776664d2e62e915f9.tar.gz | |
HVM-430 Regression in kvm-cmd-14 with KVM_NET_QUEUE ioctl
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | net/vnic.c | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -2921,8 +2921,11 @@ if test "$spice" = "yes" ; then fi if test "$sunos_vnic" = "yes" ; then - echo "CONFIG_SUNOS_VNIC=y" >> $config_host_mak - LDFLAGS="-ldlpi $LDFLAGS" + echo "CONFIG_SUNOS_VNIC=y" >> $config_host_mak + LDFLAGS="-ldlpi $LDFLAGS" + if test "$kvm" = "yes" ; then + echo "CONFIG_SUNOS_VNIC_KVM=y" >> $config_host_mak + fi else echo "failed" fi @@ -40,7 +40,6 @@ #include "net/vnic.h" -#include "config-host.h" #include "qemu-common.h" #include "qemu-error.h" #include "qemu-option.h" @@ -218,6 +217,7 @@ static NetClientInfo net_vnic_info = { .cleanup = vnic_cleanup }; +#ifdef CONFIG_SUNOS_VNIC_KVM static int net_init_kvm(int vfd) { @@ -239,6 +239,7 @@ net_init_kvm(int vfd) return (0); } +#endif int net_init_vnic(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) @@ -304,8 +305,7 @@ net_init_vnic(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) snprintf(vsp->vns_nc.info_str, sizeof (vsp->vns_nc.info_str), "ifname=%s", qemu_opt_get(opts, "ifname")); - /* XXX This should be ifdef'd around whether or not KVM is present */ -#ifdef CONFIG_KVM +#ifdef CONFIG_SUNOS_VNIC_KVM net_init_kvm(fd); #endif |