From patchwork Mon Jan 8 02:45:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 856660 Return-Path: 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=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jTejRKnl"; 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 3zFKSN49SPz9s7n for ; Mon, 8 Jan 2018 13:47:32 +1100 (AEDT) Received: from localhost ([::1]:59321 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNTG-0006qw-Lo for incoming@patchwork.ozlabs.org; Sun, 07 Jan 2018 21:47:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYNSR-0006mt-Av for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYNSP-0002P4-Br for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:39 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:39486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYNSP-0002Ov-7R for qemu-devel@nongnu.org; Sun, 07 Jan 2018 21:46:37 -0500 Received: by mail-qt0-x242.google.com with SMTP id k19so12087600qtj.6 for ; Sun, 07 Jan 2018 18:46:37 -0800 (PST) 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=V79M0vlxWnlAkroOVqDurfjyeopATnekif/q2z8wcgU=; b=jTejRKnlOYB6oC0cGaE5Wq8TIkO7/fTLRUvFNLm4Ul7XZkDcPK2aedLEm85LDShJCg dhMZNCVNZpOBB1Yr74S0lqk/xhtysHvXDIDaOTl+nrhR2qGHXf2uM+2Ffm7nc+ap6Y6o 9d16s3jT57w1GHyzZyEkxby+rf2Kjet3x9q8jdIVNNzAqe596bP/nxZ4dDdm8TWi2uM6 +CrJCSbk0yVq1WFRNVaNWkyPIqgCt1LDQlLcqEIcHTPYCgiy2q5lJNbiLz+YKqwWfXDA T592SyIQeQojIUIqGe/YLSlEDnKKW8iCylUE7+oOV3I8DNCDcGTBRyGYhU8ELEGmuV5U ZRmg== 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=V79M0vlxWnlAkroOVqDurfjyeopATnekif/q2z8wcgU=; b=DJsa0hyQSfhiPcFN0RjsGDzV2/SG9POZ7cU9+rx2l+IPG5iiNo0oZ9pWpvGGeWjNTg hA9mcerGYShepPkrCXLn66GTgGU/L1O6FylSiLLd3fc2ndyRcCEqBxmTbJGNj5kizEh2 9yhfvaKhM/khYSCORspu42NLK3cul+8Vye9ktWfD5vLNBZaB6JQuVnFLkHjqr5QS25zE ZHNZ5+/5mUeEsWj2lZEOSwSXhvbZkYU45KfurUoreDFZ1V3aaXXdSUaHLZVk56zg7tny SRscLL74wTgG9CnFhkWqQwir1qiL5TOWdxY4SwTOS9/0jThBStcNGLmYuOBR35x5Yscx Sk1A== X-Gm-Message-State: AKwxytf8CWE1fDHTP5M7fEaKRp7AsvUvH1nRfKRzqroAXTE0tNbC5MZ1 y2xMnyfnvANg6YUHYMfiFaU= X-Google-Smtp-Source: ACJfBoug/GQiSaAuW24bupr+zycgufJHf1dw4FVyLruejp+97Mkoaol8yusu49XM95fVx1ElhgvYzQ== X-Received: by 10.237.56.164 with SMTP id k33mr13726135qte.276.1515379596682; Sun, 07 Jan 2018 18:46:36 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d10sm7156245qkg.16.2018.01.07.18.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2018 18:46:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Paolo Bonzini , "Michael S. Tsirkin" , =?utf-8?q?Herv=C3=A9_Poussinea?= =?utf-8?q?u?= , Aurelien Jarno , Eduardo Habkost , Marcel Apfelbaum , Yongbok Kim Date: Sun, 7 Jan 2018 23:45:37 -0300 Message-Id: <20180108024558.17983-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108024558.17983-1-f4bug@amsat.org> References: <20180108024558.17983-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH 08/29] hw/mips/fulong2e: use isa_superio_init() 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: Igor Mammedov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/mips/mips_fulong2e.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 8660d078c8..2f4cc5d05e 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -23,13 +23,10 @@ #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/dma/i8257.h" -#include "hw/char/serial.h" -#include "hw/char/parallel.h" -#include "hw/block/fdc.h" +#include "hw/isa/superio.h" #include "net/net.h" #include "hw/boards.h" #include "hw/i2c/smbus.h" -#include "sysemu/block-backend.h" #include "hw/block/flash.h" #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" @@ -44,7 +41,6 @@ #include "hw/isa/vt82c686.h" #include "hw/timer/mc146818rtc.h" #include "hw/timer/i8254.h" -#include "hw/input/i8042.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" @@ -366,13 +362,10 @@ static void mips_fulong2e_init(MachineState *machine) i8257_dma_init(isa_bus, 0); /* Super I/O */ - isa_create_simple(isa_bus, TYPE_I8042); + isa_superio_init(isa_bus, MAX_SERIAL_PORTS, 1, 0); mc146818_rtc_init(isa_bus, 2000, NULL); - serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); - parallel_hds_isa_init(isa_bus, 1); - /* Sound card */ audio_init(pci_bus); /* Network card */