[libvirt] [libvirt PATCH v2 19/44] Deprecate QEMU_CAPS_BOOT_MENU

Andrea Bolognani abologna at redhat.com
Mon Apr 16 13:55:17 UTC 2018


On Mon, 2018-04-09 at 17:20 +0200, Ján Tomko wrote:
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 11f4b86610..7fce1e9b59 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -766,24 +766,21 @@ mymain(void)
>              QEMU_CAPS_ICH9_AHCI);
>      DO_TEST("bootindex-floppy-q35",
>              QEMU_CAPS_DEVICE_IOH3420,
> -            QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_BOOT_MENU,
> +            QEMU_CAPS_ICH9_AHCI,
>              QEMU_CAPS_BOOTINDEX);
> -    DO_TEST("boot-multi", QEMU_CAPS_BOOT_MENU);
> +    DO_TEST("boot-multi", NONE);
>      DO_TEST("boot-menu-enable",
> -            QEMU_CAPS_BOOT_MENU);
> +            NONE);

NONE goes on the first line.

>      DO_TEST("boot-menu-enable-bootindex",
> -            QEMU_CAPS_BOOT_MENU,
>              QEMU_CAPS_BOOTINDEX);
>      DO_TEST("boot-menu-enable-with-timeout",
> -            QEMU_CAPS_BOOT_MENU,
>              QEMU_CAPS_SPLASH_TIMEOUT);
> -    DO_TEST_FAILURE("boot-menu-enable-with-timeout", QEMU_CAPS_BOOT_MENU);
> +    DO_TEST_FAILURE("boot-menu-enable-with-timeout", NONE);
>      DO_TEST_PARSE_ERROR("boot-menu-enable-with-timeout-invalid", NONE);
> -    DO_TEST("boot-menu-disable", QEMU_CAPS_BOOT_MENU);
> +    DO_TEST("boot-menu-disable", NONE);
>      DO_TEST("boot-menu-disable-drive",
> -            QEMU_CAPS_BOOT_MENU);
> +            NONE);

Here too.

Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization




More information about the libvir-list mailing list