From nobody Mon Feb 9 08:10:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610125683; cv=none; d=zohomail.com; s=zohoarc; b=K/Z63ZPF2+rYlKdBQGQ83bsLq5Y6adUaLSiNAja1JiC6JNE+BONGC5uvVntKk8TyESF9/idKc7C5mLqlJrarb2xiQG+vj9WYBIznlH8YMmix5ey5GjrINbaISc3cvsIWQsbhN+oGY6Phc10jiAWuWfxA1eg0LrRXmQh5mQ+oicw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610125683; 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=lmY2JhNZLUnqHP6NOYqPtDSEUE0yShWpehx9qX7laNk=; b=O75t71cNsgNZUutPLUIQIB53jHPRrWh3YxwN4jnV6R3O3QSVgGbUZ8Mwg4o8eO80ejMH7qPVrlJ0f7eKi+I9fr/TeQitXtuLGbZcGRuKu+oRaUDuayF4wCco/othNFsFCWMAhJrlQDUuR2bO8DrD45PKwXSuKVeuDRLz3mK0BEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1610125683013782.0490655167375; Fri, 8 Jan 2021 09:08:03 -0800 (PST) Received: from localhost ([::1]:50898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kxvF3-0003JX-S5 for importer@patchew.org; Fri, 08 Jan 2021 12:08:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kxuyX-00083q-1r for qemu-devel@nongnu.org; Fri, 08 Jan 2021 11:50:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kxuyV-0005Qv-C2 for qemu-devel@nongnu.org; Fri, 08 Jan 2021 11:50:56 -0500 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-592-EgtPSOZTOLOmUz9Si841bQ-1; Fri, 08 Jan 2021 11:50:53 -0500 Received: by mail-qk1-f199.google.com with SMTP id y187so9714556qke.20 for ; Fri, 08 Jan 2021 08:50:53 -0800 (PST) Received: from xz-x1.redhat.com ([142.126.83.202]) by smtp.gmail.com with ESMTPSA id n5sm4954064qkh.126.2021.01.08.08.50.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jan 2021 08:50:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610124654; 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=lmY2JhNZLUnqHP6NOYqPtDSEUE0yShWpehx9qX7laNk=; b=do3V4h2nn3ddqiuppOyN6zmcjcBxKnI2WbgVuG2MLU60Fk1iYKWTvOe6qHAPl1l4/8FJAD k0G2cMKS2ze0KsCTwQUHOSnXEuIfB7OXncwv3DAZDoOP68xbrF6sS+Gyf+Cg6/q5oXJlSH pzJYKDjTintBagxybUWU3LEs2uycO4g= X-MC-Unique: EgtPSOZTOLOmUz9Si841bQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lmY2JhNZLUnqHP6NOYqPtDSEUE0yShWpehx9qX7laNk=; b=ISt7+DkRWyW5s3u2Kwk9LezEfcx9t3TxFOwzZ+vle3YGHe1wOjPdHOttKGTuEH075F 6jvvmE2CZADj/hG1krdt3B33CUaM5jKVsvfT0CnPStlMshMPLpBthMD5YFtXhcGAGMM9 gqxeLWBz6pThfuAdNm2qW2C0SlXefiH3Wn8ykAPB3UWL3Rf4Lb9A0s+lVfBLFSscQ1Bb rGrPpSPcO2PcXQQmGIw2yK06iCTqds102rCGn4Drp7RE7+TOwXYVvtr8YAPctWzObPdF 2vMkY0d9RGGAbbjJmma5jCc7nDG+Ze5CAqijkkHUu2WBAGiZrknz2ZORrrs2y/BBer0u 7Qxg== X-Gm-Message-State: AOAM532LfJ2xLS1L9L5tDKm4BCK2mlumznvmhzUQZcLocKnkU49JTUhr aAeTG+LUnqj7rPcRJmuNV+B5LRG0Ldc8fYUBqpt/vcLuJ/WYku4WDRW9SSbNm94c6Wi7AJ1PrZN eEqsV8m32dgnhZxH87XuyMptCyrHUkKeqUdCfWd88kxbzKk2oKTHch5RWMx+kAXAS X-Received: by 2002:a37:6144:: with SMTP id v65mr4998901qkb.222.1610124652515; Fri, 08 Jan 2021 08:50:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAl+Q+j0NU+cIXebbQfJKtY/PvwTUZUVjif2aD5K5P35sw1WC+iLDUnoBOoBS3IU4X6dG6WQ== X-Received: by 2002:a37:6144:: with SMTP id v65mr4998880qkb.222.1610124652218; Fri, 08 Jan 2021 08:50:52 -0800 (PST) From: Peter Xu To: qemu-devel@nongnu.org Subject: [PATCH v4 04/13] KVM: Fixup kvm_log_clear_one_slot() ioctl return check Date: Fri, 8 Jan 2021 11:50:41 -0500 Message-Id: <20210108165050.406906-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210108164601.406146-1-peterx@redhat.com> References: <20210108164601.406146-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.247, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Paolo Bonzini , Hyman , "Dr . David Alan Gilbert" , peterx@redhat.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) kvm_vm_ioctl() handles the errno trick already for ioctl() on returning -1 for errors. Fix this. Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Peter Xu --- accel/kvm/kvm-all.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 389eaace72..9f779b56ae 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -771,14 +771,13 @@ static int kvm_log_clear_one_slot(KVMSlot *mem, int a= s_id, uint64_t start, d.num_pages =3D bmap_npages; d.slot =3D mem->slot | (as_id << 16); =20 - if (kvm_vm_ioctl(s, KVM_CLEAR_DIRTY_LOG, &d) =3D=3D -1) { - ret =3D -errno; + ret =3D kvm_vm_ioctl(s, KVM_CLEAR_DIRTY_LOG, &d); + if (ret) { error_report("%s: KVM_CLEAR_DIRTY_LOG failed, slot=3D%d, " "start=3D0x%"PRIx64", size=3D0x%"PRIx32", errno=3D%d", __func__, d.slot, (uint64_t)d.first_page, (uint32_t)d.num_pages, ret); } else { - ret =3D 0; trace_kvm_clear_dirty_log(d.slot, d.first_page, d.num_pages); } =20 --=20 2.26.2