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: alias: Fix calculation of RNG device aliases

Browse Source 
For device hotplug, the new alias ID needs to be checked in the list
rather than using the count of devices. Unplugging a device that is not
last in the array will make further hotplug impossible due to alias
collision.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1324551
This commit is contained in:
Peter Krempa 2016-04-06 17:32:12 +02:00
parent 2844de6f40
commit bd19b4b25b
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_alias.c
View File

@ -382,10 +382,19 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
int int
qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng, qemuAssignDeviceRNGAlias(virDomainDefPtr def,
size_t idx) virDomainRNGDefPtr rng)
{ {
if (virAsprintf(&rng->info.alias, "rng%zu", idx) < 0) size_t i;
int maxidx = 0;
int idx;
for (i = 0; i < def->nrngs; i++) {
if ((idx = qemuDomainDeviceAliasIndex(&def->rngs[i]->info, "rng")) >= maxidx)
maxidx = idx + 1;
}
if (virAsprintf(&rng->info.alias, "rng%d", maxidx) < 0)
return -1; return -1;
return 0; return 0;
@ -480,7 +489,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
return -1; return -1;
} }
for (i = 0; i < def->nrngs; i++) { for (i = 0; i < def->nrngs; i++) {
if (qemuAssignDeviceRNGAlias(def->rngs[i], i) < 0) if (virAsprintf(&def->rngs[i]->info.alias, "rng%zu", i) < 0)
return -1; return -1;
} }
if (def->tpm) { if (def->tpm) {

4
src/qemu/qemu_alias.h
View File

@ -54,8 +54,8 @@ int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
virDomainRedirdevDefPtr redirdev, virDomainRedirdevDefPtr redirdev,
int idx); int idx);
int qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng, int qemuAssignDeviceRNGAlias(virDomainDefPtr def,
size_t idx); virDomainRNGDefPtr rng);
int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);

2
src/qemu/qemu_hotplug.c
View File

@ -1625,7 +1625,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver,
const char *type; const char *type;
int ret = -1; int ret = -1;
if (qemuAssignDeviceRNGAlias(rng, vm->def->nrngs) < 0) if (qemuAssignDeviceRNGAlias(vm->def, rng) < 0)
return -1; return -1;
/* preallocate space for the device definition */ /* preallocate space for the device definition */