Commit 3329f07b authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

QemuOpts: make most qemu_*_opts static 



Switch tree to lookup-by-name using qemu_find_opts().
Also hook up virtfs options so qemu_find_opts works for them too.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent dfe795e7

blockdev.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ QemuOpts *drive_add(const char *file, const char *fmt, ...) 
    vsnprintf(optstr, sizeof(optstr), fmt, ap);

    va_end(ap);



    opts = qemu_opts_parse(&qemu_drive_opts, optstr, 0);

    opts = qemu_opts_parse(qemu_find_opts("drive"), optstr, 0);

    if (!opts) {

        return NULL;

    }
@@ -451,7 +451,7 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) 
        break;

    case IF_VIRTIO:

        /* add virtio block device */

        opts = qemu_opts_create(&qemu_device_opts, NULL, 0);

        opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0);

        qemu_opt_set(opts, "driver", "virtio-blk-pci");

        qemu_opt_set(opts, "drive", dinfo->id);

        if (devaddr)

hw/pci-hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, 
        return NULL;

    }



    opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0);

    opts = qemu_opts_parse(qemu_find_opts("net"), opts_str ? opts_str : "", 0);

    if (!opts) {

        return NULL;

    }

hw/qdev-properties.c

+1 −1
Original line number Diff line number Diff line
@@ -772,5 +772,5 @@ static int qdev_add_one_global(QemuOpts *opts, void *opaque) 


void qemu_add_globals(void)

{

    qemu_opts_foreach(&qemu_global_opts, qdev_add_one_global, NULL, 0);

    qemu_opts_foreach(qemu_find_opts("global"), qdev_add_one_global, NULL, 0);

}

hw/qdev.c

+1 −1
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) 
{

    QemuOpts *opts;



    opts = qemu_opts_from_qdict(&qemu_device_opts, qdict);

    opts = qemu_opts_from_qdict(qemu_find_opts("device"), qdict);

    if (!opts) {

        return -1;

    }

hw/usb-msd.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static USBDevice *usb_msd_init(const char *filename) 


    /* parse -usbdevice disk: syntax into drive opts */

    snprintf(id, sizeof(id), "usb%d", nr++);

    opts = qemu_opts_create(&qemu_drive_opts, id, 0);

    opts = qemu_opts_create(qemu_find_opts("drive"), id, 0);



    p1 = strchr(filename, ':');

    if (p1++) {