From nobody Tue Feb 10 12:59:56 2026 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=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=1578042861; cv=none; d=zohomail.com; s=zohoarc; b=Br2eVDWb27+nKRD+zUmTNQP03FwOofph3AEGjKCvUJdrASP49hfDuJrOLG2Aq2tGtThvWK/AD4GwDxtFdqrIZODXCbBLkARw0Dz5Kb4eBV1WUmxtCcxObDWekVeHO6NHrr+qofYYUnvGIF5tQBxFGOLHbgXGGnWuaHJj43tToLg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578042861; 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=ELBgWw34BNGVKXXTbMo2iIoDpa6hhPVBdb8ILrquj6g=; b=Q3KVmrqmyXbuEWv8a5+Pxyb2lS4uYLwMzJqhC674dSFkqXwBiEyt7UE+5+h0+fe9+mPhqtmWBNPwzHCEHdInIFdyUy3DemmnFPGWVXrOiIKnAPCudUTRO0/75DduiVf9c7PoDH+97qCdo5ixKQgC+n4ReKRPUlzBQUBsJFfeyCc= 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 1578042861485726.7904575822757; Fri, 3 Jan 2020 01:14:21 -0800 (PST) Received: from localhost ([::1]:50230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inJ2B-0007ZY-Vd for importer@patchew.org; Fri, 03 Jan 2020 04:14:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1inIyE-0002fp-6F for qemu-devel@nongnu.org; Fri, 03 Jan 2020 04:10:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1inIyC-0000Mw-V9 for qemu-devel@nongnu.org; Fri, 03 Jan 2020 04:10:14 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:55175 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1inIyC-0000Lp-R3 for qemu-devel@nongnu.org; Fri, 03 Jan 2020 04:10:12 -0500 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-195-de9O8cFNMK6kRj8jV-JoKw-1; Fri, 03 Jan 2020 04:10:09 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15FE01005502; Fri, 3 Jan 2020 09:10:08 +0000 (UTC) Received: from localhost (ovpn-112-30.ams2.redhat.com [10.36.112.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 007787BA25; Fri, 3 Jan 2020 09:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578042612; 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=ELBgWw34BNGVKXXTbMo2iIoDpa6hhPVBdb8ILrquj6g=; b=Q8+U/amBjnojI1T8ZO0Ge2qOiGFYt8fsNC2CM1YCLm82U9bi+n46GvqJu5rUcqaCPzzVjv gl8mVlp5WZ0ijL2laVTIXZp4qI/1c1UGx8CqQkZesm1TrJvsa2cP7+U3i7ojtV/NQHZGpV l4ZPwWW67hlYAV/M40zzfG+LEi59UqE= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PULL v2 5/7] screendump: replace FILE with QIOChannel and fix close()/qemu_close() Date: Fri, 3 Jan 2020 13:08:51 +0400 Message-Id: <20200103090853.1014627-6-marcandre.lureau@redhat.com> In-Reply-To: <20200103090853.1014627-1-marcandre.lureau@redhat.com> References: <20200103090853.1014627-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: de9O8cFNMK6kRj8jV-JoKw-1 X-Mimecast-Spam-Score: 0 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.81 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: Peter Maydell , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The file opened for ppm_save() may be a /dev/fdset, in which case a dup fd is added to the fdset. It should be removed by calling qemu_close(), instead of the implicit close() on fclose(). I don't see a convenient way to solve that with stdio streams, so I switched the code to QIOChannel which uses qemu_close(). Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- ui/console.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/ui/console.c b/ui/console.c index 77d62fe76d..82c0b72e7e 100644 --- a/ui/console.c +++ b/ui/console.c @@ -33,6 +33,7 @@ #include "chardev/char-fe.h" #include "trace.h" #include "exec/memory.h" +#include "io/channel-file.h" =20 #define DEFAULT_BACKSCROLL 512 #define CONSOLE_CURSOR_PERIOD 500 @@ -313,36 +314,30 @@ static bool ppm_save(int fd, DisplaySurface *ds, Erro= r **errp) { int width =3D pixman_image_get_width(ds->image); int height =3D pixman_image_get_height(ds->image); - FILE *f; + g_autoptr(Object) ioc =3D OBJECT(qio_channel_file_new_fd(fd)); + g_autofree char *header =3D NULL; + g_autoptr(pixman_image_t) linebuf =3D NULL; int y; - int ret; - pixman_image_t *linebuf; - bool success =3D false; =20 trace_ppm_save(fd, ds); - f =3D fdopen(fd, "wb"); - ret =3D fprintf(f, "P6\n%d %d\n%d\n", width, height, 255); - if (ret < 0) { - linebuf =3D NULL; - goto end; + + header =3D g_strdup_printf("P6\n%d %d\n%d\n", width, height, 255); + if (qio_channel_write_all(QIO_CHANNEL(ioc), + header, strlen(header), errp) < 0) { + return false; } + linebuf =3D qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width); for (y =3D 0; y < height; y++) { qemu_pixman_linebuf_fill(linebuf, ds->image, width, 0, y); - clearerr(f); - ret =3D fwrite(pixman_image_get_data(linebuf), 1, - pixman_image_get_stride(linebuf), f); - (void)ret; - success =3D !ferror(f); + if (qio_channel_write_all(QIO_CHANNEL(ioc), + (char *)pixman_image_get_data(linebuf), + pixman_image_get_stride(linebuf), errp) = < 0) { + return false; + } } =20 -end: - if (!success) { - error_setg(errp, "failed to write to PPM file: %s", strerror(errno= )); - } - qemu_pixman_image_unref(linebuf); - fclose(f); - return success; + return true; } =20 void qmp_screendump(const char *filename, bool has_device, const char *dev= ice, --=20 2.24.0.308.g228f53135a