Commit 8707ecca authored by Anthony Liguori's avatar Anthony Liguori
Browse files

pci_add storage: fix error handling for 'if' parameter (Eduardo Habkost) 



This fixes:

 - The error message to show the actual if= argument value. It was showing
   the filename instead, because 'buf' is reaused on the filename parsing.
 - A bug that makes a block device to be created even when an unsupported if= arg
   is passed to pci_add.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6981 c046a42c-6fe2-441c-8c8c-71466251a162
parent 016c62c8

hw/pci-hotplug.c

+7 −5
Original line number Diff line number Diff line
@@ -97,19 +97,22 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, PCIBus *pci_bus, 
            type = IF_SCSI;

        else if (!strcmp(buf, "virtio")) {

            type = IF_VIRTIO;

        } else {

            monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);

            goto out;

        }

    } else {

        monitor_printf(mon, "no if= specified\n");

        return NULL;

        goto out;

    }



    if (get_param_value(buf, sizeof(buf), "file", opts)) {

        drive_idx = add_init_drive(opts);

        if (drive_idx < 0)

            return NULL;

            goto out;

    } else if (type == IF_VIRTIO) {

        monitor_printf(mon, "virtio requires a backing file/device.\n");

        return NULL;

        goto out;

    }



    switch (type) {
@@ -122,10 +125,9 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, PCIBus *pci_bus, 
    case IF_VIRTIO:

        opaque = virtio_blk_init (pci_bus, drives_table[drive_idx].bdrv);

        break;

    default:

        monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);

    }



out:

    return opaque;

}