[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] Clean up pci_drive_hot_add()'s use of BlockInte
From: |
Alexander Graf |
Subject: |
Re: [Qemu-devel] [PATCH] Clean up pci_drive_hot_add()'s use of BlockInterfaceType |
Date: |
Thu, 22 Nov 2012 15:21:38 +0100 |
On 22.11.2012, at 15:16, Markus Armbruster wrote:
> pci_drive_hot_add() parameter type has the wrong type: int instead of
> BlockInterfaceType. It's actually redundant, so we can just drop it.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> hw/device-hotplug.c | 11 ++++-------
> hw/pci-hotplug.c | 7 +++----
> sysemu.h | 3 +--
> 3 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
> index eec0fe3..6d9c080 100644
> --- a/hw/device-hotplug.c
> +++ b/hw/device-hotplug.c
> @@ -49,18 +49,16 @@ DriveInfo *add_init_drive(const char *optstr)
> }
>
> #if !defined(TARGET_I386)
> -int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
> - DriveInfo *dinfo, int type)
> +int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo)
> {
> /* On non-x86 we don't do PCI hotplug */
> - monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
> + monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);
Can't we expose names instead? I don't really want internal enum numbering be
part of our external CLI interface :)
Alex
> 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");
>
> @@ -72,14 +70,13 @@ void drive_hot_add(Monitor *mon, const QDict *qdict)
> monitor_printf(mon, "Parameter addr not supported\n");
> goto err;
> }
> - type = dinfo->type;
>
> - switch (type) {
> + switch (dinfo->type) {
> case IF_NONE:
> monitor_printf(mon, "OK\n");
> break;
> default:
> - if (pci_drive_hot_add(mon, qdict, dinfo, type)) {
> + if (pci_drive_hot_add(mon, qdict, dinfo)) {
> goto err;
> }
> }
> diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
> index e7fb780..d2121ee 100644
> --- a/hw/pci-hotplug.c
> +++ b/hw/pci-hotplug.c
> @@ -105,15 +105,14 @@ static int scsi_hot_add(Monitor *mon, DeviceState
> *adapter,
> return 0;
> }
>
> -int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
> - DriveInfo *dinfo, int type)
> +int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo)
> {
> int dom, pci_bus;
> unsigned slot;
> PCIDevice *dev;
> const char *pci_addr = qdict_get_str(qdict, "pci_addr");
>
> - switch (type) {
> + switch (dinfo->type) {
> case IF_SCSI:
> if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {
> goto err;
> @@ -129,7 +128,7 @@ int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
> }
> break;
> default:
> - monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
> + monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);
> goto err;
> }
>
> diff --git a/sysemu.h b/sysemu.h
> index f5ac664..c1b370b 100644
> --- a/sysemu.h
> +++ b/sysemu.h
> @@ -145,8 +145,7 @@ extern unsigned int nb_prom_envs;
>
> /* pci-hotplug */
> void pci_device_hot_add(Monitor *mon, const QDict *qdict);
> -int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
> - DriveInfo *dinfo, int type);
> +int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo);
> void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
>
> /* generic hotplug */
> --
> 1.7.11.7
>