From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Yonggang Luo" <luoyonggang@gmail.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 20/22] plugin: Fixes compiling errors on msys2/mingw
Date: Fri, 9 Oct 2020 17:31:45 +0100 [thread overview]
Message-ID: <20201009163147.28512-21-alex.bennee@linaro.org> (raw)
In-Reply-To: <20201009163147.28512-1-alex.bennee@linaro.org>
From: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201001163429.1348-3-luoyonggang@gmail.com>
Message-Id: <20201007160038.26953-21-alex.bennee@linaro.org>
diff --git a/contrib/plugins/hotblocks.c b/contrib/plugins/hotblocks.c
index 3942a2ca54..37435a3fc7 100644
--- a/contrib/plugins/hotblocks.c
+++ b/contrib/plugins/hotblocks.c
@@ -102,7 +102,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
ExecCount *cnt;
uint64_t pc = qemu_plugin_tb_vaddr(tb);
- unsigned long insns = qemu_plugin_tb_n_insns(tb);
+ size_t insns = qemu_plugin_tb_n_insns(tb);
uint64_t hash = pc ^ insns;
g_mutex_lock(&lock);
diff --git a/tests/plugin/bb.c b/tests/plugin/bb.c
index e4cc7fdd6e..de09bdde4e 100644
--- a/tests/plugin/bb.c
+++ b/tests/plugin/bb.c
@@ -72,7 +72,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
CPUCount *count = max_cpus ?
g_ptr_array_index(counts, cpu_index) : &inline_count;
- unsigned long n_insns = (unsigned long)udata;
+ uintptr_t n_insns = (uintptr_t)udata;
g_mutex_lock(&count->lock);
count->insn_count += n_insns;
count->bb_count++;
@@ -81,7 +81,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
- unsigned long n_insns = qemu_plugin_tb_n_insns(tb);
+ size_t n_insns = qemu_plugin_tb_n_insns(tb);
if (do_inline) {
qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64,
--
2.20.1
next prev parent reply other threads:[~2020-10-09 16:45 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-09 16:31 [PULL 00/22] acceptance regressions, testing, gitdm, plugins Alex Bennée
2020-10-09 16:31 ` [PULL 01/22] configure: fix performance regression due to PIC objects Alex Bennée
2020-10-09 16:31 ` [PULL 02/22] hw/misc/mips_cpc: Start vCPU when powered on Alex Bennée
2020-10-09 16:31 ` [PULL 03/22] hw/ide: restore replay support of IDE Alex Bennée
2020-10-09 16:31 ` [PULL 04/22] cirrus: Fixing and speedup the msys2/mingw CI Alex Bennée
2020-10-09 16:31 ` [PULL 05/22] cirrus: msys2/mingw speed is up, add excluded target back Alex Bennée
2020-10-09 16:31 ` [PULL 06/22] tests/docker: Add genisoimage to the docker file Alex Bennée
2020-10-09 16:31 ` [PULL 07/22] contrib/gitdm: Add more academic domains Alex Bennée
2020-10-09 16:31 ` [PULL 08/22] contrib/gitdm: Add more individual contributors Alex Bennée
2020-10-09 16:31 ` [PULL 09/22] contrib/gitdm: Add Baidu to the domain map Alex Bennée
2020-10-09 16:31 ` [PULL 10/22] contrib/gitdm: Add ByteDance " Alex Bennée
2020-10-09 16:31 ` [PULL 11/22] contrib/gitdm: Add Google " Alex Bennée
2020-10-09 16:31 ` [PULL 12/22] contrib/gitdm: Add Nuvia " Alex Bennée
2020-10-09 16:31 ` [PULL 13/22] contrib/gitdm: Add Qualcomm " Alex Bennée
2020-10-09 16:31 ` [PULL 14/22] contrib/gitdm: Add Nir Soffer to Red Hat domain Alex Bennée
2020-10-09 16:31 ` [PULL 15/22] contrib/gitdm: Add SUSE to the domain map Alex Bennée
2020-10-09 16:31 ` [PULL 16/22] contrib/gitdm: Add Yadro " Alex Bennée
2020-10-09 16:31 ` [PULL 17/22] contrib/gitdm: Add Yandex " Alex Bennée
2020-10-09 16:31 ` [PULL 18/22] .mailmap: Fix more contributor entries Alex Bennée
2020-10-09 16:31 ` [PULL 19/22] plugins: Fixes a issue when dlsym failed, the handle not closed Alex Bennée
2020-10-09 16:31 ` Alex Bennée [this message]
2020-10-09 16:31 ` [PULL 21/22] cirrus: use V=1 when running tests on FreeBSD and macOS Alex Bennée
2020-10-09 16:31 ` [PULL 22/22] tests/acceptance: disable machine_rx_gdbsim on GitLab Alex Bennée
2020-10-11 16:20 ` [PULL 00/22] acceptance regressions, testing, gitdm, plugins 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=20201009163147.28512-21-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=luoyonggang@gmail.com \
--cc=peter.maydell@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).