qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Sam Eiderman <sameid@google.com>
To: qemu-devel@nongnu.org
Cc: arbel.moshe@oracle.com, karl.heubaum@oracle.com,
	kevin@koconnor.net,  kraxel@redhat.com, kwolf@redhat.com,
	liran.alon@oracle.com,  qemu-block@nongnu.org, sameid@google.com,
	seabios@seabios.org,  lersek@redhat.com, philmd@redhat.com,
	jsnow@redhat.com,  Sam Eiderman <shmuel.eiderman@oracle.com>
Subject: [PATCH v8 4/8] scsi: Propagate unrealize() callback to scsi-hd
Date: Wed, 16 Oct 2019 19:41:41 +0300	[thread overview]
Message-ID: <20191016164145.115898-6-sameid@google.com> (raw)
In-Reply-To: <20191016164145.115898-1-sameid@google.com>

From: Sam Eiderman <shmuel.eiderman@oracle.com>

We will need to add LCHS removal logic to scsi-hd's unrealize() in the
next commit.

Reviewed-by: Karl Heubaum <karl.heubaum@oracle.com>
Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com>
Signed-off-by: Sam Eiderman <sameid@google.com>
---
 hw/scsi/scsi-bus.c     | 16 ++++++++++++++++
 include/hw/scsi/scsi.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index bccb7cc4c6..359d50d6d0 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -59,6 +59,14 @@ static void scsi_device_realize(SCSIDevice *s, Error **errp)
     }
 }
 
+static void scsi_device_unrealize(SCSIDevice *s, Error **errp)
+{
+    SCSIDeviceClass *sc = SCSI_DEVICE_GET_CLASS(s);
+    if (sc->unrealize) {
+        sc->unrealize(s, errp);
+    }
+}
+
 int scsi_bus_parse_cdb(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,
                        void *hba_private)
 {
@@ -217,12 +225,20 @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp)
 static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
 {
     SCSIDevice *dev = SCSI_DEVICE(qdev);
+    Error *local_err = NULL;
 
     if (dev->vmsentry) {
         qemu_del_vm_change_state_handler(dev->vmsentry);
     }
 
     scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));
+
+    scsi_device_unrealize(dev, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
     blockdev_mark_auto_del(dev->conf.blk);
 }
 
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index d77a92361b..332ef602f4 100644
--- a/include/hw/scsi/scsi.h
+++ b/include/hw/scsi/scsi.h
@@ -59,6 +59,7 @@ struct SCSIRequest {
 typedef struct SCSIDeviceClass {
     DeviceClass parent_class;
     void (*realize)(SCSIDevice *dev, Error **errp);
+    void (*unrealize)(SCSIDevice *dev, Error **errp);
     int (*parse_cdb)(SCSIDevice *dev, SCSICommand *cmd, uint8_t *buf,
                      void *hba_private);
     SCSIRequest *(*alloc_req)(SCSIDevice *s, uint32_t tag, uint32_t lun,
-- 
2.23.0.700.g56cf767bdb-goog



  parent reply	other threads:[~2019-10-16 16:48 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-16 16:41 [PATCH v8 0/8] Add Qemu to SeaBIOS LCHS interface Sam Eiderman
2019-10-16 16:41 ` [PATCH v8 1/8] block: Refactor macros - fix tabbing Sam Eiderman
2019-10-16 16:41 ` [PATCH v8 1/1] hd-geo-test: Add tests for lchs override Sam Eiderman
2019-10-16 16:41 ` [PATCH v8 2/8] block: Support providing LCHS from user Sam Eiderman
2019-10-22 10:20   ` Philippe Mathieu-Daudé
2019-10-16 16:41 ` [PATCH v8 3/8] bootdevice: Add interface to gather LCHS Sam Eiderman
2019-10-22 10:22   ` Philippe Mathieu-Daudé
2019-10-16 16:41 ` Sam Eiderman [this message]
2019-10-22 10:23   ` [PATCH v8 4/8] scsi: Propagate unrealize() callback to scsi-hd Philippe Mathieu-Daudé
2019-10-16 16:41 ` [PATCH v8 5/8] bootdevice: Gather LCHS from all relevant devices Sam Eiderman
2019-10-22 10:30   ` Philippe Mathieu-Daudé
2019-10-16 16:41 ` [PATCH v8 6/8] bootdevice: Refactor get_boot_devices_list Sam Eiderman
2019-10-22 10:32   ` Philippe Mathieu-Daudé
2019-10-16 16:41 ` [PATCH v8 7/8] bootdevice: FW_CFG interface for LCHS values Sam Eiderman
2019-10-22 10:35   ` Philippe Mathieu-Daudé
2019-10-16 16:41 ` [PATCH v8 8/8] hd-geo-test: Add tests for lchs override Sam Eiderman
2019-10-16 20:13 ` [PATCH v8 0/8] Add Qemu to SeaBIOS LCHS interface no-reply
2019-10-21 21:02 ` John Snow

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191016164145.115898-6-sameid@google.com \
    --to=sameid@google.com \
    --cc=arbel.moshe@oracle.com \
    --cc=jsnow@redhat.com \
    --cc=karl.heubaum@oracle.com \
    --cc=kevin@koconnor.net \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lersek@redhat.com \
    --cc=liran.alon@oracle.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=seabios@seabios.org \
    --cc=shmuel.eiderman@oracle.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).