Message ID | 1538295197-23704-55-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QxtWlPwh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NJzY12Lfz9s1x for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:51:05 +1000 (AEST) Received: from localhost ([::1]:54421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6XRO-0004P7-JW for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:51:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41651) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Ws3-0002wO-5G for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrz-00018k-4i for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:29 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:34296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6Wrs-00010v-ET for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:14:20 -0400 Received: by mail-wr1-x442.google.com with SMTP id z4-v6so9105014wrb.1 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:14:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=QukBDJD2Fq6marGMAAJ/yD4KpwvGNifhW7h5YWpwEFA=; b=QxtWlPwhc5BHbuElXdBK/3x5a9MzWAYZwj5JVDdMEFdnAAH10sGqnZKw3nKHOVa2O1 3ZxpFjAB0EOqp0a6S5yuH+IgVcbi1deOYnVtVwqHsm30Wk9nDL8VBQvOK04yDGstI/lf KHkL70yLfy78zjSnAEQCAPKpLSIG54C6ypf32ZI7jlbGlN5LQ8kcN+Auspc4hVdQGDqf COQWYRrJhaGQT26pEF5VIXYmADGRoTFIb87zdGicU1c4Mi2dlz7c686SnyDSfuV2LGrb NzmE4vw7wBO7SNopx1z11Ac3p8uo8hQjytpZAPA5XOkV+IZnYZtFzmQAw7MFmdwc/QVh Sumg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=QukBDJD2Fq6marGMAAJ/yD4KpwvGNifhW7h5YWpwEFA=; b=A7ijIFMBhIKHXSTuHRC8qR8u8fpmydJZxr/0T4sSCLtGZAVWUHJR/j62Obnohd9pXC L6TW69McHbofMSGvWhL0mUyZgfZxGwa6Y/v7JvicdqxDFmWLNVEnYvNkNrLgHzzhXavA cPZCWpeCipYA3oZv8ZPyz6wL33UYaFXvlTMvNKWXn72yVCKXNGyfSRZBYe1iWe98zzm0 W4x03YmVApoTlIs6KET3On4N3XmgW4n5yBDCjwd1obhQdRQ+fRVCZSlLSVPG9YhQwNaQ Juu1U9nKmbkP+j6HrQL3X72cxXOxbkgQvIRYbLX3oTb13MUdnGp/jgsK0w2rum2Eu+Uf 3ckw== X-Gm-Message-State: ABuFfoivIV9YdjK2RIQy5BfsWGZ6hKTgxNt9qkwLUDvydBBSG+psm7Q2 usXldw47WoAeuxYl+mcIsTOeh+zr X-Google-Smtp-Source: ACcGV60vsqdCErUe01rjNtPIWlNi6Tyx/n/s2HksE7NGvJS+u6fnVSpEaIED/gxGIiLSmNEpd0Ub/Q== X-Received: by 2002:adf:a144:: with SMTP id r4-v6mr3643264wrr.169.1538295255758; Sun, 30 Sep 2018 01:14:15 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.14.14 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:14:15 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:52 +0200 Message-Id: <1538295197-23704-55-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PULL 54/79] char-pty: remove unnecessary #ifdef X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 68fd4e2..e8d9a53 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -31,10 +31,6 @@ #include "chardev/char-io.h" -#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ - || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \ - || defined(__GLIBC__) - typedef struct { Chardev parent; QIOChannel *ioc; @@ -299,5 +295,3 @@ static void register_types(void) } type_init(register_types); - -#endif
For some reason __APPLE__ was not checked in pty code. However, the #ifdef is redundant: this file is already compiled only if CONFIG_POSIX, same as util/qemu-openpty.c which it uses. Reported-by: Roman Bolshakov <r.bolshakov@yadro.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- chardev/char-pty.c | 6 ------ 1 file changed, 6 deletions(-)