From nobody Sun Nov 16 09:03:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443749; cv=none; d=zohomail.com; s=zohoarc; b=Jrkn/1jq+U0ksu+6tBXW/oGkNiHHmLf8A6a8LX540obKpACUFwI9rBMKYkASGfvRd5ivtrcHYN26A63r4RO2C/3eDe/2Q9KP3UtSp3j0yFU7GDNMH4/4GvlwEh0/uNw6pg4pkNb9DkLg6LpmiIRZC+BX/Y91m2X8fVX48bf79h8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443749; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wF4VBmCfS9zKcYQvvNCwbCMf1/hOUCUDtnmmxztSuOU=; b=Sj6LJUr/KnfEO5VWnaslttQRC6D846FSBjbWhmqGv0jLT4PNsS0SeYwYuiggWYCkuDS+3YPlsyCYCbZFWU8HtnYbZvM3NV1eHGWzcuIIX5nz9JKQcPLitop1DK9EiusSmkTJGjurR1pJkIPDNmrIWIWpOw82i79d8yJxk+wG/to= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1599443749474449.1329274152156; Sun, 6 Sep 2020 18:55:49 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id q9so12874811wmj.2 for ; Sun, 06 Sep 2020 18:55:48 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id b84sm29377773wmd.0.2020.09.06.18.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:46 -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=wF4VBmCfS9zKcYQvvNCwbCMf1/hOUCUDtnmmxztSuOU=; b=A+tOfRsYi/AS2aMt6hUHW5BkWISmIH2BCCjEQWD4HndeIYLsQfqQLlIUfoFFTi1z1M rnGO5CjnV73+5YCkpwtHXHNz8VwdNie1sytnYsgLlghFjfaY5vyAvZMqqiJB8uagTeSw x6SVuuVVDThh5CV+LFSO+JGb/tlyZvKpx6GcBZkpY5BYOVqeWrk4KcZy6cwY4wIfAIok t1rZkrCwmlDV/xK0Axye3T2iUaBjQJ777GL2oHePfEAr3tuyeZMtSjr5IwAxWn008+gl YXGanU3e4qysp92XRjIS0oKo+/e2lx+mOuEGFQi/BjCOmAXONS29p86ZodboKJcvbvHB dvMQ== 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=wF4VBmCfS9zKcYQvvNCwbCMf1/hOUCUDtnmmxztSuOU=; b=dgLUrGKLILL4Gngeo781eebe9bGazAPrDuJ6Ph69u9+T1ytRISSlqKcVbJpFtc13lk nJZuOp6uotbjil8krYfs9RlwU7iYOg+ng+BSVERvNv9ynX1HAENH2yoYJ1g0M2XmYN5+ mCN1bPavIWLKRetN0QLuagqCeLT8y+xgsUR7/Txc8GJgAryPSDyT4v2gHbtr5+5D3sCR KPO+Q/5Hwf15H8j4X8/Y6zUbJCTF7oSn2gFnEQKRhNPjlweWU7CcX7sHn6yQshUBf34n FoStJ3cywR1G8LjS2G1HCCbxBcN4dS69/h/owGVtoqIFqu6m7gTOxmLSg/Ln1lY0hAjw 273w== X-Gm-Message-State: AOAM531VVYZzcW1qorJrmcB091UqgKY3QQEiu74Z2QqFQEfDja+WRkCY r+V0+0/zJlQTPO9Y4KvsUuQ= X-Google-Smtp-Source: ABdhPJxMVAy0UvsXBDC0vR3bqXONvU4Jmqf0AfclvlQ0Q3fUUlWEH/DQK+/tR6IAYuCvZhosFtoE8w== X-Received: by 2002:a1c:e0d4:: with SMTP id x203mr19691036wmg.91.1599443747539; Sun, 06 Sep 2020 18:55:47 -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: qemu-trivial@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH 7/7] hw/char/serial: Let SerialState have an 'id' field Date: Mon, 7 Sep 2020 03:55:35 +0200 Message-Id: <20200907015535.827885-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200907015535.827885-1-f4bug@amsat.org> References: <20200907015535.827885-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When a SoC has multiple UARTs (some configured differently), it is hard to associate events to their UART. To be able to distinct trace events between various instances, add an 'id' field. Update the trace format accordingly. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/char/serial.h | 1 + hw/char/serial.c | 7 ++++--- hw/char/trace-events | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 3d2a5b27e87..3ee2d096a85 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -75,6 +75,7 @@ typedef struct SerialState { uint64_t char_transmit_time; /* time to transmit a char in ticks */ int poll_msl; =20 + uint8_t id; QEMUTimer *modem_status_poll; MemoryRegion io; } SerialState; diff --git a/hw/char/serial.c b/hw/char/serial.c index ade89fadb44..e5a6b939f13 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -177,7 +177,7 @@ static void serial_update_parameters(SerialState *s) ssp.stop_bits =3D stop_bits; s->char_transmit_time =3D (NANOSECONDS_PER_SECOND / speed) * frame_si= ze; qemu_chr_fe_ioctl(&s->chr, CHR_IOCTL_SERIAL_SET_PARAMS, &ssp); - trace_serial_update_parameters(speed, parity, data_bits, stop_bits); + trace_serial_update_parameters(s->id, speed, parity, data_bits, stop_b= its); } =20 static void serial_update_msl(SerialState *s) @@ -333,7 +333,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, SerialState *s =3D opaque; =20 assert(size =3D=3D 1 && addr < 8); - trace_serial_write(addr, val); + trace_serial_write(s->id, addr, val); switch(addr) { default: case 0: @@ -550,7 +550,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) ret =3D s->scr; break; } - trace_serial_read(addr, ret); + trace_serial_read(s->id, addr, ret); return ret; } =20 @@ -1013,6 +1013,7 @@ static const TypeInfo serial_io_info =3D { }; =20 static Property serial_properties[] =3D { + DEFINE_PROP_UINT8("id", SerialState, id, 0), DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), DEFINE_PROP_BOOL("wakeup", SerialState, wakeup, false), diff --git a/hw/char/trace-events b/hw/char/trace-events index cd36b63f39d..40800c9334c 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -5,9 +5,9 @@ parallel_ioport_read(const char *desc, uint16_t addr, uint8= _t value) "read [%s] parallel_ioport_write(const char *desc, uint16_t addr, uint8_t value) "wri= te [%s] addr 0x%02x val 0x%02x" =20 # serial.c -serial_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%02x" -serial_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0x%02x" -serial_update_parameters(uint64_t baudrate, char parity, int data_bits, in= t stop_bits) "baudrate=3D%"PRIu64" parity=3D'%c' data=3D%d stop=3D%d" +serial_read(uint8_t id, uint8_t addr, uint8_t value) "id#%u read addr 0x%x= val 0x%02x" +serial_write(uint8_t id, uint8_t addr, uint8_t value) "id#%u write addr 0x= %x val 0x%02x" +serial_update_parameters(uint8_t id, uint64_t baudrate, char parity, int d= ata_bits, int stop_bits) "id#%u baudrate=3D%"PRIu64" parity=3D%c data=3D%d = stop=3D%d" =20 # virtio-serial-bus.c virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16= _t value) "port %u, event %u, value %u" --=20 2.26.2