External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Try several network devices when looking for a default

Browse Source 
Up until now, the default has been rtl8139, but no check was in
place to make sure that device was actually available.

Now we try rtl8139, e1000 and virtio-net in turn, checking for
availability before using any of them: this means we have a much
better chance for the guest to be able to boot.
This commit is contained in:
Andrea Bolognani 2015-09-07 08:51:00 +02:00
parent fedbb015a9
commit 75036c69df
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_domain.c
View File

@ -1193,7 +1193,8 @@ qemuDomainDefPostParse(virDomainDefPtr def,
} }
static const char * static const char *
qemuDomainDefaultNetModel(const virDomainDef *def) qemuDomainDefaultNetModel(const virDomainDef *def,
virQEMUCapsPtr qemuCaps)
{ {
if (ARCH_IS_S390(def->os.arch)) if (ARCH_IS_S390(def->os.arch))
return "virtio"; return "virtio";
@ -1211,6 +1212,18 @@ qemuDomainDefaultNetModel(const virDomainDef *def)
return "lan9118"; return "lan9118";
} }
/* Try several network devices in turn; each of these devices is
* less likely be supported out-of-the-box by the guest operating
* system than the previous one */
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RTL8139))
return "rtl8139";
else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_E1000))
return "e1000";
else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_NET))
return "virtio";
/* We've had no luck detecting support for any network device,
* but we have to return something: might as well be rtl8139 */
return "rtl8139"; return "rtl8139";
} }
@ -1220,18 +1233,24 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
virCapsPtr caps ATTRIBUTE_UNUSED, virCapsPtr caps ATTRIBUTE_UNUSED,
void *opaque) void *opaque)
{ {
int ret = -1;
virQEMUDriverPtr driver = opaque; virQEMUDriverPtr driver = opaque;
virQEMUCapsPtr qemuCaps = NULL;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
int ret = -1;
if (driver) if (driver)
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
/* This condition is actually a (temporary) hack for test suite which
* does not create capabilities cache */
if (driver && driver->qemuCapsCache)
qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
if (dev->type == VIR_DOMAIN_DEVICE_NET && if (dev->type == VIR_DOMAIN_DEVICE_NET &&
dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
!dev->data.net->model) { !dev->data.net->model) {
if (VIR_STRDUP(dev->data.net->model, if (VIR_STRDUP(dev->data.net->model,
qemuDomainDefaultNetModel(def)) < 0) qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
goto cleanup; goto cleanup;
} }
@ -1357,6 +1376,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(qemuCaps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }