From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CE65C341DE for ; Fri, 13 Dec 2019 20:39:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D28832470A for ; Fri, 13 Dec 2019 20:39:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eThTNBIj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728076AbfLMQSY (ORCPT ); Fri, 13 Dec 2019 11:18:24 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26592 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728057AbfLMQSY (ORCPT ); Fri, 13 Dec 2019 11:18:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576253903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCZ3/HzJt6UebSooqSPs4MgLhNuCHweYJBKUsTXMBXw=; b=eThTNBIj1LpDkDq5CCRCKqh+fTh87XpfdBoRJx4Ua0Cnn5wVsZsqDvI45VF3FHikhHRsmz 0k6nC7gXlg+1jaIRLd+AGXlbFIEFq6RVMTcDJQvis44avpk/SgJWOReOHw+A3c8uIrKyTR NTDBAlnIcJSWq1zcb9vxnBhwPlu4ToQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-3ZUD0pJMOhuSY8G0PHLj2g-1; Fri, 13 Dec 2019 11:18:21 -0500 X-MC-Unique: 3ZUD0pJMOhuSY8G0PHLj2g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B5BB107ACC4; Fri, 13 Dec 2019 16:18:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB3BD19C4F; Fri, 13 Dec 2019 16:18:12 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: John Snow , "Michael S. Tsirkin" , Eduardo Habkost , Paul Durrant , Marcel Apfelbaum , kvm@vger.kernel.org, Stefano Stabellini , Igor Mammedov , Anthony Perard , qemu-block@nongnu.org, Richard Henderson , xen-devel@lists.xenproject.org, Paolo Bonzini , Sergio Lopez , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events Date: Fri, 13 Dec 2019 17:17:42 +0100 Message-Id: <20191213161753.8051-2-philmd@redhat.com> In-Reply-To: <20191213161753.8051-1-philmd@redhat.com> References: <20191213161753.8051-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Content-Transfer-Encoding: quoted-printable Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Convert the deprecated DPRINTF() macro to trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: rename pc_pic -> x86_pic --- hw/i386/pc.c | 19 +++++-------------- hw/i386/trace-events | 6 ++++++ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac08e63604..5f8e39c025 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -90,16 +90,7 @@ #include "config-devices.h" #include "e820_memory_layout.h" #include "fw_cfg.h" - -/* debug PC/ISA interrupts */ -//#define DEBUG_IRQ - -#ifdef DEBUG_IRQ -#define DPRINTF(fmt, ...) \ - do { printf("CPUIRQ: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) -#endif +#include "trace.h" =20 struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX}; =20 @@ -348,7 +339,7 @@ void gsi_handler(void *opaque, int n, int level) { GSIState *s =3D opaque; =20 - DPRINTF("pc: %s GSI %d\n", level ? "raising" : "lowering", n); + trace_x86_gsi_interrupt(n, level); if (n < ISA_NUM_IRQS) { qemu_set_irq(s->i8259_irq[n], level); } @@ -426,7 +417,7 @@ static void pic_irq_request(void *opaque, int irq, in= t level) CPUState *cs =3D first_cpu; X86CPU *cpu =3D X86_CPU(cs); =20 - DPRINTF("pic_irqs: %s irq %d\n", level? "raise" : "lower", irq); + trace_x86_pic_interrupt(irq, level); if (cpu->apic_state && !kvm_irqchip_in_kernel()) { CPU_FOREACH(cs) { cpu =3D X86_CPU(cs); @@ -760,7 +751,7 @@ static void port92_write(void *opaque, hwaddr addr, u= int64_t val, Port92State *s =3D opaque; int oldval =3D s->outport; =20 - DPRINTF("port92: write 0x%02" PRIx64 "\n", val); + trace_port92_write(val); s->outport =3D val; qemu_set_irq(s->a20_out, (val >> 1) & 1); if ((val & 1) && !(oldval & 1)) { @@ -775,7 +766,7 @@ static uint64_t port92_read(void *opaque, hwaddr addr= , uint32_t ret; =20 ret =3D s->outport; - DPRINTF("port92: read 0x%02x\n", ret); + trace_port92_read(ret); return ret; } =20 diff --git a/hw/i386/trace-events b/hw/i386/trace-events index c8bc464bc5..a608a5b635 100644 --- a/hw/i386/trace-events +++ b/hw/i386/trace-events @@ -111,3 +111,9 @@ amdvi_ir_irte_ga_val(uint64_t hi, uint64_t lo) "hi 0x= %"PRIx64" lo 0x%"PRIx64 # vmport.c vmport_register(unsigned char command, void *func, void *opaque) "comman= d: 0x%02x func: %p opaque: %p" vmport_command(unsigned char command) "command: 0x%02x" + +# pc.c +x86_gsi_interrupt(int irqn, int level) "GSI interrupt #%d level:%d" +x86_pic_interrupt(int irqn, int level) "PIC interrupt #%d level:%d" +port92_read(uint8_t val) "port92: read 0x%02x" +port92_write(uint8_t val) "port92: write 0x%02x" --=20 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95226C2D0CA for ; Fri, 13 Dec 2019 21:25:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A01821655 for ; Fri, 13 Dec 2019 21:25:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eThTNBIj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1A01821655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifnk2-0006Ez-40 for qemu-devel@archiver.kernel.org; Fri, 13 Dec 2019 11:24:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56601) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifne8-0007pM-G0 for qemu-devel@nongnu.org; Fri, 13 Dec 2019 11:18:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifne6-0008Di-Dr for qemu-devel@nongnu.org; Fri, 13 Dec 2019 11:18:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33514 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifne4-0008AL-PY for qemu-devel@nongnu.org; Fri, 13 Dec 2019 11:18:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576253903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCZ3/HzJt6UebSooqSPs4MgLhNuCHweYJBKUsTXMBXw=; b=eThTNBIj1LpDkDq5CCRCKqh+fTh87XpfdBoRJx4Ua0Cnn5wVsZsqDvI45VF3FHikhHRsmz 0k6nC7gXlg+1jaIRLd+AGXlbFIEFq6RVMTcDJQvis44avpk/SgJWOReOHw+A3c8uIrKyTR NTDBAlnIcJSWq1zcb9vxnBhwPlu4ToQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-3ZUD0pJMOhuSY8G0PHLj2g-1; Fri, 13 Dec 2019 11:18:21 -0500 X-MC-Unique: 3ZUD0pJMOhuSY8G0PHLj2g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B5BB107ACC4; Fri, 13 Dec 2019 16:18:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB3BD19C4F; Fri, 13 Dec 2019 16:18:12 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events Date: Fri, 13 Dec 2019 17:17:42 +0100 Message-Id: <20191213161753.8051-2-philmd@redhat.com> In-Reply-To: <20191213161753.8051-1-philmd@redhat.com> References: <20191213161753.8051-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Convert the deprecated DPRINTF() macro to trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: rename pc_pic -> x86_pic --- hw/i386/pc.c | 19 +++++-------------- hw/i386/trace-events | 6 ++++++ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac08e63604..5f8e39c025 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -90,16 +90,7 @@ #include "config-devices.h" #include "e820_memory_layout.h" #include "fw_cfg.h" - -/* debug PC/ISA interrupts */ -//#define DEBUG_IRQ - -#ifdef DEBUG_IRQ -#define DPRINTF(fmt, ...) \ - do { printf("CPUIRQ: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) -#endif +#include "trace.h" =20 struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX}; =20 @@ -348,7 +339,7 @@ void gsi_handler(void *opaque, int n, int level) { GSIState *s =3D opaque; =20 - DPRINTF("pc: %s GSI %d\n", level ? "raising" : "lowering", n); + trace_x86_gsi_interrupt(n, level); if (n < ISA_NUM_IRQS) { qemu_set_irq(s->i8259_irq[n], level); } @@ -426,7 +417,7 @@ static void pic_irq_request(void *opaque, int irq, in= t level) CPUState *cs =3D first_cpu; X86CPU *cpu =3D X86_CPU(cs); =20 - DPRINTF("pic_irqs: %s irq %d\n", level? "raise" : "lower", irq); + trace_x86_pic_interrupt(irq, level); if (cpu->apic_state && !kvm_irqchip_in_kernel()) { CPU_FOREACH(cs) { cpu =3D X86_CPU(cs); @@ -760,7 +751,7 @@ static void port92_write(void *opaque, hwaddr addr, u= int64_t val, Port92State *s =3D opaque; int oldval =3D s->outport; =20 - DPRINTF("port92: write 0x%02" PRIx64 "\n", val); + trace_port92_write(val); s->outport =3D val; qemu_set_irq(s->a20_out, (val >> 1) & 1); if ((val & 1) && !(oldval & 1)) { @@ -775,7 +766,7 @@ static uint64_t port92_read(void *opaque, hwaddr addr= , uint32_t ret; =20 ret =3D s->outport; - DPRINTF("port92: read 0x%02x\n", ret); + trace_port92_read(ret); return ret; } =20 diff --git a/hw/i386/trace-events b/hw/i386/trace-events index c8bc464bc5..a608a5b635 100644 --- a/hw/i386/trace-events +++ b/hw/i386/trace-events @@ -111,3 +111,9 @@ amdvi_ir_irte_ga_val(uint64_t hi, uint64_t lo) "hi 0x= %"PRIx64" lo 0x%"PRIx64 # vmport.c vmport_register(unsigned char command, void *func, void *opaque) "comman= d: 0x%02x func: %p opaque: %p" vmport_command(unsigned char command) "command: 0x%02x" + +# pc.c +x86_gsi_interrupt(int irqn, int level) "GSI interrupt #%d level:%d" +x86_pic_interrupt(int irqn, int level) "PIC interrupt #%d level:%d" +port92_read(uint8_t val) "port92: read 0x%02x" +port92_write(uint8_t val) "port92: write 0x%02x" --=20 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 761A5C43603 for ; Fri, 13 Dec 2019 21:01:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8402246AA for ; Fri, 13 Dec 2019 21:01:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RglyfGT3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8402246AA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifne6-0008LT-GA; Fri, 13 Dec 2019 16:18:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ifne5-0008LO-KK for xen-devel@lists.xenproject.org; Fri, 13 Dec 2019 16:18:25 +0000 X-Inumbo-ID: 3009ebe4-1dc4-11ea-8f6f-12813bfff9fa Received: from us-smtp-delivery-1.mimecast.com (unknown [205.139.110.61]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 3009ebe4-1dc4-11ea-8f6f-12813bfff9fa; Fri, 13 Dec 2019 16:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576253904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zCZ3/HzJt6UebSooqSPs4MgLhNuCHweYJBKUsTXMBXw=; b=RglyfGT3r9CU70deDTCvjAs5XCx3qtvStP4m6DkjyTQrfiM21GcbA+NAnRxI/KyttjdCI6 W1jxIIZ+o+/88oWO3+eFqn3FO0PGLmpJdX8LrQ1PYXB61ihC7lfKJKitd6YQm20d4tbSHq MpgdcYuw+CpGhDmcHc8BsdnKdxHjr7I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-3ZUD0pJMOhuSY8G0PHLj2g-1; Fri, 13 Dec 2019 11:18:21 -0500 X-MC-Unique: 3ZUD0pJMOhuSY8G0PHLj2g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B5BB107ACC4; Fri, 13 Dec 2019 16:18:20 +0000 (UTC) Received: from x1w.redhat.com (ovpn-205-147.brq.redhat.com [10.40.205.147]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB3BD19C4F; Fri, 13 Dec 2019 16:18:12 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 13 Dec 2019 17:17:42 +0100 Message-Id: <20191213161753.8051-2-philmd@redhat.com> In-Reply-To: <20191213161753.8051-1-philmd@redhat.com> References: <20191213161753.8051-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Subject: [Xen-devel] [PATCH 01/12] hw/i386/pc: Convert DPRINTF() to trace events X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Paolo Bonzini , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Q29udmVydCB0aGUgZGVwcmVjYXRlZCBEUFJJTlRGKCkgbWFjcm8gdG8gdHJhY2UgZXZlbnRzLgoK U2lnbmVkLW9mZi1ieTogUGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29t PgotLS0KdjI6IHJlbmFtZSBwY19waWMgLT4geDg2X3BpYwotLS0KIGh3L2kzODYvcGMuYyAgICAg ICAgIHwgMTkgKysrKystLS0tLS0tLS0tLS0tLQogaHcvaTM4Ni90cmFjZS1ldmVudHMgfCAgNiAr KysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni9wYy5jIGIvaHcvaTM4Ni9wYy5jCmluZGV4IGFjMDhlNjM2 MDQuLjVmOGUzOWMwMjUgMTAwNjQ0Ci0tLSBhL2h3L2kzODYvcGMuYworKysgYi9ody9pMzg2L3Bj LmMKQEAgLTkwLDE2ICs5MCw3IEBACiAjaW5jbHVkZSAiY29uZmlnLWRldmljZXMuaCIKICNpbmNs dWRlICJlODIwX21lbW9yeV9sYXlvdXQuaCIKICNpbmNsdWRlICJmd19jZmcuaCIKLQotLyogZGVi dWcgUEMvSVNBIGludGVycnVwdHMgKi8KLS8vI2RlZmluZSBERUJVR19JUlEKLQotI2lmZGVmIERF QlVHX0lSUQotI2RlZmluZSBEUFJJTlRGKGZtdCwgLi4uKSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFwKLSAgICBkbyB7IHByaW50ZigiQ1BVSVJROiAiIGZtdCAsICMjIF9f VkFfQVJHU19fKTsgfSB3aGlsZSAoMCkKLSNlbHNlCi0jZGVmaW5lIERQUklOVEYoZm10LCAuLi4p Ci0jZW5kaWYKKyNpbmNsdWRlICJ0cmFjZS5oIgogCiBzdHJ1Y3QgaHBldF9md19jb25maWcgaHBl dF9jZmcgPSB7LmNvdW50ID0gVUlOVDhfTUFYfTsKIApAQCAtMzQ4LDcgKzMzOSw3IEBAIHZvaWQg Z3NpX2hhbmRsZXIodm9pZCAqb3BhcXVlLCBpbnQgbiwgaW50IGxldmVsKQogewogICAgIEdTSVN0 YXRlICpzID0gb3BhcXVlOwogCi0gICAgRFBSSU5URigicGM6ICVzIEdTSSAlZFxuIiwgbGV2ZWwg PyAicmFpc2luZyIgOiAibG93ZXJpbmciLCBuKTsKKyAgICB0cmFjZV94ODZfZ3NpX2ludGVycnVw dChuLCBsZXZlbCk7CiAgICAgaWYgKG4gPCBJU0FfTlVNX0lSUVMpIHsKICAgICAgICAgcWVtdV9z ZXRfaXJxKHMtPmk4MjU5X2lycVtuXSwgbGV2ZWwpOwogICAgIH0KQEAgLTQyNiw3ICs0MTcsNyBA QCBzdGF0aWMgdm9pZCBwaWNfaXJxX3JlcXVlc3Qodm9pZCAqb3BhcXVlLCBpbnQgaXJxLCBpbnQg bGV2ZWwpCiAgICAgQ1BVU3RhdGUgKmNzID0gZmlyc3RfY3B1OwogICAgIFg4NkNQVSAqY3B1ID0g WDg2X0NQVShjcyk7CiAKLSAgICBEUFJJTlRGKCJwaWNfaXJxczogJXMgaXJxICVkXG4iLCBsZXZl bD8gInJhaXNlIiA6ICJsb3dlciIsIGlycSk7CisgICAgdHJhY2VfeDg2X3BpY19pbnRlcnJ1cHQo aXJxLCBsZXZlbCk7CiAgICAgaWYgKGNwdS0+YXBpY19zdGF0ZSAmJiAha3ZtX2lycWNoaXBfaW5f a2VybmVsKCkpIHsKICAgICAgICAgQ1BVX0ZPUkVBQ0goY3MpIHsKICAgICAgICAgICAgIGNwdSA9 IFg4Nl9DUFUoY3MpOwpAQCAtNzYwLDcgKzc1MSw3IEBAIHN0YXRpYyB2b2lkIHBvcnQ5Ml93cml0 ZSh2b2lkICpvcGFxdWUsIGh3YWRkciBhZGRyLCB1aW50NjRfdCB2YWwsCiAgICAgUG9ydDkyU3Rh dGUgKnMgPSBvcGFxdWU7CiAgICAgaW50IG9sZHZhbCA9IHMtPm91dHBvcnQ7CiAKLSAgICBEUFJJ TlRGKCJwb3J0OTI6IHdyaXRlIDB4JTAyIiBQUkl4NjQgIlxuIiwgdmFsKTsKKyAgICB0cmFjZV9w b3J0OTJfd3JpdGUodmFsKTsKICAgICBzLT5vdXRwb3J0ID0gdmFsOwogICAgIHFlbXVfc2V0X2ly cShzLT5hMjBfb3V0LCAodmFsID4+IDEpICYgMSk7CiAgICAgaWYgKCh2YWwgJiAxKSAmJiAhKG9s ZHZhbCAmIDEpKSB7CkBAIC03NzUsNyArNzY2LDcgQEAgc3RhdGljIHVpbnQ2NF90IHBvcnQ5Ml9y ZWFkKHZvaWQgKm9wYXF1ZSwgaHdhZGRyIGFkZHIsCiAgICAgdWludDMyX3QgcmV0OwogCiAgICAg cmV0ID0gcy0+b3V0cG9ydDsKLSAgICBEUFJJTlRGKCJwb3J0OTI6IHJlYWQgMHglMDJ4XG4iLCBy ZXQpOworICAgIHRyYWNlX3BvcnQ5Ml9yZWFkKHJldCk7CiAgICAgcmV0dXJuIHJldDsKIH0KIApk aWZmIC0tZ2l0IGEvaHcvaTM4Ni90cmFjZS1ldmVudHMgYi9ody9pMzg2L3RyYWNlLWV2ZW50cwpp bmRleCBjOGJjNDY0YmM1Li5hNjA4YTViNjM1IDEwMDY0NAotLS0gYS9ody9pMzg2L3RyYWNlLWV2 ZW50cworKysgYi9ody9pMzg2L3RyYWNlLWV2ZW50cwpAQCAtMTExLDMgKzExMSw5IEBAIGFtZHZp X2lyX2lydGVfZ2FfdmFsKHVpbnQ2NF90IGhpLCB1aW50NjRfdCBsbykgImhpIDB4JSJQUkl4NjQi IGxvIDB4JSJQUkl4NjQKICMgdm1wb3J0LmMKIHZtcG9ydF9yZWdpc3Rlcih1bnNpZ25lZCBjaGFy IGNvbW1hbmQsIHZvaWQgKmZ1bmMsIHZvaWQgKm9wYXF1ZSkgImNvbW1hbmQ6IDB4JTAyeCBmdW5j OiAlcCBvcGFxdWU6ICVwIgogdm1wb3J0X2NvbW1hbmQodW5zaWduZWQgY2hhciBjb21tYW5kKSAi Y29tbWFuZDogMHglMDJ4IgorCisjIHBjLmMKK3g4Nl9nc2lfaW50ZXJydXB0KGludCBpcnFuLCBp bnQgbGV2ZWwpICJHU0kgaW50ZXJydXB0ICMlZCBsZXZlbDolZCIKK3g4Nl9waWNfaW50ZXJydXB0 KGludCBpcnFuLCBpbnQgbGV2ZWwpICJQSUMgaW50ZXJydXB0ICMlZCBsZXZlbDolZCIKK3BvcnQ5 Ml9yZWFkKHVpbnQ4X3QgdmFsKSAicG9ydDkyOiByZWFkIDB4JTAyeCIKK3BvcnQ5Ml93cml0ZSh1 aW50OF90IHZhbCkgInBvcnQ5Mjogd3JpdGUgMHglMDJ4IgotLSAKMi4yMS4wCgoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcg bGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9q ZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==