From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
peter.maydell@linaro.org,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 32/33] block: Use GString instead of QString to build filenames
Date: Sat, 19 Dec 2020 11:55:31 +0100 [thread overview]
Message-ID: <20201219105532.1734134-33-armbru@redhat.com> (raw)
In-Reply-To: <20201219105532.1734134-1-armbru@redhat.com>
QString supports modifying its string, but it's quite limited: you can
only append. Just one caller remains:
bdrv_parse_filename_strip_prefix() uses it just for building an
initial string.
Change it to do build the initial string with GString. This is
another step towards making QString immutable.
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-20-armbru@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 934d1bcc8f..27b2c3ba15 100644
--- a/block.c
+++ b/block.c
@@ -217,7 +217,7 @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
/* Stripping the explicit protocol prefix may result in a protocol
* prefix being (wrongly) detected (if the filename contains a colon) */
if (path_has_protocol(filename)) {
- QString *fat_filename;
+ GString *fat_filename;
/* This means there is some colon before the first slash; therefore,
* this cannot be an absolute path */
@@ -225,12 +225,13 @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,
/* And we can thus fix the protocol detection issue by prefixing it
* by "./" */
- fat_filename = qstring_from_str("./");
- qstring_append(fat_filename, filename);
+ fat_filename = g_string_new("./");
+ g_string_append(fat_filename, filename);
- assert(!path_has_protocol(qstring_get_str(fat_filename)));
+ assert(!path_has_protocol(fat_filename->str));
- qdict_put(options, "filename", fat_filename);
+ qdict_put(options, "filename",
+ qstring_from_gstring(fat_filename));
} else {
/* If no protocol prefix was detected, we can use the shortened
* filename as-is */
--
2.26.2
next prev parent reply other threads:[~2020-12-19 11:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 10:54 [PULL 00/33] QAPI patches patches for 2020-12-19 Markus Armbruster
2020-12-19 10:55 ` [PULL 01/33] rocker: Revamp fp_port_get_info Markus Armbruster
2020-12-19 10:55 ` [PULL 02/33] migration: Refactor migrate_cap_add Markus Armbruster
2020-12-19 10:55 ` [PULL 03/33] qapi: Use QAPI_LIST_PREPEND() where possible Markus Armbruster
2020-12-19 10:55 ` [PULL 04/33] tests/check-qjson: Don't skip funny QNumber to JSON conversions Markus Armbruster
2020-12-19 10:55 ` [PULL 05/33] tests/check-qjson: Examine QNum more thoroughly Markus Armbruster
2020-12-19 10:55 ` [PULL 06/33] tests/check-qjson: Cover number 2^63 Markus Armbruster
2020-12-19 10:55 ` [PULL 07/33] tests/check-qjson: Replace redundant large_number() Markus Armbruster
2020-12-19 10:55 ` [PULL 08/33] tests/check-qnum: Cover qnum_to_string() for "unround" argument Markus Armbruster
2020-12-19 10:55 ` [PULL 09/33] qobject: Fix qnum_to_string() to use sufficient precision Markus Armbruster
2020-12-19 10:55 ` [PULL 10/33] test-string-output-visitor: Cover "unround" number Markus Armbruster
2020-12-19 10:55 ` [PULL 11/33] string-output-visitor: Fix to use sufficient precision Markus Armbruster
2020-12-19 10:55 ` [PULL 12/33] test-visitor-serialization: Drop insufficient precision workaround Markus Armbruster
2020-12-19 10:55 ` [PULL 13/33] test-visitor-serialization: Clean up test_primitives() Markus Armbruster
2020-12-19 10:55 ` [PULL 14/33] hmp: Simplify how qmp_human_monitor_command() gets output Markus Armbruster
2020-12-19 10:55 ` [PULL 15/33] monitor: Use GString instead of QString for output buffer Markus Armbruster
2020-12-19 10:55 ` [PULL 16/33] qobject: Make qobject_to_json_pretty() take a pretty argument Markus Armbruster
2020-12-19 10:55 ` [PULL 17/33] qobject: Use GString instead of QString to accumulate JSON Markus Armbruster
2020-12-19 10:55 ` [PULL 18/33] qobject: Change qobject_to_json()'s value to GString Markus Armbruster
2020-12-19 10:55 ` [PULL 19/33] Revert "qstring: add qstring_free()" Markus Armbruster
2020-12-19 10:55 ` [PULL 20/33] hw/rdma: Replace QList by GQueue Markus Armbruster
2020-12-19 10:55 ` [PULL 21/33] qobject: Move internals to qobject-internal.h Markus Armbruster
2020-12-19 10:55 ` [PULL 22/33] qmp: Fix tracing of non-string command IDs Markus Armbruster
2020-12-19 10:55 ` [PULL 23/33] block: Avoid qobject_get_try_str() Markus Armbruster
2020-12-19 10:55 ` [PULL 24/33] Revert "qobject: let object_property_get_str() use new API" Markus Armbruster
2020-12-19 10:55 ` [PULL 25/33] qobject: Drop qobject_get_try_str() Markus Armbruster
2020-12-19 10:55 ` [PULL 26/33] qobject: Drop qstring_get_try_str() Markus Armbruster
2020-12-19 10:55 ` [PULL 27/33] qobject: Factor quoted_str() out of to_json() Markus Armbruster
2020-12-19 10:55 ` [PULL 28/33] qobject: Factor JSON writer out of qobject_to_json() Markus Armbruster
2020-12-19 10:55 ` [PULL 29/33] migration: Replace migration's JSON writer by the general one Markus Armbruster
2020-12-19 10:55 ` [PULL 30/33] json: Use GString instead of QString to accumulate strings Markus Armbruster
2020-12-19 10:55 ` [PULL 31/33] keyval: Use GString to accumulate value strings Markus Armbruster
2020-12-19 10:55 ` Markus Armbruster [this message]
2020-12-19 10:55 ` [PULL 33/33] qobject: Make QString immutable Markus Armbruster
2020-12-19 11:24 ` [PULL 00/33] QAPI patches patches for 2020-12-19 no-reply
2021-01-01 16:56 ` Peter Maydell
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=20201219105532.1734134-33-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.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).