From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443741; cv=none; d=zohomail.com; s=zohoarc; b=Z+btkaXid1eLY4k5NsoafuIvi0Sle9Pq9tfnj7acjMAQM0EvDAHT7R/vEue1tOBL5FBgNAWLJTeuf3QyNqcyKGZ8MUedMgi829UCpOykGSwaHdtRdTWHIBRW0+oWn2cQxb9E4BbHVnt4lzFPnC2NpFP6xcYB8twSaPWwPT5dOvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xNSWRDcvmAyUx6UsL/JgHCLjynBWkV6qzS6fjCc2u/4=; b=j6u0el/QDXP6eRQ5vs2T6baI2Zns33jCpRH/uKSQtpIWYjD1EFiai4/L0yJ537J++X5g9zEmYztv7Q1P7uG64Hg+bZ3GiU4cIdKGxbCF0rYdplNk56r3xcy21N6AlgUlVGO1qSMpdxvzuxSd+AKHzkds46IBXwv1HQhOVqPvEFc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1599443741318733.5604709798974; Sun, 6 Sep 2020 18:55:41 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id a65so12845168wme.5 for ; Sun, 06 Sep 2020 18:55:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xNSWRDcvmAyUx6UsL/JgHCLjynBWkV6qzS6fjCc2u/4=; b=Ub12186lydpQdjQDobPDaDVAcemBEmB5K40dMvKJkSB4NPwZe+ePaSCTfAtLdNC6FI bPKAbNK2I1GZdMocOGUEF2FmGJ+Q3UxXfYMtixrAhgaQyVzopbKZmw49NoxW+YqAZBBU hcMRo07l0cTCY+sSYslnlDHhfMkcI+j71dS+KfYkb36Nn8sTXQAZfUjIJNMGPZUMcvU3 nH67StjksCps87QX2UiWtnwqvQtwPPPplnVekeRLaGnF/eauSn5Cz8pHlLPUjLLu7XIW L254QH11I365LiZyXqtLL10amJCV9NfsB6laJDf3NHG9gOcaXwTDKTFpy+r0M7B4qh7o 5mXQ== 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=xNSWRDcvmAyUx6UsL/JgHCLjynBWkV6qzS6fjCc2u/4=; b=lF8B8OV6wISS56KVFKE/Jujfb1xvQ/K9uKEjdjhlDgL+ZcHqGJiotPX2M35LCWcbak rXDqsBz70C++LEqewZek0PsNpTV70f40Ucq8K+aEftsN9bXgDwX8+fuEHCE7mWRAPcjk e759I7PTxQaKH0tjXIYx0ldzZaakpMJwissSO2htb+fRGCUlR9L77kkNI4LIpttlwftV 8u71wgpCpjfve5x5diBxNySb3bn58qVSl1FuuVOpd2cPGmm5WMdSjqlKSUg/ig1RzSNx buPF5DON7DmhwNoHMxdVgkj1PEGUoYos6jmbDRNeny79JyY7tGz1oaBYADPPcWRPA9KW wypA== X-Gm-Message-State: AOAM533RX6vZlSIJhrlH/ds5riRGEINVdiH81j/oUKl09P1uH+2UzzZX a4VAYEFOmX/mAPpuLjukm49d9kjHUaw= X-Google-Smtp-Source: ABdhPJyEeJ8ovfrWSFuAWleTJVWWUnUmlW/AmXhxIIay8RbNE7WPmBWQfXBf3cMkU1RSw28/co5dWA== X-Received: by 2002:a1c:40a:: with SMTP id 10mr18965790wme.61.1599443739377; Sun, 06 Sep 2020 18:55:39 -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?= Subject: [PATCH 1/7] hw/char/serial: Assert serial_ioport_read/write offset fits 8 bytes Date: Mon, 7 Sep 2020 03:55:29 +0200 Message-Id: <20200907015535.827885-2-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) The serial device has 8 registers, each 8-bit. The MemoryRegionOps 'serial_io_ops' is initialized with max_access_size=3D1, and all memory_region_init_io() callers correctly set the region size to 8 bytes: - serial_io_realize - serial_isa_realizefn - serial_pci_realize - multi_serial_pci_realize It is safe to assert the offset argument of serial_ioport_read() and serial_ioport_write() is always less than 8. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/char/serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 23864794929..a855ef66ea2 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -344,7 +344,7 @@ static void serial_ioport_write(void *opaque, hwaddr ad= dr, uint64_t val, { SerialState *s =3D opaque; =20 - addr &=3D 7; + assert(size =3D=3D 1 && addr < 8); trace_serial_ioport_write(addr, val); switch(addr) { default: @@ -485,7 +485,7 @@ static uint64_t serial_ioport_read(void *opaque, hwaddr= addr, unsigned size) SerialState *s =3D opaque; uint32_t ret; =20 - addr &=3D 7; + assert(size =3D=3D 1 && addr < 8); switch(addr) { default: case 0: --=20 2.26.2 From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) client-ip=209.85.221.65; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f65.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443742; cv=none; d=zohomail.com; s=zohoarc; b=VAzs/YnDl43U5nddqNvCdX8qy2Dhos2hfWO15TTRuJU3qs59KvlpJzLVAvyjN1FDmIjmKTvYAMLZalmvFlICJLEZij029Zfi3iFA+zpvszc8+WaffVY91lJXho4CRFgNudMjBxCiZZIR0nWXX5uKkMDohdXRtjvFBr5W677d8O8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443742; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JF7kT9Jakz5MXZ7s85w029ixb/+6fikTUFTZrRv4yoU=; b=CT7CyeKDPOlCrAMFd9QTROmftQ3NZVFLQVLIlBvDcWtW/sU3c1wH+uSrkXDD63+MDsheqm9iQMH/73GlCHLjh+wd1XUPa09IrB3xY7yPcRTbxQQzLVcibDKgdlXq/Qh3vWiBqo0Qn0/OMxPvM2l06FkqVaSCJ58jKyMM1KoIXP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.65 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.zohomail.com with SMTPS id 1599443742603337.6543381533751; Sun, 6 Sep 2020 18:55:42 -0700 (PDT) Received: by mail-wr1-f65.google.com with SMTP id c15so14039353wrs.11 for ; Sun, 06 Sep 2020 18:55:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JF7kT9Jakz5MXZ7s85w029ixb/+6fikTUFTZrRv4yoU=; b=ATpKEDrJ7K9awH1N2zYTl4yBM9vwgdywoDL8jJwFb0map4kJ1wW5Z6SzgmkBLz6Di1 4+J89Zkp0QYSl/r/M91ckYgeDfnshUAdYUAwDZ3jkVqeaC5CbtrEPPKLwoHihsv1pcmG /tyiLuSpV9SCW9XFjVC1ifDvER1j9gedYUd1vK1QWQQd4onN5NYyUXPI2KEj/go04Yhp Zr4ScnsbSukE3j4I63uUQDzIW1OJlr7uwAlYA0kUv7ChD/LtZbe1m1F/jpYDX6ESedGO IOu21GsUwvi4leEM8WIe359yXNL2rInLotpGuyvnwuKHnGyQ7xGMCL0gsnLrsUJsCRX9 EmEg== 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=JF7kT9Jakz5MXZ7s85w029ixb/+6fikTUFTZrRv4yoU=; b=bxpodEshLjvcOrUonef2Un1EEWWsRU2/lZloXfJxxn/pKz9Gfhcoy5tmlh6JGDjG8e JBRcZf2zhBv7OrL9ybIz6JAQ7GGHaAZAGrkHlt4porvAeezXHnsRjHghGgxLezs8Eo9R L4cePAikN6wY01kE+s3W0kZUg1Wk8Jepv1yaxciaL9JC/vm5Aog311jdNQX3am59cssG H4YIuM/vD1Z6Lt6h/a9tckDnsy5hHo0a1iwqFtDN29ns43yjJ3cXGP/htI+mrjHUEvSG wBFxHMp+azYjEi2Ykl+gZ5YFjfZFTbngVwvGuruZovLBW1lkmGa3jpfphqZ7yUPA48+F X3KQ== X-Gm-Message-State: AOAM532hPKISfND0jdgRSRXIGtuvr3hJLqiM/UJI6NjzGNHkKvIeutXp CH7Ug0wWUVnYd18ezjqcFDYb5dZZSQE= X-Google-Smtp-Source: ABdhPJxdbJIbUhDSxyWa3OoBkrlsOphRHXMZU37nN6v0gCouNh4gRK5/N8Tw4mT/s7687uE4t+h37Q== X-Received: by 2002:adf:dfd1:: with SMTP id q17mr21031760wrn.347.1599443740620; Sun, 06 Sep 2020 18:55:40 -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 2/7] hw/char/serial: Replace commented DPRINTF() by trace event Date: Mon, 7 Sep 2020 03:55:30 +0200 Message-Id: <20200907015535.827885-3-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) Convert the old debug PRINTF() call to display the UART baudrate to a trace event. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 4 +--- hw/char/trace-events | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index a855ef66ea2..fb41337b661 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -187,9 +187,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); - - DPRINTF("speed=3D%.2f parity=3D%c data=3D%d stop=3D%d\n", - speed, parity, data_bits, stop_bits); + trace_serial_update_parameters(speed, parity, data_bits, stop_bits); } =20 static void serial_update_msl(SerialState *s) diff --git a/hw/char/trace-events b/hw/char/trace-events index d20eafd56f8..85e39d9d62b 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -7,6 +7,7 @@ parallel_ioport_write(const char *desc, uint16_t addr, uint= 8_t value) "write [%s # serial.c serial_ioport_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%= 02x" serial_ioport_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0= x%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" =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 From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443743; cv=none; d=zohomail.com; s=zohoarc; b=NT2CTJFwkiWuZ6XQMq6yaFhagvhdp18GpmQ1jTUhg325DuUh3xsbRZ6LwUT9twY2I01QNJ41EEH9u9/JaRyggy0uUVSrnd0keuAs1z6u0P6IhkG0tTNNKexHsxh6/YemXniMoFPpL9ad9fzDId/j1imzXtKQL7g4g0vJtlD+MO8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443743; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ziCw1jrdbRRxzZUuAacPeDfn99gOs6JW3cbKwKy/6Wo=; b=m/gwO4AqkdF+AqNq5URB/ya6gIKktEDCDjkMcOZgAMzB9aZvbX9+li+SO6dkJtlaDtMn+ym9wa8yQzYE2RjQINE89dVv+oZcw8foatI04C+L+C1B1NS7OqmqDT/CLC0Du8f4pl2iWTogAlWIItWGiRSyuxvM9fq2tckZXXYAkBs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1599443743770185.36900389687526; Sun, 6 Sep 2020 18:55:43 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id v4so12655882wmj.5 for ; Sun, 06 Sep 2020 18:55:43 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ziCw1jrdbRRxzZUuAacPeDfn99gOs6JW3cbKwKy/6Wo=; b=ZAKXwIlcheRQ7uF37G0Dw/DfnyfX5wqZKGp1+82B+xSifzGM6ZyoVOImVmIi4Rpc4q RLKMsl7/hnNTi0WhrtNcucLt0F/WQNWJbD0P4RpyiGFAtGswN2Eya/MBpN59KOZbFN2/ p830v0NIPzfSaniixt1aM6PCSEl/bdp0p9N/ytv2nLHb0qYUmzL+zhwIeh1ru/TPR3t/ yAjXd1MajOZ4DC4q8nFMkMXJQQxsKBzvDVCo1kZCSFaPN+OrqV4yFLX1Y1z4I/+5iWPJ kHsoNK5qP4nW5/nD5ZqzVdzQo6PYSTtyMr5Q/x/L5NrZwEx/coQH+2clx9c3VE2XrMWa v8KQ== 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=ziCw1jrdbRRxzZUuAacPeDfn99gOs6JW3cbKwKy/6Wo=; b=Q0C71PeujzmOYeo6Tpq8Wc45k3nzEqoLn6LrKhxesH2UPUk2eAKC3yIRwkp5ko/izx RbYSaPc4rbg2CaWpzDeyCqOL2ic/67amNbyAcNVgPRq+ugyNc47BhDd7cXnY40SqqzoZ JLWqDMsQM/ng2boAO9xrv4K6Ee4iFzensJdZipAwItn9ASF9+V+4zSuVtEH1TsHc1VHv sGB+GITbmt8YjJyYaWpRh9MrANjw8cN4v2FWDnvx+yfKhZ+8suhET8JUf4sB/eCd1ZT4 3RxWh/21ZMYOElx3mAXHCgzfTX6G52V/wyb1IAH13avt87WZ9tUsdPczLwLiYvum9F7w CviQ== X-Gm-Message-State: AOAM530EbtHHS8oM/m6uvEY5vb/GuzOwErhhU1rf7dsW4lfKItpGDukO JPYlBChfjH4YophRlGuQJ1U78ODbQqM= X-Google-Smtp-Source: ABdhPJwNPzGEimfV5QOVz6vrgn92szWy9wM++PUUZin7MUiYC/kpwkBNb+m+g9zmFtBocHxJClDB3A== X-Received: by 2002:a05:600c:2317:: with SMTP id 23mr19335637wmo.183.1599443741827; Sun, 06 Sep 2020 18:55:41 -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 3/7] hw/char/serial: Remove old DEBUG_SERIAL commented code Date: Mon, 7 Sep 2020 03:55:31 +0200 Message-Id: <20200907015535.827885-4-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) All useful DPRINTF() calls have been converted to trace events. Remove a pointless one in the IOEventHandler, and drop the DEBUG_SERIAL ifdef'ry. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index fb41337b661..1e70294f28a 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -36,8 +36,6 @@ #include "trace.h" #include "hw/qdev-properties.h" =20 -//#define DEBUG_SERIAL - #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ =20 #define UART_IER_MSI 0x08 /* Enable Modem status interrupt */ @@ -102,14 +100,6 @@ =20 #define MAX_XMIT_RETRY 4 =20 -#ifdef DEBUG_SERIAL -#define DPRINTF(fmt, ...) \ -do { fprintf(stderr, "serial: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ -do {} while (0) -#endif - static void serial_receive1(void *opaque, const uint8_t *buf, int size); static void serial_xmit(SerialState *s); =20 @@ -636,7 +626,6 @@ static void serial_receive1(void *opaque, const uint8_t= *buf, int size) static void serial_event(void *opaque, QEMUChrEvent event) { SerialState *s =3D opaque; - DPRINTF("event %x\n", event); if (event =3D=3D CHR_EVENT_BREAK) serial_receive_break(s); } --=20 2.26.2 From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) client-ip=209.85.221.67; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f67.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443744; cv=none; d=zohomail.com; s=zohoarc; b=W8UYjEWKXfLMr5MimxNFx4wLvakzfjoYL7mLNUISddBXBlG+sA77NuRWdDBivJFAEXg0o5yhL7bna5bYFGLbQGLS0VkLuW0/oIi6ZORE0AIixSIN1bswUB/vzm2Pf0gtr67VgfdSKisPkpmwgM/zFf+h1kkRX1u5q+toHOCf7LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QQ3fywF3U7FMDEHRpvf9acNc1XCO6x1yzECnPG9z1Co=; b=dss+6WuClPNQ//2W6GfKehIpDbr6BxKy4zc6/8T0ThtlMLXsI3CMmmylxuv4GkhyvJc6dF7jorDPTdgyj8FJPoLaw/HXQ0gC6XyJryoC0wT08TPBG02U/gMwJyHDwW8zcdvizXA1bp2pqiO6cAQKu5F33fupgiJgQJSh7dwadsw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.67 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.zohomail.com with SMTPS id 1599443744933399.629408331061; Sun, 6 Sep 2020 18:55:44 -0700 (PDT) Received: by mail-wr1-f67.google.com with SMTP id k15so14040920wrn.10 for ; Sun, 06 Sep 2020 18:55:44 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QQ3fywF3U7FMDEHRpvf9acNc1XCO6x1yzECnPG9z1Co=; b=DDB+MVtIis5U0yp6R2ic47YLBD+3fjbpRQJLkJwFHJCYLMc3mWWdHKmnSPX0tpaoTa ayue6ZuYolMfJGt029y+Dpw8ip9e7hXKiINP81BqeqJzfPkddYkCBAzpbujxisoMzviE /ku2RGwCllL8c2rMoH3ZDDvK2T2eqQeZmj0JCm1ObkFMKP5t1sWpBshEeA8XvQpIMLiu giwX+nhMn8mL3Uvkb7mW04sPOLTOA8ipXvXvGonmD+h4OyIUxVRemXT+Y7Pz54wadjZE zNpTQ8NGlJnDBy7NdIYfBI4r+M2fuWmSF4BcDVgbxdmjFxgpFFoJ7pfSk2yLP8JWV38K Mahg== 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=QQ3fywF3U7FMDEHRpvf9acNc1XCO6x1yzECnPG9z1Co=; b=YlOGp7pu8hvCi5796fUWlvcYSw7XesKaSnqem2tA6L7z2qxoK1V79MCrc3UOR4N038 fXBpNNk1GoDAJ0xLv/K7jjKnrwHcJOhfyNkUAF3YIEocYBsQ7GKP77IvwpcKC0wjl/ir Ojk9vP+U1kpHxHN1GaxvM8HbDOWtSKFP5anBpHoll9v7zfjZOdVcpixoM9QoEsYhuPGs 6Pa0ZdWMwRwOf/4bPGY7KbjQE+zoFE8/wwygQQGLKWXoJsc7Hvp8Mkdg65zG/viw/QL/ zE1ue+Y3cfwsA3yzzeElT1nV1NOfVcaFtxoqFLjHNzmpoV947sIYDqdycFWlSpIZepSe C5lw== X-Gm-Message-State: AOAM530LRcwJxbdvMw70B1DERtROlXq29TSTxXPDWltMxcdt2/eQEXVT 23IjWrju2lO2L7Gjsvppj/Q= X-Google-Smtp-Source: ABdhPJyi0x0cVVoQ+7SHtYPb1M1wl81oPCisPgg8JJWhaYjB9CXUFHhVU22DLzEkwhPYgYnZ1ZdRXA== X-Received: by 2002:a5d:4e8c:: with SMTP id e12mr6280124wru.180.1599443742996; Sun, 06 Sep 2020 18:55:42 -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?= Subject: [PATCH 4/7] hw/char/serial: Rename I/O read/write trace events Date: Mon, 7 Sep 2020 03:55:32 +0200 Message-Id: <20200907015535.827885-5-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) The serial_mm_read/write() handlers from the TYPE_SERIAL_MM device call the serial_ioport_read/write() handlers with shifted offset. When looking at the trace events from this MMIO device, it is confusing to read the accesses as I/O. Simplify using generic trace event names which make sense the various uses. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/char/serial.c | 4 ++-- hw/char/trace-events | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 1e70294f28a..ade4adfd526 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -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_ioport_write(addr, val); + trace_serial_write(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_ioport_read(addr, ret); + trace_serial_read(addr, ret); return ret; } =20 diff --git a/hw/char/trace-events b/hw/char/trace-events index 85e39d9d62b..cd36b63f39d 100644 --- a/hw/char/trace-events +++ b/hw/char/trace-events @@ -5,8 +5,8 @@ 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_ioport_read(uint16_t addr, uint8_t value) "read addr 0x%02x val 0x%= 02x" -serial_ioport_write(uint16_t addr, uint8_t value) "write addr 0x%02x val 0= x%02x" +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" =20 # virtio-serial-bus.c --=20 2.26.2 From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1599443746; cv=none; d=zohomail.com; s=zohoarc; b=mk7ABu6n+vqwajrR2Zx57ogzzOYnBZ3gA8YQLoIxrkTpCoP24RWn3z5sNDIAjIbSbLZJuCVFOa4BdS4ZfdusJGGHaMjAiGh4ffU4AO2JM6R8v/K59MteYPSD1hB4u4kYfuVVuC62rAu9MNL4KRH0kxko0KhR8OT8lpLOnWx05Ik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443746; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0L6FMvGCY7Yqd00xQ/ZxKfuTHVYGmeZNYt98i5HNRDQ=; b=dAXEALrV0lv+Zbjul7vwPj2SYklNjau2e1/69x3qCTl86BjIhGRYSCVtdOA3WBtgsJkaChgCRzSYHu9y5tDpRUaZKwtJ4R5BhgBd3P6GOk2IKhC9EmeQq5WHmQOT0SJKYnL5hOyQrCRvcMEngbCezcMceujZhpjnIhDVtqus6mw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 1599443746192362.9865670981985; Sun, 6 Sep 2020 18:55:46 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id y15so51240wmi.0 for ; Sun, 06 Sep 2020 18:55:45 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0L6FMvGCY7Yqd00xQ/ZxKfuTHVYGmeZNYt98i5HNRDQ=; b=Nu9yn4I572XTs2h/pxBeMKSFLjGP9QBvQ5EEsO3R1rF7zesE2dh8nvd0nrdIqqMaLp ic9oKnFgq6cR/TRt4Hdn/iHYWZaHLT+GrhyXe5nBxvuY1f1Ctu7yIeXfzB62LAbRyqDa I6HIuDYOGDPDIspKcvyQPki2OmqbC2O7KZ2rlz0AIIR05wwcMLuorORaY4ZGvhOmcBQp HTO2MfRSVVimUnQy9hVrbfclPgmuCcH7NPvhWk/5v6y0kdBgTycUkoVhKsy+2t0bNn9C E13N8BLsQt9pKPblQe4CL3U8yGPc5QuvYPP/MNg6ZQR/V4iHcCZH4Co5hAjbUmIl/5Cu 92vA== 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=0L6FMvGCY7Yqd00xQ/ZxKfuTHVYGmeZNYt98i5HNRDQ=; b=nVYLSyUYfxsTmwfIDH/JUF+yu4qbJILEXWXVIOi2lIy8AVC/PvRVRl/v+HhvU92D/i q3KXl0haSWHYK+oPRS53jN8dAmlvcAdrmKwEkM9YObkpdz6Gc2osmcGsWZdJtg1KaZUD BVQ5/WAOjvoLSeFDxyAiHZrcSoOt27swLuYishvXKV40XlHo3SkvFa0TMuZctipWJ23l 8R7OyJksDk9PxTil3Ja+Z7Pfk9PBf1zXWPZ7JOc9F6TpKF6/gP5G8jqgplCse7NA43+v STAwvhjSFcxNFgFKX9V5ygzfJG7il8i0e+jFhiC7VAmpsYmaZUgMCYDXvlguMycHLFFX CzRQ== X-Gm-Message-State: AOAM531Bl9f2CJYvRAVAYyczuv9pG12tgmhcef7fT1SUlFwQRRJwZfzE O09+b0w/2dq21PpDYjXpips= X-Google-Smtp-Source: ABdhPJz0+Wx8FlePRpciApvzJoZqsUGQeqDUyIJzpgtF9yr1rUki+orEphbcJKcqE9s5fB3m0cYnDg== X-Received: by 2002:a1c:7c13:: with SMTP id x19mr18864165wmc.45.1599443744300; Sun, 06 Sep 2020 18:55:44 -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?= Subject: [PATCH 5/7] hw/char/serial: Make 'wakeup' property boolean Date: Mon, 7 Sep 2020 03:55:33 +0200 Message-Id: <20200907015535.827885-6-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) Make the "wakeup" property introduced in commit 9826fd597df ("suspend: make serial ports wakeup the guest") a boolean. As we want to reuse the generic serial properties in the ISA model (next commit), expose this property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- include/hw/char/serial.h | 2 +- hw/char/serial-isa.c | 2 +- hw/char/serial.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 535fa23a2b8..3d2a5b27e87 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -60,7 +60,7 @@ typedef struct SerialState { uint32_t baudbase; uint32_t tsr_retry; guint watch_tag; - uint32_t wakeup; + bool wakeup; =20 /* Time when the last byte was successfully sent out of the tsr */ uint64_t last_xmit_ts; diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index b4c65949cd8..a0c338796d5 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -116,7 +116,7 @@ static Property serial_isa_properties[] =3D { DEFINE_PROP_UINT32("iobase", ISASerialState, iobase, -1), DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), - DEFINE_PROP_UINT32("wakeup", ISASerialState, state.wakeup, 0), + DEFINE_PROP_BOOL("wakeup", ISASerialState, state.wakeup, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/char/serial.c b/hw/char/serial.c index ade4adfd526..ade89fadb44 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -1015,6 +1015,7 @@ static const TypeInfo serial_io_info =3D { static Property serial_properties[] =3D { DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), + DEFINE_PROP_BOOL("wakeup", SerialState, wakeup, false), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.26.2 From nobody Sun May 5 14:33:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) client-ip=209.85.128.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1599443748; cv=none; d=zohomail.com; s=zohoarc; b=WrJNXspGUHhGlL4ENH7Kb67yTZ1oRx67g71DmBZ/jw2DmyU1OWs1Ljb23sw0akTBq72aYY0a6HyX4DHeGNH0Owuw9lsEVE3IpKSerroBBa1Qe+bZGaAwcMYXnM0GCNZuFxLdMmQbVqydHXBCte8WwYVanDUok6fGmLawGxtyGKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599443748; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rOdtOAtfcg70s6XvC95J7b24iDolYSlhUR8qCVqx1mg=; b=LMeGi7NT57TwoHx80gv7xwolaLTrHS04Iq7GKv/Fsph0BIoAmizIFLfNcx+sMIal+bNLLCM+qDfvSsI+nNbv2vuMzWUZjCkd0Y+zNiQmcF9cRXFmZ2FD/QbD9cl51rQTjDRfzk/5Qc9xYnKuthqMJwP6piouhL9HauPBh+Oq1w0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mx.zohomail.com with SMTPS id 159944374815935.36756609227541; Sun, 6 Sep 2020 18:55:48 -0700 (PDT) Received: by mail-wm1-f68.google.com with SMTP id e17so12876319wme.0 for ; Sun, 06 Sep 2020 18:55:47 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Sep 2020 18:55:44 -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=rOdtOAtfcg70s6XvC95J7b24iDolYSlhUR8qCVqx1mg=; b=TT96a1438TOU1/6XpjJ8jj2zBffaiIoSy0PrPjy/Ye7Lj+J3ZhA8EyX/9nIO75eO27 OspzVsLIAY4GzBsdrgV2/qCgv9hHMiCL/LUUC2fK74JnxksNAh3ZCVqgpYQxt4Q7pOdQ VaHrUjCCooeQSWR3kRfnDbz9K2fn4pOlyBm9xvxUkQ4D0prr0oPhH6JKO6j948TYJuGo 0AENerUpdiidW8eJgYhJF37rXkvjtHmffAQ5EcZLRR+UtOlTfXF0wWN6aRSXB2JTWHPY 1gqSeMlrCUC6nx4HRrXe3SVrdS69w4lWdklPqL0z9rtRUhQ1/zABfaWez8LkqBHlqPNb GA7A== 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=rOdtOAtfcg70s6XvC95J7b24iDolYSlhUR8qCVqx1mg=; b=pG+1Y/txEOvivQCL9QJQL+aDF0E5d3I6uWIsw+WwcSosuy49n7tIwya4gTZ3NdzFSk FfG+FgVJBNRs0MLp59J3u66kedkhkG8KiVMEWBcsNUs8/oDDnfli8JBtTp4crjz6opJi vS7cWWab8Incb6YDNLO4fAmTCUrSyf3TLwMrjdZ9X7Mu8o32MgVvC4BT8XUHth6sGYY6 Gw21zeFuuOpcReFD+gTqiAU5PZtAOyJm0i24FkmsRidC38UU/NFprC8lMTM9BGtemcQc kE9/Od20Gul7AMbGpcX4YhLft1TKGn+5Rhll58ZZYiord4IeZScXJcc5mBtm7vX6rWaM IlSA== X-Gm-Message-State: AOAM533mtnblvblKCxc6QRKswmhL5i3Y9AoxX1voG4zitV1Kg/fFkc+r n5PNNknZOTJ63wxAEh9a6Xw= X-Google-Smtp-Source: ABdhPJyp8VaHrFYgHeJQJsDHWfkSgg16a4KeNBjBfG3vUUMYvh7lgQs1hEDw1k3xQa+VU3SkLTUYAw== X-Received: by 2002:a1c:6145:: with SMTP id v66mr19218611wmb.171.1599443746206; Sun, 06 Sep 2020 18:55:46 -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?= Subject: [PATCH 6/7] hw/char/serial-isa: Alias QDEV properties from generic serial object Date: Mon, 7 Sep 2020 03:55:34 +0200 Message-Id: <20200907015535.827885-7-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) Instead of overwritting the properties of the generic 'state' object, alias them. Note we can now propagate the "baudbase" property. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/char/serial-isa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index a0c338796d5..0626edda8d1 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -115,8 +115,6 @@ static Property serial_isa_properties[] =3D { DEFINE_PROP_UINT32("index", ISASerialState, index, -1), DEFINE_PROP_UINT32("iobase", ISASerialState, iobase, -1), DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), - DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), - DEFINE_PROP_BOOL("wakeup", ISASerialState, state.wakeup, false), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -137,6 +135,8 @@ static void serial_isa_initfn(Object *o) ISASerialState *self =3D ISA_SERIAL(o); =20 object_initialize_child(o, "serial", &self->state, TYPE_SERIAL); + + qdev_alias_all_properties(DEVICE(&self->state), o); } =20 static const TypeInfo serial_isa_info =3D { --=20 2.26.2 From nobody Sun May 5 14:33:44 2024 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