Re: [Qemu-devel] [PATCH v4 12/13] fdc-test: Avoid deprecated 'change' command

[John Snow]

On 04/11/2017 02:50 PM, Eric Blake wrote:
> Use the preferred blockdev-change-medium command instead.
> 
> Also, use of 'device' is deprecated; adding an explicit id on
> the command line lets us use 'id' for both blockdev-change-medium
> and eject.
> 
> Signed-off-by: Eric Blake <address@hidden>
> 
> ---
> v4: use 'id' rather than 'device' [thanks to John and Kevin]
> v3: update commit message to point out that we are still using
> deprecated 'device'
> ---
>  tests/fdc-test.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/fdc-test.c b/tests/fdc-test.c
> index 738c6b4..325712e 100644
> --- a/tests/fdc-test.c
> +++ b/tests/fdc-test.c
> @@ -298,8 +298,8 @@ static void test_media_insert(void)
> 
>      /* Insert media in drive. DSKCHK should not be reset until a step pulse
>       * is sent. */
> -    qmp_discard_response("{'execute':'change', 'arguments':{"
> -                         " 'device':'floppy0', 'target': %s, 'arg': 'raw' 
> }}",
> +    qmp_discard_response("{'execute':'blockdev-change-medium', 'arguments':{"
> +                         " 'id':'floppy0', 'filename': %s, 'format': 'raw' 
> }}",
>                           test_image);
> 
>      dir = inb(FLOPPY_BASE + reg_dir);
> @@ -330,7 +330,7 @@ static void test_media_change(void)
>      /* Eject the floppy and check that DSKCHG is set. Reading it out doesn't
>       * reset the bit. */
>      qmp_discard_response("{'execute':'eject', 'arguments':{"
> -                         " 'device':'floppy0' }}");
> +                         " 'id':'floppy0' }}");
> 
>      dir = inb(FLOPPY_BASE + reg_dir);
>      assert_bit_set(dir, DSKCHG);
> @@ -564,7 +564,7 @@ int main(int argc, char **argv)
>      /* Run the tests */
>      g_test_init(&argc, &argv, NULL);
> 
> -    qtest_start(NULL);
> +    qtest_start("-device floppy,id=floppy0");
>      qtest_irq_intercept_in(global_qtest, "ioapic");
>      qtest_add_func("/fdc/cmos", test_cmos);
>      qtest_add_func("/fdc/no_media_on_start", test_no_media_on_start);
> 

yay


Reviewed-by: John Snow <address@hidden>