* Re: [Qemu-devel] [PATCH 1/2 v2] scsi bus: introduce hotplug() and hot_unplug() interfaces for SCSI bus
2012-06-21 7:54 ` [Qemu-devel] [PATCH 1/2 v2] scsi bus: introduce hotplug() and hot_unplug() interfaces for SCSI bus Cong Meng
@ 2012-06-21 9:17 ` Stefan Hajnoczi
2012-07-02 8:27 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2012-06-21 9:17 UTC (permalink / raw)
To: Cong Meng
Cc: stefanha, zwanp, Rusty Russell, linuxram, qemu-devel,
Nicholas A. Bellinger, senwang, Anthony Liguori, Paolo Bonzini,
virtualization, Andreas Färber
On Thu, Jun 21, 2012 at 8:54 AM, Cong Meng <mc@linux.vnet.ibm.com> wrote:
> +static int scsi_qdev_unplug(DeviceState *qdev)
> +{
> + SCSIDevice *dev = SCSI_DEVICE(qdev);
> + SCSIBus *bus = scsi_bus_from_device(dev);
> +
> + if (bus->info->hot_unplug)
> + bus->info->hot_unplug(bus, dev);
Please use scripts/checkpatch.pl to ensure that your patch follows
QEMU coding style. if statements must use {}.
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH 1/2 v2] scsi bus: introduce hotplug() and hot_unplug() interfaces for SCSI bus
2012-06-21 7:54 ` [Qemu-devel] [PATCH 1/2 v2] scsi bus: introduce hotplug() and hot_unplug() interfaces for SCSI bus Cong Meng
2012-06-21 9:17 ` Stefan Hajnoczi
@ 2012-07-02 8:27 ` Paolo Bonzini
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2012-07-02 8:27 UTC (permalink / raw)
To: Cong Meng
Cc: stefanha, zwanp, Rusty Russell, linuxram, senwang,
Nicholas A. Bellinger, qemu-devel, Anthony Liguori,
virtualization, Andreas Färber
Il 21/06/2012 09:54, Cong Meng ha scritto:
> Add two interfaces hotplug() and hot_unplug() to scsi bus info.
> The embody scsi bus can implement these two interfaces to signal the HBA driver
> of guest kernel to add/remove the scsi device in question.
>
> Signed-off-by: Cong Meng <mc@linux.vnet.ibm.com>
> Signed-off-by: Sen Wang <senwang@linux.vnet.ibm.com>
> ---
> hw/scsi-bus.c | 16 +++++++++++++++-
> hw/scsi.h | 2 ++
> 2 files changed, 17 insertions(+), 1 deletions(-)
>
> diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
> index dbdb99c..f08900e 100644
> --- a/hw/scsi-bus.c
> +++ b/hw/scsi-bus.c
> @@ -177,6 +177,10 @@ static int scsi_qdev_init(DeviceState *qdev)
> dev);
> }
>
> + if (bus->info->hotplug) {
> + bus->info->hotplug(bus, dev);
> + }
> +
> err:
> return rc;
> }
> @@ -1539,6 +1543,16 @@ static int get_scsi_requests(QEMUFile *f, void *pv, size_t size)
> return 0;
> }
>
> +static int scsi_qdev_unplug(DeviceState *qdev)
> +{
> + SCSIDevice *dev = SCSI_DEVICE(qdev);
> + SCSIBus *bus = scsi_bus_from_device(dev);
> +
> + if (bus->info->hot_unplug)
> + bus->info->hot_unplug(bus, dev);
Tab indentation and braces missing. I fixed this up and applied it to
the scsi-next branch.
Paolo
> + return qdev_simple_unplug_cb(qdev);
> +}
> +
> const VMStateInfo vmstate_info_scsi_requests = {
> .name = "scsi-requests",
> .get = get_scsi_requests,
> @@ -1575,7 +1589,7 @@ static void scsi_device_class_init(ObjectClass *klass, void *data)
> DeviceClass *k = DEVICE_CLASS(klass);
> k->bus_info = &scsi_bus_info;
> k->init = scsi_qdev_init;
> - k->unplug = qdev_simple_unplug_cb;
> + k->unplug = scsi_qdev_unplug;
> k->exit = scsi_qdev_exit;
> }
>
> diff --git a/hw/scsi.h b/hw/scsi.h
> index 2eb66f7..5768071 100644
> --- a/hw/scsi.h
> +++ b/hw/scsi.h
> @@ -130,6 +130,8 @@ struct SCSIBusInfo {
> void (*transfer_data)(SCSIRequest *req, uint32_t arg);
> void (*complete)(SCSIRequest *req, uint32_t arg, size_t resid);
> void (*cancel)(SCSIRequest *req);
> + void (*hotplug)(SCSIBus *bus, SCSIDevice *dev);
> + void (*hot_unplug)(SCSIBus *bus, SCSIDevice *dev);
> QEMUSGList *(*get_sg_list)(SCSIRequest *req);
>
> void (*save_request)(QEMUFile *f, SCSIRequest *req);
>
^ permalink raw reply [flat|nested] 3+ messages in thread