NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: slirp: Call qemuSlirpOpen directly from qemuSlirpStart

Browse Source 
No need to ask the callers to call this extra function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
2022-05-10 16:32:27 +02:00
parent 42b939d13a
commit 812a36557d
4 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_extdevice.c
View File

@@ -130,7 +130,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
virDomainObj *vm) virDomainObj *vm)
{ {
virDomainDef *def = vm->def; virDomainDef *def = vm->def;
size_t i;
if (qemuExtDevicesInitPaths(driver, def) < 0) if (qemuExtDevicesInitPaths(driver, def) < 0)
return -1; return -1;
@@ -139,14 +138,6 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver,
qemuExtTPMPrepareHost(driver, def) < 0) qemuExtTPMPrepareHost(driver, def) < 0)
return -1; return -1;
for (i = 0; i < def->nnets; i++) {
virDomainNetDef *net = def->nets[i];
qemuSlirp *slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;
if (slirp && qemuSlirpOpen(slirp, driver, def) < 0)
return -1;
}
return 0; return 0;
} }

3
src/qemu/qemu_hotplug.c
View File

@@ -1313,8 +1313,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
if (!(slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp)) if (!(slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp))
break; break;
if (qemuSlirpOpen(slirp, driver, vm->def) < 0 || if (qemuSlirpStart(vm, net, NULL) < 0) {
qemuSlirpStart(vm, net, NULL) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Failed to start slirp")); "%s", _("Failed to start slirp"));
goto cleanup; goto cleanup;

5
src/qemu/qemu_slirp.c
View File

@@ -156,7 +156,7 @@ qemuSlirpCreatePidFilename(virQEMUDriverConfig *cfg,
} }
int static int
qemuSlirpOpen(qemuSlirp *slirp, qemuSlirpOpen(qemuSlirp *slirp,
virQEMUDriver *driver, virQEMUDriver *driver,
virDomainDef *def) virDomainDef *def)
@@ -272,6 +272,9 @@ qemuSlirpStart(virDomainObj *vm,
_("The slirp-helper doesn't support migration")); _("The slirp-helper doesn't support migration"));
} }
if (qemuSlirpOpen(slirp, driver, vm->def) < 0)
return -1;
if (!(pidfile = qemuSlirpCreatePidFilename(cfg, vm->def, net->info.alias))) if (!(pidfile = qemuSlirpCreatePidFilename(cfg, vm->def, net->info.alias)))
return -1; return -1;

4
src/qemu/qemu_slirp.h
View File

@@ -57,10 +57,6 @@ void qemuSlirpSetFeature(qemuSlirp *slirp,
bool qemuSlirpHasFeature(const qemuSlirp *slirp, bool qemuSlirpHasFeature(const qemuSlirp *slirp,
qemuSlirpFeature feature); qemuSlirpFeature feature);
int qemuSlirpOpen(qemuSlirp *slirp,
virQEMUDriver *driver,
virDomainDef *def);
int qemuSlirpStart(virDomainObj *vm, int qemuSlirpStart(virDomainObj *vm,
virDomainNetDef *net, virDomainNetDef *net,
bool incoming); bool incoming);