diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 20:28:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-30 20:28:09 +0000 |
| commit | ee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6 (patch) | |
| tree | ee50b4b8b06e8f6cd9a3dd6fd3ddbd97bc81ad15 /hw | |
| parent | 4239e2dc018c0defdbad35d387051ca2b208889d (diff) | |
| parent | d4f9e806c20607cafe7bb0d9eba14ccb160390a1 (diff) | |
| download | focaccia-qemu-ee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6.tar.gz focaccia-qemu-ee29498e4f0f3eff90eeeb7f5fa1703abedd2fb6.zip | |
Merge remote-tracking branch 'remotes/sstabellini/xen-2014-10-30' into staging
* remotes/sstabellini/xen-2014-10-30: fix off-by-one error in pci_piix3_xen_ide_unplug xen-hvm.c: Add support for Xen access to vmport Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/piix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 574b9c164b..b0172fbf59 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -171,11 +171,11 @@ 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) { BlockBackend *blk = blk_by_legacy_dinfo(di); |