Commit dd97aa8a authored by Alexander Graf's avatar Alexander Graf
Browse files

Add generic drive hotplugging 



The monitor command for hotplugging is in i386 specific code. This is just
plain wrong, as S390 just learned how to do hotplugging too and needs to
get drives for that.

So let's add a generic copy to generic code that handles drive_add in a
way that doesn't have pci dependencies. All pci specific code can then
be handled in a pci specific function.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>

---

v1 -> v2:

  - align generic drive_add to pci specific one
  - rework to split between generic and pci code

v2 -> v3:

  - remove comment
parent 963d83c8

hw/device-hotplug.c

+47 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#include "boards.h"

#include "net.h"

#include "blockdev.h"

#include "qemu-config.h"

#include "sysemu.h"

#include "monitor.h"



DriveInfo *add_init_drive(const char *optstr)

{
@@ -44,3 +47,47 @@ DriveInfo *add_init_drive(const char *optstr) 


    return dinfo;

}



#if !defined(TARGET_I386)

int pci_drive_hot_add(Monitor *mon, const QDict *qdict,

                      DriveInfo *dinfo, int type)

{

    /* On non-x86 we don't do PCI hotplug */

    monitor_printf(mon, "Can't hot-add drive to type %d\n", type);

    return -1;

}

#endif



void drive_hot_add(Monitor *mon, const QDict *qdict)

{

    int type;

    DriveInfo *dinfo = NULL;

    const char *opts = qdict_get_str(qdict, "opts");



    dinfo = add_init_drive(opts);

    if (!dinfo) {

        goto err;

    }

    if (dinfo->devaddr) {

        monitor_printf(mon, "Parameter addr not supported\n");

        goto err;

    }

    type = dinfo->type;



    switch (type) {

    case IF_NONE:

        monitor_printf(mon, "OK\n");

        break;

    default:

        if (pci_drive_hot_add(mon, qdict, dinfo, type)) {

            goto err;

        }

    }

    return;



err:

    if (dinfo) {

        drive_put_ref(dinfo);

    }

    return;

}

hw/pci-hotplug.c

+4 −20
Original line number Diff line number Diff line
@@ -104,24 +104,13 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, 
    return 0;

}



void drive_hot_add(Monitor *mon, const QDict *qdict)

int pci_drive_hot_add(Monitor *mon, const QDict *qdict,

                      DriveInfo *dinfo, int type)

{

    int dom, pci_bus;

    unsigned slot;

    int type;

    PCIDevice *dev;

    DriveInfo *dinfo = NULL;

    const char *pci_addr = qdict_get_str(qdict, "pci_addr");

    const char *opts = qdict_get_str(qdict, "opts");



    dinfo = add_init_drive(opts);

    if (!dinfo)

        goto err;

    if (dinfo->devaddr) {

        monitor_printf(mon, "Parameter addr not supported\n");

        goto err;

    }

    type = dinfo->type;



    switch (type) {

    case IF_SCSI:
@@ -138,19 +127,14 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) 
            goto err;

        }

        break;

    case IF_NONE:

        monitor_printf(mon, "OK\n");

        break;

    default:

        monitor_printf(mon, "Can't hot-add drive to type %d\n", type);

        goto err;

    }

    return;



    return 0;

err:

    if (dinfo)

        drive_put_ref(dinfo);

    return;

    return -1;

}



static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,

sysemu.h

+5 −1
Original line number Diff line number Diff line
@@ -143,9 +143,13 @@ extern unsigned int nb_prom_envs; 


/* pci-hotplug */

void pci_device_hot_add(Monitor *mon, const QDict *qdict);

void drive_hot_add(Monitor *mon, const QDict *qdict);

int pci_drive_hot_add(Monitor *mon, const QDict *qdict,

                      DriveInfo *dinfo, int type);

void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);



/* generic hotplug */

void drive_hot_add(Monitor *mon, const QDict *qdict);



/* pcie aer error injection */

void pcie_aer_inject_error_print(Monitor *mon, const QObject *data);

int do_pcie_aer_inject_error(Monitor *mon,