| Message ID | 1542261614-2606-1-git-send-email-root@localhost.localdomain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target: hax: replace g_malloc with g_malloc0 | expand |
Your e-mail From: header is messed up. Please fix. root <root@localhost.localdomain> writes: > From: Li Qiang <liq3ea@gmail.com> > > And also the g_malloc doesn't need check return value, > remove it. > > Cc: qemu-trivial@nongnu.org > > Signed-off-by: Li Qiang <liq3ea@gmail.com> > --- > target/i386/hax-all.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c > index d2e512856b..a460c605af 100644 > --- a/target/i386/hax-all.c > +++ b/target/i386/hax-all.c > @@ -154,13 +154,7 @@ int hax_vcpu_create(int id) > return 0; > } > > - vcpu = g_malloc(sizeof(struct hax_vcpu_state)); > - if (!vcpu) { > - fprintf(stderr, "Failed to alloc vcpu state\n"); > - return -ENOMEM; > - } > - > - memset(vcpu, 0, sizeof(struct hax_vcpu_state)); > + vcpu = g_malloc0(sizeof(struct hax_vcpu_state)); Make that g_new0(struct hax_vcpu_state). > > ret = hax_host_create_vcpu(hax_global.vm->fd, id); > if (ret) { > @@ -250,11 +244,8 @@ struct hax_vm *hax_vm_create(struct hax_state *hax) > return hax->vm; > } > > - vm = g_malloc(sizeof(struct hax_vm)); > - if (!vm) { > - return NULL; > - } > - memset(vm, 0, sizeof(struct hax_vm)); > + vm = g_malloc0(sizeof(struct hax_vm)); Likewise. > + > ret = hax_host_create_vm(hax, &vm_id); > if (ret) { > fprintf(stderr, "Failed to create vm %x\n", ret); With those two changes: Reviewed-by: Markus Armbruster <armbru@redhat.com>
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index d2e512856b..a460c605af 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -154,13 +154,7 @@ int hax_vcpu_create(int id) return 0; } - vcpu = g_malloc(sizeof(struct hax_vcpu_state)); - if (!vcpu) { - fprintf(stderr, "Failed to alloc vcpu state\n"); - return -ENOMEM; - } - - memset(vcpu, 0, sizeof(struct hax_vcpu_state)); + vcpu = g_malloc0(sizeof(struct hax_vcpu_state)); ret = hax_host_create_vcpu(hax_global.vm->fd, id); if (ret) { @@ -250,11 +244,8 @@ struct hax_vm *hax_vm_create(struct hax_state *hax) return hax->vm; } - vm = g_malloc(sizeof(struct hax_vm)); - if (!vm) { - return NULL; - } - memset(vm, 0, sizeof(struct hax_vm)); + vm = g_malloc0(sizeof(struct hax_vm)); + ret = hax_host_create_vm(hax, &vm_id); if (ret) { fprintf(stderr, "Failed to create vm %x\n", ret);