From: Sam Eiderman via Qemu-devel <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, qemu-block@nongnu.org,
Arbel Moshe <arbel.moshe@oracle.com>,
seabios@seabios.org, kevin@koconnor.net, liran.alon@oracle.com,
kraxel@redhat.com, Sam Eiderman <shmuel.eiderman@oracle.com>,
sameid@google.com, karl.heubaum@oracle.com
Subject: [Qemu-devel] [PATCH v6 5/8] bootdevice: Gather LCHS from all relevant devices
Date: Tue, 27 Aug 2019 11:24:24 +0300 [thread overview]
Message-ID: <20190827082427.64280-6-sameid@google.com> (raw)
In-Reply-To: <20190827082427.64280-1-sameid@google.com>
From: Sam Eiderman <shmuel.eiderman@oracle.com>
Relevant devices are:
* ide-hd (and ide-cd, ide-drive)
* scsi-hd (and scsi-cd, scsi-disk, scsi-block)
* virtio-blk-pci
We do not call del_boot_device_lchs() for ide-* since we don't need to -
IDE block devices do not support unplugging.
Signed-off-by: Sam Eiderman <sameid@google.com>
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/block/virtio-blk.c | 6 ++++++
hw/ide/qdev.c | 5 +++++
hw/scsi/scsi-disk.c | 12 ++++++++++++
3 files changed, 23 insertions(+)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 18851601cb..6d8ff34a16 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -1186,6 +1186,11 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
blk_set_guest_block_size(s->blk, s->conf.conf.logical_block_size);
blk_iostatus_enable(s->blk);
+
+ add_boot_device_lchs(dev, "/disk@0,0",
+ conf->conf.lcyls,
+ conf->conf.lheads,
+ conf->conf.lsecs);
}
static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
@@ -1193,6 +1198,7 @@ static void virtio_blk_device_unrealize(DeviceState *dev, Error **errp)
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBlock *s = VIRTIO_BLK(dev);
+ del_boot_device_lchs(dev, "/disk@0,0");
virtio_blk_data_plane_destroy(s->dataplane);
s->dataplane = NULL;
qemu_del_vm_change_state_handler(s->change);
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 6dd219944f..2ffd387a73 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -220,6 +220,11 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
add_boot_device_path(dev->conf.bootindex, &dev->qdev,
dev->unit ? "/disk@1" : "/disk@0");
+
+ add_boot_device_lchs(&dev->qdev, dev->unit ? "/disk@1" : "/disk@0",
+ dev->conf.lcyls,
+ dev->conf.lheads,
+ dev->conf.lsecs);
}
static void ide_dev_get_bootindex(Object *obj, Visitor *v, const char *name,
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 915641a0f1..d19896fe4d 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -35,6 +35,7 @@
#include "hw/block/block.h"
#include "hw/qdev-properties.h"
#include "sysemu/dma.h"
+#include "sysemu/sysemu.h"
#include "qemu/cutils.h"
#include "trace.h"
@@ -2402,6 +2403,16 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
blk_set_guest_block_size(s->qdev.conf.blk, s->qdev.blocksize);
blk_iostatus_enable(s->qdev.conf.blk);
+
+ add_boot_device_lchs(&dev->qdev, NULL,
+ dev->conf.lcyls,
+ dev->conf.lheads,
+ dev->conf.lsecs);
+}
+
+static void scsi_unrealize(SCSIDevice *dev, Error **errp)
+{
+ del_boot_device_lchs(&dev->qdev, NULL);
}
static void scsi_hd_realize(SCSIDevice *dev, Error **errp)
@@ -3006,6 +3017,7 @@ static void scsi_hd_class_initfn(ObjectClass *klass, void *data)
SCSIDeviceClass *sc = SCSI_DEVICE_CLASS(klass);
sc->realize = scsi_hd_realize;
+ sc->unrealize = scsi_unrealize;
sc->alloc_req = scsi_new_request;
sc->unit_attention_reported = scsi_disk_unit_attention_reported;
dc->desc = "virtual SCSI disk";
--
2.23.0.187.g17f5b7556c-goog
next prev parent reply other threads:[~2019-08-27 8:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 8:24 [Qemu-devel] [PATCH v6 0/8] Add Qemu to SeaBIOS LCHS interface Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 1/8] block: Refactor macros - fix tabbing Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 2/8] block: Support providing LCHS from user Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 3/8] bootdevice: Add interface to gather LCHS Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 4/8] scsi: Propagate unrealize() callback to scsi-hd Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` Sam Eiderman via Qemu-devel [this message]
2019-09-23 21:40 ` [Qemu-block] [PATCH v6 5/8] bootdevice: Gather LCHS from all relevant devices John Snow
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 6/8] bootdevice: Refactor get_boot_devices_list Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 7/8] bootdevice: FW_CFG interface for LCHS values Sam Eiderman via Qemu-devel
2019-08-27 8:24 ` [Qemu-devel] [PATCH v6 8/8] hd-geo-test: Add tests for lchs override Sam Eiderman via Qemu-devel
2019-08-27 9:37 ` [Qemu-devel] [PATCH v6 0/8] Add Qemu to SeaBIOS LCHS interface no-reply
2019-08-27 10:02 ` no-reply
2019-09-11 14:36 ` Sam Eiderman via Qemu-devel
2019-09-23 8:23 ` Sam Eiderman via
2019-09-23 9:50 ` [Qemu-devel] " Max Reitz
2019-09-24 18:49 ` [Qemu-block] " John Snow
2019-09-25 7:58 ` Thomas Huth
2019-09-25 10:20 ` Sam Eiderman via
2019-09-25 10:22 ` mailer
2019-09-25 13:11 ` 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=20190827082427.64280-6-sameid@google.com \
--to=qemu-devel@nongnu.org \
--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=qemu-block@nongnu.org \
--cc=sameid@google.com \
--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).