From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15081994277153.5302225013080033; Mon, 16 Oct 2017 17:17:07 -0700 (PDT) Received: from localhost ([::1]:35730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FZ7-0000sP-SA for importer@patchew.org; Mon, 16 Oct 2017 20:17:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FUs-0005fX-IA for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FUr-0003aj-Kk for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:38 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:56807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FUr-0003aZ-G4; Mon, 16 Oct 2017 20:12:37 -0400 Received: by mail-qt0-x241.google.com with SMTP id z28so28430qtz.13; Mon, 16 Oct 2017 17:12:37 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:36 -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=GNG6lPxow5POZreNwO2ghqugC0ouul2u9Zvj9geqPUg=; b=UISCTZ0RZNQzV66UZ2k5DWj2GdnO2s5RcZVmLFRTHfZm3TgZyOKny5H6dVcFpcpL+d 8xqEjOQKxX/k4VQ3Kn0lYePm2SpfyCkZn5bjk2bkZW0f2NQpuZ237l9eAOAXU42kONPg I1p4mX/to9lvF/7PBkyDcf+2gXQzHhyXuLTAkJaISv+yJD0XG2cu4Tamr8spFYNwW+vm NOQVspr0SUAsLPWJsQAma0a7an9tTC4ugfn8Z0QByvloVY5mc4WIvps5In+N8YQcjtdi bfOs4JWcC+8twYv9Pynx0FsfTzF8P06iIWrIHj9BUm3kak3LPnDxz6KQsSnVU7c6lvaC SgEQ== 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=GNG6lPxow5POZreNwO2ghqugC0ouul2u9Zvj9geqPUg=; b=CgiNiK7j7Nk4FrVb4IG5nic31KRW7eMNrGY6HLGVNJpkQou23GodRX+OgCdeIscEVY smKNHKsExDh7SnuOlNLNxONsnRLPWSIqOAZEiAvt7MJsrOV3WUvXvrZp/yA7qz5b+ik/ 1HVGDS1Ew+UQ4gbRuDogPq+8WF/NVz/trxt45qoA+GOF54B8pHthDNgnWPvP+cTDdrbn Zvw5NeKJ9oiAemkD2soRTK+Xf0FZqS5okaCegJYOxp/N4lnp+1ALsT4iCO0jTaNc/lN2 Q1I9Sfd1KKKDjipywn+Zzd1O76oj+ysOTR3PimToUL557vMgq2ii1c4xbZ1jP2h93Ht1 Wp5A== X-Gm-Message-State: AMCzsaWByC24/7ipgBcVY55PbXweOaZMXvnN3gBulxFiuHnRJ/grX5h2 1ShvRDDKzZvCFWM788k/SJfllRYf X-Google-Smtp-Source: AOwi7QCo7vv+g0kxhR7HAVMqGK3xPPehvhw02RNmn05G/grj0jhU4TmlE6rOuckcCSMCCyOtEgOllQ== X-Received: by 10.237.62.45 with SMTP id l42mr17354995qtf.46.1508199157033; Mon, 16 Oct 2017 17:12:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:31 -0300 Message-Id: <20171017001209.32276-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v2 01/39] MAINTAINERS: add entries for i2c/ppc4xx_i2c 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Corey Minyard --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9cff9737d3..6f56c1349b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -954,7 +954,9 @@ M: Alexander Graf L: qemu-ppc@nongnu.org S: Odd Fixes F: hw/ppc/ppc4*.c +F: hw/i2c/ppc4xx_i2c.c F: include/hw/ppc/ppc4xx.h +F: include/hw/i2c/ppc4xx_i2c.h =20 ppce500 M: Alexander Graf --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199295852767.3582514732806; Mon, 16 Oct 2017 17:14:55 -0700 (PDT) Received: from localhost ([::1]:35713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWy-0007Ji-4A for importer@patchew.org; Mon, 16 Oct 2017 20:14:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FUw-0005ic-V1 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FUw-0003eX-54 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:42 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:51539) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FUw-0003eF-0l; Mon, 16 Oct 2017 20:12:42 -0400 Received: by mail-qt0-x243.google.com with SMTP id h4so44959qtk.8; Mon, 16 Oct 2017 17:12:41 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:41 -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=z2dAW2A8SOT1aydBzKCIRcDMXVvnjWoc/5odhds94hE=; b=OVUUk2CkI6+qA+hkvEucA82S8oy/ZcMmF02dtrIMetFnQBAxOWtRNtkpTJbIilgrUO E03iUtl0In6zj2nxBntXLehsV8HZC2frZ0OKOjqQowIUTR2iL8cUgVoX8wf3TAGj3P5P TiyWyu99TZzylZ1Ac/TXoNPIZzHlq1g79o9vSAze7+8KB9uWIkSXSPOppxf+H6gjzsE8 m2AuCgeoSyuNkseDgDK7eBoHtmeTYurP6crzbsh+ZNcpaRinteYnD8MEVLkwrMgugyJI sey4pV+c+37tvnzfQ0b3s6gOm1JuprqCLrSdGfp8FCl8Pc4SVAeV535hqipNEzQBUyAn sY4Q== 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=z2dAW2A8SOT1aydBzKCIRcDMXVvnjWoc/5odhds94hE=; b=otNr3CTf2tJJA/URMJhzGzHS58j+juKnQ4g/RhyuVI9wEC1iDe+BNmhMno458MHTvn Wj3R2OMSyoISQgKvKVh7VBoOcjIBwsO/AgOSbM7PPHV/BNOjnO0Vz5RixX6TneZqSFsA pdSdjS0VvaQx5Wm/GF56SRCAQdDPeEcMlf4FExL1+orMKds74Oc4se04OCx8KKysItsb ffAiApo/LNLjiGB7YgVjKQwKBjo5vpJkz00vL4O8Sq4h8JiH3U9V8UM5fvwaGZmdCCU2 Sx2g9XEPVEc6VPDyfBmOhbvMDXuAEvtjmw3c6Dr9iOreHNq1/mE5YMwKySmw6IRKoVfA zv1A== X-Gm-Message-State: AMCzsaWTxI7uU0p/qSEzDsRm3s1B3t02P4YHkCSR0eFsc0V9fUTStah0 0/cBVYYUkTP3TyQSgtKzkY4= X-Google-Smtp-Source: ABhQp+R/M8fe7VV7BdqvI5yrzXr0ldoN8VOAC4yz0apV88Y2z23XIFrgscuSNN8AmNC5hIcQVJfRVQ== X-Received: by 10.200.37.230 with SMTP id f35mr18040895qtf.335.1508199161574; Mon, 16 Oct 2017 17:12:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:32 -0300 Message-Id: <20171017001209.32276-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 02/39] MAINTAINERS: add entries for dma/i82374 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6f56c1349b..cfd9010e27 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -713,6 +713,7 @@ F: hw/ppc/prep_systemio.c F: hw/ppc/rs6000_mc.c F: hw/pci-host/prep.[hc] F: hw/isa/pc87312.[hc] +F: hw/dma/i82374.c F: pc-bios/ppc_rom.bin =20 sPAPR @@ -854,6 +855,7 @@ F: hw/misc/pc-testdev.c F: hw/timer/hpet* F: hw/timer/i8254* F: hw/timer/mc146818rtc* +F: include/hw/dma/i8257_dma.h F: include/hw/i2c/pm_smbus.h F: include/hw/timer/hpet.h F: include/hw/timer/i8254* --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150819946849763.25470281668481; Mon, 16 Oct 2017 17:17:48 -0700 (PDT) Received: from localhost ([::1]:35732 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FZp-0001SH-N4 for importer@patchew.org; Mon, 16 Oct 2017 20:17:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FUz-0005kp-FP for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FUy-0003ik-Cv for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:45 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:54395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FUy-0003hw-8l; Mon, 16 Oct 2017 20:12:44 -0400 Received: by mail-qt0-x241.google.com with SMTP id z19so36980qtg.11; Mon, 16 Oct 2017 17:12:44 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:43 -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=xQkSE1PIDblDDKpQn5T7Nlezcb2Hp4eFI3babWLWLtI=; b=LMb/OQTiflOFeOrVjtjamTxfsqG5teshTyXCAxTXGCC2a0lduDEO0J42lrvp5FH2sf 9GgeRWTD3dis6c8gZb/3In/xDbTKff77YU5r4PccskQOv7ReVDeVnxM/L9agXd1NQ/TG OH39yj2WxLH77D7HAEuwLJqDakEQq27/LJZqh4Vqrsy8x3iWaJkDH4kuwN7wWTwIZCLv vyDY8OwcEn0E7j/h1Tt+n7oz1I5yl32Fu0cIxqkbu9XaUbw5HGUO3YjtlD9I60wBF7Xw Po/sfFkiRVwVzRM6qDzZe9xGaVW7V36YB/qK0ChmFrE1hIrFyWKq+gcA/qNKKh+RRVoS BcRw== 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=xQkSE1PIDblDDKpQn5T7Nlezcb2Hp4eFI3babWLWLtI=; b=iOnScpyep5sdyt9Z0rqdqb7Q3rykLPChaT49X9hdbvf2pZPUxdb2sU64tmn4hYoYa3 TFJyueRi/NuzsLWcLc2iSo/hSM5vW0Es5VfUk4tj31SjkqFSQV/mcn1PCcD8PlJsKEaB ZZaw20zlkCvtp3t7c23RIktdO5yAjFn99uuvCK+FHs4HxTyYoIev2g+93Ra2E3K8JLpW uIsxw5iuenZdS/jLMoZvlRJ9sYRUAagaeF3PLC8hh3tB+znjdo8Kb1rYbAYiTM1SzAth Zd2lTXRCDFkf2IKPNNjw5D/7SoytAOFU7emCdqXZRAdnW/ZLky96Oe70Gt8j0fI/4Ff2 w32A== X-Gm-Message-State: AMCzsaUbg+rPPO+YQi994WvXY2VFrRX67R7iPwJev/Gpskcsjd4g0l4Z iGgjDoVmV2kEHhFlLewclo8= X-Google-Smtp-Source: AOwi7QAg9NqDg7NQnFJZIX3f9o2EGECtQH0PR4BDeZLjA7fP1wdJpvvK1tXX3yGy7S/FFQm7R1nXnA== X-Received: by 10.200.46.132 with SMTP id h4mr17366040qta.88.1508199163893; Mon, 16 Oct 2017 17:12:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:33 -0300 Message-Id: <20171017001209.32276-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v2 03/39] MAINTAINERS: add an entry for the i82378 (superio) 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index cfd9010e27..0ce3c353e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -712,6 +712,7 @@ F: hw/ppc/prep.c F: hw/ppc/prep_systemio.c F: hw/ppc/rs6000_mc.c F: hw/pci-host/prep.[hc] +F: hw/isa/i82378.c F: hw/isa/pc87312.[hc] F: hw/dma/i82374.c F: pc-bios/ppc_rom.bin --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199671872920.2313029281027; Mon, 16 Oct 2017 17:21:11 -0700 (PDT) Received: from localhost ([::1]:35748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fcu-0003tj-3S for importer@patchew.org; Mon, 16 Oct 2017 20:20:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33022) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FV4-0005no-5q for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FV1-0003mY-09 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:50 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:49130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FV0-0003mP-Rd; Mon, 16 Oct 2017 20:12:46 -0400 Received: by mail-qk0-x244.google.com with SMTP id d67so25025qkg.5; Mon, 16 Oct 2017 17:12:46 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:45 -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=iW4BlL67z2LU2u5Xsgn/BO6ckhBOamen+YEfDd5Bbaw=; b=k9hICTesRKTLaHN6Ze3xpMdrvViDQ5ze+sTLsdmBFUkat2jqGQQgZ0VKnkmVUgPSwJ qtLwY0Y+LMUmIaTz4EeGfrKkODol0tK7AddRPcUyYazA9NASvo6Z2vKBHMhZ1tu7QZoa FCfcWgqUedaMkWsO+DsxAe7FI9iBw0iGH6NSmi7nHs79gp2tOTvgQ4jFURr/r1OfSRhw LDgplL3dycaT4GYpfGEPx2zQYtuPw0Di/GaVR7bYkac599oZ230SjL9z7oyhaAc68YpO akiuzAld5/QWLqWHhivMp1xGxv7OGVqAp8EoCiu2/FXlURnqvyR5sCVi3Pr6QpC6f9cU Nlow== 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=iW4BlL67z2LU2u5Xsgn/BO6ckhBOamen+YEfDd5Bbaw=; b=IyzmXxCsO4Fk+1WhleD/67hJmlqT4bu1Tqo13Xe1R0A90PxP2TJuDqmfw6zJC+OrTG kRx1k6uhXaZzNAHBx6+IQ4Vw9yKcmhjwXa8nFSju0lY2/lbV1zAkY81PctoJycLWAG7n lFvf8QQThutBk0Xa+urGn0zTerNP/QVYwS1SbScdzqy635riqCM5hr0ihMszd88OuoPy aStdfNq0WBArpaBqd7GURSNHd7FnbtpF+WeH2sDKtsOBN6k0TGzncz590T5nfyCxCHdc 1ujYYn5QQCq0HPLnddioIeVpp97daChPPZXEzCUZJIoRZqWn5dxGlOkV5YXCupckczcF DYyw== X-Gm-Message-State: AMCzsaW83Y8Kybdkpvo2IRU7o6UiaxCGRFUR8hVyQKQwQYrxLdc+XXBi +tZeejOnXePiCJ1TXyJRJAw= X-Google-Smtp-Source: AOwi7QASR3KlAy0lSLfw7v+qd+ABS3gpsI+qxsfouNljk0bjGr4knMvlhVBteiNlRNiI7AxLBIH1hA== X-Received: by 10.55.20.78 with SMTP id e75mr16222963qkh.250.1508199166412; Mon, 16 Oct 2017 17:12:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:34 -0300 Message-Id: <20171017001209.32276-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v2 04/39] MAINTAINERS: add an entry for watchdog/wdt_ib700 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0ce3c353e0..99033b049c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -856,6 +856,7 @@ F: hw/misc/pc-testdev.c F: hw/timer/hpet* F: hw/timer/i8254* F: hw/timer/mc146818rtc* +F: hw/watchdog/wdt_ib700.c F: include/hw/dma/i8257_dma.h F: include/hw/i2c/pm_smbus.h F: include/hw/timer/hpet.h --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 150819929402226.87666179216012; Mon, 16 Oct 2017 17:14:54 -0700 (PDT) Received: from localhost ([::1]:35712 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWu-0007Eh-9Z for importer@patchew.org; Mon, 16 Oct 2017 20:14:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FV4-0005np-7R for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FV3-0003qV-DZ for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:50 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:46920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FV3-0003ph-9A; Mon, 16 Oct 2017 20:12:49 -0400 Received: by mail-qk0-x241.google.com with SMTP id k123so28161qke.3; Mon, 16 Oct 2017 17:12:49 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:48 -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=28F1GwnDti6WJH9NptxC/jzFepNq1oGcB3WP4jbk0As=; b=K3ZP/U6FR2n+0sO0gdQ/mM1Vzh5waSO1o82tbpvFD1B04dFOCh7A8AVZXPnvQqInLF Lozk+ga0ZGQXFwjZXbIdDznmC3Qyz72naKvED3EQhIT3JqzSCVtUI84R6QVhMHgcDUJk zrnELEK1feWMK1XLyegQOVuDVQc1uAVIAboHpfai8881/8c7XIUXf/X75XAbvyXcZbPm YaKYpcve8dCJf46mytHMnnxGMigBMeEGYeW1xgKlsfH9sv8946J671jxfdSvDWd8A9IC AX2tp2x+sCXi/RGcYhUgyHmNvf1R/J93j7XKhFI85vDHJ6TLhREo10+yNHRrDoAfemkq iteQ== 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=28F1GwnDti6WJH9NptxC/jzFepNq1oGcB3WP4jbk0As=; b=O4t2hos9HGSrpRPAep725n7PuWsb+KkpUNt8biRJHG8cdxFGAq/JeQbwzqt/qvYNlq V1JD5Rjz25hB+tRQwqrdzYldtUZEcE5PPUAr+235jrtZBzKl24us/5ySckaNMr0ojTW9 Qtzsuo6VfFwTHnfTTrDRRnsLR7fiCHWnaB3F/C+pfAZybyupAO+KyeuZPKVeRzVfUfTa H+sHaWbmjCxO5jfX6gMriAJ+eiwDZBUQ1eh3p7KlTRDLM0D8vi7GiJ63CK2alBPVFich U3BpkCFmMh2KWkS46uo9i140mXyPetYduVJ3+Hi6hTTVzS2I7mpu0RlXpSbgdfTVdGik ytSw== X-Gm-Message-State: AMCzsaXFmxA62+OUxHVCIOM4ufmKk3ckx8xRbTDE2i6Ib5IFSoSdzv37 37AbmaE9IYWYZ0KGLSD13nn4IIai X-Google-Smtp-Source: ABhQp+T6NB9Ki9jA4SzcNJE0+a2aE5UNzrRCv5TGBvmwZ8wA6+j3ls2AGGFc1OiiRmSBbSaovg1ePg== X-Received: by 10.55.97.202 with SMTP id v193mr15407511qkb.165.1508199168811; Mon, 16 Oct 2017 17:12:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:35 -0300 Message-Id: <20171017001209.32276-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 05/39] MAINTAINERS: add an entry for input/pckbd.c 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 and fix a typo in the "PC Chipset" section Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 99033b049c..b90a42d823 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -842,12 +842,13 @@ F: hw/misc/sga.c PC Chipset M: Michael S. Tsirkin M: Paolo Bonzini -S: Support +S: Supported F: hw/char/debugcon.c F: hw/char/parallel.c F: hw/char/serial* F: hw/dma/i8257* F: hw/i2c/pm_smbus.c +F: hw/input/pckbd.c F: hw/intc/apic* F: hw/intc/ioapic* F: hw/intc/i8259* --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199447343235.15850096167378; Mon, 16 Oct 2017 17:17:27 -0700 (PDT) Received: from localhost ([::1]:35731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FZU-0001BO-I4 for importer@patchew.org; Mon, 16 Oct 2017 20:17:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FV6-0005q4-Ll for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FV5-0003sB-Sh for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:52 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:45789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FV5-0003rt-PJ; Mon, 16 Oct 2017 20:12:51 -0400 Received: by mail-qt0-x242.google.com with SMTP id p1so68337qtg.2; Mon, 16 Oct 2017 17:12:51 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:50 -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=k5kFfu3fKwWGOW0m8nORyr6nOXyWki7ckl57WIjNbKc=; b=Q3B/JA8jtyyF5MLclXHNq9Xtg2TEXB8Dn3fPeo/ddxLJBkPDKlgY3ptNh1b2FkMCXa AwMZD3Gq1mrXa2FisZcN4xV7FGsR1vclRNo3d5UfQo0GYQv6TPfftdDsZSpAYGPhIz+q lUtUdQ+ZyJZh97J/02SL+2Y6noi1Te5LFgweoAQ/1iIj7sBtQHBMTo7V9V0xKWHgQLJq cVc4pGGsB2SX0Vll3wwfTX1GSH2XBY9XFTr3EmetU2mEIi1e8Bqvu8pX+RjIhogNZiTn wy66ChxK3RYlL8BPsWQSOON/3Y9oCUvNkQ3pET5OxriIEUuRKgdPTH7RmnQHqN+7d/IP NYYg== 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=k5kFfu3fKwWGOW0m8nORyr6nOXyWki7ckl57WIjNbKc=; b=RypIQwIku84lWa+s+ZnuaVR9gteoRH79lOjniRytGWqdxOQJ2ixbygDfe2YgTZcZzp Rkiz7/g41oojjlFtG5bFwK5muY4QrofkDTjFpEkUdPBmPOShNn33fg7DXlEA1j22IlId FwbGXsjYCHjYIUTdQVd6dam6QJ1s6VboiAO+0ilPKdC95ykVgTRpEC1DpVouMJO1fnIf 3/hY2ek8uml0j/MFCu+LHK4G95j0/pGFQ86HB0Y4A/GilEyJlDzMk4zIRWCBvtel8OUS yp/wQREQ646rdQkFqH5wEc+HrAyz/exqHqyOA1KoCL2rdu1uVr73tb0bEBBFjjwuAcxz dA2Q== X-Gm-Message-State: AMCzsaWzyTLKKjUaa7bcWtkhecKnVQ14ITh6hDdOLncnrvUPiz3Yv+Ly YM/cG6wqXkTy40rW2683YQM= X-Google-Smtp-Source: AOwi7QDLrcgeyQOTArJ+TFNnMqPSyBHooWbT5H7pQ1nWaclJb9JmNUl0GPl/dQhMONwC4CIod9m4/A== X-Received: by 10.200.57.86 with SMTP id t22mr15739816qtb.113.1508199171294; Mon, 16 Oct 2017 17:12:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:36 -0300 Message-Id: <20171017001209.32276-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 06/39] MAINTAINERS: add entries for timer/m48t59 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index b90a42d823..06ec24912e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -715,6 +715,8 @@ F: hw/pci-host/prep.[hc] F: hw/isa/i82378.c F: hw/isa/pc87312.[hc] F: hw/dma/i82374.c +F: hw/timer/m48t59-isa.c +F: include/hw/timer/m48t59.h F: pc-bios/ppc_rom.bin =20 sPAPR --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199938001873.4573620013814; Mon, 16 Oct 2017 17:25:38 -0700 (PDT) Received: from localhost ([::1]:35771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FhP-0007Uo-2o for importer@patchew.org; Mon, 16 Oct 2017 20:25:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FV8-0005tl-Pc for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FV8-0003ti-0e for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:54 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:47669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FV7-0003tT-Se; Mon, 16 Oct 2017 20:12:53 -0400 Received: by mail-qt0-x244.google.com with SMTP id z50so59971qtj.4; Mon, 16 Oct 2017 17:12:53 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:52 -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=rGlo2+c/qkSc7BHo6dYcKoKbfztIRGd5Ttbw7xnt3mg=; b=F6oCl7yyGTk9aL2qJ4b6Hf8fHUzbF3QecxXYFkTDVtw+8xAO16o1ILlrSGCsP9jdXm SAYWunAH007OGPLAb8MIWIHmGf0DMgbvHfTX9tjCCm6aP63/apQOUlTZlK3iT1LLBkxq 9NcKEbIO7U4sZ4bQM8PRS+0kw3EPxNSqU+LVBL8JhU669tYNTQAk/JOMdhV4dCpetkFK 7Iam9b0w5RVBZpLhSwgniLmuH4Xn0JjWdkJFR8qmbt+DAGyQ6gAUJYQYfEFMCAvjNWww 2rKHlaHpKn4CNAoFJR2vnUHVKygTCx9A9EFUb/bdBGp68yLURvc91qH74q13a3lFTGQN Ul6A== 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=rGlo2+c/qkSc7BHo6dYcKoKbfztIRGd5Ttbw7xnt3mg=; b=fqPMI+ssY5sg957Q6LL8YborY7TMZ5VerwAlybRaX36HnTrsDH2zbG6nyqhBcZ6FZD ffIJFc1xY8bfoi4ErB5wqC+65dYnYoV0rnXWYy5j4Kp5Cn8lNQrb5Kjoshvl2GEsMRfc KczOmqkYhp1MkHtfLf2oXmhp5JeVTPpl74jOHtq+11nwff0fZybBPBnJUfCPM28T0Are +z1hcoiST1ual7csKTI9bSxfBS/Dpa37SdUxh2cxPgAcAgn6SvBlMqaDtPMXuSqeb2PQ 9V88aMvdniSJ/DPL91fS0K1wELG55USzkIXhrpyttrACLM60kqG0vyH3GVio9QWvwSLu foXA== X-Gm-Message-State: AMCzsaXd0bxzR4pftTW23VpDiYfLiG1WL3SjR3VszKrsckzMxWme6OqA M9JBXMZl7lZIqhBzd79BAhI= X-Google-Smtp-Source: ABhQp+QUiElqArbt2EdQfU73E9kfEg89kW2gkHwdQzLlwaN4e3WT55Wpe2XF7DRNpTum0FDjrjR2JA== X-Received: by 10.200.36.68 with SMTP id d4mr4224627qtd.180.1508199173457; Mon, 16 Oct 2017 17:12:53 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:37 -0300 Message-Id: <20171017001209.32276-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 07/39] MAINTAINERS: add missing entry for include/hw/net/ 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 06ec24912e..ddaba2702c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -982,6 +982,7 @@ Network devices M: Jason Wang S: Odd Fixes F: hw/net/ +F: include/hw/net/ F: tests/virtio-net-test.c T: git git://github.com/jasowang/qemu.git net =20 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199353504532.1056434645375; Mon, 16 Oct 2017 17:15:53 -0700 (PDT) Received: from localhost ([::1]:35722 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FXn-00089q-H9 for importer@patchew.org; Mon, 16 Oct 2017 20:15:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVD-0005zE-PO for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVA-0003va-K3 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:59 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:44234) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVA-0003vK-EU; Mon, 16 Oct 2017 20:12:56 -0400 Received: by mail-qk0-x241.google.com with SMTP id r64so35574qkc.1; Mon, 16 Oct 2017 17:12:56 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:55 -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=II3MRSSAu5rCm7dKe/bV6oJFatmXZPYogcASEY6OqFs=; b=Fp1IpO3Ow4/anLhzGPwzR+j3KAWlB3WSP5czKbZ78Y+c4Ys+EwlnpX4ZmcRQPJ1lDP h0lAnzE9r76rn4y9QX6eC0BtVbbzvJ5EdZnVa/cAi0PyF41SFexb50M8zL8gpv1kKYth gcvV2D45M2lj+rRgyq6hDxwPFAvcz4tmR+8oMzMMHWwNGZJ3tubreTPkzcU7liUAohxy rxwyA/Z1Cz09QBZt82JPosxnXdOOEuU2msk3UglSzvCqK6AUyAX1ALuD6Mmgw6Q1eM0E jHZwdgH69e0GEG8kB8tZPvmOT/RQKI8tFkuzbd+kl98X81Kw3s7vAbUvdmQXnCpaYMD2 hz/Q== 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=II3MRSSAu5rCm7dKe/bV6oJFatmXZPYogcASEY6OqFs=; b=FftY/+5y+95SgKhAEETEiaEHA2YY1CBXmaLY3H9Ghwa1TUTEY8MDL/86un7CFispQU Jg9p/ZadVW9bzO02GoR4QnSgyoQ42RlTNW3FE6Ry+4MR3+Ab2S6JSNJNOA902krLVIgA I20hZFPkU8Db3vzp6tPpZtO9ClypB3ghep/QywMGyUYP4qArNGUx54TcD343KdBX+y7Y VX5t7pa54k9th7iRe7xduKZOJhVQYp8IMYeX0zCyQ6+cZdu5J/gX/0rkdhP8bXYeiKSX T8wm/BzCuWd4o2HF2Gr6wd3zVOTIxnWa48qEBI0mb+jzgU9pxThuAErW0zEAGB6zm2Qt i58g== X-Gm-Message-State: AMCzsaXU0R0NwkpOtzs1hufhXtBp5SStsMzDURqmyyR3penoIdNeZc41 yaxia5EgWMgxD9eJnCHa1lg= X-Google-Smtp-Source: AOwi7QBP0xRlzMiN0tXRJpfY+tqCHTmA20UwaFhw9twXae9iEh7gfjVU10ILdzZVyR5YKwAd6cpMTg== X-Received: by 10.233.222.134 with SMTP id s128mr14792136qkf.14.1508199175977; Mon, 16 Oct 2017 17:12:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:38 -0300 Message-Id: <20171017001209.32276-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 08/39] hw: use "qemu/osdep.h" as first #include in source files 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Acked-by: David Gibson Acked-by: Cornelia Huck --- hw/acpi/ipmi-stub.c | 1 + hw/audio/fmopl.c | 1 - hw/cpu/core.c | 1 + hw/ppc/spapr_cpu_core.c | 1 + hw/smbios/smbios_type_38-stub.c | 1 + hw/vfio/ccw.c | 2 +- hw/virtio/vhost-vsock.c | 2 +- 7 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c index 98b6dcee0d..f525f71c2d 100644 --- a/hw/acpi/ipmi-stub.c +++ b/hw/acpi/ipmi-stub.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include "hw/acpi/ipmi.h" =20 void build_acpi_ipmi_devices(Aml *table, BusState *bus) diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 5cfb6a96dd..9f50a89b4a 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -34,7 +34,6 @@ #include //#include "driver.h" /* use M.A.M.E. */ #include "fmopl.h" -#include "qemu/osdep.h" #ifndef PI #define PI 3.14159265358979323846 #endif diff --git a/hw/cpu/core.c b/hw/cpu/core.c index bd578ab80c..7e42e2c87a 100644 --- a/hw/cpu/core.c +++ b/hw/cpu/core.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/cpu/core.h" #include "qapi/visitor.h" #include "qapi/error.h" diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 3e20b1d886..c963440f45 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -6,6 +6,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hw/cpu/core.h" #include "hw/ppc/spapr_cpu_core.h" #include "target/ppc/cpu.h" diff --git a/hw/smbios/smbios_type_38-stub.c b/hw/smbios/smbios_type_38-stu= b.c index 9528c2c28e..5b83c9b1f1 100644 --- a/hw/smbios/smbios_type_38-stub.c +++ b/hw/smbios/smbios_type_38-stub.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ =20 +#include "qemu/osdep.h" #include "hw/smbios/ipmi.h" =20 void smbios_build_type_38_table(void) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 76323c6bde..80457a3deb 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -11,11 +11,11 @@ * directory. */ =20 +#include "qemu/osdep.h" #include #include #include =20 -#include "qemu/osdep.h" #include "qapi/error.h" #include "hw/sysbus.h" #include "hw/vfio/vfio.h" diff --git a/hw/virtio/vhost-vsock.c b/hw/virtio/vhost-vsock.c index 5ec1c6a2a2..aa5af927e1 100644 --- a/hw/virtio/vhost-vsock.c +++ b/hw/virtio/vhost-vsock.c @@ -11,8 +11,8 @@ * top-level directory. */ =20 -#include #include "qemu/osdep.h" +#include #include "standard-headers/linux/virtio_vsock.h" #include "qapi/error.h" #include "hw/virtio/virtio-bus.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15082001332881008.715222693603; Mon, 16 Oct 2017 17:28:53 -0700 (PDT) Received: from localhost ([::1]:35790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FkL-0001bO-1h for importer@patchew.org; Mon, 16 Oct 2017 20:28:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVD-0005zR-U9 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVD-0003wh-4Y for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:12:59 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:47671) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVC-0003wW-Vk; Mon, 16 Oct 2017 20:12:59 -0400 Received: by mail-qt0-x244.google.com with SMTP id z50so60235qtj.4; Mon, 16 Oct 2017 17:12:58 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:12:57 -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=1S1zneIwNjpkvHRDkXShy/fNZi31QyD+YdfZvt+9Qp8=; b=f/gwolREK7NA7c6toK0Q+MwKH2x3iPbxZftr84R1ChnS8KavsD/8wEW8O+EDiiW0iI 5C+XEKA4+H6Tk0AoqV86Jp3LAl93uj0LAI2JRbia6rsabLFj6MAKS0gKUrtMzTaCAW91 XAU6JuGBOt05BTs7oQh5HaG2sHD0P6YB73EVf8sLCIIJscq8CAgdPyZxllQvtKPrIy8t tvki3S4Ukj5SauqrrQZSGreswUYK5uKt2wjFDPw1vAYPEpx2UYcFRZPI1cnKQfIhNAgG jA8l2Z9TFyhAkh9y05YrOK6MHB1uoPfx9TFwgv7qwpobmmUsaGCthWegVBmml+lhjxF5 8rFg== 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=1S1zneIwNjpkvHRDkXShy/fNZi31QyD+YdfZvt+9Qp8=; b=cofBQylN2pRw/R9v6KgGPfKeFBLImK76zeazyShYDTVga13crKDmShupCxI73zu05f bCmq69kTIwedMZ8AKMmZJLUdD8d5RMce1g3ItO7UpH7pxBjrmxAvGe/NEDLeBMLlzJnI 5FyR2rnfGzLj2mXLQ5hT3AArRaTcKG/YV4DR7dpHZpnMDFmnxTMrgMo2Buy/wWElPOWQ W1uNP2Fcn3Y6LFPTAlJh+i7IFP90V7CTT8t0u8mMEwr2qltYBTsvriaVUIHyZqFmPIGC HPn4Vs+ojem5YLSuYpan9gvSmUIV7npUWiXvl6AQTm2Sd70cQSmBdb9b453dLRWomWLR l5Wg== X-Gm-Message-State: AMCzsaWay24hZUyslLLJ6PzIOYKZXHc1NMXR5jne7ml6OUdX1WEdVQOO xs+iY7hCOkS9inqUaFSI+Ek= X-Google-Smtp-Source: ABhQp+S6wfkRQgbBawG6rhL65OBeBfnIIUinJFK8AZtFk4Jd9e8uoez80kZOOcf0oR6NB49ylNh4yA== X-Received: by 10.200.41.90 with SMTP id z26mr14448558qtz.47.1508199178573; Mon, 16 Oct 2017 17:12:58 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:39 -0300 Message-Id: <20171017001209.32276-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 09/39] hw: remove "qemu/osdep.h" from header files 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Corey Minyard Tested-by: Corey Minyard --- include/hw/acpi/ipmi.h | 1 - include/hw/cpu/core.h | 1 - include/hw/i2c/ppc4xx_i2c.h | 1 - 3 files changed, 3 deletions(-) diff --git a/include/hw/acpi/ipmi.h b/include/hw/acpi/ipmi.h index ab2bb29048..c38483565c 100644 --- a/include/hw/acpi/ipmi.h +++ b/include/hw/acpi/ipmi.h @@ -9,7 +9,6 @@ #ifndef HW_ACPI_IPMI_H #define HW_ACPI_IPMI_H =20 -#include "qemu/osdep.h" #include "hw/acpi/aml-build.h" =20 /* diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h index 79ac79c29c..b7470644d8 100644 --- a/include/hw/cpu/core.h +++ b/include/hw/cpu/core.h @@ -9,7 +9,6 @@ #ifndef HW_CPU_CORE_H #define HW_CPU_CORE_H =20 -#include "qemu/osdep.h" #include "hw/qdev.h" =20 #define TYPE_CPU_CORE "cpu-core" diff --git a/include/hw/i2c/ppc4xx_i2c.h b/include/hw/i2c/ppc4xx_i2c.h index e53042f6d4..3450bda577 100644 --- a/include/hw/i2c/ppc4xx_i2c.h +++ b/include/hw/i2c/ppc4xx_i2c.h @@ -25,7 +25,6 @@ #ifndef PPC4XX_I2C_H #define PPC4XX_I2C_H =20 -#include "qemu/osdep.h" #include "qemu-common.h" #include "hw/sysbus.h" #include "hw/i2c/i2c.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199509042896.2011147081511; Mon, 16 Oct 2017 17:18:29 -0700 (PDT) Received: from localhost ([::1]:35733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FaS-0001uM-9N for importer@patchew.org; Mon, 16 Oct 2017 20:18:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVF-00061b-UV for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVF-0003xz-4y for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:01 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:46395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVF-0003xZ-0A; Mon, 16 Oct 2017 20:13:01 -0400 Received: by mail-qt0-x243.google.com with SMTP id 1so66946qtn.3; Mon, 16 Oct 2017 17:13:00 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.12.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:00 -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=gHdLRvpDVFNy+qKKL3ixK7mNa6loNMIqjMR1Oh9hAEY=; b=qMq9QTQEFisHpX7DRqw/VMjICte9SQU0NZjKs8Tlwh24v7Hf+wC9Osg5Ag0oTftGt+ mJIrslOu9y9W3Z4JMD8xTmuEwFXlsn7DR/aHWIhUIp+0p5veG2kLCungiAC2IsVqDje+ jaLGAqnRdu5+ceqnMyv+lrsxHghXUgWtzwKxVN95jJ9i5LBpoyl2IheCdIpXFqiiS7ib R8g1jfiXK7DvVZj8P12dEBSRPg6FtDKXC7e3rFVffglkNe6RMHZeSrpevqYBSjQ0KgKf P8uXuLaF7yboalEcrFxtxh0UieGQ/BGE8prnAI94g4Z5EDgP4nDakO6JS6tHu4AZY+/c JQ3g== 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=gHdLRvpDVFNy+qKKL3ixK7mNa6loNMIqjMR1Oh9hAEY=; b=Wcd8tZS0AmVkPsRhotu/mq0DSE/K02AmuV9K5Czyv4ZCwQ/0OQlb+u9FMK/bYhdpYa eISEA7okI/cFZHHm2oTNj/BOGKw17L7CAapxnoaQCKAVZoAKbbC7bPQYSCsML/O8jb9h ZP1qnP7+M6izauMYIRgVwR30Ej6J5apaYVQUhTzal5KlSmSCmFgIFQT1jhtNujb0Jne+ u2WHEfNv7nOeyW0+31mpMatnDAwBtioP1Pzk9rsJEG4IV8Raq5jX6NR/YlzjQeG6Khld qYncdXKgr985MSmG30SvBJNbOiVGyEWpdXWINYMyagCnvgPpzTMhEXxRxI4TX4VCVbOD BvxA== X-Gm-Message-State: AMCzsaUv+OwXb/0WJ9czDy2nAB25f7aesrAIn169j8fOh5rhp2DUdpg3 SPdSUah5xD4s/+ynf46H+4biYssx X-Google-Smtp-Source: AOwi7QCxc9Zh6Azh4VYcFHNUE7v9/jVnHOx3wimtcDviFE33Iqk1RAuyrUaRml4TNJ76FueafTzYBw== X-Received: by 10.200.22.103 with SMTP id x36mr18104802qtk.52.1508199180627; Mon, 16 Oct 2017 17:13:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:40 -0300 Message-Id: <20171017001209.32276-11-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 10/39] block: remove "qemu/osdep.h" from header file 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- block/dmg.h | 1 - 1 file changed, 1 deletion(-) diff --git a/block/dmg.h b/block/dmg.h index b592d6fa8b..2ecf239ba5 100644 --- a/block/dmg.h +++ b/block/dmg.h @@ -26,7 +26,6 @@ #ifndef BLOCK_DMG_H #define BLOCK_DMG_H =20 -#include "qemu/osdep.h" #include "qemu-common.h" #include "block/block_int.h" #include --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199642308853.2042449994133; Mon, 16 Oct 2017 17:20:42 -0700 (PDT) Received: from localhost ([::1]:35745 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fca-0003et-Jz for importer@patchew.org; Mon, 16 Oct 2017 20:20:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVI-000658-Up for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVH-0003zR-OX for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:04 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:46395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVH-0003zE-Km; Mon, 16 Oct 2017 20:13:03 -0400 Received: by mail-qt0-x244.google.com with SMTP id 1so67120qtn.3; Mon, 16 Oct 2017 17:13:03 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:02 -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=J9aT2Hl6tKhle6hN5N610lF8T02xsLKn3ookgGfaaYI=; b=aDyEJAr4cSF+04PBR+Ww1vYEJ7VU82vEUbOkDn+pVJd3AUwNFh085jq+p6CGcakDGf RW2Z00qRSpptj8KaZScV1kVKrtbiIPpyxdud+jcy7pW6pX0GgliQsE/8nEplaUjVkovX 2/yeNvDj/3eEMNUUg/vbmuqTxnbHSfvbLdWQBc5cCfnbrmlGqQIwjvFkZq1AFdxxTr0p SVlcEKC1cOk6GM02KF0y7sWtjDXUORqtWn07CfmNA3INIZRySGbyQOfhDkRJuFdf9+f+ vS7u6KpYfwYtOQqEDehCbshEEzMP3pyl0ALR2/hl27+uQs1mgaTRWs4a7ukpPPVJphQE x+cg== 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=J9aT2Hl6tKhle6hN5N610lF8T02xsLKn3ookgGfaaYI=; b=Fv449WSn8xqWhvQLh9mpffLox9fGgB3jsu5ASu2N6s2SpR3W9JSlq4wMut05d+qcOm uqPLH6AxXYlUgfJxdNaxgnAwl6At+X6ukLiMVdS/0dqOchl7xiXmuIswj3/o7xsbTRZs n1yJ0Cocntd7T9R5WSkFd2NpkJ0UI8PvHctqS0CKBX+vqNd59Nw33mk5vCaRayB1dw74 s14zfeH4MzBtxq/nBYhqXWc0zZaC5v7rsuX/48G2yi5nDw6I3KSh93JfXfGqrccXgwzM fbFMzL7LUGrXWR7zpY6+gGoSK1J6o5wNo5Amy3Vw2djmJx5Vnuc48IzTYLI9gI3Czi2q c8LA== X-Gm-Message-State: AMCzsaUjdjJSWqkWjJi2QuBWF4IIW82FFooAVVr0SwWAaI+WMXsTzg92 w9gXGb409QgmuYKgCx5yhLw= X-Google-Smtp-Source: AOwi7QCzycgmDC9CnN1chD4xdySYav9P/KwyASY9dBHLKI5ErBZx5XT2bWoeCOx1CG5hA52+Rjos9w== X-Received: by 10.200.23.153 with SMTP id o25mr17402080qtj.119.1508199183220; Mon, 16 Oct 2017 17:13:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:41 -0300 Message-Id: <20171017001209.32276-12-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 11/39] misc: remove headers implicitly included 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/audio/fmopl.h | 1 - bsd-user/main.c | 1 - chardev/wctablet.c | 4 ---- hw/scsi/vhost-user-scsi.c | 1 - linux-user/main.c | 1 - net/colo-compare.c | 1 - tests/test-aio-multithread.c | 1 - tests/test-clone-visitor.c | 1 - tests/vmgenid-test.c | 3 --- 9 files changed, 14 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index f4065f425c..e7e578a48e 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -1,7 +1,6 @@ #ifndef FMOPL_H #define FMOPL_H =20 -#include =20 typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval= _Sec); =20 diff --git a/bsd-user/main.c b/bsd-user/main.c index 836daac15c..bf27a5b44f 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -32,7 +32,6 @@ #include "qemu/envlist.h" #include "exec/log.h" #include "trace/control.h" -#include "glib-compat.h" =20 int singlestep; unsigned long mmap_min_addr; diff --git a/chardev/wctablet.c b/chardev/wctablet.c index 6c13c2c58a..969d014574 100644 --- a/chardev/wctablet.c +++ b/chardev/wctablet.c @@ -25,10 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. */ -#include -#include -#include -#include =20 #include "qemu/osdep.h" #include "qemu-common.h" diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 500fa6a067..9efa26da7d 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -18,7 +18,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qom/object.h" #include "hw/fw-path-provider.h" #include "hw/qdev-core.h" diff --git a/linux-user/main.c b/linux-user/main.c index 829f974662..85d7f6d3f7 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -35,7 +35,6 @@ #include "elf.h" #include "exec/log.h" #include "trace/control.h" -#include "glib-compat.h" =20 char *exec_path; =20 diff --git a/net/colo-compare.c b/net/colo-compare.c index b3f35d729a..27ea7d4de9 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -23,7 +23,6 @@ #include "qom/object_interfaces.h" #include "qemu/iov.h" #include "qom/object.h" -#include "qemu/typedefs.h" #include "net/queue.h" #include "chardev/char-fe.h" #include "qemu/sockets.h" diff --git a/tests/test-aio-multithread.c b/tests/test-aio-multithread.c index 549d784915..ad78c6b28b 100644 --- a/tests/test-aio-multithread.c +++ b/tests/test-aio-multithread.c @@ -11,7 +11,6 @@ */ =20 #include "qemu/osdep.h" -#include #include "block/aio.h" #include "qapi/error.h" #include "qemu/coroutine.h" diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c index 96982163e4..ac6afc562e 100644 --- a/tests/test-clone-visitor.c +++ b/tests/test-clone-visitor.c @@ -8,7 +8,6 @@ */ =20 #include "qemu/osdep.h" -#include =20 #include "qemu-common.h" #include "qapi/clone-visitor.h" diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index 918c82c82a..2f96ad453e 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -8,9 +8,6 @@ * See the COPYING file in the top-level directory. */ =20 -#include -#include -#include #include "qemu/osdep.h" #include "qemu/bitmap.h" #include "qemu/uuid.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199622399166.36743748707863; Mon, 16 Oct 2017 17:20:22 -0700 (PDT) Received: from localhost ([::1]:35742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FcC-0003Ko-3O for importer@patchew.org; Mon, 16 Oct 2017 20:20:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33325) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVM-00068g-8g for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVK-00040p-O9 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:08 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:50943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVK-00040f-JH; Mon, 16 Oct 2017 20:13:06 -0400 Received: by mail-qt0-x244.google.com with SMTP id f15so53183qtf.7; Mon, 16 Oct 2017 17:13:06 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:05 -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=DnzqFtTaNyiYhqLieZsTUgTvnHGIrUF4UKYJGxllEyY=; b=ufCg3ob8H9EYIwBFfgdiy/zRuDxeveR+zV1towy86FLXgdkymTFYUrEQmBSvH2qj38 k0oHmufP91HDgUaQOM1OL5QlCnwSUkDTD2otxEcy/7Xvi8VtP6P2N9m12q3D86eAYGKa fKzo/JDO/tIoEMMZIOtZZX1vYLQywBJbndyL1gxKRZj50Eh8tfeANLXn8iRXqYC+TIOU js0CQzdK6Iuy74o5QdlTN2JYPW/l13wToAYAvRMvEiupzj+6BggQQEeBSpW3Yr+R8ww5 W3DgYFHfv+S5EB7sd37+CGfNp7Fd0W6BqXffCsWib1COYtgwuKqaCwCKdknxlb2d2Bse bRPw== 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=DnzqFtTaNyiYhqLieZsTUgTvnHGIrUF4UKYJGxllEyY=; b=SmCj6HfODmiKDEOUyxglQOYaYB1VJ6X6EXDb0SaJjzRXIH8cG0RN3w+8R69cd37keN L85dwCsko/TLWGnmAzxUW/HasXGKkfC7wt9lEydbVfUXQ0Ks9v7bA15L0woMbcl+RtZb FMXzSshn9tKyUDZT40WO1nCXC7YWyiMhdykw2K70JrF4YXcwCm6v0nMObKYkDlWzd5Xo hUO7ZevcfBxpE30ltoN9nOxotca986wsGhGp3MarCal9SkqulruJzuq1zU+YIXGSYsX9 lLVKFF0yb7fXqvpbzyZVYyzmEYShuck+HkrES+xM+qQG4/+1gBXsyc+eoFYOJf6NZX7Z t4lQ== X-Gm-Message-State: AMCzsaWeInpg8+KjqEuCrrNVWBugD/4M6yXDTpbf4OQ8AZdsk3SehcYb 5Ee9bKywshQoxMeh22fiTNsgblue X-Google-Smtp-Source: AOwi7QBtCdDe3MudQxKp/WPsUc+++nMWxTWE3d934s7T5wF5KgO8VC4HH65QFP0jGxStD9j7h2P2xw== X-Received: by 10.237.60.154 with SMTP id d26mr15473900qtf.227.1508199186097; Mon, 16 Oct 2017 17:13:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:42 -0300 Message-Id: <20171017001209.32276-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 12/39] misc: remove duplicated includes 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: qemu-trivial@nongnu.org, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 exec: housekeeping (funny since 02d0e095031) applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Acked-by: Cornelia Huck Reviewed-by: Anthony PERARD --- accel/tcg/translate-all.c | 1 - exec.c | 3 --- hw/arm/spitz.c | 1 - hw/char/xen_console.c | 1 - hw/core/machine.c | 1 - hw/s390x/css.c | 1 - target/openrisc/exception_helper.c | 1 - tests/vhost-user-test.c | 1 - util/qemu-sockets.c | 1 - vl.c | 1 - 10 files changed, 12 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index c5ce99d549..f81afb87e6 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -31,7 +31,6 @@ #include "tcg.h" #if defined(CONFIG_USER_ONLY) #include "qemu.h" -#include "exec/exec-all.h" #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include #if __FreeBSD_version >=3D 700104 diff --git a/exec.c b/exec.c index 6378714a2b..c19061465f 100644 --- a/exec.c +++ b/exec.c @@ -18,8 +18,6 @@ */ #include "qemu/osdep.h" #include "qapi/error.h" -#ifndef _WIN32 -#endif =20 #include "qemu/cutils.h" #include "cpu.h" @@ -51,7 +49,6 @@ #include "trace-root.h" =20 #ifdef CONFIG_FALLOCATE_PUNCH_HOLE -#include #include #endif =20 diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index feccdb00d3..ac1e15cbbc 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -29,7 +29,6 @@ #include "sysemu/block-backend.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" -#include "sysemu/sysemu.h" #include "cpu.h" =20 #undef REG_FMT diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c index 3643dfe067..5e68326c19 100644 --- a/hw/char/xen_console.c +++ b/hw/char/xen_console.c @@ -27,7 +27,6 @@ #include "hw/hw.h" #include "chardev/char-fe.h" #include "hw/xen/xen_backend.h" -#include "qapi/error.h" =20 #include =20 diff --git a/hw/core/machine.c b/hw/core/machine.c index 36c2fb069c..c857f3f934 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -20,7 +20,6 @@ #include "sysemu/numa.h" #include "qemu/error-report.h" #include "qemu/cutils.h" -#include "sysemu/numa.h" #include "sysemu/qtest.h" =20 static char *machine_get_accel(Object *obj, Error **errp) diff --git a/hw/s390x/css.c b/hw/s390x/css.c index 35683d7954..2f4d40a5fb 100644 --- a/hw/s390x/css.c +++ b/hw/s390x/css.c @@ -13,7 +13,6 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/qdev.h" -#include "qemu/error-report.h" #include "qemu/bitops.h" #include "qemu/error-report.h" #include "exec/address-spaces.h" diff --git a/target/openrisc/exception_helper.c b/target/openrisc/exception= _helper.c index a8a5f69b05..6073a5b21c 100644 --- a/target/openrisc/exception_helper.c +++ b/target/openrisc/exception_helper.c @@ -21,7 +21,6 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" -#include "exec/exec-all.h" #include "exception.h" =20 void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 4b98018478..e2c89ed376 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -21,7 +21,6 @@ #include "libqos/libqos.h" #include "libqos/pci-pc.h" #include "libqos/virtio-pci.h" -#include "qapi/error.h" =20 #include "libqos/malloc-pc.h" #include "hw/virtio/virtio-net.h" diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index d149383bb9..d700caef45 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -26,7 +26,6 @@ #include "qapi/error.h" #include "qemu/sockets.h" #include "qemu/main-loop.h" -#include "qapi/clone-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi-visit.h" diff --git a/vl.c b/vl.c index 0723835bbf..0d1f612629 100644 --- a/vl.c +++ b/vl.c @@ -95,7 +95,6 @@ int main(int argc, char **argv) #include "sysemu/kvm.h" #include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/qmp/qjson.h" #include "qemu/option.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 150819981739720.634101370848384; Mon, 16 Oct 2017 17:23:37 -0700 (PDT) Received: from localhost ([::1]:35759 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FfP-0005rb-KA for importer@patchew.org; Mon, 16 Oct 2017 20:23:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVO-0006Ae-8K for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVN-00042F-D2 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:10 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:46396) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVN-000424-8d; Mon, 16 Oct 2017 20:13:09 -0400 Received: by mail-qt0-x243.google.com with SMTP id 1so67472qtn.3; Mon, 16 Oct 2017 17:13:09 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:08 -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=eyQjXyKBBwMJacP0N1mGGtdpK3BzWxv0bVtmICB0IfY=; b=K4lOEKSQMdoe7nxynnOzzNgVR0l5Y+jYBZAV5YfoeRLaubTCou4uZF0RjMHd6dAlmT cn02P53rHHoxsnSexJhjk/mEULR5v2XJ3hah8wUitHqhOSuMpzWy/U5i2QggvBrXf+Tx 28yq3rBdlEQxFq8kiXkUM0IP9GZRwwUKazYxsddQFl+xVuA1orhTP9KShGhM6nHwoeW4 l12PhMO4irE9+D/3WYg6tGInSjuAgKG2bF757Um3JEpM4JxEWL/LeR4S8qVKQY9TXt80 bonMYyyN0hg31gZA0h0vn3M95POUHIc6uMimCoibHJ0B5pUWQ9NXyMuFVbOBIewBE/gy 17KQ== 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=eyQjXyKBBwMJacP0N1mGGtdpK3BzWxv0bVtmICB0IfY=; b=PikSWwKD4sFashm5tFiM78muM/SVm0Y2vE2CTRwMPcmxhKVCew1y+NtQfHF1WymD6j aAL+NZEln7SK6BsBemol/ehVnwuRInPsCcZAbD2ryvKyB7R4DSBhyGb2lzD/rVtqb1Gn LkXT55yMdfv2EVj9+B7Ri+SN2OxoTXU4aLM2SkbK+TDduUNHoL2vpwOg45NdsDIJTZFg nu7oX2zkClKaVbiTrgmWeMK/0nwtlV2KJmcp1o3Qnpm8gMkdbgl4pH8CklI12EzE+RZL TzE3DIoYZRrkkrozZ3ZI+J6uJ2amIWkO939ECUQbQ4Us4XKiHVYvmts6aKNVh4yNIeVZ D/yw== X-Gm-Message-State: AMCzsaUnqZ+1GUUxDDJKi4sEaqPZRo3akaAv9xHI+ThBiF4QFvNXhTnY hX5aZIoiHC4mVqSTQKT14eM= X-Google-Smtp-Source: ABhQp+R5VLUHEySninKSN8HVGnfZAQ7NlQQ6Yj3OqkzhN+n4XM7b7kXYzWDktORD8gy0S2NlU6ZfFw== X-Received: by 10.237.57.228 with SMTP id m91mr12121213qte.267.1508199188851; Mon, 16 Oct 2017 17:13:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:43 -0300 Message-Id: <20171017001209.32276-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 13/39] ppc: remove duplicated includes 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes not needed since 7ebaf795560 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Acked-by: David Gibson --- hw/ppc/spapr_hcall.c | 1 - target/ppc/kvm.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 8d72bb7c1c..61e2fcb77d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -13,7 +13,6 @@ #include "trace.h" #include "kvm_ppc.h" #include "hw/ppc/spapr_ovec.h" -#include "qemu/error-report.h" #include "mmu-book3s-v3.h" =20 struct SPRSyncState { diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 171d3d8040..f4f4f20960 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -47,9 +47,6 @@ #include "sysemu/hostmem.h" #include "qemu/cutils.h" #include "qemu/mmap-alloc.h" -#if defined(TARGET_PPC64) -#include "hw/ppc/spapr_cpu_core.h" -#endif #include "elf.h" #include "sysemu/kvm_int.h" =20 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199759043445.09060141117084; Mon, 16 Oct 2017 17:22:39 -0700 (PDT) Received: from localhost ([::1]:35756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FeH-0004y0-6e for importer@patchew.org; Mon, 16 Oct 2017 20:22:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVS-0006EQ-7d for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVR-00044D-8z for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:14 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:50945) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVR-00043z-4r; Mon, 16 Oct 2017 20:13:13 -0400 Received: by mail-qt0-x244.google.com with SMTP id f15so53563qtf.7; Mon, 16 Oct 2017 17:13:13 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:12 -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=ZTkofEvEm4lN4E56aFN1R3Z7Y2LlaxOcI2xcwOQWAj8=; b=kZGx1lW2rCfVD9zq9WiE5sI3LDrRywc+5qMfPBUsfT/+Uva67mnTayUbTab3VmLkLm Iv9MWfWv3eHvgxCnW8lrx8CSLbFbIZ6PIx3yU7/ayKsE2sxVNWfQgVNyE2HsXrc47PaG lqeJzR443FtAyzCs1saXWJ/yY3OZstV/FRva8RrKczR8ZBb1F9juZDG7Q7AnUmGPd+cO DAxjJlhU4QBJIIDz0j66kcY8acKiTwz4Z/KZViuB/bEd1gfG6mcuQg2egkJtZtozG/ei 9o4dqSOha3FDMXR5/rcGSPjFBVWfqtCZ2Vz/cFDI2fKu/FnGl6TK/YOFyQdbufNnMx6U WqIQ== 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=ZTkofEvEm4lN4E56aFN1R3Z7Y2LlaxOcI2xcwOQWAj8=; b=CNUUhiYPg8XChfTVqd2Xk5JiuEaNUS9WpTOIIAO33zSBbeYn5GFHYKx9hR9H4bXVsG 9B1VlpxDCge6woFjzTy4ZBsmkNRBbZP33JAF13EUDODozWTyZ+i2C9YlR7dLzx0TzDPk +LHXSBXJ6IF/1ZnyXh8d8kgHkjzxRBtw8wcASQeEdjoc5OUJMEf3DcODh6axJZ+8zOAk xPZ/Q+9De6GnRE2+7gMeMf9bMirFw7Vlvn6HQM8MzXN9nvsauWn4Q4tgk6KVJfAljm0I fO8KbwNFfqC/+cZ7SWqdcRd8+JhjQNdMblYmE/b+VSBeB8Mmf+lKM78m9nHaa1BHpAgv Oiog== X-Gm-Message-State: AMCzsaUbywseIOd91ZJ1hPV/zRE0rf7DWnQSjIj+EeOpwS9y4LhH2ZNv 6nEB1v7rUBI3hpNDGSAiBh0= X-Google-Smtp-Source: ABhQp+TxG34H3UIH4agpb6BwR+lCTielPedhJhS3XSC3lbCMDOBwnwcJshwnqoJ8gmtf2Z/KHu15Jg== X-Received: by 10.200.41.90 with SMTP id z26mr14449245qtz.47.1508199192778; Mon, 16 Oct 2017 17:13:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev , Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Yu Ning , Vincent Palatin , Corey Minyard Date: Mon, 16 Oct 2017 21:11:44 -0300 Message-Id: <20171017001209.32276-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 14/39] i386/hax: remove duplicated includes 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- include/sysemu/hax.h | 1 - target/i386/hax-darwin.h | 3 --- target/i386/hax-windows.h | 2 -- target/i386/hax-darwin.c | 6 +----- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h index 232a68ab1b..f252399623 100644 --- a/include/sysemu/hax.h +++ b/include/sysemu/hax.h @@ -22,7 +22,6 @@ #ifndef QEMU_HAX_H #define QEMU_HAX_H =20 -#include "config-host.h" #include "qemu-common.h" =20 int hax_sync_vcpus(void); diff --git a/target/i386/hax-darwin.h b/target/i386/hax-darwin.h index 0c0968b77d..fb8e25a096 100644 --- a/target/i386/hax-darwin.h +++ b/target/i386/hax-darwin.h @@ -15,10 +15,7 @@ #ifndef TARGET_I386_HAX_DARWIN_H #define TARGET_I386_HAX_DARWIN_H =20 -#include #include -#include -#include =20 #define HAX_INVALID_FD (-1) static inline int hax_invalid_fd(hax_fd fd) diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index 1d8f68de91..f7c3e99246 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include =20 #define HAX_INVALID_FD INVALID_HANDLE_VALUE diff --git a/target/i386/hax-darwin.c b/target/i386/hax-darwin.c index 1c5bbd0a2d..ee9417454c 100644 --- a/target/i386/hax-darwin.c +++ b/target/i386/hax-darwin.c @@ -11,13 +11,9 @@ */ =20 /* HAX module interface - darwin version */ -#include -#include -#include -#include +#include "qemu/osdep.h" #include =20 -#include "qemu/osdep.h" #include "target/i386/hax-i386.h" =20 hax_fd hax_mod_open(void) --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199828855515.8694265608356; Mon, 16 Oct 2017 17:23:48 -0700 (PDT) Received: from localhost ([::1]:35761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Ffe-000628-1M for importer@patchew.org; Mon, 16 Oct 2017 20:23:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVW-0006IG-7W for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVV-00047A-5x for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:18 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:45793) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVV-00046s-1X; Mon, 16 Oct 2017 20:13:17 -0400 Received: by mail-qt0-x243.google.com with SMTP id p1so69942qtg.2; Mon, 16 Oct 2017 17:13:17 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:15 -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=IpDl0yNSmk1sfH/brr/Tu4rer3b/KD/QB9sW24KL4l0=; b=kEINvoJSKx8ixXfx97AcaM16xIx8LbkYb6PTeF+MNR4bZLZ3cQViDxXEd+MmpYT8uJ 3s43pjEqVvVzreHXkzlLWFGAu/rs9ydbR8slzd6kEcesnGVG+lCNql89p7/Vv1gJW1xF tkioLS0y3kAwuOPCWl8so99C8vZyqMPSLp3pQWtwLg+DkzeajOBU6B5HYLSrV4b/qc6g ZFk8hM7h82w8Nxm7b0/X8EKnBLw5URPgXGofMBpRdZ02EzU1bDm+KCCEtPXkeX2MgTdw TDsrA98pm2Hq71uQoL9XdsLV6I7WJ9pyTWaGGDOWykGAGM6cX8s8xGqh1mSrPOxd303Z vbhg== 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=IpDl0yNSmk1sfH/brr/Tu4rer3b/KD/QB9sW24KL4l0=; b=Q0h4P+62IuryTN5qpFZX4aKHWN5+6DVi1/cU8uJJAfAt5OWoa0f8NJPc6PNxjtKab7 UB/zJ1odZORb5+cPQUGYp/grlQWJffUYICZU2A3OapEAfUSen81HJx+LVbS4JGW2WTLU WBAmE9faW0TxRmZzSun19aCXOKNQV7SG/Z/nArf9J6vnwB/nBljULdmVswxj2/dWPJ8T ruK8epBtpegKZ30h583UOG4mfmPXhoYFmanMbj9KwQI6VYXi5UwPM3P+uR3plh1WjaWZ uibRAYpjuw0I4KfL++W3nFScvgNTAWQzDtzOxkHS5UWBSPBNQMP+xWRwElSfiDxPw8Yf ng1g== X-Gm-Message-State: AMCzsaUwalk1DM8EfHn/+1LJWACMG5xPITTxdTPctZw9Ye/LtPjfOru6 azM/WIjzww3sx0bY5p+iw90= X-Google-Smtp-Source: ABhQp+RtAvjP13DLcSLfqDKfZDqEjn7m4/juwUUMUAm360CtLQ3hKIG1pk188/cpCVgnIu+FfvcOFw== X-Received: by 10.237.63.129 with SMTP id s1mr17641263qth.89.1508199196655; Mon, 16 Oct 2017 17:13:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev , Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Yu Ning , Vincent Palatin , Corey Minyard Date: Mon, 16 Oct 2017 21:11:45 -0300 Message-Id: <20171017001209.32276-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 15/39] i386/hax: remove duplicated include 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 this file in include in "target/i386/hax-i386.h": #ifdef CONFIG_WIN32 #include "target/i386/hax-windows.h" #endif which guaranty than sysemu/os-win32.h is previously included (CONFIG_WIN32) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- could be squashed with previous target/i386/hax-windows.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/i386/hax-windows.h b/target/i386/hax-windows.h index f7c3e99246..004f867694 100644 --- a/target/i386/hax-windows.h +++ b/target/i386/hax-windows.h @@ -20,7 +20,6 @@ #ifndef TARGET_I386_HAX_WINDOWS_H #define TARGET_I386_HAX_WINDOWS_H =20 -#include #include #include #include --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199913553542.1605202695165; Mon, 16 Oct 2017 17:25:13 -0700 (PDT) Received: from localhost ([::1]:35768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fgz-00078p-PS for importer@patchew.org; Mon, 16 Oct 2017 20:25:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33533) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVY-0006Kt-Mg for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVX-00048k-GJ for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:20 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:56815) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVX-00048S-CO; Mon, 16 Oct 2017 20:13:19 -0400 Received: by mail-qt0-x242.google.com with SMTP id z28so30966qtz.13; Mon, 16 Oct 2017 17:13:19 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:18 -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=UD+wPNmnPoJcrvJdXbB4RS7dbTv3kCXlD/a5MqwZFAI=; b=Gwtd6nbUIJOlZDI1hdN40lIxMLc/CdFtXH8O8iZMeSPR8gXDVtY84AXdnCkYO+/AFl yVY8sYYoQFG4VwJ4l7wWWsVHtneyN0p9hO+fYs8rB8p3XnNz/vO/1gf/Wfv92tPjLZRX S9BoosuE46mTol30y+6ZH2TwohMn7FUaKvRyL2nKG9E6uDUbJJu4pkgkcJYaWmsuGlDF 1KtySa2QpZNtzncHZeHclpW+qq3LYHwd2/6o+Wo0ahkaAuqILjkkEcb4khjvAG2t0ao/ 8CWQ1G3Kubl5ZlKdw5D+2/+T1fKU5YQloNIeIN3rnKaygaW0Otcp5/NG+lJPXpyMPr34 rCoA== 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=UD+wPNmnPoJcrvJdXbB4RS7dbTv3kCXlD/a5MqwZFAI=; b=CZ0NvePJmywfRMbCq7SPH2YR1B6l0qsG0BKacVS34oWrvQ10XIwpPHdVNXMeDy3gZp xxhCQ7lkf5/fy61dyxeFdKKP13EAXHb1yzxWBFF1LB/NPsdo9uvBlFuwvQpwuqzNpAbf n6O39sJ5QudDN6tjg8X8mpRqHAXnmfv6jgwDWsfa3oc7pNzbNDKtUAXrrW5pMJemHTa4 bqD47+i5O/ziDJo7JmKW1uViV8wXk2WG0aubyjR8S086Lc+dnrrCuh4mQvZl20KS4l4P BXdvAjwJRHpeau/Cob1ex6zh2sP9aJlN44Gi4zRvEK9np0s/i+L9c3iAqaA13WNBWbr+ wIZA== X-Gm-Message-State: AMCzsaVfgPyCTFiLZ2sJEuAILVXah5A7Kn+oEjPVdFRb/AY/TCCyMlGy 511Ds4+7e2GjjVCGZ4d7+Gg= X-Google-Smtp-Source: AOwi7QC1OK3lQEGd/i8SQ0V8bDqt5r76KQ1CW0xyWKG9O3qbXFsBw5ugNltivJl+WzUHkQQ4yAbnAw== X-Received: by 10.200.53.89 with SMTP id z25mr17644124qtb.58.1508199198998; Mon, 16 Oct 2017 17:13:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:46 -0300 Message-Id: <20171017001209.32276-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 16/39] nios2: remove duplicated includes (in code commented out) 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 applied using ./scripts/clean-includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- target/nios2/cpu.h | 1 - disas/nios2.c | 3 --- hw/nios2/boot.c | 1 - target/nios2/helper.c | 5 +---- target/nios2/op_helper.c | 1 + target/nios2/translate.c | 1 + 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 50d803a217..fda02c39b9 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -20,7 +20,6 @@ #ifndef CPU_NIOS2_H #define CPU_NIOS2_H =20 -#include "qemu/osdep.h" #include "qemu-common.h" =20 #define TARGET_LONG_BITS 32 diff --git a/disas/nios2.c b/disas/nios2.c index b342936d21..de11f04cc4 100644 --- a/disas/nios2.c +++ b/disas/nios2.c @@ -1756,7 +1756,6 @@ extern const int nios2_num_r2_reg_range_mappings; #endif /* _NIOS2_H */ =20 /*#include "sysdep.h" -#include #include "opcode/nios2.h" */ /* Register string table */ @@ -2521,8 +2520,6 @@ const int nios2_num_r2_reg_range_mappings =3D 8; #include "dis-asm.h" #include "opcode/nios2.h" #include "libiberty.h" -#include -#include */ /* No symbol table is available when this code runs out in an embedded system as when it is used for disassembler support in a monitor. */ diff --git a/hw/nios2/boot.c b/hw/nios2/boot.c index 2b31f5b844..94f436e7fb 100644 --- a/hw/nios2/boot.c +++ b/hw/nios2/boot.c @@ -34,7 +34,6 @@ #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/error-report.h" -#include "qemu-common.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" #include "hw/loader.h" diff --git a/target/nios2/helper.c b/target/nios2/helper.c index ef9ee05798..9f741a8f19 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -18,12 +18,9 @@ * */ =20 -#include -#include -#include +#include "qemu/osdep.h" =20 #include "cpu.h" -#include "qemu/osdep.h" #include "qemu/host-utils.h" #include "qapi/error.h" #include "exec/exec-all.h" diff --git a/target/nios2/op_helper.c b/target/nios2/op_helper.c index efb1c489c9..c853aeae02 100644 --- a/target/nios2/op_helper.c +++ b/target/nios2/op_helper.c @@ -18,6 +18,7 @@ * */ =20 +#include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" #include "exec/cpu_ldst.h" diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 6b0961837d..796d399bd1 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -21,6 +21,7 @@ * */ =20 +#include "qemu/osdep.h" #include "cpu.h" #include "tcg-op.h" #include "exec/exec-all.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508199993338180.54334827025855; Mon, 16 Oct 2017 17:26:33 -0700 (PDT) Received: from localhost ([::1]:35778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FiI-0008KL-Fm for importer@patchew.org; Mon, 16 Oct 2017 20:26:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVa-0006NQ-QY for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVZ-0004Cr-VE for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:22 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:45632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVZ-0004Bz-RG; Mon, 16 Oct 2017 20:13:21 -0400 Received: by mail-qk0-x243.google.com with SMTP id f199so30874qke.2; Mon, 16 Oct 2017 17:13:21 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:20 -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=jUJhEuy+XIuC/oXCtoHkrHZlRd1DJtmdg7Wax4ceGvY=; b=ITGCh4D0Q+52+8wyEcpMqEEl6chj1/b9lrZXpQp9bp1BBI5CvFSxeIrsn1s66LGkpE BK96FTO4kUMU4uyXWORc7o0SwIT95xoztNLTYGDzUs7PkHxTXu/vdY5GQpXYwuaNYkW3 HVEUGtXKGNCg0u4U2K2HhWtClm4Z3bgjO2kDM3VYqZ8zFqZ+6eu1wvrORv1JoCXDQci3 /CfVFe5laBBRbOaDXCubPq5FkU04LdrB2evfjPcpJ7VVtvON44VLZWeoNjXPhZXdVTmx JPEv/Zr2A/mrcxBojjW4gdUNRg/5H/oQbLVOnzTxcbOVqhwNOjQk/MSOlQxQN8Ta4lGb AFGw== 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=jUJhEuy+XIuC/oXCtoHkrHZlRd1DJtmdg7Wax4ceGvY=; b=rayDCh5QR56NIZ3QT/d65mpSto4XsNA9JGWwGiNt9e+D5gogZNkQ9GoPSU8qfQpR4G aRHATQ1Dl8Uc0S86/s8qDFx7MVbQFmNpaHyA+XzAm4uOOQeTHic5EB7wDYfRlHl9x4o2 MLBEn6P3dbne8yA3nKSeWjIGyQkkFCoxOj2yaNE6UoWa90601FUTpuPDM8xd7WPpUima MvnmQkYsoVF6ujlRYZhkx7UTn0KlqWpwT+UcKFEyvu5+ukNFod8Odp42Q2nb+l7Jpbac 1+K608aNuSPGtoz62rmKYKmIoO0SUFQgdSiA5pHcvfA46EeiXSJTGxuqZf6GkjZBi7Ae PLNQ== X-Gm-Message-State: AMCzsaVOhmM/GOUGXdvufbkc4KKaIVvY0uJG2E0mPCefWXMVZeotSpEF eBs/EIx+lfnuHQ08bavobrM= X-Google-Smtp-Source: ABhQp+SKNoWpTfVTl4Ntr5lo5mfHWwoBxAuQNI14CoWS2Nkc7jWVo1+eHmGH5JOZc9h104H3mz7rJQ== X-Received: by 10.55.91.199 with SMTP id p190mr16625986qkb.291.1508199201418; Mon, 16 Oct 2017 17:13:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:47 -0300 Message-Id: <20171017001209.32276-18-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 17/39] misc: avoid "include/" in include path 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/input/adb.c | 2 +- hw/ssi/aspeed_smc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index fcca3a8eb9..924a3f9fd5 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -24,8 +24,8 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/input/adb.h" +#include "hw/input/adb-keys.h" #include "ui/console.h" -#include "include/hw/input/adb-keys.h" #include "ui/input.h" #include "sysemu/sysemu.h" =20 diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index cb515730c5..992617fd3a 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -26,7 +26,7 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/log.h" -#include "include/qemu/error-report.h" +#include "qemu/error-report.h" #include "exec/address-spaces.h" =20 #include "hw/ssi/aspeed_smc.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200370470135.760542931043; Mon, 16 Oct 2017 17:32:50 -0700 (PDT) Received: from localhost ([::1]:35821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FoK-000544-OR for importer@patchew.org; Mon, 16 Oct 2017 20:32:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVe-0006Qp-En for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVc-0004IY-85 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:26 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:45795) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVc-0004Hi-3L; Mon, 16 Oct 2017 20:13:24 -0400 Received: by mail-qt0-x243.google.com with SMTP id p1so70410qtg.2; Mon, 16 Oct 2017 17:13:24 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:23 -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=99iKmIqlXnTuP5F8/tUJPGMUeGCX1paUzqbbgtVSTbA=; b=dVG2aUDBrMDIVdLLvc5iDUiMfUNOq+A6MJ55f2VwyM69nEUlqbyu9w5tmWkNSUJczL hqj5d5bB9nLx2ZbOkSbOuYgwWQeM4LElnS7B6AO9cBlN/Ke9SurNHv9sxCNGQ89aGKtA +wMmd5ZgT1bHt9Q592u/9EandS2CQwl2SAg4qfm8NSyIPC7szdub2zradJEVEtA8PQgl 1gD8EhT4V2RZKn4NWATDOiJf539HakYQyeS5RhRlELNEMmrpyy9oQQJZnqXdMXAzKvde hGrVIwPHCyFbMkjrZsZ3h2bHcEtv7zYdqZjc25ffl3FLGGA4MQjW6Iq7pC4jOf05JkRF FviA== 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=99iKmIqlXnTuP5F8/tUJPGMUeGCX1paUzqbbgtVSTbA=; b=Nbhs61OqDp92kdZXf2gukQEC74ETgZnFcw4TMcdqFM+i5gxo/CRZVmIQbSg0mX7bZ7 TBSHXoJcuXNO6ngMEgbyqdOtillMmRv+K1nX+Yo3jWzrqlG+3aSScOESwEZxpbKPW92U 8vyj2KlFGUF+izddN8+AiEp9stJ5xMQfXIaXnKSoMmjLR70g7iHWEfJCh1GiWWlYJc+3 l2SVRZUIASSzCkoScr5oUBj7tmfhp9dv4BaGOKp5w63DolBPfFxopg7bCNk/5cvnpxJ0 t12rKUS3eJLqGxEsftUXWKeRJPYPOIjEYMW9wFV+PhHxNZ29blpH3E8hlPnfnMr71i0R TJTA== X-Gm-Message-State: AMCzsaX1URx75soJdmE9Ujd2rIfSzPRUD7HY2CK7s8QQq2YvqWacoDjD q5DuES2J5kBfFZjyKXPL88w= X-Google-Smtp-Source: ABhQp+QWwynOz9V3Pf7dgqi3mAi2pIGbECpywc00u5px4aEmB/muspXZsGAw7KKfOhpe3xUCWMCemw== X-Received: by 10.237.37.142 with SMTP id x14mr12878897qtc.6.1508199203735; Mon, 16 Oct 2017 17:13:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev , Peter Maydell Date: Mon, 16 Oct 2017 21:11:48 -0300 Message-Id: <20171017001209.32276-19-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 18/39] numa: remove unused #include 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- numa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/numa.c b/numa.c index 100a67febf..ebc553b5d9 100644 --- a/numa.c +++ b/numa.c @@ -29,7 +29,6 @@ #include "qemu/bitmap.h" #include "qom/cpu.h" #include "qemu/error-report.h" -#include "include/exec/cpu-common.h" /* for RAM_ADDR_FMT */ #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "hw/boards.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200047696798.5478973104179; Mon, 16 Oct 2017 17:27:27 -0700 (PDT) Received: from localhost ([::1]:35787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FjA-0000dI-Ur for importer@patchew.org; Mon, 16 Oct 2017 20:27:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVf-0006Ro-IP for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVe-0004Nb-Pu for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:27 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:56816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVe-0004N4-Ld; Mon, 16 Oct 2017 20:13:26 -0400 Received: by mail-qt0-x243.google.com with SMTP id z28so31399qtz.13; Mon, 16 Oct 2017 17:13:26 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:25 -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=L0zjNG/KJCrWqUy4/vjewFYt4qrERV93FJ02IL6gHSs=; b=t+R2zS0AFJhbWvD4ZSpeKSPvL8GWFLcB4kASnR62eGHwC5tTjAb/ogqNJEl8IIQgq6 NtOTdUmd8n+6dnMDfsAvstKTGiHQ8QiwSOD+PqJKJrOGxEs/H9ZH/0Nk3a58LNYyU39a geEW450+G2k9TNGgjjfgWA4GZ2z2CQwfQ5UWjif1Oja7J5FMDYSKoqiDKOlY7IfdXfc9 Wge0Hy9uG0YIRxtynbVr82e5Ooz1AkO0MfBGYLNAYn//njcGOG2BoL7hcXZbDqq8Vp4R V7ciUtVPE9JMIhc1moGz/LZd1ToOmUpwgopq566IGrjpUKlK2mMv4SuIzVHKpZ6v/PFs 2w5w== 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=L0zjNG/KJCrWqUy4/vjewFYt4qrERV93FJ02IL6gHSs=; b=YmZZdRgeIFn7DnvX9BaE7lN4nCtSjADdP3aBcsu56Vf8fLmctuhwHR1u2RQ4mXF8/Q TGAYbmcAxB3Wx8XGdQ/FoFi0JZBNiw3lmHCkaHVQcFJ8stTj5LhHefhIpenVRuHV8MgM vS9JpkY0Gwg42gIKt8W9ki8pO0db+bP7v/1+kxlSTQ6n/Y5hWEAUnMn3VON4qHkEYCod tYSy7iNg0ZaECuXexkTdxMe6T5Y/a8R4qUISJ4eg2NUWTWE9C+W1hM18P2TbdkrZbC2s 47NDJU6FhCBBFs0TWVJ0rT0WUALIDMYj23H3YrDrqZEWLShMeheCawQgdYVjE2tfTk9p xqow== X-Gm-Message-State: AMCzsaXpdLaUolFpTRsaBABu7p4059mZKRSvCPA8zbzlsZ8yO+PXkUNM Kv7sQUuxy0IbMZMJWlLJACw= X-Google-Smtp-Source: AOwi7QCiOEP0hJ8IkM0v4gguQwFVrm/M52sJ2NLsWcgQPBa5+XNOZMuF+det9hKI3SElgwEXto+iFQ== X-Received: by 10.200.39.236 with SMTP id x41mr16904714qtx.287.1508199206322; Mon, 16 Oct 2017 17:13:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:49 -0300 Message-Id: <20171017001209.32276-20-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 19/39] hw/ssi/aspeed_smc: remove unused #include 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/ssi/aspeed_smc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 992617fd3a..5059396bc6 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -27,7 +27,6 @@ #include "sysemu/sysemu.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "exec/address-spaces.h" =20 #include "hw/ssi/aspeed_smc.h" =20 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200253499809.9744711182718; Mon, 16 Oct 2017 17:30:53 -0700 (PDT) Received: from localhost ([::1]:35805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FmJ-0003NV-NX for importer@patchew.org; Mon, 16 Oct 2017 20:30:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVh-0006Th-V4 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVh-0004QZ-56 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:29 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:46923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVh-0004QL-0P; Mon, 16 Oct 2017 20:13:29 -0400 Received: by mail-qk0-x243.google.com with SMTP id k123so29546qke.3; Mon, 16 Oct 2017 17:13:28 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:28 -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=XNzx5LObWYOMQx0d38am65vxcoQsD71JBoZeNRExPgU=; b=GK5x1Lq5YZPvWR93ouG59TmGhi/ISWFBhD1vbGyS04fyC2EJ75TuXrSjf611bQQzOv E0C91sPXYljknlBYQSELqY4PA0RLwaeOf3CE4ZNPELMo5RzE8a6pYgIbbBo6YuEE34Pg 8/tAnEU4Rpc6SUjMdCp4Fp2fGmZ2cu4qzoiLcnLxh4pgAlcwKK6+AuNkvs92NcmwfDLo GJ+YlDWXSkXxZTI8pD+sOD1kphHVdkKLv3rvuv80wtQ1hmKhiUwaPAYt4BAn2I6XiTk2 N0mxXJWoBNaeUX5vQzOPrjybimWQLFQRfiFBWNWEcJowYnx+ulR1xT9CQ/0hvaseTQMj slnQ== 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=XNzx5LObWYOMQx0d38am65vxcoQsD71JBoZeNRExPgU=; b=cM6O8w+BKFQ1bygdmlZ630IDYXvP/s76KT8Ks0XWAV4D4M3dbSTUIlwQQnImcBGyql 99wNTHRh1xeCVIr8FUFc65AIXs63Zi3ApIBQiCYBuuWusPVeIinizf/bYNRa96Z5/x3M UrIkLq1X0fgMyGbtungdh9WLsVcdXBMkIkXg8U//gE5AL749hSfb7Bmteur44loHSwt7 Rj1XBtvjl03nmSJbzAHPICXj3e7UQiYSE4xZoUUaa8hdK/TT5Dw9e+2eZVqQiQtsUWOw OyoYSKEyK3i8vupdSnG/zIS4XrQy0WNPAPcCEzH64siG7eo4m2qztUcK//yy1l1s6+3W k31w== X-Gm-Message-State: AMCzsaVpqHIQtx1xO/Ruo5aiIyyVDsQL+sqEWP9DnbZYx/b2ofyhMRtR 4alIqqEKUlg31AJJPbUYWOg= X-Google-Smtp-Source: ABhQp+SY9P3VIj3AeaIRGXhuLeu5Gy9ilxx7IadyT1Q9pbJQTbAQRAFOAXTeVcWZ22HhvATqD1ooRA== X-Received: by 10.55.177.129 with SMTP id a123mr15245548qkf.162.1508199208608; Mon, 16 Oct 2017 17:13:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:50 -0300 Message-Id: <20171017001209.32276-21-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 20/39] amd_iommu: avoid needless includes in header file 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 instead move them to the source file Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/i386/amd_iommu.h | 5 ----- hw/i386/amd_iommu.c | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h index d370ae3549..aeef802364 100644 --- a/hw/i386/amd_iommu.h +++ b/hw/i386/amd_iommu.h @@ -23,11 +23,6 @@ =20 #include "hw/hw.h" #include "hw/pci/pci.h" -#include "hw/pci/msi.h" -#include "hw/sysbus.h" -#include "sysemu/dma.h" -#include "hw/i386/pc.h" -#include "hw/pci/pci_bus.h" #include "hw/i386/x86-iommu.h" =20 /* Capability registers */ diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index ad8155ca4c..eeaf0e0aa8 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -20,7 +20,10 @@ * Cache implementation inspired by hw/i386/intel_iommu.c */ #include "qemu/osdep.h" -#include "hw/i386/amd_iommu.h" +#include "hw/i386/pc.h" +#include "hw/pci/msi.h" +#include "hw/pci/pci_bus.h" +#include "amd_iommu.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "trace.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200156700778.0327096190694; Mon, 16 Oct 2017 17:29:16 -0700 (PDT) Received: from localhost ([::1]:35793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fks-000247-V1 for importer@patchew.org; Mon, 16 Oct 2017 20:29:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVk-0006WY-QZ for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVj-0004U7-P8 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:32 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:49870) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVj-0004Tq-KN; Mon, 16 Oct 2017 20:13:31 -0400 Received: by mail-qt0-x244.google.com with SMTP id k31so56822qta.6; Mon, 16 Oct 2017 17:13:31 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:30 -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=cKp4VG4C7kmcRZSQZBieXnrh1VIkQx2MeqZ7RzGzOeo=; b=dgaHXGw2HWorE94JrGsaI5DT9vs8XILr/uvV1OKc+f9qO9rE/kZa67K9GYbJ/EM3cD MM5cYXkMq8EaHPXAPSJvRq+auX3qzjpqUCGraS98GusBccwLnz7mmDf7p7fJ4WQRO8It fQASFBN6RfK6KI/0h75VZn31Xu9/Rx6vgxUlDTJBBKbKSmxAe4bg/WoWsvt+svWsi5Cg ufzUzoXrVc/PhMV5pQMtSRbP9zs4ks7cMCpz4Gj+vNRqMBm336On6YnWrHm/nHF2iQ+J I0fQq0nN3OaOgv3S1hjc5se2WBImGuaLZGIAPsR+cunIWTxN3UyhHQHXdK37InEi7iiS aaoA== 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=cKp4VG4C7kmcRZSQZBieXnrh1VIkQx2MeqZ7RzGzOeo=; b=kj2rSc7lmzLKUzMJgow2Lu1w7iWxmS3RGs3ZO/jE7umT0bXOBAdSwW6AXOblLAFsdR g3GyqLpNI4Seq42Xp8I/D38i8+SyqYBl9VdxkSrxapu2TO/wOGNPNzcNWHppmlwyBeZ6 dpj39KWlpiPNrETAIwWdPwMGzHSzuehv8iC3QiM3zp9WpU2fHRP2bI6bMWt2VMQsHQjE G1RpflfOW90s9QtW980K8QEQ8AjTlXNr3wuu2cQmk0m9uw4rW9BN+IM/qdjb3IpM/OiV 9rxiT6G9SedSXIvsvkVK1LhxFlZbob/wqYZy3q2BptrTgA/5mSKKZvDJ5nRdf2am3Ahn 2hgA== X-Gm-Message-State: AMCzsaWaiyv9Q+g/PjFPPo7vtvy39LKgiUKHCMC2pDt1aE57iR4Tz6KD XJgYYovOETfuMp4ahkD88m4= X-Google-Smtp-Source: ABhQp+ROvd6uom/dzwp+y4CHBtMudKySvIjNZnNXxebNvGKL+TGnWDgiVypAEciOoByALVo0QCCL5Q== X-Received: by 10.200.28.138 with SMTP id f10mr10971138qtl.248.1508199211200; Mon, 16 Oct 2017 17:13:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:51 -0300 Message-Id: <20171017001209.32276-22-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 21/39] misc: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth Reviewed-by: Anthony PERARD --- hw/audio/pcspk.c | 1 - hw/i386/kvm/pci-assign.c | 1 - hw/i386/pci-assign-load-rom.c | 1 - hw/i386/xen/xen_platform.c | 1 - hw/isa/vt82c686.c | 1 - hw/misc/ivshmem.c | 1 - hw/misc/sga.c | 1 - hw/pci-bridge/pci_expander_bridge.c | 1 - monitor.c | 1 - 9 files changed, 9 deletions(-) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 0206f7399b..908696d483 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -24,7 +24,6 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "hw/audio/soundhw.h" #include "audio/audio.h" diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index d8559d8342..da954d504c 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -25,7 +25,6 @@ #include #include "qapi/error.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "qemu/error-report.h" #include "ui/console.h" #include "hw/loader.h" diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c index 43429b66be..2c3a60392e 100644 --- a/hw/i386/pci-assign-load-rom.c +++ b/hw/i386/pci-assign-load-rom.c @@ -4,7 +4,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "qemu/error-report.h" #include "ui/console.h" #include "hw/loader.h" diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 056b87de0b..fc8623c90b 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -26,7 +26,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/ide.h" #include "hw/pci/pci.h" #include "hw/irq.h" diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index c129985e2a..4084b32be9 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -12,7 +12,6 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/vt82c686.h" #include "hw/i2c/i2c.h" #include "hw/i2c/smbus.h" diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index a5a46827fe..4919011f38 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -20,7 +20,6 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h" diff --git a/hw/misc/sga.c b/hw/misc/sga.c index 03b006d6f0..97fd63f176 100644 --- a/hw/misc/sga.c +++ b/hw/misc/sga.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" #include "hw/pci/pci.h" -#include "hw/i386/pc.h" #include "hw/loader.h" #include "sysemu/sysemu.h" =20 diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expand= er_bridge.c index 8c8ac737ad..9e799dc10f 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -16,7 +16,6 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bridge.h" -#include "hw/i386/pc.h" #include "qemu/range.h" #include "qemu/error-report.h" #include "sysemu/numa.h" diff --git a/monitor.c b/monitor.c index fe0d1bdbb4..54737d20e7 100644 --- a/monitor.c +++ b/monitor.c @@ -28,7 +28,6 @@ #include "hw/hw.h" #include "monitor/qdev.h" #include "hw/usb.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "sysemu/watchdog.h" #include "hw/loader.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200423029956.4889091110969; Mon, 16 Oct 2017 17:33:43 -0700 (PDT) Received: from localhost ([::1]:35822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FpC-0005jh-6B for importer@patchew.org; Mon, 16 Oct 2017 20:33:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVo-0006Zq-04 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVm-0004VC-3t for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:35 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:54403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVl-0004V5-VR; Mon, 16 Oct 2017 20:13:34 -0400 Received: by mail-qt0-x244.google.com with SMTP id z19so40115qtg.11; Mon, 16 Oct 2017 17:13:33 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:33 -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=Pt4KacQigml0SV8PYhGe5cs0b6lrPZPsSP1cWonGq7U=; b=uNMrSAFtVTfmK8EiEEfhBUzHeYV6f5ir7eKe5BOh/HABI+xXVMfk2tVbBfEUP6BUGj OFreOgau52z+21MkBL+p3ZxBzGsk1GGIe93bY88BHLfcZXFrS1Keal4j0tF8qD7quMaM USYajhDkfZ3KqW2Xzb1xS6YRqtgQwew0llLsklL7n4+DkOkCuuNXDKJNqW0gJBVN0Oqm shr8ut8Eq6U6KYzhVdS8AbFZP+s2inrjpz3r60Ktmzf1U6etPZJDLkKNvgrhWv4nodDC ksAZlETU4zrNs9pxXXAM8Uli+mPvUt4MN+wZ+wjWBhrhvyxyg64a3FJkKdWQMUD7ByGQ 0Edw== 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=Pt4KacQigml0SV8PYhGe5cs0b6lrPZPsSP1cWonGq7U=; b=QJJFk4OMWKLmqYZEzaYnc2RrR9hZwqNj/6C941Shb8J7dv2ds/2fov9DZ4cKmJd4r9 Iy6e2hn1i2c4T7cZP/I8ci/OP9RCgMJg9zLA4CXaRwALsUcqrEEqh6MOoSKQBqvZyX99 aL6PjFOvYUkiXscdUtrgTkzXI335hI74Qq4W3DlyB4DPkw8KJFoX/pOa4wj09tIfT9MI idC5Qfsclk9q9v6DW9kfE6MwFyv90yNoqLw5kfsZmjPeoFUGenerUCYyIdkAoko3RStb NOjhHwillMJjkeAkwiQVywuYJrj5YR/kMHaxQtk28uhJdk6mpgL9O7XmVCgry32UeYp6 y9NA== X-Gm-Message-State: AMCzsaV8VCtdCXODc30UNfb8jzrs49ZtWVgduIMT++LiSH9ATeUUf/G3 99iVyrImosW4wkNY3K214C7U8M9A X-Google-Smtp-Source: AOwi7QBC+Tnb6+1wqSpa9GAeMC8i34UWahzRj6gOdkcYI/qijsqecf8S00uwaSi0wk7euMeHEzKRig== X-Received: by 10.200.48.54 with SMTP id f51mr16901748qte.39.1508199213574; Mon, 16 Oct 2017 17:13:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:52 -0300 Message-Id: <20171017001209.32276-23-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 22/39] hw/ide: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 and remove a duplicated include Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: John Snow --- hw/ide/ahci.c | 1 - hw/ide/cmd646.c | 1 - hw/ide/core.c | 3 +-- hw/ide/ich.c | 1 - hw/ide/isa.c | 1 - hw/ide/microdrive.c | 1 - hw/ide/pci.c | 1 - hw/ide/piix.c | 2 +- hw/ide/via.c | 1 - 9 files changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 32d1296a64..2634f8db3d 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/msi.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" =20 #include "qemu/error-report.h" diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 86b2a8f504..65aff518ec 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" diff --git a/hw/ide/core.c b/hw/ide/core.c index 5f1cd3b91f..ceb1e32a32 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -24,17 +24,16 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" +#include "sysemu/blockdev.h" #include "sysemu/dma.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h" -#include "qemu/error-report.h" =20 #include "hw/ide/internal.h" #include "trace.h" diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 8dd0ced6b3..c01b24ecbe 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -63,7 +63,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/msi.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 40213d662c..9fb24fc92b 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 17917c0b30..fde4d4645e 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pcmcia.h" #include "sysemu/block-backend.h" #include "sysemu/dma.h" diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 25f1d36f3a..1ab0a892d0 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" diff --git a/hw/ide/piix.c b/hw/ide/piix.c index dfb21f65fa..a3afe1fd29 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -25,11 +25,11 @@ =20 #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" +#include "sysemu/blockdev.h" #include "sysemu/dma.h" =20 #include "hw/ide/pci.h" diff --git a/hw/ide/via.c b/hw/ide/via.c index 35c3059325..117ac4d95e 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -25,7 +25,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci.h" #include "hw/isa/isa.h" #include "sysemu/block-backend.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200335523292.5393951036832; Mon, 16 Oct 2017 17:32:15 -0700 (PDT) Received: from localhost ([::1]:35818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fnl-0004dv-NI for importer@patchew.org; Mon, 16 Oct 2017 20:32:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVp-0006bW-Mc for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVo-0004Ws-R7 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:37 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:50849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVo-0004Wk-Mc; Mon, 16 Oct 2017 20:13:36 -0400 Received: by mail-qk0-x241.google.com with SMTP id o187so21701qke.7; Mon, 16 Oct 2017 17:13:36 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:35 -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=CHFCjRYj3vmjtKuTiVOnt8bH1KrLcDf6RKPJCMOJzb0=; b=VloxSLReOtSTEH6ybH5z4RnhI8jCdAnyv5nxDNl7SpWV2e8OHkURdi4OCpHsrdMke2 ApydVlUXpHLmiAAGNiOzpN44/B8Z1mdRQyCe6bxHbxiEiqgtXZOQSNii8AnByahr6V0e DVQh+kepmusK6ICuUh6LkDtQRge17PV5Q1MEjJrQ7yQM3ysuzssDlp7II7OnbCwuyQFm 7OxobFuJJxgbgdslT+b14U3OTCpg40LuvsvXMGwYlQbS6RmHXF4o9B4OwLxpXfAV7jHl xyOPBuAWttJE5lr9k1xsN8vuKDwIsTSTlnLDbjT2zvfbuyJ3xYiWfBxtJql8xoEzO0oS cQNg== 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=CHFCjRYj3vmjtKuTiVOnt8bH1KrLcDf6RKPJCMOJzb0=; b=qPXw8irj5Nxf5PGnt4KLrQuflpJObBtFFchhuGJKoeAAeZ57dHS4Ht9oPQ+Ty7vG6L 3e16FsBJcxlwlg10WiQ4IDJCmOkTf6JVzYBBttkKrGpx5BbOotOrmg8KlMesUzDsvs/l vJ0hyylOSWHT17xGqKA9JlEsFf3uVYceRIu9sfwx2DSZ5WF5peusIabv02izidIy/E6j ybHW1KEcad/Bt0BuOMQ4GDo54FE5AWtRErFdUkX1kPltxKckQl3hEKNNUFeOaGk4f/mu +UDbAnFdYcZEVeKB5NCy3NnUeCwmRfKYzBjcyUuF6ifdq6k3vkRUTsLESHgf9z5hwccN rr5A== X-Gm-Message-State: AMCzsaXjQKAuD1mL7D7jZ7ohKnbViu7xYN/O+YOK7B+gZ9Wj3ksRmw4w qAkVGhGcx7Hv0U6bJHJPWuM= X-Google-Smtp-Source: ABhQp+RL4L2OBGwJkwhI/QuYg27qQzO3oxwVF9Nuh7eSvfFBIncYhj6bicpa/U6MlhMt8JSeCU6nQA== X-Received: by 10.55.42.73 with SMTP id q70mr15888965qkh.337.1508199216290; Mon, 16 Oct 2017 17:13:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev , Corey Minyard Date: Mon, 16 Oct 2017 21:11:53 -0300 Message-Id: <20171017001209.32276-24-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 23/39] hw/ipmi: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Corey Minyard Tested-by: Corey Minyard --- hw/ipmi/isa_ipmi_bt.c | 1 - hw/ipmi/isa_ipmi_kcs.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c index 2fcc3d2e7c..e098fd5206 100644 --- a/hw/ipmi/isa_ipmi_bt.c +++ b/hw/ipmi/isa_ipmi_bt.c @@ -26,7 +26,6 @@ #include "hw/hw.h" #include "hw/ipmi/ipmi.h" #include "hw/isa/isa.h" -#include "hw/i386/pc.h" =20 /* Control register */ #define IPMI_BT_CLR_WR_BIT 0 diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c index 80444977a0..689587b65d 100644 --- a/hw/ipmi/isa_ipmi_kcs.c +++ b/hw/ipmi/isa_ipmi_kcs.c @@ -26,7 +26,6 @@ #include "hw/hw.h" #include "hw/ipmi/ipmi.h" #include "hw/isa/isa.h" -#include "hw/i386/pc.h" =20 #define IPMI_KCS_OBF_BIT 0 #define IPMI_KCS_IBF_BIT 1 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150820054331589.75157948813808; Mon, 16 Oct 2017 17:35:43 -0700 (PDT) Received: from localhost ([::1]:35831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fqy-00078A-Gz for importer@patchew.org; Mon, 16 Oct 2017 20:35:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVs-0006eC-3y for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVr-0004Yg-5u for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:40 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:51257) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVr-0004YS-1R; Mon, 16 Oct 2017 20:13:39 -0400 Received: by mail-qk0-x243.google.com with SMTP id 17so17518qkq.8; Mon, 16 Oct 2017 17:13:39 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:38 -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=jsSYnS+pieiKhjh0pSRYsozy3igSZBWnMnniuZZM2w8=; b=WuG84c8y8215nINJPxaCtkfrxFQjhVp9rBu4VxwhCillGCaipSiPbvnD9xj+OZzZ4I o8AI6MIyFzDCXcSi+hxxJpjCItIwXew0HMMOWAXxnvow3nVPASzgPR2+DmyahscChkUA RjCk/vsnOFJYB7DFkDmnIMmay2Ts618pgm3W5UzSeF02dtRJD3tnPKk6QdmP2zlYsU/D sWMI4yClj1NXRm1dDOJ6A632Le2DM5SRXoBkbBqN5T2wDcXrCLRW6eZCZhvwvA9X2ZGQ wJu8LQGvHaPeLX/GTENZTgPp63TNpbI8SsEsGOfAVkfifmaj6/szokkwQfStUtPKp3vf Cu9w== 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=jsSYnS+pieiKhjh0pSRYsozy3igSZBWnMnniuZZM2w8=; b=IU8fHVXNq0WyWq3cFqBJDpTqAOk9P7kt0C/B2MBTc1+mlBHZWdHVXM6/i0LoL6JAH3 uQwZqKfK2sy/y3SBxofSSEqwsOaXufu480Z8Xv/DA/x91Sn9d044rNPiW61pcg3yeZwQ hz+IDn6tJJGTmLCmCvr5HOcKz1cv6YU0JrBaSUMRmYEv97FVXF+CCGHc+oRiWDQN1v1B K2dLW73jfPNRNBwLarWP8Fg9+P6jOqbEXj8S4HjjW31HufYPu0ZbwW3zW5BcoLhSCZRX JYvrYVWcbPUCOWOKWDE/B+DPCGKA/t2mZXo6wn1PX01ITzszVUVtTW3+i53CT7Iaf719 nxTA== X-Gm-Message-State: AMCzsaW4DphQ+aDc8ZNNpNGg36XN8PPvwtYRBmScaOo8RjACBx5xr8OJ 2e5eXC6zV3EzjtxWdklIvXo= X-Google-Smtp-Source: ABhQp+Sk9hmnfEn0JjCd7wP6Gff87b6v6MwpyvEjWGpA+s+bZTwwvUO0O8ErDU6aSImnWK91Zr8B0Q== X-Received: by 10.55.164.215 with SMTP id n206mr15483644qke.85.1508199218652; Mon, 16 Oct 2017 17:13:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:54 -0300 Message-Id: <20171017001209.32276-25-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 24/39] hw/i2c: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/i2c/pm_smbus.c | 1 - hw/i2c/smbus_ich9.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 6fc3923f56..a044dd1b27 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -19,7 +19,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/i2c/pm_smbus.h" #include "hw/i2c/smbus.h" =20 diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index e47556c9d8..007cb6701d 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -26,7 +26,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/i2c/pm_smbus.h" #include "hw/pci/pci.h" #include "sysemu/sysemu.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200631607905.8692673924254; Mon, 16 Oct 2017 17:37:11 -0700 (PDT) Received: from localhost ([::1]:35840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FsN-0008Kd-SC for importer@patchew.org; Mon, 16 Oct 2017 20:36:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVw-0006ie-AO for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVt-0004ai-O8 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:44 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:54493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVt-0004aP-JM; Mon, 16 Oct 2017 20:13:41 -0400 Received: by mail-qk0-x241.google.com with SMTP id n5so12695qke.11; Mon, 16 Oct 2017 17:13:41 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:40 -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=rZz9SpYE8cJUXiDMqqgnGSu1BW1/SuO+/tdPI4rNDkw=; b=ELKamTM4QMcRCF4R60v9B/z8QvDRQUcxBiigVuWPxIeNOJpHq0GDZXJ9wLQIqD/1ek 4s81LXJdnE/WHMYzOp/ng/zCLmRMNuxHc7VY5HQtoESZ8y9J83ebcUG3vUd4bRRkIz2I d3vfLuHp4DvxLEQFtl0tmJeZ/5k+NFit9vhqKIl8sVsQe8NZvLN2NsZ8fBfvnUM2qukb Ull6mDcCqRmcm0dkdR4vbyxOzNqOU43T8fgZvdxIYtEaJpCw6AflP7u5hwvceiAomjdk WGL1tSURlohRmw0JW9AMKN6MZh5loBJILZgD4Pv7JBFrmRzZSchF0SHO8/v/lITjVTPm DfhA== 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=rZz9SpYE8cJUXiDMqqgnGSu1BW1/SuO+/tdPI4rNDkw=; b=DM02CEmvA6G/y4wzXVfDeBn/UQ1xBI9nSDU5oEHOCChXTZritbp5BHbD5k2OqsNTNn NVG8u8mO8rJ8Xq76GA9u5F9c3YsuDrbIDHypRVcykHwFdp0Yl2/O/tDii94KByDvtFFN vbl8S6ykmVOkcevpRjhn/Zec+kz/ApIHwHl8/mY/VCmnSR+5SfRBLKr5/DtqaLXwP63M j4ON+eQrydO+T4c9HUZFQTg3b94/NC/Mtt/xHJz3cH3zBYbJ1vdhkATTVm/KfnAmOozU R7VMdiTEDnlgZ/4gGQtcfiMqGSxY1T9YTLYCySF38nsO1JQyg57jhes01WxAm0Rz2462 Rt0w== X-Gm-Message-State: AMCzsaVsYihPs8PpyEvp7rSJIRhiS0jEs8QdvSEV8qebBM2tgPmcJdlO 2chTbLOqalAYEtaJTSh/aHU= X-Google-Smtp-Source: ABhQp+QA05dZykUE2zXGFoqBYEtleWgFCDBdsWnQoMi3ZcmdZrdfih5rqrJQV6aACDdWRn13hJmD1w== X-Received: by 10.55.127.66 with SMTP id a63mr9639209qkd.90.1508199221174; Mon, 16 Oct 2017 17:13:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:55 -0300 Message-Id: <20171017001209.32276-26-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 25/39] hw/tpm: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- hw/tpm/tpm_passthrough.c | 1 - hw/tpm/tpm_tis.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index e6ace28b04..7201844657 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -29,7 +29,6 @@ #include "sysemu/tpm_backend.h" #include "tpm_int.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "qapi/clone-visitor.h" #include "tpm_tis.h" #include "tpm_util.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index d5118e7f60..b07a28aa29 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -28,7 +28,6 @@ #include "sysemu/block-backend.h" #include "exec/address-spaces.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/pci/pci_ids.h" #include "tpm_tis.h" #include "qapi/error.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200567761733.0604168457797; Mon, 16 Oct 2017 17:36:07 -0700 (PDT) Received: from localhost ([::1]:35837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FrT-0007dT-TZ for importer@patchew.org; Mon, 16 Oct 2017 20:35:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVw-0006is-II for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVv-0004bx-PA for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:44 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:50850) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVv-0004bd-L8; Mon, 16 Oct 2017 20:13:43 -0400 Received: by mail-qk0-x242.google.com with SMTP id o187so21938qke.7; Mon, 16 Oct 2017 17:13:43 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:42 -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=DWbFx1RqF/81xCg7WLslXI+d56l8J+BcYQxd5UOcBuo=; b=CzWpYvJnyUixnjg7NTNpN9mQyCpAvo11zZ7wD7BKClbBn1gNUR72++nzWoiAWHPWFo sv+WdL8TtVsPuhUW/GNPDanSHB+HJY9KH05twfBD72gd+ek0CTGFiM3+WjB/6qkP0bBZ pMxFVypBFM+3RKKaY9BO3blLqtgU2M6nhKYelPhe61JAdIN2yA3SE9BQfNP/dI6d8waO 5HKR4Hb/d+8XFWFOrvOvxwCztqn9FoODQZk0IyX5nAoHx4BH9ouq4+46c8DsSL2JmKRb yznktes/04TXdtBUhtgp1T4ltb+QL77uWhJuaBvGUpfzSXqhyvaNYl0RkIp1e8+7va5D oRtA== 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=DWbFx1RqF/81xCg7WLslXI+d56l8J+BcYQxd5UOcBuo=; b=O1CIxwc3ej4M9ypXf6lt/kt/A0Qe0IHGYwPM3niBwiolCbpdRu/ssh1jAjRBDwjifZ TZBzW4suYxxz8gmoRrE525YC4QwYM8V9KdQAFB57v7ECGAlls7YI22zVUTkkOLCw8g/T cp6/4SouJNyahm/KtikRMCpvVitdNc4EospPF2orLBt5O1bOA/QGWwP/K613b6wXIQRY pjmCe5AKkTi9lgeleVuDijlR3wNjtYg8u2tPuKU5mqfyB21uIsYA5KuxePq/iTad5oAD 4nDkkDQKMpKMYE2CB5kJyPl02KyqsI4924XgYXvZ64fmX69el/8id++QFX5aWFtJVrg1 21bQ== X-Gm-Message-State: AMCzsaVCmVCwV9mmhUmsS01u8Kty5JAGs8a29MDqIu56fx7R9dLmCqh8 nUSo/AlHzIQz8InHoZmVLl4= X-Google-Smtp-Source: ABhQp+RqBjLt1igACVE9JwEUKKikG4VouKQSBV/AhzM1gcplxs5wM2Q0c9sFGX4rw7VVRYur6CpiAg== X-Received: by 10.55.6.149 with SMTP id 143mr11670965qkg.231.1508199223225; Mon, 16 Oct 2017 17:13:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:56 -0300 Message-Id: <20171017001209.32276-27-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v2 26/39] hw/virtio-balloon: remove old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/virtio/virtio-balloon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 37cde38982..14e08d20d0 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -18,7 +18,7 @@ #include "qemu/timer.h" #include "qemu-common.h" #include "hw/virtio/virtio.h" -#include "hw/i386/pc.h" +#include "hw/mem/pc-dimm.h" #include "sysemu/balloon.h" #include "hw/virtio/virtio-balloon.h" #include "sysemu/kvm.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15082007564951014.7921336455571; Mon, 16 Oct 2017 17:39:16 -0700 (PDT) Received: from localhost ([::1]:35864 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FuW-0001ip-Ki for importer@patchew.org; Mon, 16 Oct 2017 20:39:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FVz-0006le-6x for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FVy-0004dv-7x for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:47 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:49565) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FVy-0004da-4m; Mon, 16 Oct 2017 20:13:46 -0400 Received: by mail-qk0-x243.google.com with SMTP id q83so22759qke.6; Mon, 16 Oct 2017 17:13:46 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:45 -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=haF+m8roxWJbqA8wTOEcMllGF/d3Z8gp2Ia7Bxv5STw=; b=M8HuEmw+2bt57DlciMI6IJWNjZgJuKQLhcNgATYl6Y1xJfY9R7PsuQlcHCM6yrMQiv WS1YiHdL+xAvmwWG7sOZKUOOZWrdoQXwHKf0PxtYt/SSv1UZLMN5vd39My/P3feIdu3X D0oj1lTE8c3KVaYpWfG2/5TTcQl+0sXYXe1Riv+YEdMbAPWy1FrwFMgoYqGmx3b7TEGO wnglBwATDpuqj8mIGHyoLp2VC26vZe2I61hwNtvg1ovhHaA0OHbNHCYjMvzszHxcY1cK 0UC0CAGugE/4HSIEXDXJIntnl6CuorP5VN4eYDy7m90zoVY3BHRfBP95j3UKOgBh9zdS akVw== 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=haF+m8roxWJbqA8wTOEcMllGF/d3Z8gp2Ia7Bxv5STw=; b=Kq4YmiTyAFIBtQMycLvuPyj3gtIxt/dETDyWSaPh+x6GdnHmzzKicBeQopmPhflrCp WFcEAlQVoNs163V0zMinpmZJs0KC9jlDOcKZiV97pkLMrlHFPkItOtS8REdsQqubsEJo dpfr7yDOKZJyVO0U+/a3Whzw5/W5XoIU8nl9kuwGxi+ysW76551t/rfY4VkXgpY5d6Q/ xDYb7sfLXio7cdBHhy4j0pjr7jxfoJUPj5d5UEOlCiU31Y0ky3pLOR7IN4uXiZN4WRMj xWmZr3Wl8AZmWKnxqvVQgnQxik/pCEq6A7GsHcazC/n+qwbH4+niDW58/svhn6AGO6HI MPwQ== X-Gm-Message-State: AMCzsaX2ZuCouvFt4YVquVsuave3PoIVTnfVlsCTnQXm7y5keDHLkZ04 D2RjXuGg4ggc65Frb0+vvS16pGz3 X-Google-Smtp-Source: ABhQp+TLkGEAnd3KYnx9Y1YE9NJf/YGYIuSYOfiOVC9g2FJp3lgF7WQ9p94vN3+AsD/AfXZI86weDA== X-Received: by 10.55.91.199 with SMTP id p190mr16627253qkb.291.1508199225637; Mon, 16 Oct 2017 17:13:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:57 -0300 Message-Id: <20171017001209.32276-28-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 27/39] hw/unicore32: restrict hw addr defines to source file 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 and drop unused #includes Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- include/hw/unicore32/puv3.h | 10 ---------- hw/unicore32/puv3.c | 16 ++++++++++------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h index 5a4839f8df..f587a1f622 100644 --- a/include/hw/unicore32/puv3.h +++ b/include/hw/unicore32/puv3.h @@ -14,16 +14,6 @@ =20 #define PUV3_REGS_OFFSET (0x1000) /* 4K is reasonable */ =20 -/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */ -#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */ - -/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */ -#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */ -#define PUV3_INTC_BASE (0xee600000) /* APB-6 */ -#define PUV3_OST_BASE (0xee800000) /* APB-8 */ -#define PUV3_PM_BASE (0xeea00000) /* APB-10 */ -#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */ - /* Hardware interrupts */ #define PUV3_IRQS_NR (32) =20 diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 504ea46211..6849bac59c 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -11,16 +11,10 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "ui/console.h" -#include "elf.h" -#include "exec/address-spaces.h" -#include "hw/sysbus.h" #include "hw/boards.h" #include "hw/loader.h" -#include "hw/i386/pc.h" -#include "qemu/error-report.h" #include "sysemu/qtest.h" =20 #undef DEBUG_PUV3 @@ -29,6 +23,16 @@ #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ =20 +/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */ +#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */ + +/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */ +#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */ +#define PUV3_INTC_BASE (0xee600000) /* APB-6 */ +#define PUV3_OST_BASE (0xee800000) /* APB-8 */ +#define PUV3_PM_BASE (0xeea00000) /* APB-10 */ +#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */ + static void puv3_intc_cpu_handler(void *opaque, int irq, int level) { UniCore32CPU *cpu =3D opaque; --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200904658975.4528562847786; Mon, 16 Oct 2017 17:41:44 -0700 (PDT) Received: from localhost ([::1]:35880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fwl-0003eT-0B for importer@patchew.org; Mon, 16 Oct 2017 20:41:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FW2-0006pV-Jc for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FW1-0004fl-KV for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:50 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:56095) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FW1-0004fU-FQ; Mon, 16 Oct 2017 20:13:49 -0400 Received: by mail-qk0-x243.google.com with SMTP id x82so9637qkb.12; Mon, 16 Oct 2017 17:13:49 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:48 -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=f7+dvg4iGrjPpbeDNR/sPrlo38DWcv453r/1QYU2zRo=; b=YbKohdRPtbk2bI8lM29XW+MKGt1R398jOFomvQUtilOlps5Czx2xmpIF4LbeDQzqsx u4oC0GqZFMDLHwMZ53vvNVLK9K16PZOPe7QG4wqqVKHb5tZM4fHBBa0jsFfmF8I2DUMR oH8NEEyHBoo1kkrEA3qJWwe5KrVdSepVy1X+glltBMoYcdyDBqHUbyzBU3mCOm4XJGAO dlC5JbeIBLdS2tYrbfvfuhts1bw0lTXYAb6bLXx5yRaLX1K6F9J8oLKNYWnrWY+Muohf a0NgW5c/nVeyxXhc9AomwgCitIi+4gy9MB5AgKc3FlBDyYRnqhOmnXlYVVJvVboaZhOL xSPA== 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=f7+dvg4iGrjPpbeDNR/sPrlo38DWcv453r/1QYU2zRo=; b=htSPBRi/jmfsxseP/RZCLiUfrL2CPJSxYHr5tpHg2X6CP6fNLuOtGxLuuvt55H3Mct QYHbsNYxPN8zesDE4Hc8CbgPamy29/nAdHEpsHnbAML3qEiURt7D1dNWHqtrzWKbvmlc X0g6gbpGjV8n7m7MkmLlctqljcszDYrfWC+9cLblYcnQ8HdzDFrSG175F0kOFzkoBl2l gjHSEYuDWKn7Rjz8g3UfUY/66kucX4NWi6BIeweJ1oQGHutfdR/BpO9XpW6A33wo/Tau uRC4jb5yblXinN9MufrkMbuVhnJzGN5NsGvlAD6hoktLsGTNEmUKLDdSA5r1mPyYWCCQ dVrw== X-Gm-Message-State: AMCzsaWREBzLLNEeip+ufyaPNhRZfP6NvCS+2fNVO96lVv5umiY01E+d 6N5gDyTX94YCLFRf28PNYuw= X-Google-Smtp-Source: AOwi7QCI2OjQZqBTbVTVZuu9scDgfwJt8BD7s9cuqPXLgV+Hr4b3MSn69Hhj8sThQ0Kwwu1cnaAQjg== X-Received: by 10.55.188.132 with SMTP id m126mr15798555qkf.126.1508199229050; Mon, 16 Oct 2017 17:13:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev , Peter Maydell , Thomas Huth , Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov Date: Mon, 16 Oct 2017 21:11:58 -0300 Message-Id: <20171017001209.32276-29-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 28/39] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 this allows to remove the old i386/pc dependency on acpi/core. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/acpi/acpi.h | 12 ++++++++++++ include/hw/i386/pc.h | 13 ------------- hw/acpi/core.c | 1 - 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index 7b3d93cf0d..30013b0464 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -39,6 +39,18 @@ #define ACPI_PM2_REGISTER_WIDTH 8 #define ACPI_PM_TIMER_WIDTH 32 =20 +/* PC-style peripherals (also used by other machines). */ +#define ACPI_PM_PROP_S3_DISABLED "disable_s3" +#define ACPI_PM_PROP_S4_DISABLED "disable_s4" +#define ACPI_PM_PROP_S4_VAL "s4_val" +#define ACPI_PM_PROP_SCI_INT "sci_int" +#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd" +#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd" +#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base" +#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk" +#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len" +#define ACPI_PM_PROP_TCO_ENABLED "enable_tco" + /* PM Timer ticks per second (HZ) */ #define PM_TIMER_FREQUENCY 3579545 =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 087d184ef5..b1b4c918af 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -151,19 +151,6 @@ struct PCMachineClass { #define PC_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(PCMachineClass, (klass), TYPE_PC_MACHINE) =20 -/* PC-style peripherals (also used by other machines). */ - -#define ACPI_PM_PROP_S3_DISABLED "disable_s3" -#define ACPI_PM_PROP_S4_DISABLED "disable_s4" -#define ACPI_PM_PROP_S4_VAL "s4_val" -#define ACPI_PM_PROP_SCI_INT "sci_int" -#define ACPI_PM_PROP_ACPI_ENABLE_CMD "acpi_enable_cmd" -#define ACPI_PM_PROP_ACPI_DISABLE_CMD "acpi_disable_cmd" -#define ACPI_PM_PROP_PM_IO_BASE "pm_io_base" -#define ACPI_PM_PROP_GPE0_BLK "gpe0_blk" -#define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len" -#define ACPI_PM_PROP_TCO_ENABLED "enable_tco" - /* parallel.c */ =20 void parallel_hds_isa_init(ISABus *bus, int n); diff --git a/hw/acpi/core.c b/hw/acpi/core.c index cd0a1d357b..eb9b76f70b 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -21,7 +21,6 @@ #include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200185723245.17586779229293; Mon, 16 Oct 2017 17:29:45 -0700 (PDT) Received: from localhost ([::1]:35795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FlG-0002Pj-2z for importer@patchew.org; Mon, 16 Oct 2017 20:29:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FW5-0006to-Qv for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FW4-0004hl-B3 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:53 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:45635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FW4-0004hB-6L; Mon, 16 Oct 2017 20:13:52 -0400 Received: by mail-qk0-x241.google.com with SMTP id f199so31933qke.2; Mon, 16 Oct 2017 17:13:52 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:51 -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=CriTZop5//4NRL+V/LDPCcYnfDX8w9Or8e5FjaPVaI8=; b=mBClRKTQqQ1q+USDJ9pmwmeJOoc29hlrlg/sLu4e2bZ4iZgynyL+Nbd7ISZ/yDueR4 KTLExMDIb0Uqowxc0AaW2CZfbwuppbUsfA80Xhd2mr+OhnspyV8xeprtJQvpClXsYJN7 7aKPR7JxUCTd6pq963FxToMF80oHhOK7zzyBFXb3eoHC8Xl+KOZyimd83WY21+RxrnNK TUUcw/x+EFAHaN7SEVQzvxdBqhQV0pd9RVMBfmL/Kc+1JKbavlO/UQGDD3ScJc5xAKS2 whO5776OExBGTmq8U6w3YnmAQhTFUFihPTI4wva4+8MGqvrkWWrY337L70pG2ofOSw1T eYVg== 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=CriTZop5//4NRL+V/LDPCcYnfDX8w9Or8e5FjaPVaI8=; b=nXZTPgC6+TMjI/lZh6U5MU1LmHPGBPxFiQveU64cc0kKV5Y0u6kRoszchOBuw4v3Cj S67wiDEv6znTGG4goWlXCls1p6E2BLseUYx5ZB7q9yFDu0Jciw8DlHjKvpfvsD5RDhLZ krmXUtGH2UfEqm1qd2+4FcD0+ij6bSm7trTEbwBGdoYF8NbSinUPyNoF5B4CzNf2yQDM d24C4w5poDivycFWYEMm0JfiAZ96S5j+thxibFBJyTi0ymbPlcPVRfN5xmvpx80bweNY /wAqfyvpyz8owZwY/iXiqAQhws8UedaaEyeAbH7pi/Ljq0DifcldegTdCCaPWRIyK9vF MGlA== X-Gm-Message-State: AMCzsaXQXTn0vU/vBYb2iVsxgbhMJ3A45WDn6RBhzT2lqQ64w9zHz25x SaEohAAQiUUWfA/EMa8hEqU= X-Google-Smtp-Source: ABhQp+QceMq2EdWLrVZ6IpwdI+6l1gSGdAAx1zoegR1knA4VwYaujBqLbpZNFZB+T8GAG8Zr8V40Bw== X-Received: by 10.55.27.91 with SMTP id b88mr16644755qkb.0.1508199231677; Mon, 16 Oct 2017 17:13:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:59 -0300 Message-Id: <20171017001209.32276-30-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 29/39] hw/timer/i8254: rename pit_init() -> i8254_pit_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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 and remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- include/hw/timer/i8254.h | 5 +++-- include/hw/timer/i8254_internal.h | 2 +- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 2 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/timer/i8254.c | 1 - hw/timer/i8254_common.c | 1 - 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 5adae9fa44..5b12eb918e 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -26,6 +26,7 @@ #define HW_I8254_H =20 #include "hw/hw.h" +#include "hw/qdev.h" #include "hw/isa/isa.h" =20 #define PIT_FREQ 1193182 @@ -48,8 +49,8 @@ typedef struct PITChannelInfo { #define TYPE_I8254 "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" =20 -static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq, - qemu_irq alt_irq) +static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, + qemu_irq alt_irq) { DeviceState *dev; ISADevice *d; diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_int= ernal.h index dc09cc0467..c37a438f82 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -26,8 +26,8 @@ #define QEMU_I8254_INTERNAL_H =20 #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" +#include "qemu/timer.h" =20 typedef struct PITChannelState { int count; /* can be 65536 */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 1b121306c2..1bd5243648 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -81,7 +81,7 @@ static void clipper_init(MachineState *machine) /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ rtc_init(isa_bus, 1900, rtc_irq); =20 - pit_init(isa_bus, 0x40, 0, NULL); + i8254_pit_init(isa_bus, 0x40, 0, NULL); isa_create_simple(isa_bus, "i8042"); =20 /* VGA setup. Don't bother loading the bios. */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 05985d4927..b565c6086c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1551,7 +1551,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, if (kvm_pit_in_kernel()) { pit =3D kvm_pit_init(isa_bus, 0x40); } else { - pit =3D pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq); + pit =3D i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq= ); } if (hpet) { /* connect PIT to output control line of the HPET */ diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index d20ea4c2ee..a9c15f858d 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) isa_bus_irqs(isabus, s->i8259); =20 /* 1 82C54 (pit) */ - isa =3D pit_init(isabus, 0x40, 0, NULL); + isa =3D i8254_pit_init(isabus, 0x40, 0, NULL); =20 /* speaker */ pcspk_init(isabus, isa); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 75318680e1..22e6c05fb5 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -363,7 +363,7 @@ static void mips_fulong2e_init(MachineState *machine) smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd)); =20 /* init other devices */ - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); DMA_init(isa_bus, 0); =20 /* Super I/O */ diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 7e6626dc88..5f37852499 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -222,7 +222,7 @@ static void mips_jazz_init(MachineState *machine, i8259 =3D i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); DMA_init(isa_bus, 0); - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); =20 /* Video card */ diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2adb9bcf89..de547d732f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1217,7 +1217,7 @@ void mips_malta_init(MachineState *machine) isa_get_irq(NULL, 9), NULL, 0, NULL); smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); DMA_init(isa_bus, 0); =20 /* Super I/O */ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 1272d4ef9d..48fad52540 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -280,7 +280,7 @@ void mips_r4k_init(MachineState *machine) =20 rtc_init(isa_bus, 2000, NULL); =20 - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); =20 serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); =20 diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 5e61ad50a8..dbc4a0baec 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index b623c96198..6190b6fc5d 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200817928288.4954876253928; Mon, 16 Oct 2017 17:40:17 -0700 (PDT) Received: from localhost ([::1]:35869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fvb-0002dG-3l for importer@patchew.org; Mon, 16 Oct 2017 20:40:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWA-0006zo-VU for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FW9-0004o0-Hn for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:58 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:44239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FW9-0004ns-DZ; Mon, 16 Oct 2017 20:13:57 -0400 Received: by mail-qk0-x241.google.com with SMTP id r64so37704qkc.1; Mon, 16 Oct 2017 17:13:57 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:56 -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=dWaTggjfQiuK0GltWZQOE6k1QOCcCLfjBd2bgyLRn8I=; b=Ti+CVrNXohNvjNpmBn0qBR2x5kFlgQmUgaxkBF7ixCQ2pG9z2aG4Dgtt+i9aFIHRTu jOlvOFmMSCl07fj/b4RQSKF/LUcRakJ2MkhPlW7u33qaPtyKQV6fR7ZFPAPUPZ/Df7w8 lAPQSx71E+KisEDgF35tqC7OCP5yG0aDSdAxCZ0Kd67n0WKDfuKakfxuniFFKwfu10TW X3DEFt2xmLNOTAGev/SLd7O77XzjYcPd7WAOjNTeD610CBFihGNRsw2Pk34CWChyaoRc Ri3t0ZnPhCwhHNAXj1HnChY/hcLc7k/rvPCl33ZJYViY6mjzAuiLkGBAw1p++x/3d52m bhhg== 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=dWaTggjfQiuK0GltWZQOE6k1QOCcCLfjBd2bgyLRn8I=; b=CO4XgwoVN8T7PKAzPFUEaoJQCBvNk6K6yFZzfTtLXsalnhOKskWAeuvjdTXU7utOIG e5ADU63z40YK7dUqp5kMQf4ZDXzOUnHJtd1PXPeCsuwnmWjXwCTiihAEGq/qxK1vauQ8 DRwEnCtXpB48BJq5aYAjJOlHHxKkpAusc1iyfviwPyEqmhWv8dQMOrsTL+Ybs2Mkvx7n YL/C3VaprUvybFx/i/rOZFGV1zzvIlijYXLzKxQ14WZvF7qYQxi2iYgHqo4junthxA/2 /YsIFodVyn2KsFknzYestC98DAsmBZq7lZH5839uDel0oe/vOkoq/ilX9Bt3YD1E5tZn R18w== X-Gm-Message-State: AMCzsaXcu8EJOzr+OAY0g5uvmfTQzFCBI4nLrouBB60p7su+RFBisbky h4e0P7F6tDWe2GJvc+XV5RE= X-Google-Smtp-Source: ABhQp+TacNakPsuqHK+dM1U4doGz+CvJOE83b2dxwtjFR1RcJcnkklCT99/0rPQ1RnT8BTH/jhL7Cg== X-Received: by 10.55.126.2 with SMTP id z2mr7213956qkc.129.1508199236936; Mon, 16 Oct 2017 17:13:56 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Michael Tokarev , Gerd Hoffmann , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Yongbok Kim Date: Mon, 16 Oct 2017 21:12:00 -0300 Message-Id: <20171017001209.32276-31-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 30/39] hw/display/vga: remove the old i386/pc dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 move public API to "hw/display/vga.h" and private registers to "hw/display/vga_int_regs.h" Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/vga_int.h | 3 ++- hw/display/{vga.h =3D> vga_int_regs.h} | 0 include/hw/display/vga.h | 25 +++++++++++++++++++++++++ include/hw/i386/pc.h | 12 ------------ hw/display/vga-isa-mm.c | 4 +--- hw/display/vga-isa.c | 2 +- hw/display/vga.c | 4 ++-- hw/mips/mips_jazz.c | 1 + vl.c | 2 +- MAINTAINERS | 1 + 10 files changed, 34 insertions(+), 20 deletions(-) rename hw/display/{vga.h =3D> vga_int_regs.h} (100%) create mode 100644 include/hw/display/vga.h diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index ad34a1f048..fe23b81442 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -25,8 +25,9 @@ #ifndef HW_VGA_INT_H #define HW_VGA_INT_H =20 -#include "hw/hw.h" +#include "exec/ioport.h" #include "exec/memory.h" +#include "ui/console.h" =20 #define ST01_V_RETRACE 0x08 #define ST01_DISP_ENABLE 0x01 diff --git a/hw/display/vga.h b/hw/display/vga_int_regs.h similarity index 100% rename from hw/display/vga.h rename to hw/display/vga_int_regs.h diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h new file mode 100644 index 0000000000..0401a3a292 --- /dev/null +++ b/include/hw/display/vga.h @@ -0,0 +1,25 @@ +/* + * QEMU VGA Emulator. + * + * Copyright (c) 2003 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_HW_DISPLAY_VGA_H +#define QEMU_HW_DISPLAY_VGA_H + +#include "exec/memory.h" + +enum vga_retrace_method { + VGA_RETRACE_DUMB, + VGA_RETRACE_PRECISE +}; + +extern enum vga_retrace_method vga_retrace_method; + +int isa_vga_mm_init(hwaddr vram_base, + hwaddr ctrl_base, int it_shift, + MemoryRegion *address_space); + +#endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index b1b4c918af..25ba378bd8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -302,18 +302,6 @@ PCIBus *find_i440fx(void); extern PCIDevice *piix4_dev; int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); =20 -/* vga.c */ -enum vga_retrace_method { - VGA_RETRACE_DUMB, - VGA_RETRACE_PRECISE -}; - -extern enum vga_retrace_method vga_retrace_method; - -int isa_vga_mm_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space); - /* ne2000.c */ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo= *nd) { diff --git a/hw/display/vga-isa-mm.c b/hw/display/vga-isa-mm.c index 51ccbccc41..e887b45651 100644 --- a/hw/display/vga-isa-mm.c +++ b/hw/display/vga-isa-mm.c @@ -23,11 +23,9 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "ui/console.h" -#include "hw/i386/pc.h" +#include "hw/display/vga.h" #include "vga_int.h" #include "ui/pixel_ops.h" -#include "qemu/timer.h" =20 #define VGA_RAM_SIZE (8192 * 1024) =20 diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c index 1af95562f2..9af43abee8 100644 --- a/hw/display/vga-isa.c +++ b/hw/display/vga-isa.c @@ -26,7 +26,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "ui/console.h" -#include "hw/i386/pc.h" +#include "hw/isa/isa.h" #include "vga_int.h" #include "ui/pixel_ops.h" #include "qemu/timer.h" diff --git a/hw/display/vga.c b/hw/display/vga.c index ed24ef7076..0da4942a09 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -24,9 +24,9 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" -#include "vga.h" +#include "hw/display/vga.h" #include "ui/console.h" -#include "hw/i386/pc.h" +#include "vga_int_regs.h" #include "hw/pci/pci.h" #include "vga_int.h" #include "ui/pixel_ops.h" diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 5f37852499..25f0294236 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -39,6 +39,7 @@ #include "hw/loader.h" #include "hw/timer/mc146818rtc.h" #include "hw/timer/i8254.h" +#include "hw/display/vga.h" #include "hw/audio/pcspk.h" #include "sysemu/block-backend.h" #include "hw/sysbus.h" diff --git a/vl.c b/vl.c index 0d1f612629..f0b7106feb 100644 --- a/vl.c +++ b/vl.c @@ -57,9 +57,9 @@ int main(int argc, char **argv) #include "hw/boards.h" #include "sysemu/accel.h" #include "hw/usb.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "hw/scsi/scsi.h" +#include "hw/display/vga.h" #include "hw/bt.h" #include "sysemu/watchdog.h" #include "hw/smbios/smbios.h" diff --git a/MAINTAINERS b/MAINTAINERS index ddaba2702c..9907b3dae2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -860,6 +860,7 @@ F: hw/timer/hpet* F: hw/timer/i8254* F: hw/timer/mc146818rtc* F: hw/watchdog/wdt_ib700.c +F: include/hw/display/vga.h F: include/hw/dma/i8257_dma.h F: include/hw/i2c/pm_smbus.h F: include/hw/timer/hpet.h --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508201063037749.6729700067796; Mon, 16 Oct 2017 17:44:23 -0700 (PDT) Received: from localhost ([::1]:35892 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FzU-0005tL-A3 for importer@patchew.org; Mon, 16 Oct 2017 20:44:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWE-00072M-T6 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWD-0004qN-38 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:02 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:47679) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWC-0004q2-TJ; Mon, 16 Oct 2017 20:14:01 -0400 Received: by mail-qt0-x241.google.com with SMTP id z50so63917qtj.4; Mon, 16 Oct 2017 17:14:00 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:59 -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=/0pwdqjEadMZbKLTF8ZdjgCcwLcbvnT1wtaVR+IB2+c=; b=QZCt2dPsqVRQzdWrSR72lBA6vxdex1DdBG9mKZWFytbYoiGpfL4SUZM+KLSTn23i5J OfOfUiI8MvWU3bwVrJpRTosl45GVvPsIMAMdR5536GDlX+qRn41KJT3AT4nt5+7D9c2H vcCZgf+P1SSfJGwer5jWBv23dba5hRrfTaSeryzjUPbZum3MlsvajcbtAR2FqcKV6p/6 6GkJp4dfruBSN+zKCLd7kV0B0qEbvN7rzmMKR9Apc1MURQv0BIQacQ3fGqQOuXaaglsD 2mbGqryZLaqhbMwX6AlCHtd/V+VZkF6myd89+N6SHYdzY7DImkIMoMbZ+zwkDqv7zNgO k8IQ== 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=/0pwdqjEadMZbKLTF8ZdjgCcwLcbvnT1wtaVR+IB2+c=; b=rybvAMNi6RB3p1drmE1gF8XIO+jsAAIAecM5h9VG8mp7g26rQTLt2v3S8HY9iL4SAF cfFKvHuGzh4SlBtuOjrxMbxQSuAEBie6knmh8DFImBt9SHD8kSzhFetfbWNE8agNv/eY LFQHbzBNBGhdb8Kzf959VSt/Rug9lUR5KPWQMThW1l+URA3AVBFEdMu2A5LfECi9CU2R FdKi+THMtcSZmNzT4dPwyuQIwWQbphK7qYugQ3k9aiXf5DMegfeeL/VVBu8/ziPGsz13 gZt20c3XmQRlRcRlpTVvDxameb7PaB1/1BwkSepc0fdME1paxlv68ti+ZznElWeWpFam vueA== X-Gm-Message-State: AMCzsaUQoJ1sHDAbDDWE4kxmqpm3YmATv2SVqmZV+HFpFDLtJGAo33xU S/BlZshCtJboxNakYbUBuDCTGseW X-Google-Smtp-Source: AOwi7QCReLJqY6R3r9jZKCqRY7QaGu0xMUwvNfqNcVqhiA+ixyKkI+Z6R4VYUINqvgYeChwjdEMhYg== X-Received: by 10.200.23.153 with SMTP id o25mr17405048qtj.119.1508199240348; Mon, 16 Oct 2017 17:14:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:12:01 -0300 Message-Id: <20171017001209.32276-32-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v2 31/39] hw/input/i8042: extract pckbd and vmmouse API from hw/i386/pc.h 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau Acked-by: David Gibson --- include/hw/i386/pc.h | 11 ----------- include/hw/input/i8042.h | 30 ++++++++++++++++++++++++++++++ hw/alpha/dp264.c | 3 ++- hw/i386/pc.c | 5 +++-- hw/input/pckbd.c | 2 +- hw/input/vmmouse.c | 3 +-- hw/mips/mips_fulong2e.c | 3 ++- hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 3 ++- hw/mips/mips_r4k.c | 3 ++- hw/misc/vmport.c | 1 + hw/ppc/prep.c | 5 +++-- hw/sparc64/sun4u.c | 3 ++- hw/unicore32/puv3.c | 1 + MAINTAINERS | 1 + 15 files changed, 52 insertions(+), 23 deletions(-) create mode 100644 include/hw/input/i8042.h diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 25ba378bd8..6a2e947332 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -193,17 +193,6 @@ static inline void vmport_init(ISABus *bus) } =20 void vmport_register(unsigned char command, VMPortReadFunc *func, void *op= aque); -void vmmouse_get_data(uint32_t *data); -void vmmouse_set_data(const uint32_t *data); - -/* pckbd.c */ -#define I8042_A20_LINE "a20" - -void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, - MemoryRegion *region, ram_addr_t size, - hwaddr mask); -void i8042_isa_mouse_fake_event(void *opaque); -void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out); =20 /* pc.c */ extern int fd_bootchk; diff --git a/include/hw/input/i8042.h b/include/hw/input/i8042.h new file mode 100644 index 0000000000..836417304b --- /dev/null +++ b/include/hw/input/i8042.h @@ -0,0 +1,30 @@ +/* + * QEMU PS/2 Controller + * + * Copyright (c) 2003 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#ifndef HW_INPUT_I8042_H +#define HW_INPUT_I8042_H + +#include "hw/hw.h" +#include "hw/isa/isa.h" + +#define TYPE_I8042 "i8042" + +#define I8042_A20_LINE "a20" + +void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, + MemoryRegion *region, ram_addr_t size, + hwaddr mask); +void i8042_isa_mouse_fake_event(void *opaque); +void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out); + +#define TYPE_VMMOUSE "vmmouse" + +void vmmouse_get_data(uint32_t *data); +void vmmouse_set_data(const uint32_t *data); + +#endif /* HW_INPUT_I8042_H */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 1bd5243648..2253990654 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -19,6 +19,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/ide.h" #include "hw/timer/i8254.h" +#include "hw/input/i8042.h" #include "hw/char/serial.h" #include "qemu/cutils.h" =20 @@ -82,7 +83,7 @@ static void clipper_init(MachineState *machine) rtc_init(isa_bus, 1900, rtc_irq); =20 i8254_pit_init(isa_bus, 0x40, 0, NULL); - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); =20 /* VGA setup. Don't bother loading the bios. */ pci_vga_init(pci_bus); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b565c6086c..6959a0a712 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -40,6 +40,7 @@ #include "multiboot.h" #include "hw/timer/mc146818rtc.h" #include "hw/timer/i8254.h" +#include "hw/input/i8042.h" #include "hw/audio/pcspk.h" #include "hw/pci/msi.h" #include "hw/sysbus.h" @@ -1564,11 +1565,11 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq= *gsi, parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS); =20 a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); - i8042 =3D isa_create_simple(isa_bus, "i8042"); + i8042 =3D isa_create_simple(isa_bus, TYPE_I8042); i8042_setup_a20_line(i8042, a20_line[0]); if (!no_vmport) { vmport_init(isa_bus); - vmmouse =3D isa_try_create(isa_bus, "vmmouse"); + vmmouse =3D isa_try_create(isa_bus, TYPE_VMMOUSE); } else { vmmouse =3D NULL; } diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index c479f827b6..f17f18e51b 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -26,6 +26,7 @@ #include "hw/isa/isa.h" #include "hw/i386/pc.h" #include "hw/input/ps2.h" +#include "hw/input/i8042.h" #include "sysemu/sysemu.h" =20 /* debug PC keyboard */ @@ -480,7 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, qemu_register_reset(kbd_reset, s); } =20 -#define TYPE_I8042 "i8042" #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) =20 typedef struct ISAKBDState { diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c index b6d22086f4..c48c07c564 100644 --- a/hw/input/vmmouse.c +++ b/hw/input/vmmouse.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "ui/console.h" -#include "hw/input/ps2.h" +#include "hw/input/i8042.h" #include "hw/i386/pc.h" #include "hw/qdev.h" =20 @@ -52,7 +52,6 @@ #define DPRINTF(fmt, ...) do { } while (0) #endif =20 -#define TYPE_VMMOUSE "vmmouse" #define VMMOUSE(obj) OBJECT_CHECK(VMMouseState, (obj), TYPE_VMMOUSE) =20 typedef struct VMMouseState diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 22e6c05fb5..a35745a407 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -42,6 +42,7 @@ #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" @@ -367,7 +368,7 @@ static void mips_fulong2e_init(MachineState *machine) DMA_init(isa_bus, 0); =20 /* Super I/O */ - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); =20 rtc_init(isa_bus, 2000, NULL); =20 diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 25f0294236..1bbef7eeb5 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -41,6 +41,7 @@ #include "hw/timer/i8254.h" #include "hw/display/vga.h" #include "hw/audio/pcspk.h" +#include "hw/input/i8042.h" #include "sysemu/block-backend.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index de547d732f..45c7f589aa 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -45,6 +45,7 @@ #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" +#include "hw/input/i8042.h" #include "hw/timer/i8254.h" #include "sysemu/blockdev.h" #include "exec/address-spaces.h" @@ -1221,7 +1222,7 @@ void mips_malta_init(MachineState *machine) DMA_init(isa_bus, 0); =20 /* Super I/O */ - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); =20 rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, 2); diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 48fad52540..946097a31f 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -27,6 +27,7 @@ #include "hw/loader.h" #include "elf.h" #include "hw/timer/mc146818rtc.h" +#include "hw/input/i8042.h" #include "hw/timer/i8254.h" #include "sysemu/block-backend.h" #include "exec/address-spaces.h" @@ -295,7 +296,7 @@ void mips_r4k_init(MachineState *machine) hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]); =20 - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); } =20 static void mips_machine_init(MachineClass *mc) diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c index 165500223f..bc078eb20a 100644 --- a/hw/misc/vmport.c +++ b/hw/misc/vmport.c @@ -25,6 +25,7 @@ #include "hw/hw.h" #include "hw/isa/isa.h" #include "hw/i386/pc.h" +#include "hw/input/i8042.h" #include "sysemu/hw_accel.h" #include "hw/qdev.h" =20 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 94138a4e8c..16f4537093 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -41,6 +41,7 @@ #include "hw/ide.h" #include "hw/loader.h" #include "hw/timer/mc146818rtc.h" +#include "hw/input/i8042.h" #include "hw/isa/pc87312.h" #include "sysemu/block-backend.h" #include "sysemu/arch_init.h" @@ -643,7 +644,7 @@ static void ppc_prep_init(MachineState *machine) hd[2 * i], hd[2 * i + 1]); } - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); =20 cpu =3D POWERPC_CPU(first_cpu); sysctrl->reset_irq =3D cpu->env.irq_inputs[PPC6xx_INPUT_HRESET]; @@ -775,7 +776,7 @@ static void ibm_40p_init(MachineState *machine) =20 /* add some more devices */ if (defaults_enabled()) { - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); m48t59 =3D NVRAM(isa_create_simple(isa_bus, "isa-m48t59")); =20 dev =3D DEVICE(isa_create(isa_bus, "cs4231a")); diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 8282651aeb..1cd283063e 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -31,6 +31,7 @@ #include "hw/i386/pc.h" #include "hw/char/serial.h" #include "hw/timer/m48t59.h" +#include "hw/input/i8042.h" #include "hw/block/fdc.h" #include "net/net.h" #include "qemu/timer.h" @@ -492,7 +493,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem, =20 pci_cmd646_ide_init(pci_bus, hd, 1); =20 - isa_create_simple(isa_bus, "i8042"); + isa_create_simple(isa_bus, TYPE_I8042); =20 /* Floppy */ for(i =3D 0; i < MAX_FD; i++) { diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c index 6849bac59c..cf79c89f12 100644 --- a/hw/unicore32/puv3.c +++ b/hw/unicore32/puv3.c @@ -19,6 +19,7 @@ =20 #undef DEBUG_PUV3 #include "hw/unicore32/puv3.h" +#include "hw/input/i8042.h" =20 #define KERNEL_LOAD_ADDR 0x03000000 #define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */ diff --git a/MAINTAINERS b/MAINTAINERS index 9907b3dae2..632eb3f50e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -863,6 +863,7 @@ F: hw/watchdog/wdt_ib700.c F: include/hw/display/vga.h F: include/hw/dma/i8257_dma.h F: include/hw/i2c/pm_smbus.h +F: include/hw/input/i8042.h F: include/hw/timer/hpet.h F: include/hw/timer/i8254* F: include/hw/timer/mc146818rtc* --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508201188350896.8450877478147; Mon, 16 Oct 2017 17:46:28 -0700 (PDT) Received: from localhost ([::1]:35912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4G1P-0007UM-LZ for importer@patchew.org; Mon, 16 Oct 2017 20:46:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWI-00075W-04 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWG-0004sZ-LP for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:05 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:51551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWG-0004sP-FO; Mon, 16 Oct 2017 20:14:04 -0400 Received: by mail-qt0-x243.google.com with SMTP id h4so49710qtk.8; Mon, 16 Oct 2017 17:14:04 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:03 -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=fUPwxV1I3KFXMiJ+jMQBDbL8UZVxROpx3APVL5xwb38=; b=ZnomJcKDEuLObyLMv/IVMSfultk3VOJlYFpj0ssYJrhXldvlVxYpxE5WbWddpjqJX+ 1YXnNeKU/NqTxkmyoKM7AyCllhzdP+dAxihXzYSmnH4dyAMBEX7S0djPKk1t1yxcBkOn CuSbazdaD2NJgWfota7Xwxv2l6ddD76qU6FDSqUqtE5qf6oq7bzCudcGBRtX6aV+R1ME k7Q07XFT3aduJ2vsSglJ1MrtZEkjo2UE+QZzIT8uVqtKBpT37CUNp4Xzrf1SqrOb9yK+ KLqYrSMkgoI64lJxFT2T4aMfkLgMyYPwW+sjpOjj9HD63bpQPHmTIeLnTZdEWYhR3qEq V29A== 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=fUPwxV1I3KFXMiJ+jMQBDbL8UZVxROpx3APVL5xwb38=; b=H7feDTff1McR4dzhOJiT4dNhqBhvJQuFhP5PXr36o420ub5xTAQTICu0wVkrXTOtHT I821UUzamIkAE4g9NF6/ILnoI9NeeXxnQUfRbaKN0YXr0uSRxVuL/5pey9Na+MzIUpx/ CpuC2CVreIWTUZXbEIdBPzdscQE5zC9StdnTqTuDGKA8Y/nhST933MMfkFDlz596mW4s ikwQaQYMWN8pHomBTXl5ptFXCMk9KOtwikF/tdxv3GDH3t2l2DI3MKov5brFgF7UtpZ5 4o+AmSQj+Y21jFM3ErhQgk49MOBtJopgDtzxe3WSAGfgOs7vI5YSQvXoUgXtmDzRfS8t w5cQ== X-Gm-Message-State: AMCzsaXqL5R94zO8lh7IoqxkUtQajY7wB/fRUQq6q94xeIoBlInsTHpi 2VpMwLjCoUvV6ScsIy1grS8= X-Google-Smtp-Source: AOwi7QDJ0kJ3iB49t8Qh5DkXHPg+fHCyxjRCVXFgefDIF6nAiIQ2fLh9B+aedbg21XivRWg00ToEcw== X-Received: by 10.237.60.154 with SMTP id d26mr15476525qtf.227.1508199243963; Mon, 16 Oct 2017 17:14:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:12:02 -0300 Message-Id: <20171017001209.32276-33-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 32/39] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: David Gibson --- include/hw/timer/mc146818rtc.h | 3 ++- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 3 ++- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/ppc/pnv.c | 2 +- hw/timer/mc146818rtc.c | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/hw/timer/mc146818rtc.h b/include/hw/timer/mc146818rtc.h index 7c8e64b203..fe6ed63f71 100644 --- a/include/hw/timer/mc146818rtc.h +++ b/include/hw/timer/mc146818rtc.h @@ -6,7 +6,8 @@ =20 #define TYPE_MC146818_RTC "mc146818rtc" =20 -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq); +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, + qemu_irq intercept_irq); void rtc_set_memory(ISADevice *dev, int addr, int val); int rtc_get_memory(ISADevice *dev, int addr); =20 diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 2253990654..df6dadf13f 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) clipper_pci_map_irq); =20 /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ - rtc_init(isa_bus, 1900, rtc_irq); + mc146818_rtc_init(isa_bus, 1900, rtc_irq); =20 i8254_pit_init(isa_bus, 0x40, 0, NULL); isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 6959a0a712..39076aeb9f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1544,7 +1544,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, rtc_irq =3D qdev_get_gpio_in(hpet, HPET_LEGACY_RTC_INT); } } - *rtc_state =3D rtc_init(isa_bus, 2000, rtc_irq); + *rtc_state =3D mc146818_rtc_init(isa_bus, 2000, rtc_irq); =20 qemu_register_boot_set(pc_boot_set, *rtc_state); =20 diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index a9c15f858d..a5d67bc6d7 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -21,6 +21,7 @@ #include "hw/pci/pci.h" #include "hw/i386/pc.h" #include "hw/timer/i8254.h" +#include "hw/timer/mc146818rtc.h" #include "hw/audio/pcspk.h" =20 #define TYPE_I82378 "i82378" @@ -106,7 +107,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) isa =3D isa_create_simple(isabus, "i82374"); =20 /* timer */ - isa_create_simple(isabus, "mc146818rtc"); + isa_create_simple(isabus, TYPE_MC146818_RTC); } =20 static void i82378_init(Object *obj) diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index a35745a407..bf021ba018 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -370,7 +370,7 @@ static void mips_fulong2e_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); =20 - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); =20 serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); parallel_hds_isa_init(isa_bus, 1); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 1bbef7eeb5..f5112fab39 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -294,7 +294,7 @@ static void mips_jazz_init(MachineState *machine, fdctrl_init_sysbus(qdev_get_gpio_in(rc4030, 1), -1, 0x80003000, fds); =20 /* Real time clock */ - rtc_init(isa_bus, 1980, NULL); + mc146818_rtc_init(isa_bus, 1980, NULL); memory_region_init_io(rtc, NULL, &rtc_ops, NULL, "rtc", 0x1000); memory_region_add_subregion(address_space, 0x80004000, rtc); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 45c7f589aa..7e8194be17 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1224,7 +1224,7 @@ void mips_malta_init(MachineState *machine) /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); =20 - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 0, 2); parallel_hds_isa_init(isa_bus, 1); =20 diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 946097a31f..349da59912 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -279,7 +279,7 @@ void mips_r4k_init(MachineState *machine) i8259 =3D i8259_init(isa_bus, env->irq[2]); isa_bus_irqs(isa_bus, i8259); =20 - rtc_init(isa_bus, 2000, NULL); + mc146818_rtc_init(isa_bus, 2000, NULL); =20 pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d46d91c76f..0e47757bff 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -651,7 +651,7 @@ static void ppc_powernv_init(MachineState *machine) serial_hds_isa_init(pnv->isa_bus, 0, MAX_SERIAL_PORTS); =20 /* Create an RTC ISA device too */ - rtc_init(pnv->isa_bus, 2000, NULL); + mc146818_rtc_init(pnv->isa_bus, 2000, NULL); =20 /* OpenPOWER systems use a IPMI SEL Event message to notify the * host to powerdown */ diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 7764be25ec..35a05a64cc 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -999,7 +999,7 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) qdev_init_gpio_out(dev, &s->irq, 1); } =20 -ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) +ISADevice *mc146818_rtc_init(ISABus *bus, int base_year, qemu_irq intercep= t_irq) { DeviceState *dev; ISADevice *isadev; --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200973939201.5021829075381; Mon, 16 Oct 2017 17:42:53 -0700 (PDT) Received: from localhost ([::1]:35885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4Fy0-0004gx-7G for importer@patchew.org; Mon, 16 Oct 2017 20:42:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWN-0007Ay-79 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWK-0004uq-Pq for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:11 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:54494) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWK-0004ug-K4; Mon, 16 Oct 2017 20:14:08 -0400 Received: by mail-qk0-x243.google.com with SMTP id n5so13694qke.11; Mon, 16 Oct 2017 17:14:08 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:07 -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=V39AFlm93MIf+4sVJAz/gcgoqp6oYZva96tOLOC2P/4=; b=ZtydCnakAol+qC6at4TIDN5TWN6pvpAWFs0aEZUnUq8XFAf5lprJBMFwf3yILx0ujc 1TYp5IabMM1KwOHOpOGUVGL8xeGbfr6vgNkL1O4aJU1dWUUwe1sPYTxGFE55uK6Pms8q 118MmNBlniOtOAZm4u+2KXabAlhAMPVNM08gVpYSNLq0CBXogywUJGc8GuHlmhXDqIk0 fEFFHZVfrvjTWWx7r9VFSBRP4OPPbZI6QQo9F5pZTMuyBHy01H0S3T54oYCXyCyb/bGV W7hoGff18vV7b7AgRw1ObtAUaJ1Wuigk0EuO8OWsfAmcCWW9ETG6IhSV9h7J8CWksBaE PDKQ== 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=V39AFlm93MIf+4sVJAz/gcgoqp6oYZva96tOLOC2P/4=; b=pC9/Lg4/pJ+ZWhwBElA0JKPpcEUoS3GBLzBE8eqMo8j6URzGSuEXGqtVeT++4+xN/Z 0o6oioXFpVvDrLZBU3eL0y1gBvTjs4JwPrYHt6xF4fnhkCZiKPAjuzFS9alEB2Yb7d4P ik1aUfahoIrEKYHTaAy+G79sLF7IlGULTAhVc2hW53Y7QnUQ83fog6cF1Fvq7VgsTDcA L9sWUrgsfAeYP2nC1M5psyp1Ks5G9DYE2fvshn15eRVaqDf5Ck5Qpa+thcrqtD0M2lPV gjSE0kfxM9dFSn171NM2SXQYytPPY0B2GnJ/UQuoKU93k4PPhJf4M3W4jsgvms0Tjx71 n4GA== X-Gm-Message-State: AMCzsaWdCTtdyvlbfLmNzHanZ1rR2MrvDzUnaGbHfkXDrCV78z5/gcy/ pFjk0Si0zsdLbIai6AUXoGY= X-Google-Smtp-Source: AOwi7QACmGEMxEwMpQgwLITlTbVFKb5VWXnYTQpsLYXEltf8BbWTIxTF7DELLrKJRbMDG9VpvqaAZA== X-Received: by 10.55.33.203 with SMTP id f72mr16694142qki.176.1508199248118; Mon, 16 Oct 2017 17:14:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:12:03 -0300 Message-Id: <20171017001209.32276-34-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 33/39] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 - add "hw/net/ne2000-isa.h" - remove the old i386 dependency Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau Acked-by: David Gibson --- hw/net/ne2000.h | 3 +++ include/hw/i386/pc.h | 20 -------------------- include/hw/net/ne2000-isa.h | 33 +++++++++++++++++++++++++++++++++ hw/i386/pc.c | 1 + hw/mips/mips_r4k.c | 1 + hw/net/ne2000-isa.c | 6 ++---- hw/net/ne2000.c | 2 -- hw/ppc/prep.c | 1 + 8 files changed, 41 insertions(+), 26 deletions(-) create mode 100644 include/hw/net/ne2000-isa.h diff --git a/hw/net/ne2000.h b/hw/net/ne2000.h index d213dccae3..adb8021bd1 100644 --- a/hw/net/ne2000.h +++ b/hw/net/ne2000.h @@ -1,6 +1,9 @@ #ifndef HW_NE2000_H #define HW_NE2000_H =20 +#include "hw/hw.h" +#include "net/net.h" + #define NE2000_PMEM_SIZE (32*1024) #define NE2000_PMEM_START (16*1024) #define NE2000_PMEM_END (NE2000_PMEM_SIZE+NE2000_PMEM_START) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 6a2e947332..020792c2e8 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -291,26 +291,6 @@ PCIBus *find_i440fx(void); extern PCIDevice *piix4_dev; int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn); =20 -/* ne2000.c */ -static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo= *nd) -{ - DeviceState *dev; - ISADevice *isadev; - - qemu_check_nic_model(nd, "ne2k_isa"); - - isadev =3D isa_try_create(bus, "ne2k_isa"); - if (!isadev) { - return false; - } - dev =3D DEVICE(isadev); - qdev_prop_set_uint32(dev, "iobase", base); - qdev_prop_set_uint32(dev, "irq", irq); - qdev_set_nic_properties(dev, nd); - qdev_init_nofail(dev); - return true; -} - /* pc_sysfw.c */ void pc_system_firmware_init(MemoryRegion *rom_memory, bool isapc_ram_fw); diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h new file mode 100644 index 0000000000..ff2bed9c95 --- /dev/null +++ b/include/hw/net/ne2000-isa.h @@ -0,0 +1,33 @@ +/* + * QEMU NE2000 emulation -- isa bus windup + * + * Copyright (c) 2003-2004 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "hw/hw.h" +#include "hw/qdev.h" +#include "hw/isa/isa.h" +#include "net/net.h" + +#define TYPE_ISA_NE2000 "ne2k_isa" + +static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq, + NICInfo *nd) +{ + ISADevice *d; + + qemu_check_nic_model(nd, "ne2k_isa"); + + d =3D isa_try_create(bus, TYPE_ISA_NE2000); + if (d) { + DeviceState *dev =3D DEVICE(d); + + qdev_prop_set_uint32(dev, "iobase", base); + qdev_prop_set_uint32(dev, "irq", irq); + qdev_set_nic_properties(dev, nd); + qdev_init_nofail(dev); + } + return d; +} diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 39076aeb9f..08d01b46eb 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -70,6 +70,7 @@ #include "qom/cpu.h" #include "hw/nmi.h" #include "hw/i386/intel_iommu.h" +#include "hw/net/ne2000-isa.h" =20 /* debug PC/ISA interrupts */ //#define DEBUG_IRQ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 349da59912..33ff89f02c 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -18,6 +18,7 @@ #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "net/net.h" +#include "hw/net/ne2000-isa.h" #include "sysemu/sysemu.h" #include "hw/boards.h" #include "hw/block/flash.h" diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c index f3455339ee..70e5c1d3d4 100644 --- a/hw/net/ne2000-isa.c +++ b/hw/net/ne2000-isa.c @@ -22,17 +22,15 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" +#include "hw/net/ne2000-isa.h" #include "hw/qdev.h" -#include "net/net.h" #include "ne2000.h" +#include "sysemu/sysemu.h" #include "exec/address-spaces.h" #include "qapi/error.h" #include "qapi/visitor.h" =20 -#define TYPE_ISA_NE2000 "ne2k_isa" #define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE200= 0) =20 typedef struct ISANE2000State { diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 3938e6ddd8..6874c8c6b9 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -22,9 +22,7 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/pci/pci.h" -#include "net/net.h" #include "ne2000.h" #include "hw/loader.h" #include "sysemu/sysemu.h" diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 16f4537093..1442bc39c5 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -43,6 +43,7 @@ #include "hw/timer/mc146818rtc.h" #include "hw/input/i8042.h" #include "hw/isa/pc87312.h" +#include "hw/net/ne2000-isa.h" #include "sysemu/block-backend.h" #include "sysemu/arch_init.h" #include "sysemu/kvm.h" --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508201272010649.8557254791897; Mon, 16 Oct 2017 17:47:52 -0700 (PDT) Received: from localhost ([::1]:35917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4G2q-0008Va-AA for importer@patchew.org; Mon, 16 Oct 2017 20:47:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWO-0007Bz-6e for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWN-0004vx-6e for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:12 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:54187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWN-0004vl-2K; Mon, 16 Oct 2017 20:14:11 -0400 Received: by mail-qt0-x243.google.com with SMTP id n61so43023qte.10; Mon, 16 Oct 2017 17:14:11 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:10 -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=8ROr7wKR1HNM3arK+N3XS2nqKzhARhHINhAJSV6TCM0=; b=UqXtY9TVcKiJ4FGzS24ekzVI8d6S2oHsBCz+VEVVomtc8jBWIBpux3MXC2fycdzYc4 06zQR6Zy1BsJCLYdwLU37bB56NAoL2EGOz7TixpMshyLNRmZruCwkt+fHi7ywZE/HKUU tyYD9D7x607a3uXHHSON55pI0aWZrK6eaoeI1+Fk74jiGCgGZN/71A0pKaXDif13yI83 ATl28+g4Zjyj2mKKCuWfsJjpgYQC8iJ/VNL5yQoMl6N2uO+6oBLmZ5ZaZ5n/fV026hzS nHgI7raijHxwkYQ5KdkCPYX/yzzKFD+ZY04D70yWOtADHyxQ/HFZZXpfg5QJaXG4REyl XI7Q== 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=8ROr7wKR1HNM3arK+N3XS2nqKzhARhHINhAJSV6TCM0=; b=o1mdVaLKvpsjZ0q0opksSEScKrQvDrLHlPTUF09QbRLh5kvEvB3TCOU5/yXLOZLOzR imRq7kZuXr1gsfJtuG/I5+hZb90IWF2Rx/2rCC0k66ZnwQKk/WRMWFnVacI8ao77vZ3F PpTNLIxshzGa0Ur/lIq+NSVyz3IxrlFXxNV7fJyhU6teR9oeCrXsKFiKJVictkRUW3jB lOzgOu8vyC2haGMxfY+d9WQgiv1DZEcrIjeVRBCVTK5tYhjYvemxplrvgb9+OEi7ImXr R1EeppiOE/RsNs1BBvvgc88InBan5/iufmapDZ/kG51qY4AQ1aulMN9HpkZDjd7buH9I FwRw== X-Gm-Message-State: AMCzsaWA0ImDFcEOujQaNQQpfz3iLkZu1takZQK0C/ZLdnqjDeicH7Yp 8CkUPm1G1gwQS0x6TOLwHonS0IC/ X-Google-Smtp-Source: ABhQp+RVWbQZTQyShnTkcAe1KqftxoxxL/htKXqASs77mGTOPIvMbeW02nkijnbx3bSWJMyhkFsMyQ== X-Received: by 10.200.36.68 with SMTP id d4mr4228744qtd.180.1508199250658; Mon, 16 Oct 2017 17:14:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:12:04 -0300 Message-Id: <20171017001209.32276-35-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 34/39] misc: drop old i386 dependency 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/char/debugcon.c | 1 - hw/intc/lm32_pic.c | 1 - hw/moxie/moxiesim.c | 1 - hw/sparc/sun4m.c | 1 - hw/watchdog/wdt_ib700.c | 1 - 5 files changed, 5 deletions(-) diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c index 95ccec6f8b..e2abc61b04 100644 --- a/hw/char/debugcon.c +++ b/hw/char/debugcon.c @@ -29,7 +29,6 @@ #include "hw/hw.h" #include "chardev/char-fe.h" #include "hw/isa/isa.h" -#include "hw/i386/pc.h" =20 #define TYPE_ISA_DEBUGCON_DEVICE "isa-debugcon" #define ISA_DEBUGCON_DEVICE(obj) \ diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 09e15115fb..db6c7afc2f 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" =20 #include "hw/hw.h" -#include "hw/i386/pc.h" #include "monitor/monitor.h" #include "hw/sysbus.h" #include "trace.h" diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 5ea8dd3a93..5c9a4211ac 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -30,7 +30,6 @@ #include "cpu.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "net/net.h" #include "sysemu/sysemu.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index e1bdd4828d..93424b186f 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -36,7 +36,6 @@ #include "net/net.h" #include "hw/boards.h" #include "hw/scsi/esp.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "hw/nvram/sun_nvram.h" #include "hw/nvram/chrp_nvram.h" diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index 532afe89e7..d045032bf4 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -25,7 +25,6 @@ #include "sysemu/watchdog.h" #include "hw/hw.h" #include "hw/isa/isa.h" -#include "hw/i386/pc.h" =20 /*#define IB700_DEBUG 1*/ =20 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508201347559993.3833936830231; Mon, 16 Oct 2017 17:49:07 -0700 (PDT) Received: from localhost ([::1]:35921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4G45-0001HZ-V2 for importer@patchew.org; Mon, 16 Oct 2017 20:49:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWS-0007GB-0z for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWR-0004yc-09 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:15 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:43476) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWQ-0004yJ-SB; Mon, 16 Oct 2017 20:14:14 -0400 Received: by mail-qt0-x244.google.com with SMTP id j58so80617qtj.0; Mon, 16 Oct 2017 17:14:14 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:13 -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=xQ0BUrqOTBr2242YTc97Gf98kMMY/BNwgwnn+L3Tc/8=; b=GnNqilIc0BZHphSNIXY82BCyS2ghyZvI6/SnZNX/ETpSNBCrcWBLr20EXPVX4A0/mC H2iF4/wSY45Ab11buoM3N6d/BASm41L6d08CVv34OIcMSrzKJbfNEloa4MS8Se8uo+Ya pTC8HH3EKghoCJ3o5qgEWll2VWr3er7S3iksLtlNbVG/NPLieM98I1i0KI//cJMrOpcv 6L4UiCxfDIuvXNoDIPYeJJWUWlCdKJbED3xVEIE2a/TK6TwwlC38r+0E3NVgVcQkciN1 4sRttjD9dz+pHCMIbg/E2vDvi2AkHOnPuATSbqypIu/YpI/11C9xytVZNjRUiu026NMb 0bHw== 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=xQ0BUrqOTBr2242YTc97Gf98kMMY/BNwgwnn+L3Tc/8=; b=gHJGf/yiFDxJi2N95C4YHSYA6jbbUgKqhZa3TgNXnZ6Oi9LYlSC7bDWwfza8yixigA 6YjM+hCnlxzRKDN07dHKcM5OKJe+fRluS9Nf2MwB0RM2TvJVCu6phOX3cdlaK2DzpsK1 OlYPGMk4rMj7zV3W9Plf4MrkqJpNCKni23DE9dHChrYyyloLMVcNaQBjAmtBRsSlDMWy gB4pZjY9Cn+IW5Hw32cDjlcp9D0LefG81kLIz5hRem2OddkxpuTxRKmhXA6JWebZmdQk kcIe0b8mRX69pHBPvb7rkhIZHVJfkambMyqIHtLHTHWmg/ypRY7rWzq6bosceapxsRO4 EB9A== X-Gm-Message-State: AMCzsaVEnY9wqmYunXHsC6lvqCi5tEKFHgQMmzr9OTZq5CvGs9EfTTB9 i91HK5o4OJIwZ0Cku85xUIU= X-Google-Smtp-Source: ABhQp+SyRDkmd43iXMR3yl1+PgNpKOWrVkHwdCOC7abGkJHPfHuBcMuA+cbp7+0WUHW7XvqPymDdyw== X-Received: by 10.200.47.187 with SMTP id l56mr16799713qta.319.1508199254451; Mon, 16 Oct 2017 17:14:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Michael Tokarev Date: Mon, 16 Oct 2017 21:12:05 -0300 Message-Id: <20171017001209.32276-36-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 35/39] i386/pc: move vmport.c from hw/misc/ to hw/i386/ 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/{misc =3D> i386}/vmport.c | 0 hw/i386/Makefile.objs | 1 + hw/misc/Makefile.objs | 2 -- 5 files changed, 1 insertion(+), 4 deletions(-) rename hw/{misc =3D> i386}/vmport.c (100%) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index d2ab2f6655..dbc4e65652 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy CONFIG_PCI_Q35=3Dy diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-so= ftmmu.mak index 9bde2f1c4b..f1fe508ff4 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=3Dy CONFIG_WDT_IB700=3Dy CONFIG_ISA_DEBUG=3Dy CONFIG_ISA_TESTDEV=3Dy -CONFIG_VMPORT=3Dy CONFIG_SGA=3Dy CONFIG_LPC_ICH9=3Dy CONFIG_PCI_Q35=3Dy diff --git a/hw/misc/vmport.c b/hw/i386/vmport.c similarity index 100% rename from hw/misc/vmport.c rename to hw/i386/vmport.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 909ead6a77..feff56a9b7 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -9,3 +9,4 @@ obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ obj-y +=3D kvmvapic.o obj-y +=3D acpi-build.o obj-y +=3D pci-assign-load-rom.o +obj-y +=3D vmport.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 19202d90cf..03bc758592 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) +=3D edu.o common-obj-y +=3D unimp.o common-obj-y +=3D vmcoreinfo.o =20 -obj-$(CONFIG_VMPORT) +=3D vmport.o - # ARM devices common-obj-$(CONFIG_PL310) +=3D arm_l2x0.o common-obj-$(CONFIG_INTEGRATOR_DEBUG) +=3D arm_integrator_debug.o --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508201419054754.3870001675825; Mon, 16 Oct 2017 17:50:19 -0700 (PDT) Received: from localhost ([::1]:35923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4G5F-0001yb-FW for importer@patchew.org; Mon, 16 Oct 2017 20:50:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWW-0007LP-E8 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWV-00051Z-A6 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:20 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:45636) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWV-00051R-5z; Mon, 16 Oct 2017 20:14:19 -0400 Received: by mail-qk0-x242.google.com with SMTP id f199so32990qke.2; Mon, 16 Oct 2017 17:14:19 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:18 -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=+ISYs3l6xypf2ckPjA3GDCMzA6U11y/hwgDbsP/fkHc=; b=GjOimRmOnVFDh2tB2xzTEMEzPz65AeDRMPVHTeQi9ebReSX2tqwv8ePUYPSTtHNZNe HtpxaEvE+dvvEQDA5c0b/RTC+CggsoO9LkbtioayHRslfB0Vg44LW5cO9TfXCdZXidrd SWS7WFwrq6hJo+vlFDtyP25gJqSGPduv37DWH4kGc6TRDUurGXry2FG0fIhLlTHc6IGA VtCjff4pcjYej/LGn2DZkr00Z/6lnxCgoHUbxD0GacbhR2jF62WRlMZYJdSO1VloEnaN EtMBNFCxIuoLvW4FWGvH3tKrmefbqArK+UhsmZl4WrXzuwaUJKYqgIJ6OJQ1+OjqBhKj JeGw== 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=+ISYs3l6xypf2ckPjA3GDCMzA6U11y/hwgDbsP/fkHc=; b=tQto95oPbZ+7WRwest62zKtbcg+WuFx9WyyarIYx4/dJLWCyytLzGoy59LDxxmcXzX pgAoIrP6u4uyAt7Fd/3rVMP7py5SMNLFompkKYpmJeQA7GXdKhDSUpMIZV9D2dwcFQQE S4ZE9fa/6L9sp4v8pxiZeiEjZ6VyClc56p2zRNP9Q9DE/XZfwZQogvaGs0XU0uouAFa0 M1/fVDJWNe9/+Jcp5ufFVUe+rVjUGjmIO3JxIJAuqPpg8QJcfSQ8Fe5R2rgBqtlT5ZGz 7xSt6Hvz1B5rsRxsk1TCJcj8+Lpt+yWXzDB4mfyadc5/bxK19ZQnZ6r3WZraqL4YdGG5 hIyg== X-Gm-Message-State: AMCzsaU/C/mWPiqOGsXNAYObfcVx3jqNo4xlXaihem1alWLfcYHlhpSP AxSN+FKPNPTWuoU7RjOcx1o= X-Google-Smtp-Source: AOwi7QDhc3xZtdFblidHoT5XGqkDYBcMJPiAMZtCTcaKpo6VDlaXr0Sk6CLBXvpB6Wj4Q3UBj7pPWA== X-Received: by 10.55.200.27 with SMTP id c27mr16608585qkj.115.1508199258758; Mon, 16 Oct 2017 17:14:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Michael Tokarev Date: Mon, 16 Oct 2017 21:12:06 -0300 Message-Id: <20171017001209.32276-37-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v2 36/39] i386/pc: move pvpanic.c from hw/misc/ to hw/i386/ 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/{misc =3D> i386}/pvpanic.c | 0 hw/i386/Makefile.objs | 2 +- hw/misc/Makefile.objs | 1 - 5 files changed, 1 insertion(+), 4 deletions(-) rename hw/{misc =3D> i386}/pvpanic.c (100%) diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index dbc4e65652..541ec8604d 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -46,7 +46,6 @@ CONFIG_LPC_ICH9=3Dy CONFIG_PCI_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy -CONFIG_PVPANIC=3Dy CONFIG_MEM_HOTPLUG=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-so= ftmmu.mak index f1fe508ff4..23488d324f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -46,7 +46,6 @@ CONFIG_LPC_ICH9=3Dy CONFIG_PCI_Q35=3Dy CONFIG_APIC=3Dy CONFIG_IOAPIC=3Dy -CONFIG_PVPANIC=3Dy CONFIG_MEM_HOTPLUG=3Dy CONFIG_NVDIMM=3Dy CONFIG_ACPI_NVDIMM=3Dy diff --git a/hw/misc/pvpanic.c b/hw/i386/pvpanic.c similarity index 100% rename from hw/misc/pvpanic.c rename to hw/i386/pvpanic.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index feff56a9b7..41574096f1 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -7,6 +7,6 @@ obj-y +=3D amd_iommu.o obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ =20 obj-y +=3D kvmvapic.o -obj-y +=3D acpi-build.o +obj-y +=3D acpi-build.o pvpanic.o obj-y +=3D pci-assign-load-rom.o obj-y +=3D vmport.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 03bc758592..182f9a7d54 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -53,7 +53,6 @@ obj-$(CONFIG_MIPS_CPS) +=3D mips_cpc.o obj-$(CONFIG_MIPS_ITU) +=3D mips_itu.o obj-$(CONFIG_MPS2_SCC) +=3D mps2-scc.o =20 -obj-$(CONFIG_PVPANIC) +=3D pvpanic.o obj-$(CONFIG_HYPERV_TESTDEV) +=3D hyperv_testdev.o obj-$(CONFIG_AUX) +=3D auxbus.o obj-$(CONFIG_ASPEED_SOC) +=3D aspeed_scu.o aspeed_sdmc.o --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200443087822.8571383495077; Mon, 16 Oct 2017 17:34:03 -0700 (PDT) Received: from localhost ([::1]:35824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FpS-0005wD-4f for importer@patchew.org; Mon, 16 Oct 2017 20:33:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWa-0007Pq-UG for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWZ-00053g-Be for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:24 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:54189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWZ-00053N-7E; Mon, 16 Oct 2017 20:14:23 -0400 Received: by mail-qt0-x242.google.com with SMTP id n61so43716qte.10; Mon, 16 Oct 2017 17:14:23 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:22 -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=gId9aQ/hyu+1DDdpB+fR6+2YnllLaJzyZ1NMsoMtpWA=; b=KU0yx6HGVgUsFFfsmKufGDPjEbh08xEcpKQAVyVTjZsSOxqKUdS5hOd7f+h57nPJWX cRESzTGcuS0Yh/IRt772K/1v0d5UTkS2nqhwc5rWggdZ2JHsoavT5LRhJVVab7ycdFHA rfGRETaDRZitfmla7AWZPGlUyVYi1MyQlqqqtQCEIiWC5J50V+pcjD1L4O6stJXsUq8m L3AUmcSUhpwQc6T+nb/zmlHO0do1EnqK647L3jsuy1aNYuCyQ07xW67BL4sVuXpdMVLB iALVX82xhMMFZnVbvO3ct/awFrnqj4bu1sPmM6gc9S061/F2wcFtMSjGrM5op6Or0bkR JbKw== 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=gId9aQ/hyu+1DDdpB+fR6+2YnllLaJzyZ1NMsoMtpWA=; b=MGJjq/offPB5t5l2Ri3VkVXEHBAIUvBeALD6DVJiAu0u2U0zTobY9kIrzRp4uRdalQ HkexdYFdt/2WaFGNSKhgzSTyboOqHSuJs2qt3Pk+Mr2bVZ757ws4S2Y9wUX3Z17xRIGn hVSphof4v8Ygz1+briqSYnhDSNmbujwHW7J0qyIq8EsMxWULNUJm59ts0W2xO5GkMpO8 MsaD+DtU2xXUd0KA+0JHdUJ3T9HZozDCv/3pe3ENdwCcJagjsiJhnoBc5EjKKt8Hrxuo DkAyP8HvrtbGdufNGk6HH82kzkjJpJeFDYLM5pZufJXQTQ4qgBraKnhdpxj0VN73BqQ8 ogoA== X-Gm-Message-State: AMCzsaXfanlaHgMrNhEf1WtQ0mZeQUXP+wxljnP2c69lgqW6sJ103FUK i0D9ou3jsjlO77nfebVxuKE= X-Google-Smtp-Source: ABhQp+Q+NW7XhtCyn4pdkUirS/30UVDcEx3+1t5nFk/Hlr2s/jnPcSCBftISfg8A0MqIBb8XEHoxlA== X-Received: by 10.200.37.230 with SMTP id f35mr18046439qtf.335.1508199262719; Mon, 16 Oct 2017 17:14:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Michael Tokarev Date: Mon, 16 Oct 2017 21:12:07 -0300 Message-Id: <20171017001209.32276-38-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v2 37/39] i386/pc: extract port92 from pc.c 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: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/i386/pc.h | 3 +- hw/i386/pc.c | 126 ++--------------------------------------------= ---- hw/i386/port92.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++= ++ hw/i386/Makefile.objs | 2 +- 4 files changed, 130 insertions(+), 123 deletions(-) create mode 100644 hw/i386/port92.c diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 020792c2e8..fcb5223423 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -249,7 +249,8 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); =20 #define FW_CFG_IO_BASE 0x510 =20 -#define PORT92_A20_LINE "a20" +#define TYPE_PORT92 "port92" +void port92_init(ISADevice *dev, qemu_irq a20_out); =20 /* acpi_piix.c */ =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 08d01b46eb..a8d20ae89c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -499,124 +499,6 @@ void pc_cmos_init(PCMachineState *pcms, qemu_register_reset(pc_cmos_init_late, &arg); } =20 -#define TYPE_PORT92 "port92" -#define PORT92(obj) OBJECT_CHECK(Port92State, (obj), TYPE_PORT92) - -/* port 92 stuff: could be split off */ -typedef struct Port92State { - ISADevice parent_obj; - - MemoryRegion io; - uint8_t outport; - qemu_irq a20_out; -} Port92State; - -static void port92_write(void *opaque, hwaddr addr, uint64_t val, - unsigned size) -{ - Port92State *s =3D opaque; - int oldval =3D s->outport; - - DPRINTF("port92: write 0x%02" PRIx64 "\n", val); - s->outport =3D val; - qemu_set_irq(s->a20_out, (val >> 1) & 1); - if ((val & 1) && !(oldval & 1)) { - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - } -} - -static uint64_t port92_read(void *opaque, hwaddr addr, - unsigned size) -{ - Port92State *s =3D opaque; - uint32_t ret; - - ret =3D s->outport; - DPRINTF("port92: read 0x%02x\n", ret); - return ret; -} - -static void port92_init(ISADevice *dev, qemu_irq a20_out) -{ - qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out); -} - -static const VMStateDescription vmstate_port92_isa =3D { - .name =3D "port92", - .version_id =3D 1, - .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { - VMSTATE_UINT8(outport, Port92State), - VMSTATE_END_OF_LIST() - } -}; - -static void port92_reset(DeviceState *d) -{ - Port92State *s =3D PORT92(d); - - s->outport &=3D ~1; -} - -static const MemoryRegionOps port92_ops =3D { - .read =3D port92_read, - .write =3D port92_write, - .impl =3D { - .min_access_size =3D 1, - .max_access_size =3D 1, - }, - .endianness =3D DEVICE_LITTLE_ENDIAN, -}; - -static void port92_initfn(Object *obj) -{ - Port92State *s =3D PORT92(obj); - - memory_region_init_io(&s->io, OBJECT(s), &port92_ops, s, "port92", 1); - - s->outport =3D 0; - - qdev_init_gpio_out_named(DEVICE(obj), &s->a20_out, PORT92_A20_LINE, 1); -} - -static void port92_realizefn(DeviceState *dev, Error **errp) -{ - ISADevice *isadev =3D ISA_DEVICE(dev); - Port92State *s =3D PORT92(dev); - - isa_register_ioport(isadev, &s->io, 0x92); -} - -static void port92_class_initfn(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - - dc->realize =3D port92_realizefn; - dc->reset =3D port92_reset; - dc->vmsd =3D &vmstate_port92_isa; - /* - * Reason: unlike ordinary ISA devices, this one needs additional - * wiring: its A20 output line needs to be wired up by - * port92_init(). - */ - dc->user_creatable =3D false; -} - -static const TypeInfo port92_info =3D { - .name =3D TYPE_PORT92, - .parent =3D TYPE_ISA_DEVICE, - .instance_size =3D sizeof(Port92State), - .instance_init =3D port92_initfn, - .class_init =3D port92_class_initfn, -}; - -static void port92_register_types(void) -{ - type_register_static(&port92_info); -} - -type_init(port92_register_types) - static void handle_a20_line_change(void *opaque, int irq, int level) { X86CPU *cpu =3D opaque; @@ -1568,6 +1450,11 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq = *gsi, a20_line =3D qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2); i8042 =3D isa_create_simple(isa_bus, TYPE_I8042); i8042_setup_a20_line(i8042, a20_line[0]); + + port92 =3D isa_create_simple(isa_bus, TYPE_PORT92); + port92_init(port92, a20_line[1]); + g_free(a20_line); + if (!no_vmport) { vmport_init(isa_bus); vmmouse =3D isa_try_create(isa_bus, TYPE_VMMOUSE); @@ -1579,9 +1466,6 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, qdev_prop_set_ptr(dev, "ps2_mouse", i8042); qdev_init_nofail(dev); } - port92 =3D isa_create_simple(isa_bus, "port92"); - port92_init(port92, a20_line[1]); - g_free(a20_line); =20 DMA_init(isa_bus, 0); =20 diff --git a/hw/i386/port92.c b/hw/i386/port92.c new file mode 100644 index 0000000000..f067bbd051 --- /dev/null +++ b/hw/i386/port92.c @@ -0,0 +1,122 @@ +#include "qemu/osdep.h" +#include "hw/hw.h" +#include "hw/i386/pc.h" + +#define PORT92_A20_LINE "a20" + +#define PORT92(obj) OBJECT_CHECK(Port92State, (obj), TYPE_PORT92) + +/* port 92 stuff: could be split off */ +typedef struct Port92State { + ISADevice parent_obj; + + MemoryRegion io; + uint8_t outport; + qemu_irq a20_out; +} Port92State; + +static void port92_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + Port92State *s =3D opaque; + int oldval =3D s->outport; + + //DPRINTF("port92: write 0x%02" PRIx64 "\n", val); + s->outport =3D val; + qemu_set_irq(s->a20_out, (val >> 1) & 1); + if ((val & 1) && !(oldval & 1)) { + qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); + } +} + +static uint64_t port92_read(void *opaque, hwaddr addr, + unsigned size) +{ + Port92State *s =3D opaque; + uint32_t ret; + + ret =3D s->outport; + //DPRINTF("port92: read 0x%02x\n", ret); + return ret; +} + +void port92_init(ISADevice *dev, qemu_irq a20_out) +{ + qdev_connect_gpio_out_named(DEVICE(dev), PORT92_A20_LINE, 0, a20_out); +} + +static const VMStateDescription vmstate_port92_isa =3D { + .name =3D "port92", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT8(outport, Port92State), + VMSTATE_END_OF_LIST() + } +}; + +static void port92_reset(DeviceState *d) +{ + Port92State *s =3D PORT92(d); + + s->outport &=3D ~1; +} + +static const MemoryRegionOps port92_ops =3D { + .read =3D port92_read, + .write =3D port92_write, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 1, + }, + .endianness =3D DEVICE_LITTLE_ENDIAN, +}; + +static void port92_initfn(Object *obj) +{ + Port92State *s =3D PORT92(obj); + + memory_region_init_io(&s->io, OBJECT(s), &port92_ops, s, "port92", 1); + + s->outport =3D 0; + + qdev_init_gpio_out_named(DEVICE(obj), &s->a20_out, PORT92_A20_LINE, 1); +} + +static void port92_realizefn(DeviceState *dev, Error **errp) +{ + ISADevice *isadev =3D ISA_DEVICE(dev); + Port92State *s =3D PORT92(dev); + + isa_register_ioport(isadev, &s->io, 0x92); +} + +static void port92_class_initfn(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->realize =3D port92_realizefn; + dc->reset =3D port92_reset; + dc->vmsd =3D &vmstate_port92_isa; + /* + * Reason: unlike ordinary ISA devices, this one needs additional + * wiring: its A20 output line needs to be wired up by + * port92_init(). + */ + dc->user_creatable =3D false; +} + +static const TypeInfo port92_info =3D { + .name =3D TYPE_PORT92, + .parent =3D TYPE_ISA_DEVICE, + .instance_size =3D sizeof(Port92State), + .instance_init =3D port92_initfn, + .class_init =3D port92_class_initfn, +}; + +static void port92_register_types(void) +{ + type_register_static(&port92_info); +} + +type_init(port92_register_types) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 41574096f1..37ce88d380 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -9,4 +9,4 @@ obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ obj-y +=3D kvmvapic.o obj-y +=3D acpi-build.o pvpanic.o obj-y +=3D pci-assign-load-rom.o -obj-y +=3D vmport.o +obj-y +=3D vmport.o port92.o --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200617118993.6061883971257; Mon, 16 Oct 2017 17:36:57 -0700 (PDT) Received: from localhost ([::1]:35839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FsJ-0008HH-Ej for importer@patchew.org; Mon, 16 Oct 2017 20:36:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWg-0007Uv-Ou for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWf-00056x-R8 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:30 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:47582) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWf-00056d-Mx; Mon, 16 Oct 2017 20:14:29 -0400 Received: by mail-qk0-x244.google.com with SMTP id m189so28870qke.4; Mon, 16 Oct 2017 17:14:29 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:28 -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=K7Il9e4gdvfd5CEL77iu9A6C8SdwX5vWI0pDwfAhw3g=; b=Ais4fNr3f7bPeiPdWLQqD3j6ZCJSRHbLdoV70Le5gQKYs8x4myXbR8TgDfDgNjNEz7 nyKYwijn31pUGrD+gnJrzU/22y3/h56m7GSyDQX+QO/nAYfmtXl3smexhcsBglPjE+f+ ylNumLCidoDpP1JglrdDXrAuRdAMPXdKUGa1Iw4c1LWn42vMG//txJEe5tQTm8dsEbyw mfofEBjtBBjwpiSQxohq8gQcbDIRB6vOhx3ATd0ih1eR/ZKKyDl07gkkqsEyDboMrAjf GuDGPxxykbQicsetdMNH+n0uFqpeVT12g/Q1fQDlaj32Z2ap8eLFquPzAFdqLmMQ8i/J EJ8Q== 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=K7Il9e4gdvfd5CEL77iu9A6C8SdwX5vWI0pDwfAhw3g=; b=Ks2kRyzqMcGOemicIwL5IXOgp4D/Tnb0gysaXJifXVYZ1d2OPTzOarhf+gkcditSoP vpPgM19aiX0v4wMz5hYNsIGrA2J+CahtZVjlkEm6wEFo03VDUpXvswCpcRa2jp0aZJiZ B5b15Vjn4NH2T4TZo8kpSIySP7ohn2pAvUaxHDBjjHTJoRcXJP8PE1TBF/DutuEE9kbP tjQ5lugStog1lftwzccTkjwKo+UtPPKjORFCOSbpCMbSD4ZyLZlCgMvwx6I1qnxMhtR2 LmnQkEzHbtnaldQlg8hrRL1xXoRwDP00APP/hWMASJKYRg6Dh3bnMzU/U8qX9EkdUXVF iHgA== X-Gm-Message-State: AMCzsaXW+kZhRqiYtfczUGTWV1eNfxAeNbWOhNeiPz6yXCQuEobOfAcn lXwZjcWK8NFztUcCW1+3a00= X-Google-Smtp-Source: ABhQp+TkumlCxOVnd/zjCPfq1UfQEgM0AXblqhpRRoosd2gMcekzkMZJVwU9DdALQsR0oOKmM5NODg== X-Received: by 10.55.127.66 with SMTP id a63mr9641332qkd.90.1508199269088; Mon, 16 Oct 2017 17:14:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Markus Armbruster , Paolo Bonzini , "Michael S. Tsirkin" , Aurelien Jarno , Yongbok Kim , Richard Henderson , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson , Alexander Graf , Mark Cave-Ayland , Artyom Tarasenko , Michael Tokarev , Eduardo Otubo , Eduardo Habkost Date: Mon, 16 Oct 2017 21:12:08 -0300 Message-Id: <20171017001209.32276-39-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v2 38/39] hw/dma/i82374: avoid multiple creations on the same ISA bus 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 $ ./ppc64-softmmu/qemu-system-ppc64 -S -machine 40p,accel=3Dtcg -device i82= 374 qemu-system-ppc64: -device i82374: DMA already initialized on ISA bus Reported-by: Eduardo Otubo Suggested-by: Eduardo Habkost Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/dma/i82374.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 6c0f975df0..280e64f0fa 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/isa/isa.h" =20 #define TYPE_I82374 "i82374" @@ -117,13 +118,19 @@ static const MemoryRegionPortio i82374_portio_list[] = =3D { static void i82374_realize(DeviceState *dev, Error **errp) { I82374State *s =3D I82374(dev); + ISABus *isa_bus =3D isa_bus_from_device(ISA_DEVICE(dev)); + + if (isa_bus->dma[0] || isa_bus->dma[1]) { + error_setg(errp, "DMA already initialized on ISA bus"); + return; + } =20 portio_list_init(&s->port_list, OBJECT(s), i82374_portio_list, s, "i82374"); portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), s->iobase); =20 - DMA_init(isa_bus_from_device(ISA_DEVICE(dev)), 1); + DMA_init(isa_bus, 1); memset(s->commands, 0, sizeof(s->commands)); } =20 --=20 2.15.0.rc0 From nobody Sat May 4 14:14:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200796028657.9062992055808; Mon, 16 Oct 2017 17:39:56 -0700 (PDT) Received: from localhost ([::1]:35868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FvE-0002JZ-38 for importer@patchew.org; Mon, 16 Oct 2017 20:39:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FWo-0007be-Aw for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FWl-0005AD-QR for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:14:38 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:43481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FWl-0005A1-La; Mon, 16 Oct 2017 20:14:35 -0400 Received: by mail-qt0-x241.google.com with SMTP id j58so81960qtj.0; Mon, 16 Oct 2017 17:14:35 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.14.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:14:34 -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=AYTlDxMCQMLZI7wQ2VNpv0YnAPLdWV38wdYQS/QvKiY=; b=Qw9BjqEfL9cA3cmdBmV8/62sRbD9WRWLuKAZSrQoAsfAjP+zMwbSfZU8rHr1DLpcwF KpEr2Lg27rsCnyxurIuVmNK4ef2XgMPE5s5RUBu8hEr29azs2+qx6Jqp3Sa5UNgmKhud j3zVqDS1LCKk67Ka1Bvdzg5ZUXhj0Mo8EuH9CXM1DoevT4oqOaeyqDSIj5wWNRIwqJND mDwMfTD16pJplF3ZZxnZ/c4D4UjmiLcpT7PfKkLJTacOl8RCqnsIXhqE22Spu369bEhO Yv0o36JLAYuwViJrY5o0VN2HbozNznJyXH3UQDNuCUilJvEnWhDp4HRWw8me3Ul30tqW VcGw== 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=AYTlDxMCQMLZI7wQ2VNpv0YnAPLdWV38wdYQS/QvKiY=; b=HTxO0MFZzP0G1RqQ3SqfVp7PaLSTbnwzMqUXDkzSqO2ZXRHatOMO/pY03EAxd5Ze8J G7m3bQL5cPZhQWYzz3BeP3PNqgpidiHuQdATks9a0itxSerCX6e5Kx5aDwMOcp5srOtv CnCfx9JST1Z+YJWJByuuRkk1XrfmBp16qWU1pSKoUdghdrrYbje72yuDbQGTIBJO7twE klqhZW+Kl6HPj0L3u1qEnOFiWjLCCpVnS78kFk5tVJjS3kzsIHz61xKNGtDcIDerH/RX T87CVfBNddz2ILjU//Uy+WGmGuE8D9uMSpjwY4z0gsPUyJOoYjgo6yiO7T6emsbEjiCL Bblw== X-Gm-Message-State: AMCzsaVLAsbSfl+FTu+ThHfUFDJgwTVBNmjJ9pe2sOEzk2KktpLtgj9v UW/fewDHfLTXuoI5QFFdFrTmmLnieBI= X-Google-Smtp-Source: AOwi7QDp84MOK2lcJSjwbts6Fm4PewxNdPR3fBYM1s+VchSDn2nUXNGUuIrVgtjuIMTMr+8btiKpqw== X-Received: by 10.200.26.216 with SMTP id h24mr16969460qtk.175.1508199275165; Mon, 16 Oct 2017 17:14:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , Thomas Huth , Markus Armbruster , Paolo Bonzini , "Michael S. Tsirkin" , Aurelien Jarno , Yongbok Kim , Richard Henderson , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , David Gibson , Alexander Graf , Mark Cave-Ayland , Artyom Tarasenko , Michael Tokarev , Eduardo Otubo , Eduardo Habkost Date: Mon, 16 Oct 2017 21:12:09 -0300 Message-Id: <20171017001209.32276-40-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v2 39/39] hw/dma/i8257: rename DMA_init() to i8257_dma_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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 - move the header from hw/isa/ to hw/dma/ - remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/{isa/i8257.h =3D> dma/i8257_dma.h} | 6 ++++++ include/hw/isa/isa.h | 2 -- hw/dma/i82374.c | 3 ++- hw/dma/i8257.c | 4 ++-- hw/i386/pc.c | 3 ++- hw/mips/mips_fulong2e.c | 3 ++- hw/mips/mips_jazz.c | 3 ++- hw/mips/mips_malta.c | 3 ++- hw/sparc/sun4m.c | 4 ---- hw/sparc64/sun4u.c | 4 ---- 10 files changed, 18 insertions(+), 17 deletions(-) rename include/hw/{isa/i8257.h =3D> dma/i8257_dma.h} (86%) diff --git a/include/hw/isa/i8257.h b/include/hw/dma/i8257_dma.h similarity index 86% rename from include/hw/isa/i8257.h rename to include/hw/dma/i8257_dma.h index 88a2766a3f..0041565177 100644 --- a/include/hw/isa/i8257.h +++ b/include/hw/dma/i8257_dma.h @@ -1,6 +1,10 @@ #ifndef HW_I8257_H #define HW_I8257_H =20 +#include "hw/hw.h" +#include "hw/isa/isa.h" +#include "exec/ioport.h" + #define TYPE_I8257 "i8257" =20 typedef struct I8257Regs { @@ -40,4 +44,6 @@ typedef struct I8257State { PortioList portio_pageh; } I8257State; =20 +void i8257_dma_init(ISABus *bus, int high_page_enable); + #endif diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 95593408ef..b9dbab24b4 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -151,6 +151,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } =20 -/* i8257.c */ -void DMA_init(ISABus *bus, int high_page_enable); #endif diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 280e64f0fa..42b9eef659 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/isa/isa.h" +#include "hw/dma/i8257_dma.h" =20 #define TYPE_I82374 "i82374" #define I82374(obj) OBJECT_CHECK(I82374State, (obj), TYPE_I82374) @@ -130,7 +131,7 @@ static void i82374_realize(DeviceState *dev, Error **er= rp) portio_list_add(&s->port_list, isa_address_space_io(&s->parent_obj), s->iobase); =20 - DMA_init(isa_bus, 1); + i8257_dma_init(isa_bus, 1); memset(s->commands, 0, sizeof(s->commands)); } =20 diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index bd23e893bf..a8f26b003b 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/isa/isa.h" -#include "hw/isa/i8257.h" +#include "hw/dma/i8257_dma.h" #include "qemu/main-loop.h" #include "trace.h" =20 @@ -622,7 +622,7 @@ static void i8257_register_types(void) =20 type_init(i8257_register_types) =20 -void DMA_init(ISABus *bus, int high_page_enable) +void i8257_dma_init(ISABus *bus, int high_page_enable) { ISADevice *isa1, *isa2; DeviceState *d; diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a8d20ae89c..bb0c70f606 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -39,6 +39,7 @@ #include "elf.h" #include "multiboot.h" #include "hw/timer/mc146818rtc.h" +#include "hw/dma/i8257_dma.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/audio/pcspk.h" @@ -1467,7 +1468,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, qdev_init_nofail(dev); } =20 - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 for(i =3D 0; i < MAX_FD; i++) { fd[i] =3D drive_get(IF_FLOPPY, 0, i); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index bf021ba018..7ebbffa8f2 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -22,6 +22,7 @@ #include "qapi/error.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" #include "net/net.h" @@ -365,7 +366,7 @@ static void mips_fulong2e_init(MachineState *machine) =20 /* init other devices */ pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index f5112fab39..439bbd71fe 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -27,6 +27,7 @@ #include "hw/mips/mips.h" #include "hw/mips/cpudevs.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "hw/block/fdc.h" @@ -223,7 +224,7 @@ static void mips_jazz_init(MachineState *machine, /* ISA devices */ i8259 =3D i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); =20 diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 7e8194be17..6945fa47c3 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -27,6 +27,7 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/i386/pc.h" +#include "hw/dma/i8257_dma.h" #include "hw/char/serial.h" #include "hw/block/fdc.h" #include "net/net.h" @@ -1219,7 +1220,7 @@ void mips_malta_init(MachineState *machine) smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); - DMA_init(isa_bus, 0); + i8257_dma_init(isa_bus, 0); =20 /* Super I/O */ isa_create_simple(isa_bus, TYPE_I8042); diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 93424b186f..f6fda6eb13 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -100,10 +100,6 @@ struct sun4m_hwdef { uint8_t nvram_machine_id; }; =20 -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 1cd283063e..6b45d487f0 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -86,10 +86,6 @@ typedef struct EbusState { MemoryRegion bar1; } EbusState; =20 -void DMA_init(ISABus *bus, int high_page_enable) -{ -} - static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) { --=20 2.15.0.rc0