[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/20] block: Avoid qobject_get_try_str()
From: |
Markus Armbruster |
Subject: |
[PATCH 10/20] block: Avoid qobject_get_try_str() |
Date: |
Fri, 11 Dec 2020 18:11:42 +0100 |
I'm about to remove qobject_get_try_str(). Use qstring_get_str()
instead. Safe because the argument is known to be a QString here.
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: qemu-block@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
block.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index 487b2b1497..94d3a15081 100644
--- a/block.c
+++ b/block.c
@@ -4015,7 +4015,7 @@ static int bdrv_reopen_parse_backing(BDRVReopenState
*reopen_state,
new_backing_bs = NULL;
break;
case QTYPE_QSTRING:
- str = qobject_get_try_str(value);
+ str = qstring_get_str(qobject_to(QString, value));
new_backing_bs = bdrv_lookup_bs(NULL, str, errp);
if (new_backing_bs == NULL) {
return -EINVAL;
@@ -4278,8 +4278,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
}
if (child) {
- const char *str = qobject_get_try_str(new);
- if (!strcmp(child->bs->node_name, str)) {
+ if (!strcmp(child->bs->node_name,
+ qstring_get_str(qobject_to(QString, new)))) {
continue; /* Found child with this name, skip option */
}
}
--
2.26.2
- [PATCH 14/20] qobject: Factor quoted_str() out of to_json(), (continued)
- [PATCH 14/20] qobject: Factor quoted_str() out of to_json(), Markus Armbruster, 2020/12/11
- [PATCH 08/20] qobject: Move internals to qobject-internal.h, Markus Armbruster, 2020/12/11
- [PATCH 05/20] qobject: Change qobject_to_json()'s value to GString, Markus Armbruster, 2020/12/11
- [PATCH 06/20] Revert "qstring: add qstring_free()", Markus Armbruster, 2020/12/11
- [PATCH 12/20] qobject: Drop qobject_get_try_str(), Markus Armbruster, 2020/12/11
- [PATCH 19/20] block: Use GString instead of QString to build filenames, Markus Armbruster, 2020/12/11
- [PATCH 09/20] qmp: Fix tracing of non-string command IDs, Markus Armbruster, 2020/12/11
- [PATCH 03/20] qobject: Make qobject_to_json_pretty() take a pretty argument, Markus Armbruster, 2020/12/11
- [PATCH 07/20] hw/rdma: Replace QList by GQueue, Markus Armbruster, 2020/12/11
- [PATCH 10/20] block: Avoid qobject_get_try_str(),
Markus Armbruster <=
- [PATCH 15/20] qobject: Factor JSON writer out of qobject_to_json(), Markus Armbruster, 2020/12/11
- [PATCH 20/20] qobject: Make QString immutable, Markus Armbruster, 2020/12/11
- [PATCH 18/20] keyval: Use GString to accumulate value strings, Markus Armbruster, 2020/12/11
- [PATCH 01/20] hmp: Simplify how qmp_human_monitor_command() gets output, Markus Armbruster, 2020/12/11
- [PATCH 11/20] Revert "qobject: let object_property_get_str() use new API", Markus Armbruster, 2020/12/11
- [PATCH 17/20] json: Use GString instead of QString to accumulate strings, Markus Armbruster, 2020/12/11