From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38723)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cohuck@redhat.com>) id 1dSmFW-0003xV-Ql
	for qemu-devel@nongnu.org; Wed, 05 Jul 2017 11:29:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cohuck@redhat.com>) id 1dSmFS-0002o5-T2
	for qemu-devel@nongnu.org; Wed, 05 Jul 2017 11:29:54 -0400
Received: from mx1.redhat.com ([209.132.183.28]:57185)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <cohuck@redhat.com>) id 1dSmFS-0002n4-MT
	for qemu-devel@nongnu.org; Wed, 05 Jul 2017 11:29:50 -0400
Date: Wed, 5 Jul 2017 17:29:46 +0200
From: Cornelia Huck <cohuck@redhat.com>
Message-ID: <20170705172946.49f0e214@dhcp-192-215.str.redhat.com>
In-Reply-To: <20170705135407.6221-1-pasic@linux.vnet.ibm.com>
References: <1499177279-131407-1-git-send-email-borntraeger@de.ibm.com>
	<1499177279-131407-4-git-send-email-borntraeger@de.ibm.com>
	<20170704163103.4d6670a9@dhcp-192-215.str.redhat.com>
	<3200e2c0-8ffe-2f6d-b7a8-049352851c96@linux.vnet.ibm.com>
	<87aeaca3-5261-91c9-506b-eded3dededb4@linux.vnet.ibm.com>
	<20170704185924.3eb7171d@dhcp-192-215.str.redhat.com>
	<0a35bfd4-b1d1-ce6c-19e0-4aea225c4406@de.ibm.com>
	<20170705135407.6221-1-pasic@linux.vnet.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 1/1] s390x: fixup for "fix error
 propagation in kvm-flic..."
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Halil Pasic <pasic@linux.vnet.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>, qemu-devel@nongnu.org, Alexander Graf <agraf@suse.de>, Richard Henderson <rth@twiddle.net>

On Wed,  5 Jul 2017 15:54:07 +0200
Halil Pasic <pasic@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 <pasic@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 <cohuck@redhat.com>

Christian, will you handle this?