[libvirt] [PATCH 1/2] hostdev: Fix index error in loop after remove an element

[Martin Kletzander]

On Thu, Mar 26, 2015 at 10:23:46PM +0800, Huanle Han wrote:
>'virPCIDeviceList' is actually an array. Removing one element makes the
>rest of the element move.
>
>Use while loop, increase index only when not virPCIDeviceListDel(pcidevs, dev)
>
>Signed-off-by: Huanle Han <hanxueluo at gmail.com>
>---
> src/util/virhostdev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
>index 23365a3..83f567d 100644
>--- a/src/util/virhostdev.c
>+++ b/src/util/virhostdev.c
>@@ -785,7 +785,8 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
>      * them and reset all the devices before re-attach.
>      * Attach mac and port profile parameters to devices
>      */
>-    for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
>+    i = 0;
>+    while (i < virPCIDeviceListCount(pcidevs)) {
>         virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
>         virPCIDevicePtr activeDev = NULL;
>
>@@ -806,6 +807,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
>         }
>
>         virPCIDeviceListDel(hostdev_mgr->activePCIHostdevs, dev);
>+        i++;

'i--;' before that 'continue;' that's not in the index would be
shorter, but I guess this is more readable.  Or maybe:

for (i = virPCIDeviceListCount(pcidevs); i > 0; i--) {
    size_t dev_index = i - 1;

would just deal with this.

Anyway, this works just as it is, ACK if you don't want to change it.

>     }
>
>     /* At this point, any device that had been used by the guest is in
>--
>1.9.1
>
>--
>libvir-list mailing list
>libvir-list at redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150331/96593e27/attachment-0001.sig>