External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Remove the actual hostdev when removing a network

Browse Source 
Commit 50348e6edf reused the code to remove the hostdev portion of a
network definition on multiple places but forgot to take into account
that sometimes the "actual" network is passed and in some cases the
parent of that.

This patch uses the virDomainNetGetActualHostdev() helper to acquire the
correct pointer all the time while removing the hostdev portion from the
list.
This commit is contained in:
Peter Krempa 2013-09-03 17:25:56 +02:00
parent 8d67c550e9
commit 991270db99
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -10002,14 +10002,14 @@ void
virDomainNetRemoveHostdev(virDomainDefPtr def, virDomainNetRemoveHostdev(virDomainDefPtr def,
virDomainNetDefPtr net) virDomainNetDefPtr net)
{ {
if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
/* hostdev net devices are normally also be in the hostdevs /* hostdev net devices are normally also be in the hostdevs
* array, but might have already been removed by the time we * array, but might have already been removed by the time we
* get here. * get here.
*/ */
virDomainHostdevDefPtr hostdev = &net->data.hostdev.def; virDomainHostdevDefPtr hostdev = virDomainNetGetActualHostdev(net);
size_t i; size_t i;
if (hostdev) {
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
if (def->hostdevs[i] == hostdev) { if (def->hostdevs[i] == hostdev) {
virDomainHostdevRemove(def, i); virDomainHostdevRemove(def, i);