Re: [qemu-s390x] [Qemu-devel] [PATCH v6 21/29] hw/s390x: Replace fprintf(stderr, "*\n" with error_report()

[Alistair Francis]

On Tue, Jan 9, 2018 at 9:45 AM, Cornelia Huck <address@hidden> wrote:
> On Wed, 20 Dec 2017 09:24:41 -0800
> Alistair Francis <address@hidden> wrote:
>
>> Replace a large number of the fprintf(stderr, "*\n" calls with
>> error_report(). The functions were renamed with these commands and then
>> compiler issues where manually fixed.
>>
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N;N; {s|fprintf(stderr, 
>> "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>> find ./* -type f -exec sed -i \
>>     'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
>>     {} +
>>
>> Some lines where then manually tweaked to pass checkpatch.
>>
>> One fprintf(stderr, was manually converted to a
>> qemu_log_mask(LOG_GUEST_ERROR,
>>
>> Signed-off-by: Alistair Francis <address@hidden>
>> Reviewed-by: Thomas Huth <address@hidden>
>> ---
>> V3:
>>  - Use a qemu_log_mask(LOG_GUEST_ERROR,
>> V2:
>>  - Split hw patch into individual directories
>>
>>  hw/s390x/virtio-ccw.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
>> index 38f6a8afc9..3d8f26949b 100644
>> --- a/hw/s390x/virtio-ccw.c
>> +++ b/hw/s390x/virtio-ccw.c
>> @@ -426,8 +426,9 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
>>                   * passes us zeroes for those we don't support.
>>                   */
>>                  if (features.features) {
>> -                    fprintf(stderr, "Guest bug: features[%i]=%x (expected 
>> 0)\n",
>> -                            features.index, features.features);
>> +                    qemu_log_mask(LOG_GUEST_ERROR,
>> +                                  "Guest bug: features[%i]=%x (expected 0)",
>> +                                  features.index, features.features);
>>                      /* XXX: do a unit check here? */
>>                  }
>>              }
>
> I'll queue this to s390-next so this doesn't get lost.
>
> I'll also tweak the commit message, as nothing is converted to
> error_report().

Thanks!

Alistair