From patchwork Mon Oct 1 22:09:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mty7Y+5a"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGvD4Md0z9s3x for ; Tue, 2 Oct 2018 08:20:40 +1000 (AEST) Received: from localhost ([::1]:40914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76YP-0004By-Vy for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:20:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XW-00041Z-65 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76O9-0007Ed-KK for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:02 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39994) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76O9-0007E9-CU for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:01 -0400 Received: by mail-wr1-x433.google.com with SMTP id y8-v6so15662839wrh.7 for ; Mon, 01 Oct 2018 15:10: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=u0b4jCc2S5lv9O1zhbSCS53q5I1y674zdyXHzkbJfhI=; b=mty7Y+5aeudgRNnbTmpfMyJzUIGoAs/3GhWbvnhhEkyAzv0+kqY/heq6e2xZDKb6Hj gdMLZ28OSjMY8BiaFVrGPaW434SSvyIOCpOnnRqABss2YXY30gilcPRVAiFQ0MyaYp3K EkqypY+2RIBMr8AUOwyOgUHKpnvo4wthZ6lvGZaEGBBt8tdsSfRkE16Ow0uy4YeCGB2k HVhpj3ebLrbG4cgL/GTU38uzo8fuVRYMVYUGFo2EIjVOszo+S16s+5XkDvnoEgtU3dot qIPlbkOELs2WlE0D6/a/hRMqd72fM4g9/vXXhzP83iDguUQZ8phIN5C5Th+XfRMnaX+t XD5g== 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=u0b4jCc2S5lv9O1zhbSCS53q5I1y674zdyXHzkbJfhI=; b=QHbTD+EbWWztkrxlqdH/qP5pIkJToV5OX/ctGy8lzFnmQ/hFLhcuxIYRlsDQ8a9LjG aw81+7rpjvBzOY3dUvQ78tyDegVbYYRVA8fLK2tb3nXQlzuVRya9KtyhZvA2CDvfrMWV Ydb48QO0pNtcLrzEjTlvqSAGT92pa6nB/ns5iCE+Xlqv5ERo7wdk+ahLFp7ReMJPjger 5OeC2Sxssuu4lS3Irl7LjpQp4P2oWyu12Gqq7jEQjneABpqUM+vYfTRFdun9iKSZNWe2 lw0lpfkIMiC4st0mnyf0d7kHV7Af+8rOvAsqFNNv/FOKdLgEsLKm6YqYbnArcUY6U6Ye GZrA== X-Gm-Message-State: ABuFfojO8jFN4gcDdkIsk4rDBe91zbv+6hklUGnyOHWGgtfgbqnVfV97 YGlL/yIMYbYfLla8ZtRpyJ4= X-Google-Smtp-Source: ACcGV6147A8QLsQxOsRkVQDfy0HopRTegAsWElTsDbAeLafwKB5GTEtH5nQ1QxWVJPXrAWLwOX2EqQ== X-Received: by 2002:adf:a144:: with SMTP id r4-v6mr8341655wrr.169.1538431799213; Mon, 01 Oct 2018 15:09:59 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.09.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:09:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:28 +0200 Message-Id: <20181001220942.2382-2-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::433 Subject: [Qemu-devel] [PATCH 01/15] trace-events: Fix copy/paste typo 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Missed while reviewing 5dd85b4b486. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Cédric Le Goater --- hw/timer/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/trace-events b/hw/timer/trace-events index fa4213df5b..ca9ad6321a 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -56,7 +56,7 @@ systick_timer_tick(void) "systick reload" systick_read(uint64_t addr, uint32_t value, unsigned size) "systick read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" systick_write(uint64_t addr, uint32_t value, unsigned size) "systick write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" -# hw/char/cmsdk_apb_timer.c +# hw/timer/cmsdk_apb_timer.c cmsdk_apb_timer_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB timer read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_timer_write(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB timer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_timer_reset(void) "CMSDK APB timer: reset" From patchwork Mon Oct 1 22:09:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O5EnV0n1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH7G6xlqz9s3l for ; Tue, 2 Oct 2018 08:31:06 +1000 (AEST) Received: from localhost ([::1]:40974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76iW-0005rL-LG for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:31:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XV-00041R-N5 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OD-0007HF-HU for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:08 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43518) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OD-0007Gg-93 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:05 -0400 Received: by mail-wr1-x435.google.com with SMTP id n1-v6so5502285wrt.10 for ; Mon, 01 Oct 2018 15:10: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=pBSy+cmyl1xiqOIalJT3WVoAQSHu6GZjIz+/f2h6grQ=; b=O5EnV0n1a09sB1TJp2ywEcfUqR6BxCHPzmPPnhzo6blvH0vGSzqYfTXEIIvSNwzoBL 6npthCTgKZrjVGbbQB5ewhLanaG49JUn1lAkaDttQ5MomziaPD1z+tCNWTiLtj9gu/fy +pkhiuV46nQ/0m+AX6dMdKYE+AOhRLbgAQR7KUvot+EMvI9scvesV1x0b+iGUSyiKsxO dy/TqEgErTC099dQA1USjDxg3z955h4BzC4mCqCc1J6IiIbddHDLnQzGjb5iFbfh1YLR LtSyqctS3g+g8OZ38zFzeyZJmNTwvzVTYb6COZ3951D7tYHP8hFMQVovQNKk/D2yEIxH bxNQ== 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=pBSy+cmyl1xiqOIalJT3WVoAQSHu6GZjIz+/f2h6grQ=; b=WqSUGrPMhhyiC/GsC+KJx1JegAf4pXOB3YGK6sWJN0914ptxHf/dBRICevX2pciSB1 3eMCi9YicjJeSs/LSOYl/mDkCdGyXhiJIA1sY5n/rdqg3lI4Tqb94oT/oT+3zN0zrBQI bKK/OQkCyLV1l9jUljjjYtb6XjN9heziM9suSkzWl2G5lh5iT+kTwQLH+r8QMEHc1bf6 4Ew3pBuJTv/ff2Kj66FLhx188UUSPgbdv+lbZxAwrTQbQRVVyb7LKLOdY8CduNirpNm/ zMbFii+Mab2JK60OrsujOlzQ0u+GUKCFH2MsepRGDtHQak2QBKIJcDYdm+AF3yYvz+zK 0PAg== X-Gm-Message-State: ABuFfoh07maTMFnjCQSJQ11U3zW0Z7q0E6UxmvRJFsDK5sBhaK7heXl3 5UORHcIgVa/w9coqJUjb/NI= X-Google-Smtp-Source: ACcGV622AcDY8OHgwr9KRLOnZnqLpIt5jyRXV7FANC11+Apkl7zONMo6C3p2ZzlG30XJOwU1wcpYyg== X-Received: by 2002:adf:fec9:: with SMTP id q9-v6mr7629094wrs.164.1538431804212; Mon, 01 Oct 2018 15:10:04 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:29 +0200 Message-Id: <20181001220942.2382-3-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PATCH 02/15] hw/timer/sun4v-rtc: Convert from DPRINTF() macro to trace events 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: Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Artyom Tarasenko Reviewed-by: Cédric Le Goater --- hw/timer/sun4v-rtc.c | 13 +++---------- hw/timer/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index 310523225f..13be94f8da 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -14,15 +14,8 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/timer/sun4v-rtc.h" +#include "trace.h" -//#define DEBUG_SUN4V_RTC - -#ifdef DEBUG_SUN4V_RTC -#define DPRINTF(fmt, ...) \ - do { printf("sun4v_rtc: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif #define TYPE_SUN4V_RTC "sun4v_rtc" #define SUN4V_RTC(obj) OBJECT_CHECK(Sun4vRtc, (obj), TYPE_SUN4V_RTC) @@ -41,14 +34,14 @@ static uint64_t sun4v_rtc_read(void *opaque, hwaddr addr, /* accessing the high 32 bits */ val >>= 32; } - DPRINTF("read from " TARGET_FMT_plx " val %lx\n", addr, val); + trace_sun4v_rtc_read(addr, val); return val; } static void sun4v_rtc_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr); + trace_sun4v_rtc_read(addr, val); } static const MemoryRegionOps sun4v_rtc_ops = { diff --git a/hw/timer/trace-events b/hw/timer/trace-events index ca9ad6321a..75bd3b1042 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -66,5 +66,9 @@ cmsdk_apb_dualtimer_read(uint64_t offset, uint64_t data, unsigned size) "CMSDK A cmsdk_apb_dualtimer_write(uint64_t offset, uint64_t data, unsigned size) "CMSDK APB dualtimer write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_dualtimer_reset(void) "CMSDK APB dualtimer: reset" +# hw/timer/sun4v-rtc.c +sun4v_rtc_read(uint64_t addr, uint64_t value) "read: addr 0x%" PRIx64 " value 0x%" PRIx64 +sun4v_rtc_write(uint64_t addr, uint64_t value) "write: addr 0x%" PRIx64 " value 0x%" PRIx64 + # hw/timer/xlnx-zynqmp-rtc.c xlnx_zynqmp_rtc_gettime(int year, int month, int day, int hour, int min, int sec) "Get time from host: %d-%d-%d %2d:%02d:%02d" From patchwork Mon Oct 1 22:09:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RtqynM8N"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH1l3C3Lz9sB4 for ; Tue, 2 Oct 2018 08:26:18 +1000 (AEST) Received: from localhost ([::1]:40947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76ds-0001SQ-7d for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:26:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XV-00041Z-EA for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OE-0007HR-F7 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:08 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OE-0007HK-8d for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:06 -0400 Received: by mail-wr1-x441.google.com with SMTP id u12-v6so15632854wrr.4 for ; Mon, 01 Oct 2018 15:10:06 -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=dD+oT1d73kI+T4UbkBU9325q4bnyCtuyUiCPOgRUgIc=; b=RtqynM8NRafaOJFrqE2yUNOyRd6kh//Pr2JS5mpMptWPjc2h/Q2l+rNvwHINKtNKD2 8H6j1IWSRBB/6xsNk32nunS3o/TFzTPuuCA5fTqI0ZSEclRCyeZP6FnLp/ZUHm9DfU1D wLCZkv9LVzAoEL1nXc7Eqr8uQC/A34mz8caUCqPWTURNP89NPzkEIPG6pG5ZgfMQgb67 FjXRYr0IHYeJWvqgMvb6ojoL/AlRTJqKPcv+3CynT9zkCJBFW3h0HJI4Usp1ZziZl9L3 SC3jlMVI6zx9qRbd/8t+Rhn+QzP9tHhmufxbcysPwPjMZfcxcEqygXZGzhci1zdADAvV qOgQ== 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=dD+oT1d73kI+T4UbkBU9325q4bnyCtuyUiCPOgRUgIc=; b=Ss3OzIdpyaDK1vln7JzHgK7CpV94mXn/TjGmrC8tAfbyYJoo9UegDQgvBhcPMNcbBU Vv3qeJW6Ru0qKaOkzRFadSrpNdb5OhtfoAk8K6GptXZUJb/nux5L4lhiBlMaeXgPKm/Z CC4AnkifGWBAO2IsJfOM9XLLubsfY0kQTqoX9YhPI+kbROCYT+lJ01Ikf1+D+lv88xBA /aTqr3KgTdAEuUSl8zqLZXI8qY3IG1HuRHXwwSODN+inQphsyvI21LROvC8r4mlk5wgX 0856y/h0A/3BS0uPBmDOWffcmis7+WJR7XEyK5XvyjSkIWxHcNpWnldTv+0SVBNV5ft+ rbMg== X-Gm-Message-State: ABuFfohuaBCEbW7dtivPQH+QxqafM0LgtvdZmeELYnKglBDPs1cyrgme 0A+3qp2AB2rUjY140fIAzOE= X-Google-Smtp-Source: ACcGV60OUvJaPh1iSglHSagTcksxWPabys91Z5cHHRHB7AT2psVy10EmFpFCYsfGJqZrs5XBgqp82A== X-Received: by 2002:a5d:540d:: with SMTP id g13-v6mr5927998wrv.4.1538431805381; Mon, 01 Oct 2018 15:10:05 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:04 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:30 +0200 Message-Id: <20181001220942.2382-4-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 03/15] hw/timer/sun4v-rtc: Use DeviceState::realize rather than SysBusDevice::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: Artyom Tarasenko , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?b?ZMOp?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Cédric Le Goater --- hw/timer/sun4v-rtc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/timer/sun4v-rtc.c b/hw/timer/sun4v-rtc.c index 13be94f8da..4e7f6a1eff 100644 --- a/hw/timer/sun4v-rtc.c +++ b/hw/timer/sun4v-rtc.c @@ -63,21 +63,21 @@ void sun4v_rtc_init(hwaddr addr) sysbus_mmio_map(s, 0, addr); } -static int sun4v_rtc_init1(SysBusDevice *dev) +static void sun4v_rtc_realize(DeviceState *dev, Error **errp) { + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); Sun4vRtc *s = SUN4V_RTC(dev); memory_region_init_io(&s->iomem, OBJECT(s), &sun4v_rtc_ops, s, "sun4v-rtc", 0x08ULL); - sysbus_init_mmio(dev, &s->iomem); - return 0; + sysbus_init_mmio(sbd, &s->iomem); } static void sun4v_rtc_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - k->init = sun4v_rtc_init1; + dc->realize = sun4v_rtc_realize; } static const TypeInfo sun4v_rtc_info = { From patchwork Mon Oct 1 22:09:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GzMSfVXW"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH8r0Ttmz9s3l for ; Tue, 2 Oct 2018 08:32:28 +1000 (AEST) Received: from localhost ([::1]:40979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76jp-0006fh-Kx for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:32:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XV-00041R-04 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OF-0007Ht-Na for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:08 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OF-0007Hd-Gx for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:07 -0400 Received: by mail-wm1-x343.google.com with SMTP id q8-v6so280854wmq.4 for ; Mon, 01 Oct 2018 15:10: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=8AHQ1gUm+bZGrBPi20N/vbi2namOl1g98QuH7hMaGu8=; b=GzMSfVXWogppDDgeia0TA/00Nnvwxi1QEtF3T2Ag5HoIVNn5pmzzT8QwslDlC849VC r1otn6c2KTJhOpUmZmBB4JgYwnvbQuOSZ0mz5hyHIUVMwtzKjWn0MBD0Ez9IKMAr6N23 JPH09e59ga4IX603ZKcYMT3GJbz4TyAou1KRE47EuD86TxP0EryN3QQ4UIuM58P4yOkO Lmjd9shgKzz6n2ODyYCrE8zM4BuzsJ2v6hgOguGDPYxVPhnl7rnQEoo20RoNpJ3tEiMr CHi5p3q/uzBSrJvp1qIj2Jk9fSdNFw0pfa7kEUvfPvC93r5DdyxwAht02yjG2FXeY9Zi yf2A== 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=8AHQ1gUm+bZGrBPi20N/vbi2namOl1g98QuH7hMaGu8=; b=nD88c21uXUcVI1M/FzVYG2P1d5aVBTe5kk7NVepOWVsx4vrC4Ds/iYMi7SWxXZk4te iQyLsOGuqP1Y8ZjSHgOlK/2Q5NoVJ1NBUVW14O4iWlhbQE9P5BnXX/R/ghLL4a2fo0R6 dq09kedP7Oz0yAwEoB/WUOu+VUMT1ciIE61IhN0DhdvCZjluNlRRUvRp5gCXr++1iUt1 ti1Sakn8JFujiWZbuC2Xz3i8oLgpZQT6A8htr9vq7u8NinvN7ywNHw/fIYGt0BrPsRem FUdm1/beJT6Sr5Yj7OtS7Be/1E9pTtzmW0pUjA7wUe8sDAlMNWMxj6LxC+ZtvRK8o7xl 5Oyg== X-Gm-Message-State: ABuFfojiagoo9ltVLIQH+Ccrv+Qc6mO39t6j9PH6rLMuR9zFJ9SFV4BG aJ/Qlwy2c9Wu2Qgg7lbq/L8bYmTC X-Google-Smtp-Source: ACcGV62z8laK2xvZIkIfAuJ6I+yI2p+mp1ebFamjD28lwM3z3r69r2czY5skEdFU0/40FZm6NiHR3g== X-Received: by 2002:a1c:6:: with SMTP id 6-v6mr2544wma.126.1538431806563; Mon, 01 Oct 2018 15:10:06 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:05 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:31 +0200 Message-Id: <20181001220942.2382-5-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 04/15] hw/ssi/xilinx_spi: Use DeviceState::realize rather than SysBusDevice::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: Peter Crosthwaite , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Cédric Le Goater Reviewed-by: Alistair Francis --- hw/ssi/xilinx_spi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 83585bc8b2..3dae303d5b 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -319,9 +319,9 @@ static const MemoryRegionOps spi_ops = { } }; -static int xilinx_spi_init(SysBusDevice *sbd) +static void xilinx_spi_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); XilinxSPI *s = XILINX_SPI(dev); int i; @@ -344,8 +344,6 @@ static int xilinx_spi_init(SysBusDevice *sbd) fifo8_create(&s->tx_fifo, FIFO_CAPACITY); fifo8_create(&s->rx_fifo, FIFO_CAPACITY); - - return 0; } static const VMStateDescription vmstate_xilinx_spi = { @@ -368,9 +366,8 @@ static Property xilinx_spi_properties[] = { static void xilinx_spi_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = xilinx_spi_init; + dc->realize = xilinx_spi_realize; dc->reset = xlx_spi_reset; dc->props = xilinx_spi_properties; dc->vmsd = &vmstate_xilinx_spi; From patchwork Mon Oct 1 22:09:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EFCrBmf3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH6Q73Qsz9s3l for ; Tue, 2 Oct 2018 08:30:22 +1000 (AEST) Received: from localhost ([::1]:40968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76ho-0005NY-K2 for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:30:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XU-00041Z-GD for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OH-0007Kg-8V for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:11 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:33292) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OH-0007I1-03 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:09 -0400 Received: by mail-wm1-x342.google.com with SMTP id y140-v6so3547842wmd.0 for ; Mon, 01 Oct 2018 15:10: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=TLfE/NctGfJNgscKmEDsGlNw0O7peG1r8g8M4McGz6I=; b=EFCrBmf3DmG5NV1YEtpqA4U0Uc48+NqTt8lehVpVW3oHUppAox5gbs1kIkpcA9mAm8 GJSQ/kpcmmAD1Wk+8CXbhCRyqwhwDetxgX2skX4as3LsQLb9hfDSkqxbaxhaGWrdrfAQ 0dZuaVbfUNT6nsP3CJ2gkMP/hhBeTrRunu18JRvTlMxGtBdxlcH1Py/DRulmGpJfiT7b 5xIyXDA2AU/M6tRizggPa/aqJkaJQKFzM7seNQbw+sJXRI35/apcuud9vfR7TTTNngOT QgGDaKiuwIEEDifNiCU9PRHBa4P8CoUHk31DwNarjvbIywW72aOtQJHFvkrRipSDh+jU AXSA== 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=TLfE/NctGfJNgscKmEDsGlNw0O7peG1r8g8M4McGz6I=; b=A0eQ5wuDlRoIrjXdKRRKG983dOWv+PoDwgQOizAldtupy5R0GwEstpHKD7y+ynQTxe tPLfY2MIQcUs5twQs32mprAaGn5LRhOWI8TheqXwKKcMXSkszYV8t+UTc+jwkRrT5n9b is6btdw3Z5CxMogToyxZiEOhVqAoy3LPuVTUj55vdrVZfIlAyDvryLRlWtHJrnMAti33 4vRdDady5FOrFBefjuKd6L9iWDBm1ZGug9p18sfQ2+XbLqcQYUvgUoDPG+3mHhj1WCTh FS2s5Qv2pyKiFegkthaG6cqI2KyUWUEuQfusd1SGoeIzF0qWZJc1LmgK+uoRk0Wg838k XMGg== X-Gm-Message-State: ABuFfognSnkUdJZNHQe5lYRIKu6d4m2qj1zBlLAKEemUiRfDFfYXtUSg QkLAcIiM1xD8UueSTfUBJDM+2hv6 X-Google-Smtp-Source: ACcGV60qysIg5LfSc3Q5VadQNqy0eil8+WCn1RC45NzLWxN0Mu5m2GuVsGLrm3lGMRkL3VygljGHhA== X-Received: by 2002:a1c:a9ce:: with SMTP id s197-v6mr7591wme.82.1538431807703; Mon, 01 Oct 2018 15:10:07 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:07 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:32 +0200 Message-Id: <20181001220942.2382-6-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 05/15] hw/sh4/sh_pci: Use DeviceState::realize rather than SysBusDevice::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: Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater --- hw/sh4/sh_pci.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c index 4ec2e35500..84c52df067 100644 --- a/hw/sh4/sh_pci.c +++ b/hw/sh4/sh_pci.c @@ -120,16 +120,15 @@ static void sh_pci_set_irq(void *opaque, int irq_num, int level) qemu_set_irq(pic[irq_num], level); } -static int sh_pci_device_init(SysBusDevice *dev) +static void sh_pci_device_realize(PCIDevice *dev, Error **errp) { - PCIHostState *phb; - SHPCIState *s; + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); + SHPCIState *s = SH_PCI_HOST_BRIDGE(dev); + PCIHostState *phb = PCI_HOST_BRIDGE(s); int i; - s = SH_PCI_HOST_BRIDGE(dev); - phb = PCI_HOST_BRIDGE(s); for (i = 0; i < 4; i++) { - sysbus_init_irq(dev, &s->irq[i]); + sysbus_init_irq(sbd, &s->irq[i]); } phb->bus = pci_register_root_bus(DEVICE(dev), "pci", sh_pci_set_irq, sh_pci_map_irq, @@ -143,13 +142,12 @@ static int sh_pci_device_init(SysBusDevice *dev) &s->memconfig_p4, 0, 0x224); memory_region_init_alias(&s->isa, OBJECT(s), "sh_pci.isa", get_system_io(), 0, 0x40000); - sysbus_init_mmio(dev, &s->memconfig_p4); - sysbus_init_mmio(dev, &s->memconfig_a7); + sysbus_init_mmio(sbd, &s->memconfig_p4); + sysbus_init_mmio(sbd, &s->memconfig_a7); s->iobr = 0xfe240000; memory_region_add_subregion(get_system_memory(), s->iobr, &s->isa); s->dev = pci_create_simple(phb->bus, PCI_DEVFN(0, 0), "sh_pci_host"); - return 0; } static void sh_pci_host_realize(PCIDevice *d, Error **errp) @@ -187,9 +185,9 @@ static const TypeInfo sh_pci_host_info = { static void sh_pci_device_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - sdc->init = sh_pci_device_init; + k->realize = sh_pci_device_realize; } static const TypeInfo sh_pci_device_info = { From patchwork Mon Oct 1 22:09:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LiHdxqzg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGv21L5bz9s3x for ; Tue, 2 Oct 2018 08:20:28 +1000 (AEST) Received: from localhost ([::1]:40911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76YC-00044j-Kj for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:20:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XN-00041R-Eo for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76Oc-0007Re-K6 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:31 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:36899) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76Oc-0007Ka-93 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: by mail-wm1-x341.google.com with SMTP id 185-v6so290838wmt.2 for ; Mon, 01 Oct 2018 15:10:09 -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=98oYneg53qPOLyu70wT0GXMiXaFUAGxT4nWfd3vHJlY=; b=LiHdxqzgpFYO9FKV9qUgxH6RdZPQyXjiE62gqpIjtxsPKR+KUQTAOtOxCDoz3A99kp EW2QRpfdNGRGristTbYLImOSCakTsY0TlxiPcEwCHm7edSkqALn5XhaV+rIyjPmvlNxw dROppQmjysE5M/EzAi6GSYqyq71+hPF41ZM8SnOAfQnAJdLsaG55+KgvC4I/vHA3HNDw 2ecjgQFWa7J8zQzBmhZ+OUV1TxvezUnu4AAzjss05HYAPa/i+wGojgGzeOJuFY2jhGW8 1TWT7vqRQD7XNOvChADo/pbJAQ/cBMrqqy8P0sAtwXazJ+KiKP59uyVIqnCV08gphr6R +N+g== 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=98oYneg53qPOLyu70wT0GXMiXaFUAGxT4nWfd3vHJlY=; b=L52dBGt1fYSZhqCtPfno94UvRXcbwjWxU3zbLwF6vADiG/oumbxA+KXydOGrVNO2sJ ZgNDRSWyecKE87Nn0Fr91SeG5U5lUaTLLK9b5prpTF4LEx0Q/5BoI2tYrfuFxUVafO5j ME5MlZnzRgwENr99IJN1AFwD0U/N3qpPerTKAU33+lmRMCoyNrX0RTCJiGumTelbRG6F Uy5ABJnweQFUNPrM1M5+7eofVvp/jj8IymnhuduzOg8byhu2kklU59q9h3WDxlLGnPEO T1k1yxb6qaW7pXFLKQzEIlxzXt2fnfr0ToYjJR1BGRvo1BqCbuMynOUqog0YlNJsft8D CoSQ== X-Gm-Message-State: ABuFfoi5/LRRfZ1OeZzWUbTTzb1jZABo6Nnlzj4XEO3AUmpLdyeZ0VZE kt0LA5mtgvkFVVBkw40aNDRwGucF X-Google-Smtp-Source: ACcGV621VgqKP7CTd1qWsW6GPPs9cUoR3tRNgVatmoSYuLuVp/olisbmHYM7ykCqkQRgcnGPF/Dsyg== X-Received: by 2002:a1c:a794:: with SMTP id q142-v6mr6815864wme.77.1538431808800; Mon, 01 Oct 2018 15:10:08 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:33 +0200 Message-Id: <20181001220942.2382-7-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 06/15] hw/pci-host/bonito: Use DeviceState::realize rather than SysBusDevice::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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Move from the legacy SysBusDevice::init method to using DeviceState::realize. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/bonito.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c index 9868e2eccc..03d1ec33e3 100644 --- a/hw/pci-host/bonito.c +++ b/hw/pci-host/bonito.c @@ -595,7 +595,7 @@ static const VMStateDescription vmstate_bonito = { } }; -static int bonito_pcihost_initfn(SysBusDevice *dev) +static void bonito_pcihost_realize(PCIDevice *dev, Error **errp) { PCIHostState *phb = PCI_HOST_BRIDGE(dev); @@ -603,8 +603,6 @@ static int bonito_pcihost_initfn(SysBusDevice *dev) pci_bonito_set_irq, pci_bonito_map_irq, dev, get_system_memory(), get_system_io(), 0x28, 32, TYPE_PCI_BUS); - - return 0; } static void bonito_realize(PCIDevice *dev, Error **errp) @@ -684,7 +682,6 @@ PCIBus *bonito_init(qemu_irq *pic) pcihost->pic = pic; qdev_init_nofail(dev); - /* set the pcihost pointer before bonito_initfn is called */ d = pci_create(phb->bus, PCI_DEVFN(0, 0), TYPE_PCI_BONITO); s = PCI_BONITO(d); s->pcihost = pcihost; @@ -726,9 +723,9 @@ static const TypeInfo bonito_info = { static void bonito_pcihost_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->init = bonito_pcihost_initfn; + k->realize = bonito_pcihost_realize; } static const TypeInfo bonito_pcihost_info = { From patchwork Mon Oct 1 22:09:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977508 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FQ4P4FS3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH4G3l67z9s3l for ; Tue, 2 Oct 2018 08:28:30 +1000 (AEST) Received: from localhost ([::1]:40958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76fz-0004Bm-R0 for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:28:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XU-00041R-93 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OP-0007Nv-87 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:22 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76ON-0007Lu-9k for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:16 -0400 Received: by mail-wm1-x344.google.com with SMTP id s12-v6so302381wmc.0 for ; Mon, 01 Oct 2018 15:10:11 -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=H/cquYdlhsglwiE+uwh6nI3f2i7WvrFejkdhmd0I3l8=; b=FQ4P4FS3niSemXYMA4fJVpjQM/kL8huqWLlm82eHGMqrhQA3eNvpwt3c9B5uYdXQMI 9NmGxAsnEVBB4mkB4llYYGKu3yVvPwwLhyNRpo/HDvjRK5Z8edhGY34jf6wUiHiNZjXV BMsq/WJY1nPSdczcVz2Ecwik477oaiE6/OaiKGj3tzb6x2CaD2NMow6SPPlnFC5R2Xwf 9yghxOYAFOKjn22SH5e1LTnXswxE9U9uaIQzMzszKHW+6kpA4zW1L9y9LgwAfkrMhiRg Z5JQyegIkdwpT4m1SewlvxzQQQFWKQ1HDDz43+MH5XOKttaP6dBJTWTaNXayIMWmquGP DxFA== 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=H/cquYdlhsglwiE+uwh6nI3f2i7WvrFejkdhmd0I3l8=; b=lmpHC6zL0ujwfaAERpXCccpDIippOWSgd4WjRDczvlnUMbj8xuDH1tQLSuc74q8uHA VTB0M6HUoD9w8adhIjoCHvo9t7F/JRLd4EAEiWvbpN9mS0HHEpSu2VZxMZzPAwI/4Scm JIa9qcpuWz1fjz4XmFhfYrew8k06cCzuynCOa0KXw2vAvpsyyKwQ7uA/9o6hoW1UA2BX NrumNU2pPay5HrQJpqizjFfsNLnF2jwiKzcYq187eb6IkdFlAUJoIWLb72slQNKbbj/o txT/2ReSnQFBQXRj3FlLIFhm45gXByYAZ79rwn45zkdBVEpq3JR3pNq3TQZ7BYabmwFL +zyA== X-Gm-Message-State: ABuFfojMbW5yIfryj7RK53Wg570F5jt8+orrkd7x7qXYbmlLtumswAd+ fe9NX1ZToLatC+eUNWWGnFFv9lqc X-Google-Smtp-Source: ACcGV63byBOszF2674C9X9wIFXjaaMo9JDzi/pBWNAFIDHdqKn8fD5yoGwVKgcFTU2XE0oMc5A+BcA== X-Received: by 2002:a1c:6782:: with SMTP id b124-v6mr12671wmc.30.1538431810133; Mon, 01 Oct 2018 15:10:10 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:09 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:34 +0200 Message-Id: <20181001220942.2382-8-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 07/15] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method 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: Aleksandar Markovic , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Convert the gt64120_reset() function into a proper Device reset method. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Cédric Le Goater --- hw/mips/gt64xxx_pci.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index 24ad0ad024..dcd1a66329 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -992,9 +992,9 @@ static void gt64120_pci_set_irq(void *opaque, int irq_num, int level) } -static void gt64120_reset(void *opaque) +static void gt64120_reset(DeviceState *dev) { - GT64120State *s = opaque; + GT64120State *s = GT64120_PCI_HOST_BRIDGE(dev); /* FIXME: Malta specific hw assumptions ahead */ @@ -1184,16 +1184,6 @@ PCIBus *gt64120_register(qemu_irq *pic) return phb->bus; } -static int gt64120_init(SysBusDevice *dev) -{ - GT64120State *s; - - s = GT64120_PCI_HOST_BRIDGE(dev); - - qemu_register_reset(gt64120_reset, s); - return 0; -} - static void gt64120_pci_realize(PCIDevice *d, Error **errp) { /* FIXME: Malta specific hw assumptions ahead */ @@ -1241,9 +1231,8 @@ static const TypeInfo gt64120_pci_info = { static void gt64120_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - sdc->init = gt64120_init; + dc->reset = gt64120_reset; dc->vmsd = &vmstate_gt64120; } From patchwork Mon Oct 1 22:09:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uFAEwryg"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH1l3BHWz9s8T for ; Tue, 2 Oct 2018 08:26:18 +1000 (AEST) Received: from localhost ([::1]:40946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76dq-0001Qc-LT for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:26:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XS-00041R-Q7 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OZ-0007QM-Br for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:55571) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OW-0007Mh-8t for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:24 -0400 Received: by mail-wm1-x341.google.com with SMTP id 206-v6so276579wmb.5 for ; Mon, 01 Oct 2018 15:10: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=9EHioq8nhRwzR4MQ4ek7NRkwvcaUb40g8n7gy+Agai4=; b=uFAEwrygcWGO/EwxH9cSrS/7qGg6/BwSHC84vvQsmjIP6mz/PPTaPlE0ldDAmrDiGF mHNCTZmes3v5wdjcroVV4ceT5pE5kod7MaB/xU9W1wxaTN2JcprrifIT7eQ/whdrJcq8 9M4/MTMXzkmQ778PNb6ziGXaz3/7RuBa0umcKlgV7qPdov5Gr8iVwiH038wAWAUAez1d 0tYOB796Gdh2VclPyugDJSHBK47DzdRZZbzlZ3qCnk9D56mK1C7fAwhPyptVuvV2zTJ9 pdtC+mGMN6ruewgRLvzEwI/JuGdkuQRwWllFhk/qgE573DBaKVDju73X8e+Px4MDhE2Q tM6Q== 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=9EHioq8nhRwzR4MQ4ek7NRkwvcaUb40g8n7gy+Agai4=; b=GF2j4/l+ekovBFJRjJZbD+iunp2UVzT5r4jXAsCuNn6ehvhO0zx4J47JrXILPjogwI 0gdRRaIIZzWxGXXF2jwkHweoyUCfSvG37Gt+mEkcDSUs1RPUkVmRnbSmBNI25rfR/L3P 5Db/RqOf7D3/UNEASksiZLMZ7fySaFsFFTyJAeqcaOE4Nyrw1lOD1POL0O5YPecughMF m0TNO2ID23hOTy+ux1ZUMwy5pNvNV47P0BGLQqnBYO/cki5gqfC0gYOUTzh52uBuGVxP Jsh2hfFlqGVzV+PEtdmYg2PFd7sQf+phSuJK9pMuF5ZlnY+O314sqaoLhsUtabwEk+jy pV2A== X-Gm-Message-State: ABuFfogBR8t23QfFHqY9Y6rJMUXh+tK+AcAh5fFIM7S0zFoKtu1ViIij oeCcXbXaLo5yedfZv86/C+0= X-Google-Smtp-Source: ACcGV63ta3P26G7iBW/I6jDByS05aAEgOeB86K3S/K+q/Sl73puvCxxkggfFIrlWtiVNrT9uB/hgUA== X-Received: by 2002:a1c:2905:: with SMTP id p5-v6mr103wmp.1.1538431811258; Mon, 01 Oct 2018 15:10:11 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:10 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:35 +0200 Message-Id: <20181001220942.2382-9-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH 08/15] hw/mips/gt64xxx_pci: Mark as bridge device 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: Aleksandar Markovic , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The gt64120 is currently listed as uncategorized device. Mark it as bridge device. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Cédric Le Goater --- hw/mips/gt64xxx_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c index dcd1a66329..1cd8aac658 100644 --- a/hw/mips/gt64xxx_pci.c +++ b/hw/mips/gt64xxx_pci.c @@ -1232,6 +1232,7 @@ static void gt64120_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); + set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->reset = gt64120_reset; dc->vmsd = &vmstate_gt64120; } From patchwork Mon Oct 1 22:09:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dmSxyLSh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGyc27c5z9s7T for ; Tue, 2 Oct 2018 08:23:36 +1000 (AEST) Received: from localhost ([::1]:40930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76bF-0006iX-Rh for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:23:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XT-00041Z-MO for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OU-0007P2-OC for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:23 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43488) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OP-0007N1-6P for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:19 -0400 Received: by mail-wr1-x443.google.com with SMTP id n1-v6so5502586wrt.10 for ; Mon, 01 Oct 2018 15:10: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=Q7me9ajxCyC00cbHWSqFbliFeut7xk6aNiYBjOoR1LA=; b=dmSxyLShLeT1tunzS7ZJadtkAry97XQ14mUbPy3nY6B12yimuirk97Wr0e2WvmZNAv Ta/BogcF0cvzfAI40D+bzseBGy4j9ZAvgJLrHjOk9eJ0pOcFjmO8ifaPCAfnnj2WVFf5 l/o54thhc/izY64HsRyqDcat1WLjAY7xG40EKLkVJQXjgLRNV9aTGo6Uv7IGIAf7CQXB NnaNw7/ePoF5RmrgIJctlqMJxAxaJ+k3zrUmMCL2PfAvdniAWCplVl6ee+BQlXa9gn0m RXF+FlZzW4Oevbdi7spmDyLNX+MaZ5TdTIRjM4+wbHZlm8NXmIUpuCwsU1pk08YA4D8V Nsaw== 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=Q7me9ajxCyC00cbHWSqFbliFeut7xk6aNiYBjOoR1LA=; b=F57ZeTrOSYaJm5OqW/E8TnBoOV81k4ijhlyvNMm15uQx/l8PO2py65ytVEL4bAx86J nBLh/hfh7CwlVqTUuT43fhOOuV8p+XW3hfabILxrEvxhIGuYxiBfx570XWj0j3l7AhiM I3iTR+mYrUtekGRCkjbW+eo0kVbUKJc94CjzDNlQlAFeEKYqaYbQ5Cvvm7rroIFqlagC khzCxLp1NSfALnCrX9JP4EGB0j1loxHeae0oIdF90NN8mphf1aydLnyein2ojWoA6En7 XyWRQrP9ehjmlYqi2N5B5reEto8YEd0jMDwzCSo/MX174v25T+deMVIfoHUABkFkvsFs eyzQ== X-Gm-Message-State: ABuFfoilqbGycdyavXH7iGN0G++c9pAgpD0cN6dDPi370vU+DBBs9ZRw kqiMaJteB+UTR6Kg4BX608A= X-Google-Smtp-Source: ACcGV625/O/XItl2ZmHd4IhpefqjkYZ0nfcFWNuyXEShc/93scJlaZz/cAhYXknHH7dQ8bjoPRBt4Q== X-Received: by 2002:adf:8288:: with SMTP id 8-v6mr8835962wrc.252.1538431812430; Mon, 01 Oct 2018 15:10:12 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:11 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:36 +0200 Message-Id: <20181001220942.2382-10-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH 09/15] hw/mips/malta: Replace 'empty_slot' by 'unimplemented_device' 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: Aleksandar Markovic , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The TYPE_EMPTY_SLOT and TYPE_UNIMPLEMENTED_DEVICE are identical devices, however the later use more recent APIs and is more widely used. Replace 'empty_slot' by 'unimplemented_device' to simplify devices code maintenance. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/mips-softmmu-common.mak | 1 - hw/mips/mips_malta.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index fae2347ee7..f9d664e120 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -32,7 +32,6 @@ CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y -CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_I2C=y diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 40041d5ec0..4ccfa87c35 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -53,7 +53,7 @@ #include "sysemu/qtest.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/empty_slot.h" +#include "hw/misc/unimp.h" #include "sysemu/kvm.h" #include "exec/semihost.h" #include "hw/mips/cps.h" @@ -1216,7 +1216,7 @@ void mips_malta_init(MachineState *machine) /* The whole address space decoded by the GT-64120A doesn't generate exception when accessing invalid memory. Create an empty slot to emulate this feature. */ - empty_slot_init(0, 0x20000000); + create_unimplemented_device("gt64120-SysAD", 0, 0x20000000); qdev_init_nofail(dev); From patchwork Mon Oct 1 22:09:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fYoTMGC1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH4G5ZD8z9s7T for ; Tue, 2 Oct 2018 08:28:30 +1000 (AEST) Received: from localhost ([::1]:40960 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76fz-0004CR-SA for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:28:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XT-00041R-H8 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76Oa-0007QZ-CP for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OW-0007NG-Hy for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:26 -0400 Received: by mail-wr1-x42e.google.com with SMTP id n1-v6so5502626wrt.10 for ; Mon, 01 Oct 2018 15:10:14 -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=TjNlFgpPZiZ2e7xdUgFDsJs0C2caudkIVArfSiZkJlU=; b=fYoTMGC1p9NZQ8UU7aB/uXA5l70CuzOmrqDv/amI3d5KNDglQFfdQcz26550wxJOhv evlqQ/+TuvDCK/IYBJ9kWLK03o8h1n2grl6Dg5i4nCVwSXbYm4y10Pn1x9ye0l8etIrr ny52p5cfAXzHCodyG4O/sBbC2fHiZ5VSy1J54Q33likTh2S57PvuP6ieYLeC2yV0pIXT rIlCxiEJYvMz3oLQMZ0rVA92Se82zPR3xo4nVsZ7NfSQ08vnh25rRSyBh7ZTdKrZOQ1x HIJm4E6mALCw71LoyRJp0PcSCQFp81c4PBXxASDeIGp224VB21FFOluuzdTLqL46ehOy sHww== 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=TjNlFgpPZiZ2e7xdUgFDsJs0C2caudkIVArfSiZkJlU=; b=mp7xBbZLSb2oaQu1n1CJLbYTcs31n7rqiScZ6+A6u0YsfH7qYhth7UhnpIcMYif9eI 1gnODogWWUmZq4zFl9boCf5mdlEN3wrW4Ae/rzH22GCstetQ13lced973F4roOjY5ASS fVnsJ5IVtdb4OVybEGec/rHmNB5oRDpZT5piZcqSfrbYEKd5SanaJoT2iGHra7k1/X7V gsjyHmzJtp0K09tqExDGhk8qEzQSmJxuCm55xDrUgAnTz7yp8Cm8vI/LckMI4Rk7Uwt6 ByJd9lY6vzkcxKoVAHxUxyqkpO8LZAWk1lr3mOtnAG8aZwLKOmkjI19lSyrk33A9inD4 ia7Q== X-Gm-Message-State: ABuFfoj8fSto0inR2ZYBJima9LWQsWiUyWifrny5+T63Xx3YeKMood6p oiP7wBF934sLSq0dJ6npcTE= X-Google-Smtp-Source: ACcGV62RhyGDKRB4YyYfSbQLToruTXyWatvB3lOatwWCr8VcWydgE6tkquc8vy25OOJ/DTf/6bwBAQ== X-Received: by 2002:a5d:46d2:: with SMTP id g18-v6mr3180802wrs.185.1538431813658; Mon, 01 Oct 2018 15:10:13 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:37 +0200 Message-Id: <20181001220942.2382-11-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH 10/15] hw/sparc64/niagara: Replace 'empty_slot' by 'unimplemented_device' 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: Artyom Tarasenko , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The TYPE_EMPTY_SLOT and TYPE_UNIMPLEMENTED_DEVICE are identical devices, however the later use more recent APIs and is more widely used. Replace 'empty_slot' by 'unimplemented_device' to simplify devices code maintenance. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/sparc64-softmmu.mak | 1 - hw/sparc64/niagara.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak index 52edafe547..ce63d47046 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -16,5 +16,4 @@ CONFIG_SIMBA=y CONFIG_SUNHME=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y -CONFIG_EMPTY_SLOT=y CONFIG_SUN4V_RTC=y diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c index 4fa8cb2904..f8a856f611 100644 --- a/hw/sparc64/niagara.c +++ b/hw/sparc64/niagara.c @@ -29,7 +29,7 @@ #include "hw/hw.h" #include "hw/boards.h" #include "hw/char/serial.h" -#include "hw/empty_slot.h" +#include "hw/misc/unimp.h" #include "hw/loader.h" #include "hw/sparc/sparc64.h" #include "hw/timer/sun4v-rtc.h" @@ -161,7 +161,7 @@ static void niagara_init(MachineState *machine) serial_mm_init(sysmem, NIAGARA_UART_BASE, 0, NULL, 115200, serial_hd(0), DEVICE_BIG_ENDIAN); } - empty_slot_init(NIAGARA_IOBBASE, NIAGARA_IOBSIZE); + create_unimplemented_device("sun4v-iob", NIAGARA_IOBBASE, NIAGARA_IOBSIZE); sun4v_rtc_init(NIAGARA_RTC_BASE); } From patchwork Mon Oct 1 22:09:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977501 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aua27wVU"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGyc4PLKz9s8T for ; Tue, 2 Oct 2018 08:23:36 +1000 (AEST) Received: from localhost ([::1]:40929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76bF-0006hQ-V7 for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:23:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XS-00041Z-23 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76Oc-0007RC-Am for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:31 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76Oa-0007Nb-I5 for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:29 -0400 Received: by mail-wr1-x441.google.com with SMTP id u12-v6so15633251wrr.4 for ; Mon, 01 Oct 2018 15:10:16 -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=RsAOrTX/E33kPVDfEgsIsccgiosWT/pbvFuZcYuKJ44=; b=aua27wVUaC68rlD0lvpYHl+rM9cESjySXmBP6HYpubD9CjX13hi4YFfyIw02GdTF41 6b3T2ikJjEGJo8L4mG6PGu8YeP7UK3QLYO8nFhf0jPhLnPcAekp10Ey5C3h8OiXVJ0EX qCoV8Fj4kHsakTQJCBNZCIfshkUQODkencq+ag7G4ts1epuxQjebVjkIsrmrWqpL4vdR YBOACBmVDGvz0xBmd8c5lylwpZLoyjRIXHIEfs4MnUpbrmMcXh+SSJ3eAsA8vqnTpW0/ B/EuFDpJSvBjtKpHk+m4Ivs3VAlsr8sFDrTCU49J4/gAqtTcETOvYqSLaCU0ls7/eX7z bSzA== 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=RsAOrTX/E33kPVDfEgsIsccgiosWT/pbvFuZcYuKJ44=; b=cb4RtRpshw5U8Mo+rG5AURJXs1TMJwFkXmybGVvBYT829Ko7ikTgJ1cHHej8w6kDxd 4xfXEhYCq9tzWLwoC8F8lK281neoCeYx7mVkoeIIA16uABKZ5/16OeaMjogcN7dpcPbS xhXDFH+eGCiPo8cwv5h1sHECy68/FpxXiozBipAgFrThquS/GNUV4JKbVuesznwCByfF BAmP52JZkKnfIvLvw7MOrnRj1nPb02IKsJ1loRydY8R2Dcr1vWwkNlnnBGJ1r4tfbITq lxifau5Ax6iBAUdHvTD9jLj5nRpRhomr0iEfZKRkVCQARg4h6kf2fF6v7mteZ3Yp6Lcn AsdQ== X-Gm-Message-State: ABuFfohtJ5UB0gu9jGjXst47aESRWg3CVH15WNXJX+JadMmoEioBueXe JUQvFL+PxfX/LDfpWwxRzjA= X-Google-Smtp-Source: ACcGV60fU6qxt7zNjoA8OYYa2TJHxTRBiO+duqZIjT5qt/D3eNEGFxbKEXtvWQonqiQ8sBOAF7w59g== X-Received: by 2002:adf:92e6:: with SMTP id 93-v6mr9005742wrn.124.1538431815152; Mon, 01 Oct 2018 15:10:15 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:38 +0200 Message-Id: <20181001220942.2382-12-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 11/15] hw/sparc/sun4m: Replace 'empty_slot' by 'unimplemented_device' 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: Artyom Tarasenko , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The TYPE_EMPTY_SLOT and TYPE_UNIMPLEMENTED_DEVICE are identical devices, however the later use more recent APIs and is more widely used. Replace 'empty_slot' by 'unimplemented_device' to simplify devices code maintenance. Signed-off-by: Philippe Mathieu-Daudé --- default-configs/sparc-softmmu.mak | 1 - hw/sparc/sun4m.c | 24 ++++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 12f97eeb20..7369b54467 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -8,7 +8,6 @@ CONFIG_ESCC=y CONFIG_M48T59=y CONFIG_PTIMER=y CONFIG_FDC=y -CONFIG_EMPTY_SLOT=y CONFIG_PCNET_COMMON=y CONFIG_LANCE=y CONFIG_TCX=y diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 3c29b68e67..ca37acf7af 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -42,7 +42,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" -#include "hw/empty_slot.h" +#include "hw/misc/unimp.h" #include "hw/loader.h" #include "elf.h" #include "trace.h" @@ -863,7 +863,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_init(0, machine->ram_size, hwdef->max_mem); /* models without ECC don't trap when missing ram is accessed */ if (!hwdef->ecc_base) { - empty_slot_init(machine->ram_size, hwdef->max_mem - machine->ram_size); + create_unimplemented_device("ecc", machine->ram_size, + hwdef->max_mem - machine->ram_size); } prom_init(hwdef->slavio_base, bios_name); @@ -892,9 +893,10 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, if (hwdef->iommu_pad_base) { /* On the real hardware (SS-5, LX) the MMU is not padded, but aliased. Software shouldn't use aliased addresses, neither should it crash - when does. Using empty_slot instead of aliasing can help with - debugging such accesses */ - empty_slot_init(hwdef->iommu_pad_base,hwdef->iommu_pad_len); + when does. Using the 'unimplemented device' instead of aliasing can + help with debugging such accesses */ + create_unimplemented_device("iommu.alias", hwdef->iommu_pad_base, + hwdef->iommu_pad_len); } sparc32_dma_init(hwdef->dma_base, @@ -944,12 +946,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, for (i = num_vsimms; i < MAX_VSIMMS; i++) { /* vsimm registers probed by OBP */ if (hwdef->vsimm[i].reg_base) { - empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000); + create_unimplemented_device("vsimm", hwdef->vsimm[i].reg_base, + 0x2000); } } if (hwdef->sx_base) { - empty_slot_init(hwdef->sx_base, 0x2000); + create_unimplemented_device("sx", hwdef->sx_base, 0x2000); } nvram = m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 1968, 8); @@ -1012,14 +1015,15 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, if (hwdef->dbri_base) { /* ISDN chip with attached CS4215 audio codec */ /* prom space */ - empty_slot_init(hwdef->dbri_base+0x1000, 0x30); + create_unimplemented_device("dbri.prom", hwdef->dbri_base + 0x1000, + 0x30); /* reg space */ - empty_slot_init(hwdef->dbri_base+0x10000, 0x100); + create_unimplemented_device("dbri", hwdef->dbri_base + 0x10000, 0x100); } if (hwdef->bpp_base) { /* parallel port */ - empty_slot_init(hwdef->bpp_base, 0x20); + create_unimplemented_device("bpp", hwdef->bpp_base, 0x20); } kernel_size = sun4m_load_kernel(machine->kernel_filename, From patchwork Mon Oct 1 22:09:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ue14AnFC"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGyZ0qcWz9s7T for ; Tue, 2 Oct 2018 08:23:34 +1000 (AEST) Received: from localhost ([::1]:40928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76bD-0006gM-Nc for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:23:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XR-000442-Bb for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76Oc-0007RY-Ij for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:31 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76Oc-0007Np-7C for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: by mail-wr1-x444.google.com with SMTP id n1-v6so5502724wrt.10 for ; Mon, 01 Oct 2018 15:10:17 -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=Ab1RF85KO97chDtaADEve8jBUgos4p8KjNxdBKBchjs=; b=Ue14AnFC6/fIrPvYS1Q3DOPl74dgzjD+D4w4lZs0rMPy4OrRc739pCmqT1E2YiJAIh qIlXyMvPrGJju+Pu6vHCnsHQltph/CFhMJLB1T7vRqSKGF2zqoa4tUlXd49KFxmZR2YE 3oi/hj3/7XfrQeXdniDLPeujUP2vr86qEg0zAvOHUdbJM5rEtPcxv6R+W4vhlyWIiUOe k5vhIyN6jdt2Kf1su4XRM6gsLxpedCEYFBhUrxUo6GsaN4CkjEE4Qs2NwXFLedaFBvmB 5jske3kRsOVP9P5GHmxzawv/E1JBVNb0gp9nIaCe43CIodHUB1G6rZJmq3UgCS5nQu22 ZTHg== 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=Ab1RF85KO97chDtaADEve8jBUgos4p8KjNxdBKBchjs=; b=gLOmEnTuU3qi7T3YGPNQhHZjEZUJGw+dXcAvK1qY6iN6JR82SZcLRoFnvj+YLpXOG2 cP65YvVnWigcZ14jhmnfW5DaCcVTaNxyciAS6M0S2lmddOSVxHPQyRSk/ix4sbpWNPKE w/JgXLKDkUhX8Mz0xSSMzfCvDNS93ymIrMOgTsYL9d8bcMnj2WB4lUMQvdYv0lCjbloT hb5UDnam/PuyBPUq8j6eGI7BMQGvfto0hBBSDvFRCoKcf8Y3HRrHY8JJxR5LnZGaAV9P GdrGRoH/6ycVfBvwRCXlONmpe+9J3KvHCKSArhBPx1eR1xYEuIMuTYfTbEA0m50KrdLR Xytw== X-Gm-Message-State: ABuFfohs1vwhJod6SMeS+ir031kUIQdYrB4Nm9MNspwVIGKchVbsLFnq ZB4u/2TaZDTChDYhx7j3qbHmW9qS X-Google-Smtp-Source: ACcGV60pYR1xZTR/p06vB+z5EOF49FJNpDZsO9E2kxb0dfYc6QIcFac73B0A0g4XGnKOikT4DtavDg== X-Received: by 2002:adf:b71d:: with SMTP id l29-v6mr9021255wre.115.1538431816298; Mon, 01 Oct 2018 15:10:16 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:39 +0200 Message-Id: <20181001220942.2382-13-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH 12/15] hw/core: Remove the 'empty_slot' device 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" All previous users of TYPE_EMPTY_SLOT now use TYPE_UNIMPLEMENTED_DEVICE. Since TYPE_EMPTY_SLOT is no more used/referenced, remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/empty_slot.h | 7 --- hw/core/empty_slot.c | 103 ---------------------------------------- hw/core/Makefile.objs | 1 - 3 files changed, 111 deletions(-) delete mode 100644 include/hw/empty_slot.h delete mode 100644 hw/core/empty_slot.c diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h deleted file mode 100644 index 123a9f8989..0000000000 --- a/include/hw/empty_slot.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef HW_EMPTY_SLOT_H -#define HW_EMPTY_SLOT_H - -/* empty_slot.c */ -void empty_slot_init(hwaddr addr, uint64_t slot_size); - -#endif diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c deleted file mode 100644 index c1b9c2b104..0000000000 --- a/hw/core/empty_slot.c +++ /dev/null @@ -1,103 +0,0 @@ -/* - * QEMU Empty Slot - * - * The empty_slot device emulates known to a bus but not connected devices. - * - * Copyright (c) 2010 Artyom Tarasenko - * - * This code is licensed under the GNU GPL v2 or (at your option) any later - * version. - */ - -#include "qemu/osdep.h" -#include "hw/hw.h" -#include "hw/sysbus.h" -#include "hw/empty_slot.h" - -//#define DEBUG_EMPTY_SLOT - -#ifdef DEBUG_EMPTY_SLOT -#define DPRINTF(fmt, ...) \ - do { printf("empty_slot: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif - -#define TYPE_EMPTY_SLOT "empty_slot" -#define EMPTY_SLOT(obj) OBJECT_CHECK(EmptySlot, (obj), TYPE_EMPTY_SLOT) - -typedef struct EmptySlot { - SysBusDevice parent_obj; - - MemoryRegion iomem; - uint64_t size; -} EmptySlot; - -static uint64_t empty_slot_read(void *opaque, hwaddr addr, - unsigned size) -{ - DPRINTF("read from " TARGET_FMT_plx "\n", addr); - return 0; -} - -static void empty_slot_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ - DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr); -} - -static const MemoryRegionOps empty_slot_ops = { - .read = empty_slot_read, - .write = empty_slot_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - -void empty_slot_init(hwaddr addr, uint64_t slot_size) -{ - if (slot_size > 0) { - /* Only empty slots larger than 0 byte need handling. */ - DeviceState *dev; - SysBusDevice *s; - EmptySlot *e; - - dev = qdev_create(NULL, TYPE_EMPTY_SLOT); - s = SYS_BUS_DEVICE(dev); - e = EMPTY_SLOT(dev); - e->size = slot_size; - - qdev_init_nofail(dev); - - sysbus_mmio_map(s, 0, addr); - } -} - -static int empty_slot_init1(SysBusDevice *dev) -{ - EmptySlot *s = EMPTY_SLOT(dev); - - memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, - "empty-slot", s->size); - sysbus_init_mmio(dev, &s->iomem); - return 0; -} - -static void empty_slot_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - - k->init = empty_slot_init1; -} - -static const TypeInfo empty_slot_info = { - .name = TYPE_EMPTY_SLOT, - .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(EmptySlot), - .class_init = empty_slot_class_init, -}; - -static void empty_slot_register_types(void) -{ - type_register_static(&empty_slot_info); -} - -type_init(empty_slot_register_types) diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index eb88ca979e..fd75172a21 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -8,7 +8,6 @@ common-obj-y += irq.o common-obj-y += hotplug.o common-obj-$(CONFIG_SOFTMMU) += nmi.o -common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o common-obj-$(CONFIG_XILINX_AXI) += stream.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_SOFTMMU) += sysbus.o From patchwork Mon Oct 1 22:09:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gx8+vbe8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PH1l6bFRz9sBJ for ; Tue, 2 Oct 2018 08:26:19 +1000 (AEST) Received: from localhost ([::1]:40949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76dt-0001TW-7u for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:26:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XT-00041Z-0b for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76OY-0007Q3-Cu for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76OV-0007O6-He for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:24 -0400 Received: by mail-wm1-x344.google.com with SMTP id q8-v6so281162wmq.4 for ; Mon, 01 Oct 2018 15:10: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=xpIe65eEudwVMzaauhD5KN7ihn5Iz3+m5TXoAceOUEI=; b=gx8+vbe83RBJ+8zNAZwwnOj9M7p3VQbfsWN1o6GQBejAu7+whk7sH0QxU63d9PVeoP X992mhFmyeC2yCUEfvAPGO2F+duIUnyLdg3KWQDpL0S+OJRJRYBQml8OyiTKa+hfhjqk FxgiEE8iVJParUUDhfh2uFSBQbcW4Q30vdOvIZdD8riMo7OQCXu3KUgh+mCEeGUGIO9+ RBzG33d4KpcfZ5UPJjRkIPE1CYT3MGuApIqvUo/GSPOFk4LBUtR3G61RFsj26ZbjRTJR ckYc99CcqM8zZLf4fvUp/QQywFVsAw0cH4dwr4bNe95FfIwjuaMX70Wg53tUSLjmNwXp C1GA== 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=xpIe65eEudwVMzaauhD5KN7ihn5Iz3+m5TXoAceOUEI=; b=sIJw1rt5Fy5Sda9yCS4tvOu+v8MfxnKtO/WSNRBU8yLV0ETHYFl9vejYFQr6Tebky5 nqscvgdf/PWTckmKv0DP5XPDCIYNK2b2WIA+BnnaHQhk39X7B5bX3jkSAVXfReyKU6f4 OwRD5dTJZbVAgz9x/KBUcC/n+EDXvc0ad7jaOT2bRD3Pl5t9Dcjmd+JonaPPTT8s/GbI gMZf+xsJypMOFhcEq9pGmPLjNMjwZNf/iM/49JLTQHEJIh94vba3ZxMW1R/cIu72x5ho c5Zlb5n1B4p+D+mC57hv7zLl6y+bP0mGA6P/3Ux4ASoswIifIyNHx+HkLEhBnuehGvbN 7lSQ== X-Gm-Message-State: ABuFfojeeMfNBlcy9sHFw3cfClQhRkk2scs5eW+fBviyj2prO094lCIa fmVWpB7bN/d+C5VgX6BUTP8T+0/H X-Google-Smtp-Source: ACcGV63fnLAJRmjrTqqVLOi/2bCaND5FmTrmdbzf07MIOP1rkWZBRQyAwy8HdmpTcgIQ9mrxHdsS7g== X-Received: by 2002:a1c:6a08:: with SMTP id f8-v6mr1126821wmc.49.1538431817606; Mon, 01 Oct 2018 15:10:17 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:40 +0200 Message-Id: <20181001220942.2382-14-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [RFC PATCH 13/15] hw/alpha/typhoon: Remove unuseful code 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: Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/alpha/typhoon.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c index d74b5b55e1..8004afe45b 100644 --- a/hw/alpha/typhoon.c +++ b/hw/alpha/typhoon.c @@ -932,23 +932,10 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, return b; } -static int typhoon_pcihost_init(SysBusDevice *dev) -{ - return 0; -} - -static void typhoon_pcihost_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - - k->init = typhoon_pcihost_init; -} - static const TypeInfo typhoon_pcihost_info = { .name = TYPE_TYPHOON_PCI_HOST_BRIDGE, .parent = TYPE_PCI_HOST_BRIDGE, .instance_size = sizeof(TyphoonState), - .class_init = typhoon_pcihost_class_init, }; static void typhoon_iommu_memory_region_class_init(ObjectClass *klass, From patchwork Mon Oct 1 22:09:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 977497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kYYz6oAh"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42PGv64QGNz9s3x for ; Tue, 2 Oct 2018 08:20:34 +1000 (AEST) Received: from localhost ([::1]:40913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76YK-00046g-3o for incoming@patchwork.ozlabs.org; Mon, 01 Oct 2018 18:20:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35142) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g76XS-00041R-3J for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:19:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g76Oc-0007RO-EN for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:31 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:38816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g76Ob-0007Og-3o for qemu-devel@nongnu.org; Mon, 01 Oct 2018 18:10:30 -0400 Received: by mail-wr1-x42f.google.com with SMTP id a13-v6so4946448wrt.5 for ; Mon, 01 Oct 2018 15:10: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=MFK5LGnHoB2dFW0/GV9yyDQlc8w/tpYmoruwtTW5s1Q=; b=kYYz6oAhfyBqVDGxIviu+uRuv7lta3idGuH+uvhx06uemMSfFNG7Dhx4ll0SbqjFtS vebVP2q/v/d6kOOdSgGut7cdAau3DgfXuGPOEaHzlTwob5Uo0rqDh4+7RtsUTUgU6mII 2Mq7m40TcKQBbVazGqZAISDkyD+Gst51/Vro10rQv6+iiDqFruGaIb3LDeccyivpD9Qn J8kjPITj4LS8md4kt54To0a9pAzpCXJnwk9lHVLHE1IwPOBRuqOgR3anceaACRnIdfhn pMS43O8xwgpdkG+qMgBc6I4hq6Y9oOmHyH++S6GxYAWlT7VcHOzTE+EQSCiL8yFGhd46 vvpQ== 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=MFK5LGnHoB2dFW0/GV9yyDQlc8w/tpYmoruwtTW5s1Q=; b=lhu9tZzimpeweXszTzBf555j2L4MMxCtVn8OYWQAQ8X8lJ4547SZh0hHU+9WRwOKT2 roK7G8yXBoi4DHIahQN2cJYdS6opnxeu6JqYsRdpeGyH6bb+L8HzUmMnL20CdhEerep5 SaW3niwvFlL7m02cSZfOq0XtzcNiK/Mskwqfip0CELc8uOTQWGs/NRwBtz4v1AKRLdTR txIAeI1P2EXgtgdt76KK3+gsM0zOJeLznjVsRO+d2P9HUFi/hvn8hLZkt0U4uzu8f8Tk UQMGsrjvaGw1IqCOuFrRMJqYhqxlm0vyTG8B4ava7oA9PnSyfnpODdCtXMEtpMNdY5Qj /TaA== X-Gm-Message-State: ABuFfohxv0NVCQtWJVGqSeeKiSCYIyQaA8cpY5S9nPtUcGXlGAnE9xyd suiDLdwukflOMtT5uMMbMg4= X-Google-Smtp-Source: ACcGV63MGwIFXh1Mo/NKDSlK8VJeJLDavD1dc67bec0gpobhd2RjKdz6YTjaFUjASnXJjPKbuBU4Yg== X-Received: by 2002:adf:bb02:: with SMTP id r2-v6mr8539899wrg.24.1538431819884; Mon, 01 Oct 2018 15:10:19 -0700 (PDT) Received: from x1.local (11.red-88-24-160.staticip.rima-tde.net. [88.24.160.11]) by smtp.gmail.com with ESMTPSA id 185-v6sm13554914wmy.38.2018.10.01.15.10.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 15:10:19 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= Date: Tue, 2 Oct 2018 00:09:42 +0200 Message-Id: <20181001220942.2382-16-f4bug@amsat.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001220942.2382-1-f4bug@amsat.org> References: <20181001220942.2382-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42f Subject: [Qemu-devel] [RFC PATCH 15/15] hw/mips/malta: Remove unuseful code 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: Aleksandar Markovic , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth --- hw/mips/mips_malta.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 4ccfa87c35..b6633fa141 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1422,23 +1422,10 @@ void mips_malta_init(MachineState *machine) pci_vga_init(pci_bus); } -static int mips_malta_sysbus_device_init(SysBusDevice *sysbusdev) -{ - return 0; -} - -static void mips_malta_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - - k->init = mips_malta_sysbus_device_init; -} - static const TypeInfo mips_malta_device = { .name = TYPE_MIPS_MALTA, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MaltaState), - .class_init = mips_malta_class_init, }; static void mips_malta_machine_init(MachineClass *mc)