On 01.09.2017 20:03, Eric Blake wrote: > As a general rule, we prefer avoiding implicit global state > because it makes code harder to safely copy and paste without > thinking about the global state. It turns out that with the > recent changes to libqos, fw_cfg-test was not even using > global_qtest any more. Avoid a pointless strdup while at it. > > Signed-off-by: Eric Blake <ebl...@redhat.com> > --- > tests/fw_cfg-test.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c > index 47596c57a1..3a8dc7a2cd 100644 > --- a/tests/fw_cfg-test.c > +++ b/tests/fw_cfg-test.c > @@ -102,14 +102,11 @@ static void test_fw_cfg_boot_menu(void) > int main(int argc, char **argv) > { > QTestState *s; > - char *cmdline; > int ret; > > g_test_init(&argc, &argv, NULL); > > - cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 "); > - s = qtest_start(cmdline); > - g_free(cmdline); > + s = qtest_init("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8"); > > fw_cfg = pc_fw_cfg_init(s); >
Why don't you merge this with patch 14/29? Thomas