From 2d8f5cf694d855fa06a5b06f1fd5cdcef3206dc6 Mon Sep 17 00:00:00 2001 From: James Harper Date: Thu, 30 Oct 2014 10:08:28 +0000 Subject: [PATCH] fix off-by-one error in pci_piix3_xen_ide_unplug Fix off-by-one error when unplugging disks, which would otherwise leave the last ATA disk plugged, with obvious consequences. Also rewrite loop to be more readable. upstream-commit-id: d4f9e806c20607cafe7bb0d9eba14ccb160390a1 Signed-off-by: James Harper Signed-off-by: Stefano Stabellini --- hw/ide/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index e6e6c0bb7..c043a8de4 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -171,11 +171,11 @@ static int pci_piix3_xen_ide_unplug(DeviceState *dev) { PCIIDEState *pci_ide; DriveInfo *di; - int i = 0; + int i; pci_ide = PCI_IDE(dev); - for (; i < 3; i++) { + for (i = 0; i < 4; i++) { di = drive_get_by_index(IF_IDE, i); if (di != NULL && !di->media_cd) { DeviceState *ds = bdrv_get_attached_dev(di->bdrv); -- 2.39.5