From nobody Thu Nov 13 23:19:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584029672; cv=none; d=zohomail.com; s=zohoarc; b=lFqljRlPZOGK30tN1jYgvIjx65EZuMkv+xTvPqRAy33TdA7WfFxZIkmUIcTeFk4zrwgfuhKjaebLF9k16xfVzAwBOqDiYbJpIqS46OZztcDNW6bS6UYE6C/CIIFTcLkVnXobJglAuk0zqHYdbjvfO+S8schu9oCkCUsWWmtEpfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584029672; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Uwrs/CORLnGGhUdeF1wuS44JPM7elseCQ8oqDPJu/lU=; b=DtJ19XKMBTdLS5dc3X7wYxR5weMv9FPmmNkiwnq3cuU6HkhURgF3ORwAKS6uSHu2JL3h4Dqmg4GdHvzRWxosSqAIuA37wfY8wVUc4ubLVKhMfe3jCEADw0nbnsapY0TqLRFfwzYAF5JuP4+8vfAD443sEWufU0nIkSxj0vQ3xRw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584029672646708.619350433615; Thu, 12 Mar 2020 09:14:32 -0700 (PDT) Received: from localhost ([::1]:44568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCQTf-0003u6-NV for importer@patchew.org; Thu, 12 Mar 2020 12:14:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57079) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCQSI-0001gK-OP for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCQSH-0007n4-MD for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:13:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:56668 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCQSH-0007mt-HS for qemu-devel@nongnu.org; Thu, 12 Mar 2020 12:13:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-OVNBp4c8MMy9ejoGfHl9Vw-1; Thu, 12 Mar 2020 12:13:01 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC4CA18B9FC3; Thu, 12 Mar 2020 16:12:59 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-131.ams2.redhat.com [10.36.117.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 049CF5C1B5; Thu, 12 Mar 2020 16:12:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584029585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Uwrs/CORLnGGhUdeF1wuS44JPM7elseCQ8oqDPJu/lU=; b=h2kSMlJHdhAjOCKGGyrIn4weBP+TZBuSfbpJfSFRryA6btetLeU+DDGLt944VdoOOFQU/+ J7aRNqhErpLQetkUkIUF67Ma+YpXXaIddVXRo5diycQLGvTwdR+yip3Uu/Oo1CpxhhspWc Vls3DIATCeNrm1JHg9KFcwTLTGjJJto= X-MC-Unique: OVNBp4c8MMy9ejoGfHl9Vw-1 From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH RFCv2 1/4] openpic_kvm: Use kvm_device_ioctl() instead of ioctl() Date: Thu, 12 Mar 2020 17:12:14 +0100 Message-Id: <20200312161217.3590-2-david@redhat.com> In-Reply-To: <20200312161217.3590-1-david@redhat.com> References: <20200312161217.3590-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , qemu-s390x@nongnu.org, Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Let's use the official variant, which will e.g., trace the call. Cc: Markus Armbruster Cc: "Philippe Mathieu-Daud=C3=A9" Cc: "Marc-Andr=C3=A9 Lureau" Cc: Paolo Bonzini Signed-off-by: David Hildenbrand --- hw/intc/openpic_kvm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c index e4bf47d885..a5aa0ce915 100644 --- a/hw/intc/openpic_kvm.c +++ b/hw/intc/openpic_kvm.c @@ -70,10 +70,10 @@ static void kvm_openpic_write(void *opaque, hwaddr addr= , uint64_t val, attr.attr =3D addr; attr.addr =3D (uint64_t)(unsigned long)&val32; =20 - ret =3D ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); + ret =3D kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { qemu_log_mask(LOG_UNIMP, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), attr.attr); + strerror(-ret), attr.attr); } } =20 @@ -96,10 +96,10 @@ static uint64_t kvm_openpic_read(void *opaque, hwaddr a= ddr, unsigned size) attr.attr =3D addr; attr.addr =3D (uint64_t)(unsigned long)&val; =20 - ret =3D ioctl(opp->fd, KVM_GET_DEVICE_ATTR, &attr); + ret =3D kvm_device_ioctl(opp->fd, KVM_GET_DEVICE_ATTR, &attr); if (ret < 0) { qemu_log_mask(LOG_UNIMP, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), attr.attr); + strerror(-ret), attr.attr); return 0; } =20 @@ -145,10 +145,10 @@ static void kvm_openpic_region_add(MemoryListener *li= stener, attr.attr =3D KVM_DEV_MPIC_BASE_ADDR; attr.addr =3D (uint64_t)(unsigned long)®_base; =20 - ret =3D ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); + ret =3D kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + strerror(-ret), reg_base); } } =20 @@ -179,10 +179,10 @@ static void kvm_openpic_region_del(MemoryListener *li= stener, attr.attr =3D KVM_DEV_MPIC_BASE_ADDR; attr.addr =3D (uint64_t)(unsigned long)®_base; =20 - ret =3D ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); + ret =3D kvm_device_ioctl(opp->fd, KVM_SET_DEVICE_ATTR, &attr); if (ret < 0) { fprintf(stderr, "%s: %s %" PRIx64 "\n", __func__, - strerror(errno), reg_base); + strerror(-ret), reg_base); } } =20 --=20 2.24.1