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 6/8] bootdevice: Refactor get_boot_devices_list
Date: Wed, 26 Jun 2019 15:39:46 +0300 [thread overview]
Message-ID: <20190626123948.10199-7-shmuel.eiderman@oracle.com> (raw)
In-Reply-To: <20190626123948.10199-1-shmuel.eiderman@oracle.com>
Move device name construction to a separate function.
We will reuse this function in the following commit to pass logical CHS
parameters through fw_cfg much like we currently pass bootindex.
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>
---
bootdevice.c | 61 +++++++++++++++++++++++++++++++++---------------------------
1 file changed, 34 insertions(+), 27 deletions(-)
diff --git a/bootdevice.c b/bootdevice.c
index bc5e1c2de4..2b12fb85a4 100644
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -202,6 +202,39 @@ DeviceState *get_boot_device(uint32_t position)
return res;
}
+static char *get_boot_device_path(DeviceState *dev, bool ignore_suffixes,
+ char *suffix)
+{
+ char *devpath = NULL, *s = NULL, *d, *bootpath;
+
+ if (dev) {
+ devpath = qdev_get_fw_dev_path(dev);
+ assert(devpath);
+ }
+
+ if (!ignore_suffixes) {
+ if (dev) {
+ d = qdev_get_own_fw_dev_path_from_handler(dev->parent_bus, dev);
+ if (d) {
+ assert(!suffix);
+ s = d;
+ } else {
+ s = g_strdup(suffix);
+ }
+ } else {
+ s = g_strdup(suffix);
+ }
+ }
+
+ bootpath = g_strdup_printf("%s%s",
+ devpath ? devpath : "",
+ s ? s : "");
+ g_free(devpath);
+ g_free(s);
+
+ return bootpath;
+}
+
/*
* This function returns null terminated string that consist of new line
* separated device paths.
@@ -218,36 +251,10 @@ char *get_boot_devices_list(size_t *size)
bool ignore_suffixes = mc->ignore_boot_device_suffixes;
QTAILQ_FOREACH(i, &fw_boot_order, link) {
- char *devpath = NULL, *suffix = NULL;
char *bootpath;
- char *d;
size_t len;
- if (i->dev) {
- devpath = qdev_get_fw_dev_path(i->dev);
- assert(devpath);
- }
-
- if (!ignore_suffixes) {
- if (i->dev) {
- d = qdev_get_own_fw_dev_path_from_handler(i->dev->parent_bus,
- i->dev);
- if (d) {
- assert(!i->suffix);
- suffix = d;
- } else {
- suffix = g_strdup(i->suffix);
- }
- } else {
- suffix = g_strdup(i->suffix);
- }
- }
-
- bootpath = g_strdup_printf("%s%s",
- devpath ? devpath : "",
- suffix ? suffix : "");
- g_free(devpath);
- g_free(suffix);
+ bootpath = get_boot_device_path(i->dev, ignore_suffixes, i->suffix);
if (total) {
list[total-1] = '\n';
--
2.13.3
next prev parent reply other threads:[~2019-06-26 12:52 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 ` [Qemu-devel] [QEMU] [PATCH v5 4/8] scsi: Propagate unrealize() callback to scsi-hd Sam Eiderman
2019-08-13 19:06 ` 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 ` Sam Eiderman [this message]
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-7-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).