| Message ID | 1476700224-13186-3-git-send-email-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 17.10.2016 12:30, Laurent Vivier wrote: > qtest_spapr_boot()/qtest_pc_boot()/qtest_boot() call qtest_vboot() > and qtest_vboot() calls g_malloc(), > and g_malloc() never fails: > if memory allocation fails, the application is terminated. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > tests/libqos/libqos.c | 2 ++ > tests/rtas-test.c | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c > index 7abb482..6226546 100644 > --- a/tests/libqos/libqos.c > +++ b/tests/libqos/libqos.c > @@ -10,6 +10,8 @@ > /** > * Launch QEMU with the given command line, > * and then set up interrupts and our guest malloc interface. > + * Never returns NULL: > + * Terminates the application in case an error is encountered. > */ > QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap) > { > diff --git a/tests/rtas-test.c b/tests/rtas-test.c > index ba0867a..276c87e 100644 > --- a/tests/rtas-test.c > +++ b/tests/rtas-test.c > @@ -14,7 +14,6 @@ static void test_rtas_get_time_of_day(void) > time_t t1, t2; > > qs = qtest_spapr_boot("-machine pseries"); > - g_assert(qs != NULL); > > t1 = time(NULL); > ret = qrtas_get_time_of_day(qs->alloc, &tm, &ns); > Reviewed-by: Thomas Huth <thuth@redhat.com>
On Mon, 17 Oct 2016 12:30:20 +0200 Laurent Vivier <lvivier@redhat.com> wrote: > qtest_spapr_boot()/qtest_pc_boot()/qtest_boot() call qtest_vboot() > and qtest_vboot() calls g_malloc(), > and g_malloc() never fails: > if memory allocation fails, the application is terminated. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > tests/libqos/libqos.c | 2 ++ > tests/rtas-test.c | 1 - > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c > index 7abb482..6226546 100644 > --- a/tests/libqos/libqos.c > +++ b/tests/libqos/libqos.c > @@ -10,6 +10,8 @@ > /** > * Launch QEMU with the given command line, > * and then set up interrupts and our guest malloc interface. > + * Never returns NULL: > + * Terminates the application in case an error is encountered. > */ > QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap) > { > diff --git a/tests/rtas-test.c b/tests/rtas-test.c > index ba0867a..276c87e 100644 > --- a/tests/rtas-test.c > +++ b/tests/rtas-test.c > @@ -14,7 +14,6 @@ static void test_rtas_get_time_of_day(void) > time_t t1, t2; > > qs = qtest_spapr_boot("-machine pseries"); > - g_assert(qs != NULL); > > t1 = time(NULL); > ret = qrtas_get_time_of_day(qs->alloc, &tm, &ns);
diff --git a/tests/libqos/libqos.c b/tests/libqos/libqos.c index 7abb482..6226546 100644 --- a/tests/libqos/libqos.c +++ b/tests/libqos/libqos.c @@ -10,6 +10,8 @@ /** * Launch QEMU with the given command line, * and then set up interrupts and our guest malloc interface. + * Never returns NULL: + * Terminates the application in case an error is encountered. */ QOSState *qtest_vboot(QOSOps *ops, const char *cmdline_fmt, va_list ap) { diff --git a/tests/rtas-test.c b/tests/rtas-test.c index ba0867a..276c87e 100644 --- a/tests/rtas-test.c +++ b/tests/rtas-test.c @@ -14,7 +14,6 @@ static void test_rtas_get_time_of_day(void) time_t t1, t2; qs = qtest_spapr_boot("-machine pseries"); - g_assert(qs != NULL); t1 = time(NULL); ret = qrtas_get_time_of_day(qs->alloc, &tm, &ns);
qtest_spapr_boot()/qtest_pc_boot()/qtest_boot() call qtest_vboot() and qtest_vboot() calls g_malloc(), and g_malloc() never fails: if memory allocation fails, the application is terminated. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- tests/libqos/libqos.c | 2 ++ tests/rtas-test.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-)