From patchwork Wed Sep 19 14:31:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 185082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C88132C007B for ; Thu, 20 Sep 2012 01:27:53 +1000 (EST) Received: from localhost ([::1]:33587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELKK-00014P-Ud for incoming@patchwork.ozlabs.org; Wed, 19 Sep 2012 10:32:32 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJq-0008Cj-1n for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TELJg-0005Hc-9D for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:32:01 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50022) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TELJg-0005F9-1y for qemu-devel@nongnu.org; Wed, 19 Sep 2012 10:31:52 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so2588440pbb.4 for ; Wed, 19 Sep 2012 07:31:51 -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:x-mailer:in-reply-to :references; bh=UaLklyfY9L8z8P8+V4eIHikPyV7SeON2Hx+vds+6IcQ=; b=qCDHNnT6XO85cDFonBR8EGeYdVtLAH/W1udguDih/dwRiIxf+Wx2QoHQGLtcCP2mqI 2XdNOPU+agOQ4+tldLTUywgZrpPn9IFzdT+AboxvUjjjFKChcjzLeDiz0g2tRxpNZHza 2Of7z3v1/jA+3CvH27wg3IplSR64dKcQij98aPf5F3F0KkKuPkktn6Ooc5pTD4wnRzHi +c4/lKU48SUa3jam+wul++80SQI8O+mNLneK3DUMydgciuyJlbO1jvGFK88olJCiWgI6 2+benHv83SLpI19PexnxF9yHgT7bIQJLwPZW3zcbevDX4nWEhbBquFRO3P6FBwOMAPGW +VyA== Received: by 10.66.75.133 with SMTP id c5mr7411720paw.24.1348065111685; Wed, 19 Sep 2012 07:31:51 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id it5sm1939572pbc.10.2012.09.19.07.31.48 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Sep 2012 07:31:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 19 Sep 2012 16:31:05 +0200 Message-Id: <1348065078-5139-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> References: <1348065078-5139-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 02/12] monitor: add Error * argument to monitor_get_fd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Differentiate monitor_get_fd and monitor_handle_fd_param by doing correct error propagation in the former and its callers. Signed-off-by: Paolo Bonzini --- dump.c | 5 +++-- monitor.c | 9 ++++++--- monitor.h | 2 +- 3 file modificati, 10 inserzioni(+), 6 rimozioni(-) diff --git a/dump.c b/dump.c index 2bf8d8d..cc7aecd 100644 --- a/dump.c +++ b/dump.c @@ -824,6 +824,7 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, int fd = -1; DumpState *s; int ret; + Error *local_err = NULL; if (has_begin && !has_length) { error_set(errp, QERR_MISSING_PARAMETER, "length"); @@ -836,9 +837,9 @@ void qmp_dump_guest_memory(bool paging, const char *file, bool has_begin, #if !defined(WIN32) if (strstart(file, "fd:", &p)) { - fd = monitor_get_fd(cur_mon, p); + fd = monitor_get_fd(cur_mon, p, &local_err); if (fd == -1) { - error_set(errp, QERR_FD_NOT_FOUND, p); + error_propagate(errp, local_err); return; } } diff --git a/monitor.c b/monitor.c index 4901600..b73ae57 100644 --- a/monitor.c +++ b/monitor.c @@ -2118,7 +2118,7 @@ static void do_loadvm(Monitor *mon, const QDict *qdict) } } -int monitor_get_fd(Monitor *mon, const char *fdname) +int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp) { mon_fd_t *monfd; @@ -2139,6 +2139,7 @@ int monitor_get_fd(Monitor *mon, const char *fdname) return fd; } + error_set(errp, QERR_FD_NOT_FOUND, fdname); return -1; } @@ -2410,12 +2411,14 @@ int monitor_fdset_dup_fd_remove(int dup_fd) int monitor_handle_fd_param(Monitor *mon, const char *fdname) { int fd; + Error *local_err = NULL; if (!qemu_isdigit(fdname[0]) && mon) { - fd = monitor_get_fd(mon, fdname); + fd = monitor_get_fd(mon, fdname, &local_err); if (fd == -1) { - error_report("No file descriptor named %s found", fdname); + qerror_report_err(local_err); + error_free(local_err); return -1; } } else { diff --git a/monitor.h b/monitor.h index 64c1561..e240c3f 100644 --- a/monitor.h +++ b/monitor.h @@ -66,7 +66,7 @@ int monitor_read_block_device_key(Monitor *mon, const char *device, BlockDriverCompletionFunc *completion_cb, void *opaque); -int monitor_get_fd(Monitor *mon, const char *fdname); +int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp); int monitor_handle_fd_param(Monitor *mon, const char *fdname); void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)