| Message ID | 20210506133758.1749233-10-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | misc: Replace alloca() by g_malloc() | expand |
On Thu, 6 May 2021 15:37:58 +0200 Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > 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> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > target/ppc/kvm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 104a308abb5..63c458e2211 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -2698,11 +2698,10 @@ 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; > + g_autofree struct kvm_get_htab_header *buf = g_malloc(chunksize); > ssize_t rc; > > - buf = alloca(chunksize); > buf->index = index; > buf->n_valid = n_valid; > buf->n_invalid = n_invalid;
On Thu, May 06, 2021 at 03:37:58PM +0200, Philippe Mathieu-Daudé wrote: > 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 | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 104a308abb5..63c458e2211 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -2698,11 +2698,10 @@ 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; > + g_autofree struct kvm_get_htab_header *buf = g_malloc(chunksize); Um.. that doesn't look like it would compile, since you use sizeof(*buf) before declaring buf. > ssize_t rc; > > - buf = alloca(chunksize); > buf->index = index; > buf->n_valid = n_valid; > buf->n_invalid = n_invalid;
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 104a308abb5..63c458e2211 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2698,11 +2698,10 @@ 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; + g_autofree struct kvm_get_htab_header *buf = g_malloc(chunksize); ssize_t rc; - buf = alloca(chunksize); buf->index = index; buf->n_valid = n_valid; buf->n_invalid = n_invalid;
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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)