From nobody Tue Feb 10 18:54:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635613647; cv=none; d=zohomail.com; s=zohoarc; b=Xo5Sun2hLFbK339lfzB2seYZCXWmvXBypVPfwMEy3JB15lN1Rf5si+cBlK4QKiiz3IPvi5pJLa42j6CTqbZQBTAm30QFQcF7qlEsYfR0k046HTUNjgWcXPPDe6mjv+7zzeozICJ2AYZz4GKKX7SKqtWaRf9e5b43l48I6ECLpXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635613647; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ohXc7eYpDMugIP0Bb3hBeNgUAK1r4bs/uM2nEOBJZ3Q=; b=PQe8RTxiPbyX7ZgTxYTxKV8XdiexWb93jBudFvvmfSg1PoTuclxtJwAkIDkb8XLA33s4QIbB8nnaOiC9Esfvs0bCbbnUcBGoZ0tlnW8KdKhw45Y04kE35uRg16Pd3ylX8yJtlR/Vo5rrowgXwOaDMLZNHbARcFboeYKdAykxiTc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 16356136471831013.5494875408943; Sat, 30 Oct 2021 10:07:27 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id o14so21542721wra.12 for ; Sat, 30 Oct 2021 10:07:26 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id l6sm7700883wmq.17.2021.10.30.10.07.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:07:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ohXc7eYpDMugIP0Bb3hBeNgUAK1r4bs/uM2nEOBJZ3Q=; b=kkErw6C7RE1dh2N29B3XfAcd1BfqRHNcL529e41nDjsYr6XGoedjbabktVCHynaptN qD+Pu63ONKsXAZPS+3u96tOYFFeQE1vUatAdSj/WaffX4zNiEhmg/oO5HsoqEwS9UqCi 6Gpo/mSLLhxlwzIsv0IBxMRgqvNHrXRyeTq5/HMCeL7rad8qUOz6P2uXPXC68jhJmEf7 3YAmzFfxZL3UA8I0Pj9AKPjWXi5WNEhQVz0ghNguX1JRuFbCDfkvvbgnGEOJ3k4Dgyun nlUiAGcgFIQspCYHza01m0uFNK+JXhbOyLYxypfD3xMTJOW9TBDmY0eyjjirCUlvKj0W P+dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ohXc7eYpDMugIP0Bb3hBeNgUAK1r4bs/uM2nEOBJZ3Q=; b=8K7P4M/dgo0MGbQXmSv3JH9Uyz/9M+Fg7c2HJaA1oyol2U86+OzzE0ZKKfowx4Mco7 VQOOyYHSs7SAJBv4Scr8zdaeHrS6tcPKxuWPBm/2PPSsCX0RurWtZVWsC0hy15cDD3lP J4NOumPVpN0+days8B+PKv5tRYakjaFqcf55Wirp2+E5uPUJx5LrKnJ5Fu1DXQ2XDE4b Wu+k9NN7Mt0TDtL/kV8o3Q9sa48c+AlzdlTICwMs2ZTIRUC+CupSHwzG+PlMhYa6rSRD cwhGHsZZCYATFwbRsJVoCRlcOqkPEfZR3mdj97ELrXRe/gC00ptl+jGyvs99xI9LzeAg 9Lxw== X-Gm-Message-State: AOAM530h2lu3e9reTSJ9Px2d4L5gB28Ab4ChbHADrmHN30vVT0QNvcl/ 3U9IEUtOFrs+QmKj8zD0zfE= X-Google-Smtp-Source: ABdhPJywl9usLV5/wHPBYUBrykxA2pDlIQhZo1blVpnwa6Ny2VW/8eWOQimvNlbjXwaI3ppbWNGauA== X-Received: by 2002:a5d:460d:: with SMTP id t13mr20401825wrq.44.1635613645462; Sat, 30 Oct 2021 10:07:25 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Yoshinori Sato , Magnus Damm , Paolo Bonzini , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 14/30] hw/char/sh_serial: Add device id to trace output Date: Sat, 30 Oct 2021 19:05:59 +0200 Message-Id: <20211030170615.2636436-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211030170615.2636436-1-f4bug@amsat.org> References: <20211030170615.2636436-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635613648557100001 From: BALATON Zoltan Normally there are at least two sh_serial instances. Add device id to trace messages to make it clear which instance they belong to otherwise its not possible to tell which serial device is accessed. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/sh_serial.c | 6 ++++-- hw/char/trace-events | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 808d4ebae70..355886ee3a1 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -94,9 +94,10 @@ static void sh_serial_write(void *opaque, hwaddr offs, uint64_t val, unsigned size) { SHSerialState *s =3D opaque; + DeviceState *d =3D DEVICE(s); unsigned char ch; =20 - trace_sh_serial_write(size, offs, val); + trace_sh_serial_write(d->id, size, offs, val); switch (offs) { case 0x00: /* SMR */ s->smr =3D val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0x7b : 0xff); @@ -212,6 +213,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr off= s, unsigned size) { SHSerialState *s =3D opaque; + DeviceState *d =3D DEVICE(s); uint32_t ret =3D UINT32_MAX; =20 #if 0 @@ -304,7 +306,7 @@ static uint64_t sh_serial_read(void *opaque, hwaddr off= s, break; } } - trace_sh_serial_read(size, offs, ret); + trace_sh_serial_read(d->id, size, offs, ret); =20 if (ret > UINT16_MAX) { qemu_log_mask(LOG_GUEST_ERROR, diff --git a/hw/char/trace-events b/hw/char/trace-events index 4a92e7674a2..2ecb36232e9 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -103,5 +103,5 @@ exynos_uart_rx_timeout(uint32_t channel, uint32_t stat,= uint32_t intsp) "UART%d: cadence_uart_baudrate(unsigned baudrate) "baudrate %u" =20 # sh_serial.c -sh_serial_read(unsigned size, uint64_t offs, uint64_t val) " size %d offs = 0x%02" PRIx64 " -> 0x%02" PRIx64 -sh_serial_write(unsigned size, uint64_t offs, uint64_t val) "size %d offs = 0x%02" PRIx64 " <- 0x%02" PRIx64 +sh_serial_read(char *id, unsigned size, uint64_t offs, uint64_t val) " %s = size %d offs 0x%02" PRIx64 " -> 0x%02" PRIx64 +sh_serial_write(char *id, unsigned size, uint64_t offs, uint64_t val) "%s = size %d offs 0x%02" PRIx64 " <- 0x%02" PRIx64 --=20 2.31.1