From patchwork Wed Jul 5 13:54:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Halil Pasic X-Patchwork-Id: 9826567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C168D60237 for ; Wed, 5 Jul 2017 13:55:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4B7823F88 for ; Wed, 5 Jul 2017 13:55:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96E9B284B5; Wed, 5 Jul 2017 13:55:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2913623F88 for ; Wed, 5 Jul 2017 13:55:04 +0000 (UTC) Received: from localhost ([::1]:46360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSklj-0001yz-Tv for patchwork-qemu-devel@patchwork.kernel.org; Wed, 05 Jul 2017 09:55:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43407) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSklB-0001sR-SU for qemu-devel@nongnu.org; Wed, 05 Jul 2017 09:54:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSkl7-000449-0N for qemu-devel@nongnu.org; Wed, 05 Jul 2017 09:54:29 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40601 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dSkl6-00043p-Q7 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 09:54:24 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v65DsHAZ076752 for ; Wed, 5 Jul 2017 09:54:23 -0400 Received: from e06smtp13.uk.ibm.com (e06smtp13.uk.ibm.com [195.75.94.109]) by mx0b-001b2d01.pphosted.com with ESMTP id 2bgvxxutfd-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 05 Jul 2017 09:54:23 -0400 Received: from localhost by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 5 Jul 2017 14:54:21 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 5 Jul 2017 14:54:18 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v65DsI4S20513202; Wed, 5 Jul 2017 13:54:18 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1E0B0A4040; Wed, 5 Jul 2017 14:51:44 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D5F06A4055; Wed, 5 Jul 2017 14:51:43 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 5 Jul 2017 14:51:43 +0100 (BST) From: Halil Pasic To: Christian Borntraeger , Cornelia Huck Date: Wed, 5 Jul 2017 15:54:07 +0200 X-Mailer: git-send-email 2.11.2 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> In-Reply-To: <0a35bfd4-b1d1-ce6c-19e0-4aea225c4406@de.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17070513-0012-0000-0000-0000055F5180 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17070513-0013-0000-0000-000018D1B985 Message-Id: <20170705135407.6221-1-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-07-05_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1707050234 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 1/1] s390x: fixup for "fix error propagation in kvm-flic..." X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Halil Pasic , Richard Henderson , qemu-devel@nongnu.org, Alexander Graf Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP My patch "s390x: fix error propagation in kvm-flic's realize" accidentally replaced with. That's wrong! So please apply this fixup before including that patch into mainline (or any other repo). Signed-off-by: Halil Pasic Acked-by: Cornelia Huck --- Hope this is appropriate. --- 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;