From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Paolo Bonzini" <pbonzini@redhat.com>, "Warner Losh" <imp@bsdimp.com>, "Kyle Evans" <kevans@freebsd.org>, "Greg Kurz" <groug@kaod.org>, "Alex Bennée" <alex.bennee@linaro.org>, qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs), kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH 5/5] target/ppc/kvm: Replace alloca() by g_malloc() Date: Wed, 5 May 2021 19:00:55 +0200 [thread overview] Message-ID: <20210505170055.1415360-6-philmd@redhat.com> (raw) In-Reply-To: <20210505170055.1415360-1-philmd@redhat.com> The ALLOCA(3) man-page mentions its "use is discouraged". Replace it by a g_malloc() call. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/ppc/kvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 104a308abb5..ae62daddf7d 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2698,11 +2698,11 @@ int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns) int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index, uint16_t n_valid, uint16_t n_invalid, Error **errp) { - struct kvm_get_htab_header *buf; - size_t chunksize = sizeof(*buf) + n_valid * HASH_PTE_SIZE_64; + size_t chunksize = sizeof(struct kvm_get_htab_header) + + n_valid * HASH_PTE_SIZE_64; ssize_t rc; + g_autofree struct kvm_get_htab_header *buf = g_malloc(chunksize); - buf = alloca(chunksize); buf->index = index; buf->n_valid = n_valid; buf->n_invalid = n_invalid; @@ -2741,10 +2741,10 @@ void kvmppc_read_hptes(ppc_hash_pte64_t *hptes, hwaddr ptex, int n) i = 0; while (i < n) { struct kvm_get_htab_header *hdr; + char buf[sizeof(*hdr) + HPTES_PER_GROUP * HASH_PTE_SIZE_64]; int m = n < HPTES_PER_GROUP ? n : HPTES_PER_GROUP; - char buf[sizeof(*hdr) + m * HASH_PTE_SIZE_64]; - rc = read(fd, buf, sizeof(buf)); + rc = read(fd, buf, sizeof(*hdr) + m * HASH_PTE_SIZE_64); if (rc < 0) { hw_error("kvmppc_read_hptes: Unable to read HPTEs"); } -- 2.26.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "open list:Overall KVM CPUs" <kvm@vger.kernel.org>, "Kyle Evans" <kevans@freebsd.org>, "Greg Kurz" <groug@kaod.org>, "Alex Bennée" <alex.bennee@linaro.org>, "open list:PowerPC TCG CPUs" <qemu-ppc@nongnu.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Warner Losh" <imp@bsdimp.com>, "David Gibson" <david@gibson.dropbear.id.au> Subject: [PATCH 5/5] target/ppc/kvm: Replace alloca() by g_malloc() Date: Wed, 5 May 2021 19:00:55 +0200 [thread overview] Message-ID: <20210505170055.1415360-6-philmd@redhat.com> (raw) In-Reply-To: <20210505170055.1415360-1-philmd@redhat.com> The ALLOCA(3) man-page mentions its "use is discouraged". Replace it by a g_malloc() call. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/ppc/kvm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 104a308abb5..ae62daddf7d 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2698,11 +2698,11 @@ int kvmppc_save_htab(QEMUFile *f, int fd, size_t bufsize, int64_t max_ns) int kvmppc_load_htab_chunk(QEMUFile *f, int fd, uint32_t index, uint16_t n_valid, uint16_t n_invalid, Error **errp) { - struct kvm_get_htab_header *buf; - size_t chunksize = sizeof(*buf) + n_valid * HASH_PTE_SIZE_64; + size_t chunksize = sizeof(struct kvm_get_htab_header) + + n_valid * HASH_PTE_SIZE_64; ssize_t rc; + g_autofree struct kvm_get_htab_header *buf = g_malloc(chunksize); - buf = alloca(chunksize); buf->index = index; buf->n_valid = n_valid; buf->n_invalid = n_invalid; @@ -2741,10 +2741,10 @@ void kvmppc_read_hptes(ppc_hash_pte64_t *hptes, hwaddr ptex, int n) i = 0; while (i < n) { struct kvm_get_htab_header *hdr; + char buf[sizeof(*hdr) + HPTES_PER_GROUP * HASH_PTE_SIZE_64]; int m = n < HPTES_PER_GROUP ? n : HPTES_PER_GROUP; - char buf[sizeof(*hdr) + m * HASH_PTE_SIZE_64]; - rc = read(fd, buf, sizeof(buf)); + rc = read(fd, buf, sizeof(*hdr) + m * HASH_PTE_SIZE_64); if (rc < 0) { hw_error("kvmppc_read_hptes: Unable to read HPTEs"); } -- 2.26.3
next prev parent reply other threads:[~2021-05-05 17:27 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-05 17:00 [PATCH 0/5] misc: Replace alloca() by g_malloc() Philippe Mathieu-Daudé 2021-05-05 17:00 ` [PATCH 1/5] bsd-user/syscall: Replace alloca() by g_new() Philippe Mathieu-Daudé 2021-05-05 17:00 ` [PATCH 2/5] gdbstub: Constify GdbCmdParseEntry Philippe Mathieu-Daudé 2021-05-06 11:50 ` Alex Bennée 2021-05-05 17:00 ` [PATCH 3/5] gdbstub: Use fixed-size array in GdbCmdParseEntry instead of pointer Philippe Mathieu-Daudé 2021-05-06 12:01 ` Alex Bennée 2021-05-06 12:39 ` Philippe Mathieu-Daudé 2021-05-06 15:15 ` Alex Bennée 2021-05-05 17:00 ` [PATCH 4/5] gdbstub: Replace alloca() by g_new() Philippe Mathieu-Daudé 2021-05-06 16:07 ` [ALT PATCH] gdbstub: Replace GdbCmdContext with plain g_array() Alex Bennée 2021-05-05 17:00 ` Philippe Mathieu-Daudé [this message] 2021-05-05 17:00 ` [PATCH 5/5] target/ppc/kvm: Replace alloca() by g_malloc() Philippe Mathieu-Daudé 2021-05-06 2:18 ` David Gibson 2021-05-06 2:18 ` David Gibson 2021-05-06 8:41 ` Greg Kurz 2021-05-06 8:41 ` Greg Kurz 2021-05-06 13:09 ` Philippe Mathieu-Daudé 2021-05-06 13:09 ` Philippe Mathieu-Daudé
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=20210505170055.1415360-6-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=david@gibson.dropbear.id.au \ --cc=groug@kaod.org \ --cc=imp@bsdimp.com \ --cc=kevans@freebsd.org \ --cc=kvm@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.