From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:907:c68a:b0:84d:2074:29bb with SMTP id ue10csp3106012ejc; Tue, 10 Jan 2023 04:01:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnPVjl0/6wCRaxEkE+i0FHqDifZw4n22DS8AfPsVPdnRIHreQk5D7f3Rqu8xqHrxv+JGxQ X-Received: by 2002:ac8:6c7:0:b0:3a7:f424:d1bb with SMTP id j7-20020ac806c7000000b003a7f424d1bbmr3094005qth.21.1673352072554; Tue, 10 Jan 2023 04:01:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673352072; cv=none; d=google.com; s=arc-20160816; b=um6mXSnlvNsqjz8MYF3e2OMilD9xv+FH3uTpVuGkq975u03wgYQUH3Lk2ZesA/VfNI BjEqDM5OIHxVQw/ko1qp44WrahDXwmpu4WpeDtMHfQ20A3eiNt2JTxqKTIVPj2ScNzpj xPoc2Nfnt3A9ByvH/JwMq9q78QXZqDqKWAGq5lfQi3nVse+VtKpf6e3Zf40PIdIAbBrG 9bEM3Rm/q7FR4Hc9TMShxNwyj7LJNEnNyayRuXBeWUw8YFiFAypHlu22oRZ+VdFGa7td fSXAfNjAZkbYcjSSHGW9Qb2DXkQsouWdzynSRyRW+TSnL6xtrGPHwy6EYAq04C9Tbn/s H9IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=pzbpW94v8kWOhXIB6ZCp0GJ688lmlczVML2krcqmSY8=; b=UR5FZ+q7HZI/Z2wtjjWMf/jHR0bJetVVweAoCIb3SaLT0WRZm604CIMZsCxUSaqlop PQATgTyunpLxj5q7mBKTbd5pRWa7pv07hu589DAQZqjiIgRFRULcrpzEz6JwyxLUzbTh rTF3UTSl2/S0/+FvrH3TAFk7gEvVk7XJPOQ/60QCk80jclL/v4rJq3qyf5m41VJnswkG XepmCQPFP/cJGivwxOyDat8vnXI+6zZ0JE6Qybsn/kdr+uYCmCy6Jjb7aoxKx8PJ6t5N gXIQv+T3M50It9LKzfnyY10RZcb57Goef5ljpU4PAxzIzFaJXnteJgw0aW4DxPuRU9Sp yGdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ho1aPlSm; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fa7-20020a05622a4cc700b003a68917ff78si6477835qtb.782.2023.01.10.04.01.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jan 2023 04:01:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ho1aPlSm; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFDIV-0008NH-JB; Tue, 10 Jan 2023 07:00:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFDIT-0008Mt-RO; Tue, 10 Jan 2023 07:00:05 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFDIS-0000mf-55; Tue, 10 Jan 2023 07:00:05 -0500 Received: by mail-lf1-x12a.google.com with SMTP id bp15so18005820lfb.13; Tue, 10 Jan 2023 04:00:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=pzbpW94v8kWOhXIB6ZCp0GJ688lmlczVML2krcqmSY8=; b=Ho1aPlSmv8w+WSGMlYAVT0KFE5qLkrcxepXeonrdH11D8ytQdU2ICWLK9qyD7xI+j5 9YEaroCq3o95N4Kck3giU7pd5RoIBzmcrePq8gMwrhrbgST9RubpabqZnlYNW+jV0zzE c+MY9cX9G8xod9B7h9Agvj69x+SwX2SEI29U1sZHRbXt9dj9zj2VAx4bs2nATT6L9H6a l+qhByojJAfL5wXLHCFKqWKI1kvDSDQ4sLYz9n4FXGbWB0CR2wcHaEcUABYqQr6W1qCC lVAmnklWhX4Qlk3yUzPtSKCgtBk1w72klHQ6QIFiiCfXaOL0IXVZyFeC5Po58AyhgVZ+ KVSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pzbpW94v8kWOhXIB6ZCp0GJ688lmlczVML2krcqmSY8=; b=xwmNRknzgpBqK8BjQ2a0CUO3uZLPFx03B+eKW5Lf2RlIBMHTkNCluPNlCIBO95yNuT DFo8QDrnEqPFjNj/5K2AwnrkWJ2/0207yPJUVN4IFBPyHLMkC5TpbvYBgkwpTC8Z9UW3 LWozaz1ZdwNpY5AHsjvGTX1N03grZ3ffV/NiL0a1S+J2SSYipfgQg8eKtROIwS5pvYeu unSN6e24BRHqb/Li/MSfLR0t4bQWLX7dE5UvCwj0/bSDvBJfh8QpYi8EnTLoiFvgp+cn zP1nVt4Ge90AlwHYi1UnBXTtHAs3DePEt7OMNaAu4Ml1c2Hf6ErD6ZLhwdpM9/uHjs46 QY4w== X-Gm-Message-State: AFqh2kpXWr9OefrISnyeejWA/uKRlDquxl2wZQXFuMjsmBdKmjD8P+5s 4rly5Nxs+VCtD1jBRYbn+0s= X-Received: by 2002:ac2:490f:0:b0:4b6:eca8:f6ca with SMTP id n15-20020ac2490f000000b004b6eca8f6camr16632641lfi.67.1673352001827; Tue, 10 Jan 2023 04:00:01 -0800 (PST) Received: from gmail.com (81-232-4-135-no39.tbcn.telia.com. [81.232.4.135]) by smtp.gmail.com with ESMTPSA id bq33-20020a056512152100b004cc7da37d52sm1495026lfb.94.2023.01.10.04.00.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 04:00:01 -0800 (PST) Date: Tue, 10 Jan 2023 13:00:00 +0100 From: "Edgar E. Iglesias" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org, Havard Skinnemoen , Alistair Francis , Peter Maydell , Eduardo Habkost , Tyrone Ting Subject: Re: [PATCH 14/14] hw/timer/xilinx_timer: Use XpsTimerState instead of 'struct timerblock' Message-ID: References: <20230109140306.23161-1-philmd@linaro.org> <20230109140306.23161-15-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230109140306.23161-15-philmd@linaro.org> Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=edgar.iglesias@gmail.com; helo=mail-lf1-x12a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: xVWo4h79oGBR On Mon, Jan 09, 2023 at 03:03:06PM +0100, Philippe Mathieu-Daudé wrote: > This remove a use of 'struct' in the DECLARE_INSTANCE_CHECKER() > macro call, to avoid after a QOM refactor: > > hw/timer/xilinx_timer.c:65:1: error: declaration of anonymous struct must be a definition > DECLARE_INSTANCE_CHECKER(struct timerblock, XILINX_TIMER, > ^ Reviewed-by: Edgar E. Iglesias > > Signed-off-by: Philippe Mathieu-Daudé > --- > hw/timer/xilinx_timer.c | 27 +++++++++++++-------------- > 1 file changed, 13 insertions(+), 14 deletions(-) > > diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c > index c7f17cd646..32a9df69e0 100644 > --- a/hw/timer/xilinx_timer.c > +++ b/hw/timer/xilinx_timer.c > @@ -62,10 +62,10 @@ struct xlx_timer > }; > > #define TYPE_XILINX_TIMER "xlnx.xps-timer" > -DECLARE_INSTANCE_CHECKER(struct timerblock, XILINX_TIMER, > - TYPE_XILINX_TIMER) > +typedef struct XpsTimerState XpsTimerState; > +DECLARE_INSTANCE_CHECKER(XpsTimerState, XILINX_TIMER, TYPE_XILINX_TIMER) > > -struct timerblock > +struct XpsTimerState > { > SysBusDevice parent_obj; > > @@ -76,7 +76,7 @@ struct timerblock > struct xlx_timer *timers; > }; > > -static inline unsigned int num_timers(struct timerblock *t) > +static inline unsigned int num_timers(XpsTimerState *t) > { > return 2 - t->one_timer_only; > } > @@ -87,7 +87,7 @@ static inline unsigned int timer_from_addr(hwaddr addr) > return addr >> 2; > } > > -static void timer_update_irq(struct timerblock *t) > +static void timer_update_irq(XpsTimerState *t) > { > unsigned int i, irq = 0; > uint32_t csr; > @@ -104,7 +104,7 @@ static void timer_update_irq(struct timerblock *t) > static uint64_t > timer_read(void *opaque, hwaddr addr, unsigned int size) > { > - struct timerblock *t = opaque; > + XpsTimerState *t = opaque; > struct xlx_timer *xt; > uint32_t r = 0; > unsigned int timer; > @@ -155,7 +155,7 @@ static void > timer_write(void *opaque, hwaddr addr, > uint64_t val64, unsigned int size) > { > - struct timerblock *t = opaque; > + XpsTimerState *t = opaque; > struct xlx_timer *xt; > unsigned int timer; > uint32_t value = val64; > @@ -202,7 +202,7 @@ static const MemoryRegionOps timer_ops = { > static void timer_hit(void *opaque) > { > struct xlx_timer *xt = opaque; > - struct timerblock *t = xt->parent; > + XpsTimerState *t = xt->parent; > D(fprintf(stderr, "%s %d\n", __func__, xt->nr)); > xt->regs[R_TCSR] |= TCSR_TINT; > > @@ -213,7 +213,7 @@ static void timer_hit(void *opaque) > > static void xilinx_timer_realize(DeviceState *dev, Error **errp) > { > - struct timerblock *t = XILINX_TIMER(dev); > + XpsTimerState *t = XILINX_TIMER(dev); > unsigned int i; > > /* Init all the ptimers. */ > @@ -236,16 +236,15 @@ static void xilinx_timer_realize(DeviceState *dev, Error **errp) > > static void xilinx_timer_init(Object *obj) > { > - struct timerblock *t = XILINX_TIMER(obj); > + XpsTimerState *t = XILINX_TIMER(obj); > > /* All timers share a single irq line. */ > sysbus_init_irq(SYS_BUS_DEVICE(obj), &t->irq); > } > > static Property xilinx_timer_properties[] = { > - DEFINE_PROP_UINT32("clock-frequency", struct timerblock, freq_hz, > - 62 * 1000000), > - DEFINE_PROP_UINT8("one-timer-only", struct timerblock, one_timer_only, 0), > + DEFINE_PROP_UINT32("clock-frequency", XpsTimerState, freq_hz, 62 * 1000000), > + DEFINE_PROP_UINT8("one-timer-only", XpsTimerState, one_timer_only, 0), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -260,7 +259,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) > static const TypeInfo xilinx_timer_info = { > .name = TYPE_XILINX_TIMER, > .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(struct timerblock), > + .instance_size = sizeof(XpsTimerState), > .instance_init = xilinx_timer_init, > .class_init = xilinx_timer_class_init, > }; > -- > 2.38.1 >