From: Bin Meng <bin.meng@windriver.com>
To: qemu-devel@nongnu.org
Cc: "Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Eric Blake" <eblake@redhat.com>,
"Hanna Czenczek" <hreitz@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH] util/cutil: Allow relocatable install with prefix /
Date: Tue, 23 Jan 2024 18:06:40 +0800 [thread overview]
Message-ID: <20240123100640.1865139-1-bin.meng@windriver.com> (raw)
When configuring QEMU with --prefix=/, the generated QEMU executables
can't be relocated to other directories. Add an additional test logic
in starts_with_prefix() to handle this.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
util/cutils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/util/cutils.c b/util/cutils.c
index 42364039a5..676bd757ba 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -1021,7 +1021,8 @@ static inline bool starts_with_prefix(const char *dir)
#pragma GCC diagnostic ignored "-Warray-bounds="
#endif
return !memcmp(dir, CONFIG_PREFIX, prefix_len) &&
- (!dir[prefix_len] || G_IS_DIR_SEPARATOR(dir[prefix_len]));
+ (!dir[prefix_len] || G_IS_DIR_SEPARATOR(dir[prefix_len]) ||
+ !strcmp(CONFIG_PREFIX, "/"));
#pragma GCC diagnostic pop
}
--
2.34.1
next reply other threads:[~2024-01-23 10:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 10:06 Bin Meng [this message]
2024-01-24 3:25 ` [PATCH] util/cutil: Allow relocatable install with prefix / Akihiko Odaki
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=20240123100640.1865139-1-bin.meng@windriver.com \
--to=bin.meng@windriver.com \
--cc=akihiko.odaki@daynix.com \
--cc=eblake@redhat.com \
--cc=hreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.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).