[PATCH] fuzz: Avoid deprecated misuse of -drive if=sd

[PATCH] fuzz: Avoid deprecated misuse of -drive if=sd

[Markus Armbruster]

qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 uses -drive=sd where it
should use -drive if=none instead.  This prints a deprecation warning:

    $ ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 -runs=1 -seed=1
    [ASan warnings snipped...]
--> i386: -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive: warning: bogus if=sd is deprecated, use if=none
    INFO: Seed: 1
    [More normal output snipped...]

Support for this usage will be gone soon.  Adjust the test.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 tests/qtest/fuzz/generic_fuzz_configs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qtest/fuzz/generic_fuzz_configs.h b/tests/qtest/fuzz/generic_fuzz_configs.h
index 8b8c7ac553..004c701915 100644
--- a/tests/qtest/fuzz/generic_fuzz_configs.h
+++ b/tests/qtest/fuzz/generic_fuzz_configs.h
@@ -182,7 +182,7 @@ const generic_fuzz_config predefined_configs[] = {
         .name = "sdhci-v3",
         .args = "-nodefaults -device sdhci-pci,sd-spec-version=3 "
         "-device sd-card,drive=mydrive "
-        "-drive if=sd,index=0,file=null-co://,format=raw,id=mydrive -nographic",
+        "-drive if=none,index=0,file=null-co://,format=raw,id=mydrive -nographic",
         .objects = "sd*"
     },{
         .name = "ehci",
-- 
2.26.3

Re: [PATCH] fuzz: Avoid deprecated misuse of -drive if=sd

[Philippe Mathieu-Daudé]

On 3/19/21 2:20 PM, Markus Armbruster wrote:
> qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 uses -drive=sd where it
> should use -drive if=none instead.  This prints a deprecation warning:
> 
>     $ ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 -runs=1 -seed=1
>     [ASan warnings snipped...]
> --> i386: -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive: warning: bogus if=sd is deprecated, use if=none
>     INFO: Seed: 1
>     [More normal output snipped...]
> 
> Support for this usage will be gone soon.  Adjust the test.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  tests/qtest/fuzz/generic_fuzz_configs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [PATCH] fuzz: Avoid deprecated misuse of -drive if=sd

[Alexander Bulekov]

On 210319 1420, Markus Armbruster wrote:
> qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 uses -drive=sd where it
> should use -drive if=none instead.  This prints a deprecation warning:
> 
>     $ ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 -runs=1 -seed=1
>     [ASan warnings snipped...]
> --> i386: -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive: warning: bogus if=sd is deprecated, use if=none
>     INFO: Seed: 1
>     [More normal output snipped...]
> 
> Support for this usage will be gone soon.  Adjust the test.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  tests/qtest/fuzz/generic_fuzz_configs.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Alexander Bulekov <alxndr@bu.edu>

Thanks

Re: [PATCH] fuzz: Avoid deprecated misuse of -drive if=sd

[Philippe Mathieu-Daudé]

On 3/19/21 3:40 PM, Alexander Bulekov wrote:
> On 210319 1420, Markus Armbruster wrote:
>> qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 uses -drive=sd where it
>> should use -drive if=none instead.  This prints a deprecation warning:
>>
>>     $ ./build-oss-fuzz/DEST_DIR/qemu-fuzz-i386-target-generic-fuzz-sdhci-v3 -runs=1 -seed=1
>>     [ASan warnings snipped...]
>> --> i386: -drive if=sd,index=0,file=null-co://,format=raw,id=mydrive: warning: bogus if=sd is deprecated, use if=none
>>     INFO: Seed: 1
>>     [More normal output snipped...]
>>
>> Support for this usage will be gone soon.  Adjust the test.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>>  tests/qtest/fuzz/generic_fuzz_configs.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
> 
> Reviewed-by: Alexander Bulekov <alxndr@bu.edu>

This patch doesn't apply:

$ git am -s 20210319_armbru_fuzz_avoid_deprecated_misuse_of_drive_if_sd.mbx
Applying: fuzz: Avoid deprecated misuse of -drive if=sd
error: patch failed: tests/qtest/fuzz/generic_fuzz_configs.h:182
error: tests/qtest/fuzz/generic_fuzz_configs.h: patch does not apply
Patch failed at 0001 fuzz: Avoid deprecated misuse of -drive if=sd
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Which makes sense because it is already in the tree as commit
9585376ab5e.

To ease maintainer/reviewers email based workflow, does it make
sense to configure patchew to reply "this patch/series has been
merged as sha1..range" or or "this patch/series has been superseded
by this one: [link of v(N+1)]"?

Thanks,

Phil.