Re: [Qemu-block] [Qemu-devel] [PATCH v2 4/6] fdc-test: Avoid deprecated 'change' command

[Eric Blake]

On 01/19/2017 08:39 AM, Eric Blake wrote:
> On 01/19/2017 03:30 AM, Markus Armbruster wrote:
>> Eric Blake <address@hidden> writes:
>>
>>> Use the preferred blockdev-change-medium command instead.
>>>
>>> Signed-off-by: Eric Blake <address@hidden>
>>> Reviewed-by: John Snow <address@hidden>
>>> ---
>>>  tests/fdc-test.c | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/tests/fdc-test.c b/tests/fdc-test.c
>>> index 738c6b4..f5ff68d 100644
>>> --- a/tests/fdc-test.c
>>> +++ b/tests/fdc-test.c
>>> @@ -298,8 +298,9 @@ 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':{"
>>> +                         " 'device':'floppy0', 'filename': %s, "
>>> +                         "'format': 'raw' }}",
>>>                           test_image);
>>>
>>>      dir = inb(FLOPPY_BASE + reg_dir);
>>
>> 'device' is deprecated.  Can we use 'id' here?
> 
> I'll give it a shot.

Harder than I thought. Search for 'floppy0' in tests/ - you'll notice
that nothing explicitly sets that device name, which means I don't know
where to inject an explicit 'id' counterpart name to use instead (we are
inheriting the default device name that you get when starting an x86
board without -nodefaults).  Maybe someone else can supply an idea?

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

signature.asc
Description: OpenPGP digital signature