qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Sam Eiderman <shmuel.eiderman@oracle.com>
To: kwolf@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org,
	mreitz@redhat.com, seabios@seabios.org, kraxel@redhat.com,
	kevin@koconnor.net
Cc: liran.alon@oracle.com, shmuel.eiderman@oracle.com,
	karl.heubaum@oracle.com, arbel.moshe@oracle.com
Subject: [Qemu-devel] [QEMU] [PATCH v5 4/8] scsi: Propagate unrealize() callback to scsi-hd
Date: Wed, 26 Jun 2019 15:39:44 +0300	[thread overview]
Message-ID: <20190626123948.10199-5-shmuel.eiderman@oracle.com> (raw)
In-Reply-To: <20190626123948.10199-1-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>
Signed-off-by: Sam Eiderman <shmuel.eiderman@oracle.com>
---
 hw/scsi/scsi-bus.c     | 15 +++++++++++++++
 include/hw/scsi/scsi.h |  1 +
 2 files changed, 16 insertions(+)

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index c480553083..f6fe497a1a 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -55,6 +55,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)
 {
@@ -213,11 +221,18 @@ 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_unrealize(dev, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
+
     scsi_device_purge_requests(dev, SENSE_CODE(NO_SENSE));
     blockdev_mark_auto_del(dev->conf.blk);
 }
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index 426566a5c6..8cf71f910d 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.13.3



  parent reply	other threads:[~2019-06-26 12:49 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-26 12:39 [Qemu-devel] [QEMU] [PATCH v5 0/8] Add Qemu to SeaBIOS LCHS interface Sam Eiderman
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 1/8] block: Refactor macros - fix tabbing Sam Eiderman
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 2/8] block: Support providing LCHS from user Sam Eiderman
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 3/8] bootdevice: Add interface to gather LCHS Sam Eiderman
2019-08-13 18:51   ` Max Reitz
2019-08-22 15:13     ` Sam Eiderman via Qemu-devel
2019-06-26 12:39 ` Sam Eiderman [this message]
2019-08-13 19:06   ` [Qemu-devel] [QEMU] [PATCH v5 4/8] scsi: Propagate unrealize() callback to scsi-hd Max Reitz
2019-08-25 13:35     ` Sam Eiderman via Qemu-devel
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 5/8] bootdevice: Gather LCHS from all relevant devices Sam Eiderman
2019-08-13 19:05   ` Max Reitz
2019-08-25 13:38     ` Sam Eiderman via Qemu-devel
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 6/8] bootdevice: Refactor get_boot_devices_list Sam Eiderman
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 7/8] bootdevice: FW_CFG interface for LCHS values Sam Eiderman
2019-06-26 12:39 ` [Qemu-devel] [QEMU] [PATCH v5 8/8] hd-geo-test: Add tests for lchs override Sam Eiderman
2019-07-01  7:41 ` [Qemu-devel] [QEMU] [PATCH v5 0/8] Add Qemu to SeaBIOS LCHS interface Gerd Hoffmann
2019-07-08 17:30   ` Sam Eiderman
2019-07-17 19:03     ` Sam Eiderman
2019-07-17 19:46       ` Kevin Wolf
2019-07-19 10:10         ` Sam Eiderman
2019-07-25  0:47           ` [Qemu-devel] [Qemu-block] " John Snow
2019-07-25  0:50             ` John Snow
2019-07-25 19:42               ` Laszlo Ersek
2019-07-30 11:35               ` Gerd Hoffmann
2019-08-13 19:35 ` [Qemu-devel] " Max Reitz

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=20190626123948.10199-5-shmuel.eiderman@oracle.com \
    --to=shmuel.eiderman@oracle.com \
    --cc=arbel.moshe@oracle.com \
    --cc=karl.heubaum@oracle.com \
    --cc=kevin@koconnor.net \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=liran.alon@oracle.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=seabios@seabios.org \
    /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).