From patchwork Thu Sep 8 13:59:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Halil Pasic X-Patchwork-Id: 667708 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 3sVQfY0vRqz9s1h for ; Fri, 9 Sep 2016 02:25:08 +1000 (AEST) Received: from localhost ([::1]:49094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi28P-0007CS-D5 for incoming@patchwork.ozlabs.org; Thu, 08 Sep 2016 12:25:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhzrZ-0000bk-IP for qemu-devel@nongnu.org; Thu, 08 Sep 2016 09:59:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhzrV-0004Qu-C2 for qemu-devel@nongnu.org; Thu, 08 Sep 2016 09:59:32 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:33664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhzrV-0004QO-4D for qemu-devel@nongnu.org; Thu, 08 Sep 2016 09:59:29 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u88Dw85A112854 for ; Thu, 8 Sep 2016 09:59:26 -0400 Received: from e06smtp06.uk.ibm.com (e06smtp06.uk.ibm.com [195.75.94.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 25b2bmy4vm-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 08 Sep 2016 09:59:26 -0400 Received: from localhost by e06smtp06.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Sep 2016 14:59:24 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp06.uk.ibm.com (192.168.101.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Sep 2016 14:59:22 +0100 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: pasic@linux.vnet.ibm.com X-IBM-RcptTo: qemu-block@nongnu.org;qemu-devel@nongnu.org Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 9C87A17D8042; Thu, 8 Sep 2016 15:01:14 +0100 (BST) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u88DxLjQ5439942; Thu, 8 Sep 2016 13:59:21 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u88DxKXU012330; Thu, 8 Sep 2016 07:59:21 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u88DxKE6012301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Thu, 8 Sep 2016 07:59:20 -0600 From: Halil Pasic To: qemu-block@nongnu.org Date: Thu, 8 Sep 2016 15:59:05 +0200 X-Mailer: git-send-email 2.8.4 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16090813-0024-0000-0000-00000214348F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16090813-0025-0000-0000-0000204C2B9E Message-Id: <20160908135905.86622-1-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-09-08_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1609080203 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v4 1/1] block: improve error handling in raw_open 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: Kevin Wolf , Cornelia Huck , Halil Pasic , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Make raw_open for POSIX more consistent in handling errors by setting the error object also when qemu_open fails. The error object was set generally set in case of errors, but I guess this case was overlooked. Do the same for win32. Signed-off-by: Halil Pasic Reviewed-by: Sascha Silbe Tested-by: Marc Hartmayer (POSIX only) --- Stumbled upon this (POSIX) while testing VMs with too many SCSI disks in respect to my nofile limit. When open hits the nofile limit while trying to hotplug yet another SCSI disk via libvirt we end up with no adequate error message (one stating too many files). Sadly this patch in not sufficient to fix this problem because drive_new (/qemu/blockdev.c) handles errors using error_report_err which is documented as not to be used in QMP context. Do not have a patch for that, because I'm unsure whats the best way to deal with it. My guess right now is to make sure we propagate errors at least until reaching code which is called only QMP in context and handle communicating the error to the requester of the operation there. Any suggestions or ideas? The win32 part was not tested, and the sole reason I touched it is to not introduce unnecessary divergence. v3 -> v4: * rebased on current master v2 -> v3: * first save errno then error_setg_errno v1 -> v2: * fixed win32 by the correct error_setg_* * use the original errno consequently --- block/raw-posix.c | 1 + block/raw-win32.c | 1 + 2 files changed, 2 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index 6ed7547..51e4ddb 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -436,6 +436,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options, fd = qemu_open(filename, s->open_flags, 0644); if (fd < 0) { ret = -errno; + error_setg_errno(errp, errno, "Could not open file"); if (ret == -EROFS) { ret = -EACCES; } diff --git a/block/raw-win32.c b/block/raw-win32.c index 56f45fe..185dd9b 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -338,6 +338,7 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags, if (s->hfile == INVALID_HANDLE_VALUE) { int err = GetLastError(); + error_setg_win32(errp, err, "Could not open file"); if (err == ERROR_ACCESS_DENIED) { ret = -EACCES; } else {