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));
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);
--
2.11.0
On 15/11/2018 07:05, Li Qiang wrote: > 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(-) > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Li Qiang <liq3ea@gmail.com> writes:
> 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>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> 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));
>
> 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);
--
Alex Bennée
On 15/11/18 7:05, Li Qiang wrote:
> 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));
Can you use the g_new form?
vcpu = g_new0(struct hax_vcpu_state, 1);
>
> 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));
Ditto.
> +
> ret = hax_host_create_vm(hax, &vm_id);
> if (ret) {
> fprintf(stderr, "Failed to create vm %x\n", ret);
>
This patch as it or using g_new0:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 15/11/18 07:05, Li Qiang wrote:
> 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));
>
> 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);
>
Queued, thanks.
Paolo
On 21/11/2018 18:55, Paolo Bonzini wrote:
> On 15/11/18 07:05, Li Qiang wrote:
>> 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));
>>
>> 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);
>>
>
> Queued, thanks.
Markus and Philippe have asked to use g_new0() rather than g_malloc0().
Thanks,
Laurent
On 22/11/18 13:08, Laurent Vivier wrote:
> On 21/11/2018 18:55, Paolo Bonzini wrote:
>> On 15/11/18 07:05, Li Qiang wrote:
>>> 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));
>>>
>>> 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);
>>>
>>
>> Queued, thanks.
>
> Markus and Philippe have asked to use g_new0() rather than g_malloc0().
Sorry, not sure why I didn't notice the replies. Also, it's sent to
qemu-trivial so I'll ignore v2...
Paolo
© 2016 - 2025 Red Hat, Inc.