SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block: Avoid qobject_get_try_str()

Browse Source 
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>
Message-Id: <20201211171152.146877-11-armbru@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This commit is contained in:
Markus Armbruster 2020-12-11 18:11:42 +01:00
parent d403d92dfc
commit 410f44f596
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block.c
View File

@ -4021,7 +4021,7 @@ static int bdrv_reopen_parse_backing(BDRVReopenState *reopen_state,
new_backing_bs = NULL; new_backing_bs = NULL;
break; break;
case QTYPE_QSTRING: 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); new_backing_bs = bdrv_lookup_bs(NULL, str, errp);
if (new_backing_bs == NULL) { if (new_backing_bs == NULL) {
return -EINVAL; return -EINVAL;
@ -4284,8 +4284,8 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
} }
if (child) { if (child) {
const char *str = qobject_get_try_str(new); if (!strcmp(child->bs->node_name,
if (!strcmp(child->bs->node_name, str)) { qstring_get_str(qobject_to(QString, new)))) {
continue; /* Found child with this name, skip option */ continue; /* Found child with this name, skip option */
} }
} }