From patchwork Tue Jun 28 17:33:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 641663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rfD6N04rFz9sdg for ; Wed, 29 Jun 2016 03:57:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=MdaZO7TV; dkim-atps=neutral Received: from localhost ([::1]:38532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHxGL-0003WH-RX for incoming@patchwork.ozlabs.org; Tue, 28 Jun 2016 13:57:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwuY-0000lf-Sk for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:35:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHwuX-00039C-Tm for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:34:58 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:35536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwuX-000397-MO; Tue, 28 Jun 2016 13:34:57 -0400 Received: by mail-wm0-x241.google.com with SMTP id a66so7650941wme.2; Tue, 28 Jun 2016 10:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WLX2mUTeU1skSxjsNVosifKGxaiRPLmQcdXMHRjTWVc=; b=MdaZO7TV/VB57DkdSvyeIMuP0vG4r8MBtJ7TywWLf6svXfNuD5iZByOf0u4uzzoQc1 yF2l6Y1l0fECDGc0/Vv0dUJ9bX+7QXurQWX37DHGF7bMFqfeIdZC94xRp+dPfpR7mfKw X/+YkxSnRZ3RsmPpWQWXA9myiPJXQsAF/TfBt4+0Vv/IsGLPKw+a9aaLq14P8d6ib9hB AIDZzICDz6S5IUKRDuweyHrpfKufJEwOb5Dl7I6JH7R7uq+yy1FezGqNd7x5C9F7EZDZ lpeKyq3vaHYXUUkGQUG+LbUiCU04QFuKj8h8fAgSLw0bfhCcvQ0TUUPhce1QW5aeCjT0 vlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WLX2mUTeU1skSxjsNVosifKGxaiRPLmQcdXMHRjTWVc=; b=SRgtL5POVOyfNPyPu1U25kYH0CzdBvCwjOL/cU1IlBRI3zFNMJJkVo80fCs31k6kam 3btKiVJm3ZRlW8Av/WQMLx0t6daZKEgtuyU3lIDh/oe90CF9IfULcYahmt2qv6nHz5bg amQBRb0lYI6xTXvHqDFYASMcGEpuZo02VYZwPdUeW032R90yR+C2xZLOlfxoXjqePyw5 LwNeiXBrpxP6ENmb3IDCZq2uH0GTVcLZYPoeMyRGLiMhKW5v/x1DXj7XpYy/XoDZBjpE j3vzktiJscNDdyHsDs7B4nm1x1CxBfUvQwJbMNB6u2xLGT3cI56cDzO/O94H9/Ckm/1H CowA== X-Gm-Message-State: ALyK8tL+r3D9WtATP/N1QCJVvbTdErkj1iDSbrsdaWwq+G0UHMyNGPqEXa9Uap9TMfVMiQ== X-Received: by 10.28.74.20 with SMTP id x20mr18226278wma.14.1467135297028; Tue, 28 Jun 2016 10:34:57 -0700 (PDT) Received: from donizetti.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id c142sm5305wme.18.2016.06.28.10.34.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 10:34:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 19:33:49 +0200 Message-Id: <1467135242-874-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467135242-874-1-git-send-email-pbonzini@redhat.com> References: <1467135242-874-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PULL 19/32] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c 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: qemu-stable@nongnu.org, Lin Ma Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Lin Ma In function pci_assign_dev_load_option_rom, For those pci devices don't have 'rom' file under sysfs or if loading ROM from external file, The function returns NULL, and won't set the passed 'size' variable. In these 2 cases, qemu still reports "Invalid ROM" error message, Users may be confused by it. Signed-off-by: Lin Ma Message-Id: <1466010327-22368-1-git-send-email-lma@suse.com> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/i386/kvm/pci-assign.c | 4 ---- hw/i386/pci-assign-load-rom.c | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 98997d1..3623aa1 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -1891,8 +1891,4 @@ static void assigned_dev_load_option_rom(AssignedDevice *dev) pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size, dev->host.domain, dev->host.bus, dev->host.slot, dev->host.function); - - if (!size) { - error_report("pci-assign: Invalid ROM."); - } } diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c index 4bbb08c..0d8e4b2 100644 --- a/hw/i386/pci-assign-load-rom.c +++ b/hw/i386/pci-assign-load-rom.c @@ -40,6 +40,9 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, domain, bus, slot, function); if (stat(rom_file, &st)) { + if (errno != ENOENT) { + error_report("pci-assign: Invalid ROM."); + } return NULL; }