Message ID | 20180723201748.25573-87-mdroth@linux.vnet.ibm.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=none (p=none dis=none) header.from=linux.vnet.ibm.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="GW5/hb0L"; dkim-atps=neutral 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 41ZF0d6VdDz9s3N for <incoming@patchwork.ozlabs.org>; Tue, 24 Jul 2018 07:26:09 +1000 (AEST) Received: from localhost ([::1]:36764 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 1fhiLG-00039B-B3 for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2018 17:26:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhL3-0004Fa-Hz for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhL0-0005XH-Gl for qemu-devel@nongnu.org; Mon, 23 Jul 2018 16:21:49 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:41193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <flukshun@gmail.com>) id 1fhhL0-0005Wu-A0; Mon, 23 Jul 2018 16:21:46 -0400 Received: by mail-oi0-x242.google.com with SMTP id k12-v6so3471708oiw.8; Mon, 23 Jul 2018 13:21:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XsX1EfwzxLyNCkb8W94bPS3FZCOVUqOQnXVP2BsHDx8=; b=GW5/hb0LmMkNUZc8PghYqRxPkQnDpr2G8Vlccw0gWfZycebFdIfIK/8UhIWpkozGil EIGxQuoxxnwXpiQmZ6eDY+T34JYZydtsyHCa3J9uLwZXR0tS+QXYOveIAvRjuIvg35gj V7M+m4CZF1hkw/J08wXRkf3Q+/7f5x0cMQWua/zmJkG/kYeR30rO0TFKWJkYor52sqBr VsXXb8+VP7A9m7GOaGJFhMnSX2cVLYuFNnvpC2D/e0g3qEVkolHWRaNGB0d7xqxRwpQU vYHgTynzk6vzvjbFsjt58H+1ZeyMmoStGM202+YLWBBUJuKvASfs/WY3so3j97LS/UHI KaPg== 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:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XsX1EfwzxLyNCkb8W94bPS3FZCOVUqOQnXVP2BsHDx8=; b=Ku5dvInUzezEJilBQuJDJDv/SrrwdKHsckKqbHWs5ZKqSuMMvJeEzaZ7ekJ552tXcA x2Dj8GMthGojs9I3jB1meZNI5ElDak7RmmMjJICwkFeyyyUCG7r6ZXn2mYUHztIxe/OZ W/WZ4oEOHYrn8dD/pNbx85jSJ8J796ONt1OZywpxDw2A2tjXtsVEZa/nVLVwpS1NldAo xGRXB4S7pzUYfrRXiZljSsPI45Y2kgc22cHtD0vVkUrGhFjnXUdg7i3tBnS+fsXpEJ2C ncGYSFIvTc9gXpdniIe+gfqtYSPSXCZgR1LBQwtm2542UNKdtgrTI7FEh0lBUIrm9M77 2vRg== X-Gm-Message-State: AOUpUlGfqixTZzNJ8+cjgeTvPOuvRksGiFYHbSqznLNXLUAttG2HO7MA 4St5nRhQBZ4FKt+DUjgfbdLq8WQHvk1vBg== X-Google-Smtp-Source: AAOMgpfeGgXdgR4OUlZ27XVbshysPOlK2KDSxas1Bn+d8CcQb8VMIO2/EAh4RyDVYkAnuR96PSBxUQ== X-Received: by 2002:aca:4886:: with SMTP id v128-v6mr319298oia.69.1532377305143; Mon, 23 Jul 2018 13:21:45 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id r133-v6sm7512020oia.33.2018.07.23.13.21.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Jul 2018 13:21:44 -0700 (PDT) From: Michael Roth <mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 15:17:35 -0500 Message-Id: <20180723201748.25573-87-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> References: <20180723201748.25573-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4003:c06::242 Subject: [Qemu-devel] [PATCH 86/99] hw/isa/superio: Fix inconsistent use of Chardev->be 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> Cc: Paolo Bonzini <pbonzini@redhat.com>, qemu-stable@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
Patch Round-up for stable 2.12.1, freeze on 2018-07-30
|
expand
|
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index b95608a003..8ae6ea6f7b 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -43,7 +43,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) if (!k->parallel.is_enabled || k->parallel.is_enabled(sio, i)) { /* FIXME use a qdev chardev prop instead of parallel_hds[] */ chr = parallel_hds[i]; - if (chr == NULL || chr->be) { + if (chr == NULL) { name = g_strdup_printf("discarding-parallel%d", i); chr = qemu_chr_new(name, "null"); } else { @@ -81,9 +81,9 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) break; } if (!k->serial.is_enabled || k->serial.is_enabled(sio, i)) { - /* FIXME use a qdev chardev prop instead of serial_hds[] */ + /* FIXME use a qdev chardev prop instead of serial_hd() */ chr = serial_hds[i]; - if (chr == NULL || chr->be) { + if (chr == NULL) { name = g_strdup_printf("discarding-serial%d", i); chr = qemu_chr_new(name, "null"); } else {