On 07/05/2017 05:29 PM, Cornelia Huck wrote:
> On Wed, 5 Jul 2017 15:54:07 +0200
> Halil Pasic <pa...@linux.vnet.ibm.com> wrote:
>
>> My patch "s390x: fix error propagation in kvm-flic's realize" accidentally
>> replaced with. That's wrong! So please apply this fixup before including
>
> This sentence is missing something ;)
>
>> that patch into mainline (or any other repo).
>>
>> Signed-off-by: Halil Pasic <pa...@linux.vnet.ibm.com>
>> ---
>>
>> Hope this is appropriate.
>
> git actually has a 'fixup!' handling mechanism.
>
>> ---
>> hw/intc/s390_flic_kvm.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
>> index 88f1555121..a587ace3df 100644
>> --- a/hw/intc/s390_flic_kvm.c
>> +++ b/hw/intc/s390_flic_kvm.c
>> @@ -467,7 +467,7 @@ static void kvm_s390_flic_realize(DeviceState *dev,
>> Error **errp)
>> ret = kvm_vm_ioctl(kvm_state, KVM_CREATE_DEVICE, &cd);
>> if (ret < 0) {
>> error_setg_errno(&errp_local, errno, "Creating the KVM device
>> failed");
>> - trace_flic_no_device_api(errno);
>> + trace_flic_create_device(errno);
>> goto fail;
>> }
>> flic_state->fd = cd.fd;
>
> Acked-by: Cornelia Huck <coh...@redhat.com>
>
> Christian, will you handle this?
Yes, I will fold this into the original fix and send a pull request for the
whole patch list.
Thanks for your review :-)
