From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MhOdw-000346-0u for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:11:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MhOdr-00032P-2m for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:59 -0400 Received: from [199.232.76.173] (port=54728 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOdq-00032K-SM for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:54 -0400 Received: from mail-ew0-f223.google.com ([209.85.219.223]:38548) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MhOdn-0004BP-7K for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:10:54 -0400 Received: by ewy23 with SMTP id 23so3204445ewy.8 for ; Sat, 29 Aug 2009 07:10:47 -0700 (PDT) MIME-Version: 1.0 From: Blue Swirl Date: Sat, 29 Aug 2009 17:10:27 +0300 Message-ID: Content-Type: multipart/mixed; boundary=0015174c382cff965d0472485d9d Subject: [Qemu-devel] [PATCH, RFC 5/5] PPC: use device info for CPU statistics List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --0015174c382cff965d0472485d9d Content-Type: text/plain; charset=UTF-8 Signed-off-by: Blue Swirl --- cpu-all.h | 3 --- monitor.c | 15 --------------- qemu-monitor.hx | 2 -- target-ppc/cpu.h | 2 ++ target-ppc/helper.c | 1 + target-ppc/translate.c | 40 ++++++++++++++++++++++++---------------- 6 files changed, 27 insertions(+), 36 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 1a6a812..de65fb8 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -752,9 +752,6 @@ CPUState *qemu_get_cpu(int cpu); void cpu_dump_state(CPUState *env, FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...), int flags); -void cpu_dump_statistics (CPUState *env, FILE *f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), - int flags); void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))); diff --git a/monitor.c b/monitor.c index 9a55e1c..57212da 100644 --- a/monitor.c +++ b/monitor.c @@ -408,17 +408,6 @@ static void do_info_history(Monitor *mon) } } -#if defined(TARGET_PPC) -/* XXX: not implemented in other targets */ -static void do_info_cpu_stats(Monitor *mon) -{ - CPUState *env; - - env = mon_get_cpu(); - cpu_dump_statistics(env, (FILE *)mon, &monitor_fprintf, 0); -} -#endif - static void do_quit(Monitor *mon) { exit(0); @@ -1827,10 +1816,6 @@ static const mon_cmd_t info_cmds[] = { "", "show the current VM name" }, { "uuid", "", do_info_uuid, "", "show the current VM UUID" }, -#if defined(TARGET_PPC) - { "cpustats", "", do_info_cpu_stats, - "", "show CPU statistics", }, -#endif #if defined(CONFIG_SLIRP) { "usernet", "", do_info_usernet, "", "show user network stack connection states", }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 946ba34..c2ef603 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -73,8 +73,6 @@ show the vnc server status show the current VM name @item info uuid show the current VM UUID -@item info cpustats -show CPU statistics @item info usernet show user network stack connection states @item info migrate diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 27f523f..3cb0424 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -827,6 +827,8 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif +void register_stats_handler(const char *name, CPUState *env1); + #include "cpu-all.h" #include "exec-all.h" diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 5c85c61..192e137 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2812,6 +2812,7 @@ CPUPPCState *cpu_ppc_init (const char *cpu_model) env->cpu_model_str = cpu_model; cpu_ppc_register_internal(env, def); cpu_ppc_reset(env); + register_stats_handler(cpu_model, env); qemu_init_vcpu(env); diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 1c54fa7..547f370 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -28,6 +28,7 @@ #include "tcg-op.h" #include "qemu-common.h" #include "host-utils.h" +#include "monitor.h" #include "helper.h" #define GEN_HELPER 1 @@ -39,7 +40,7 @@ /* Include definitions for instructions classes and implementations flags */ //#define PPC_DEBUG_DISAS -//#define DO_PPC_STATISTICS +#define DO_PPC_STATISTICS #ifdef PPC_DEBUG_DISAS # define LOG_DISAS(...) qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__) @@ -8898,11 +8899,10 @@ void cpu_dump_state (CPUState *env, FILE *f, #undef RFPL } -void cpu_dump_statistics (CPUState *env, FILE*f, - int (*cpu_fprintf)(FILE *f, const char *fmt, ...), - int flags) +static void cpu_dump_statistics(Monitor *mon, void *opaque) { #if defined(DO_PPC_STATISTICS) + CPUState *env = opaque; opc_handler_t **t1, **t2, **t3, *handler; int op1, op2, op3; @@ -8919,32 +8919,40 @@ void cpu_dump_statistics (CPUState *env, FILE*f, handler = t3[op3]; if (handler->count == 0) continue; - cpu_fprintf(f, "%02x %02x %02x (%02x %04d) %16s: " - "%016llx %lld\n", - op1, op2, op3, op1, (op3 << 5) | op2, - handler->oname, - handler->count, handler->count); + monitor_printf(mon, "%02x %02x %02x (%02x %04d) %16s: " + "%016" PRIx64 " %" PRId64 "\n", + op1, op2, op3, op1, (op3 << 5) | op2, + handler->oname, + handler->count, handler->count); } } else { if (handler->count == 0) continue; - cpu_fprintf(f, "%02x %02x (%02x %04d) %16s: " - "%016llx %lld\n", - op1, op2, op1, op2, handler->oname, - handler->count, handler->count); + monitor_printf(mon, "%02x %02x (%02x %04d) %16s: " + "%016" PRIx64 " %" PRId64 "\n", + op1, op2, op1, op2, handler->oname, + handler->count, handler->count); } } } else { if (handler->count == 0) continue; - cpu_fprintf(f, "%02x (%02x ) %16s: %016llx %lld\n", - op1, op1, handler->oname, - handler->count, handler->count); + monitor_printf(mon, "%02x (%02x ) %16s: %016" PRIx64 + " %" PRId64 "\n", + op1, op1, handler->oname, + handler->count, handler->count); } } +#else + monitor_printf(mon, "CPU statistics not compiled\n"); #endif } +void register_stats_handler(const char *name, CPUState *env1) +{ + monitor_register_device_info(name, cpu_dump_statistics, env1); +} + /*****************************************************************************/ static inline void gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb, -- 1.6.2.4 --0015174c382cff965d0472485d9d Content-Type: application/mbox; name="0005-PPC-use-device-info-for-CPU-statistics.patch" Content-Disposition: attachment; filename="0005-PPC-use-device-info-for-CPU-statistics.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fyyfjbzk0 RnJvbSA0MzJmMjI3ZWI0YzU5MTcwYjBkNzFiOGQ5MWM0N2Y4YTZkMmFiNzk0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4KRGF0 ZTogU2F0LCAyOSBBdWcgMjAwOSAxNDowMjowOCArMDAwMApTdWJqZWN0OiBbUEFUQ0hdIFBQQzog dXNlIGRldmljZSBpbmZvIGZvciBDUFUgc3RhdGlzdGljcwoKU2lnbmVkLW9mZi1ieTogQmx1ZSBT d2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+Ci0tLQogY3B1LWFsbC5oICAgICAgICAgICAgICB8 ICAgIDMgLS0tCiBtb25pdG9yLmMgICAgICAgICAgICAgIHwgICAxNSAtLS0tLS0tLS0tLS0tLS0K IHFlbXUtbW9uaXRvci5oeCAgICAgICAgfCAgICAyIC0tCiB0YXJnZXQtcHBjL2NwdS5oICAgICAg IHwgICAgMiArKwogdGFyZ2V0LXBwYy9oZWxwZXIuYyAgICB8ICAgIDEgKwogdGFyZ2V0LXBwYy90 cmFuc2xhdGUuYyB8ICAgNDAgKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0t LQogNiBmaWxlcyBjaGFuZ2VkLCAyNyBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9jcHUtYWxsLmggYi9jcHUtYWxsLmgKaW5kZXggMWE2YTgxMi4uZGU2NWZiOCAx MDA2NDQKLS0tIGEvY3B1LWFsbC5oCisrKyBiL2NwdS1hbGwuaApAQCAtNzUyLDkgKzc1Miw2IEBA IENQVVN0YXRlICpxZW11X2dldF9jcHUoaW50IGNwdSk7CiB2b2lkIGNwdV9kdW1wX3N0YXRlKENQ VVN0YXRlICplbnYsIEZJTEUgKmYsCiAgICAgICAgICAgICAgICAgICAgIGludCAoKmNwdV9mcHJp bnRmKShGSUxFICpmLCBjb25zdCBjaGFyICpmbXQsIC4uLiksCiAgICAgICAgICAgICAgICAgICAg IGludCBmbGFncyk7Ci12b2lkIGNwdV9kdW1wX3N0YXRpc3RpY3MgKENQVVN0YXRlICplbnYsIEZJ TEUgKmYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGludCAoKmNwdV9mcHJpbnRmKShGSUxF ICpmLCBjb25zdCBjaGFyICpmbXQsIC4uLiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCBmbGFncyk7CiAKIHZvaWQgUUVNVV9OT1JFVFVSTiBjcHVfYWJvcnQoQ1BVU3RhdGUgKmVudiwg Y29uc3QgY2hhciAqZm10LCAuLi4pCiAgICAgX19hdHRyaWJ1dGVfXyAoKF9fZm9ybWF0X18gKF9f cHJpbnRmX18sIDIsIDMpKSk7CmRpZmYgLS1naXQgYS9tb25pdG9yLmMgYi9tb25pdG9yLmMKaW5k ZXggOWE1NWUxYy4uNTcyMTJkYSAxMDA2NDQKLS0tIGEvbW9uaXRvci5jCisrKyBiL21vbml0b3Iu YwpAQCAtNDA4LDE3ICs0MDgsNiBAQCBzdGF0aWMgdm9pZCBkb19pbmZvX2hpc3RvcnkoTW9uaXRv ciAqbW9uKQogICAgIH0KIH0KIAotI2lmIGRlZmluZWQoVEFSR0VUX1BQQykKLS8qIFhYWDogbm90 IGltcGxlbWVudGVkIGluIG90aGVyIHRhcmdldHMgKi8KLXN0YXRpYyB2b2lkIGRvX2luZm9fY3B1 X3N0YXRzKE1vbml0b3IgKm1vbikKLXsKLSAgICBDUFVTdGF0ZSAqZW52OwotCi0gICAgZW52ID0g bW9uX2dldF9jcHUoKTsKLSAgICBjcHVfZHVtcF9zdGF0aXN0aWNzKGVudiwgKEZJTEUgKiltb24s ICZtb25pdG9yX2ZwcmludGYsIDApOwotfQotI2VuZGlmCi0KIHN0YXRpYyB2b2lkIGRvX3F1aXQo TW9uaXRvciAqbW9uKQogewogICAgIGV4aXQoMCk7CkBAIC0xODI3LDEwICsxODE2LDYgQEAgc3Rh dGljIGNvbnN0IG1vbl9jbWRfdCBpbmZvX2NtZHNbXSA9IHsKICAgICAgICIiLCAic2hvdyB0aGUg Y3VycmVudCBWTSBuYW1lIiB9LAogICAgIHsgInV1aWQiLCAiIiwgZG9faW5mb191dWlkLAogICAg ICAgIiIsICJzaG93IHRoZSBjdXJyZW50IFZNIFVVSUQiIH0sCi0jaWYgZGVmaW5lZChUQVJHRVRf UFBDKQotICAgIHsgImNwdXN0YXRzIiwgIiIsIGRvX2luZm9fY3B1X3N0YXRzLAotICAgICAgIiIs ICJzaG93IENQVSBzdGF0aXN0aWNzIiwgfSwKLSNlbmRpZgogI2lmIGRlZmluZWQoQ09ORklHX1NM SVJQKQogICAgIHsgInVzZXJuZXQiLCAiIiwgZG9faW5mb191c2VybmV0LAogICAgICAgIiIsICJz aG93IHVzZXIgbmV0d29yayBzdGFjayBjb25uZWN0aW9uIHN0YXRlcyIsIH0sCmRpZmYgLS1naXQg YS9xZW11LW1vbml0b3IuaHggYi9xZW11LW1vbml0b3IuaHgKaW5kZXggOTQ2YmEzNC4uYzJlZjYw MyAxMDA2NDQKLS0tIGEvcWVtdS1tb25pdG9yLmh4CisrKyBiL3FlbXUtbW9uaXRvci5oeApAQCAt NzMsOCArNzMsNiBAQCBzaG93IHRoZSB2bmMgc2VydmVyIHN0YXR1cwogc2hvdyB0aGUgY3VycmVu dCBWTSBuYW1lCiBAaXRlbSBpbmZvIHV1aWQKIHNob3cgdGhlIGN1cnJlbnQgVk0gVVVJRAotQGl0 ZW0gaW5mbyBjcHVzdGF0cwotc2hvdyBDUFUgc3RhdGlzdGljcwogQGl0ZW0gaW5mbyB1c2VybmV0 CiBzaG93IHVzZXIgbmV0d29yayBzdGFjayBjb25uZWN0aW9uIHN0YXRlcwogQGl0ZW0gaW5mbyBt aWdyYXRlCmRpZmYgLS1naXQgYS90YXJnZXQtcHBjL2NwdS5oIGIvdGFyZ2V0LXBwYy9jcHUuaApp bmRleCAyN2Y1MjNmLi4zY2IwNDI0IDEwMDY0NAotLS0gYS90YXJnZXQtcHBjL2NwdS5oCisrKyBi L3RhcmdldC1wcGMvY3B1LmgKQEAgLTgyNyw2ICs4MjcsOCBAQCBzdGF0aWMgaW5saW5lIHZvaWQg Y3B1X2Nsb25lX3JlZ3MoQ1BVU3RhdGUgKmVudiwgdGFyZ2V0X3Vsb25nIG5ld3NwKQogfQogI2Vu ZGlmCiAKK3ZvaWQgcmVnaXN0ZXJfc3RhdHNfaGFuZGxlcihjb25zdCBjaGFyICpuYW1lLCBDUFVT dGF0ZSAqZW52MSk7CisKICNpbmNsdWRlICJjcHUtYWxsLmgiCiAjaW5jbHVkZSAiZXhlYy1hbGwu aCIKIApkaWZmIC0tZ2l0IGEvdGFyZ2V0LXBwYy9oZWxwZXIuYyBiL3RhcmdldC1wcGMvaGVscGVy LmMKaW5kZXggNWM4NWM2MS4uMTkyZTEzNyAxMDA2NDQKLS0tIGEvdGFyZ2V0LXBwYy9oZWxwZXIu YworKysgYi90YXJnZXQtcHBjL2hlbHBlci5jCkBAIC0yODEyLDYgKzI4MTIsNyBAQCBDUFVQUENT dGF0ZSAqY3B1X3BwY19pbml0IChjb25zdCBjaGFyICpjcHVfbW9kZWwpCiAgICAgZW52LT5jcHVf bW9kZWxfc3RyID0gY3B1X21vZGVsOwogICAgIGNwdV9wcGNfcmVnaXN0ZXJfaW50ZXJuYWwoZW52 LCBkZWYpOwogICAgIGNwdV9wcGNfcmVzZXQoZW52KTsKKyAgICByZWdpc3Rlcl9zdGF0c19oYW5k bGVyKGNwdV9tb2RlbCwgZW52KTsKIAogICAgIHFlbXVfaW5pdF92Y3B1KGVudik7CiAKZGlmZiAt LWdpdCBhL3RhcmdldC1wcGMvdHJhbnNsYXRlLmMgYi90YXJnZXQtcHBjL3RyYW5zbGF0ZS5jCmlu ZGV4IDFjNTRmYTcuLjU0N2YzNzAgMTAwNjQ0Ci0tLSBhL3RhcmdldC1wcGMvdHJhbnNsYXRlLmMK KysrIGIvdGFyZ2V0LXBwYy90cmFuc2xhdGUuYwpAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUg InRjZy1vcC5oIgogI2luY2x1ZGUgInFlbXUtY29tbW9uLmgiCiAjaW5jbHVkZSAiaG9zdC11dGls cy5oIgorI2luY2x1ZGUgIm1vbml0b3IuaCIKIAogI2luY2x1ZGUgImhlbHBlci5oIgogI2RlZmlu ZSBHRU5fSEVMUEVSIDEKQEAgLTM5LDcgKzQwLDcgQEAKIAogLyogSW5jbHVkZSBkZWZpbml0aW9u cyBmb3IgaW5zdHJ1Y3Rpb25zIGNsYXNzZXMgYW5kIGltcGxlbWVudGF0aW9ucyBmbGFncyAqLwog Ly8jZGVmaW5lIFBQQ19ERUJVR19ESVNBUwotLy8jZGVmaW5lIERPX1BQQ19TVEFUSVNUSUNTCisj ZGVmaW5lIERPX1BQQ19TVEFUSVNUSUNTCiAKICNpZmRlZiBQUENfREVCVUdfRElTQVMKICMgIGRl ZmluZSBMT0dfRElTQVMoLi4uKSBxZW11X2xvZ19tYXNrKENQVV9MT0dfVEJfSU5fQVNNLCAjIyBf X1ZBX0FSR1NfXykKQEAgLTg4OTgsMTEgKzg4OTksMTAgQEAgdm9pZCBjcHVfZHVtcF9zdGF0ZSAo Q1BVU3RhdGUgKmVudiwgRklMRSAqZiwKICN1bmRlZiBSRlBMCiB9CiAKLXZvaWQgY3B1X2R1bXBf c3RhdGlzdGljcyAoQ1BVU3RhdGUgKmVudiwgRklMRSpmLAotICAgICAgICAgICAgICAgICAgICAg ICAgICBpbnQgKCpjcHVfZnByaW50ZikoRklMRSAqZiwgY29uc3QgY2hhciAqZm10LCAuLi4pLAot ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgZmxhZ3MpCitzdGF0aWMgdm9pZCBjcHVfZHVt cF9zdGF0aXN0aWNzKE1vbml0b3IgKm1vbiwgdm9pZCAqb3BhcXVlKQogewogI2lmIGRlZmluZWQo RE9fUFBDX1NUQVRJU1RJQ1MpCisgICAgQ1BVU3RhdGUgKmVudiA9IG9wYXF1ZTsKICAgICBvcGNf aGFuZGxlcl90ICoqdDEsICoqdDIsICoqdDMsICpoYW5kbGVyOwogICAgIGludCBvcDEsIG9wMiwg b3AzOwogCkBAIC04OTE5LDMyICs4OTE5LDQwIEBAIHZvaWQgY3B1X2R1bXBfc3RhdGlzdGljcyAo Q1BVU3RhdGUgKmVudiwgRklMRSpmLAogICAgICAgICAgICAgICAgICAgICAgICAgaGFuZGxlciA9 IHQzW29wM107CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaGFuZGxlci0+Y291bnQgPT0g MCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGNwdV9mcHJpbnRmKGYsICIlMDJ4ICUwMnggJTAyeCAoJTAyeCAlMDRkKSAlMTZz OiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJTAxNmxseCAlbGxkXG4i LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3AxLCBvcDIsIG9wMywgb3Ax LCAob3AzIDw8IDUpIHwgb3AyLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aGFuZGxlci0+b25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBoYW5k bGVyLT5jb3VudCwgaGFuZGxlci0+Y291bnQpOworICAgICAgICAgICAgICAgICAgICAgICAgbW9u aXRvcl9wcmludGYobW9uLCAiJTAyeCAlMDJ4ICUwMnggKCUwMnggJTA0ZCkgJTE2czogIgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiUwMTYiIFBSSXg2NCAiICUiIFBS SWQ2NCAiXG4iLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3AxLCBv cDIsIG9wMywgb3AxLCAob3AzIDw8IDUpIHwgb3AyLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaGFuZGxlci0+b25hbWUsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBoYW5kbGVyLT5jb3VudCwgaGFuZGxlci0+Y291bnQpOwogICAgICAgICAg ICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgICAg ICAgaWYgKGhhbmRsZXItPmNvdW50ID09IDApCiAgICAgICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKLSAgICAgICAgICAgICAgICAgICAgY3B1X2ZwcmludGYoZiwgIiUwMnggJTAyeCAgICAo JTAyeCAlMDRkKSAlMTZzOiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIlMDE2 bGx4ICVsbGRcbiIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wMSwgb3AyLCBv cDEsIG9wMiwgaGFuZGxlci0+b25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGhhbmRsZXItPmNvdW50LCBoYW5kbGVyLT5jb3VudCk7CisgICAgICAgICAgICAgICAgICAgIG1v bml0b3JfcHJpbnRmKG1vbiwgIiUwMnggJTAyeCAgICAoJTAyeCAlMDRkKSAlMTZzOiAiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIlMDE2IiBQUkl4NjQgIiAlIiBQUklkNjQg IlxuIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3AxLCBvcDIsIG9wMSwg b3AyLCBoYW5kbGVyLT5vbmFtZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg aGFuZGxlci0+Y291bnQsIGhhbmRsZXItPmNvdW50KTsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBpZiAoaGFuZGxlci0+Y291 bnQgPT0gMCkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIGNwdV9mcHJp bnRmKGYsICIlMDJ4ICAgICAgICglMDJ4ICAgICApICUxNnM6ICUwMTZsbHggJWxsZFxuIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgIG9wMSwgb3AxLCBoYW5kbGVyLT5vbmFtZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgIGhhbmRsZXItPmNvdW50LCBoYW5kbGVyLT5jb3VudCk7CisgICAgICAg ICAgICBtb25pdG9yX3ByaW50Zihtb24sICIlMDJ4ICAgICAgICglMDJ4ICAgICApICUxNnM6ICUw MTYiIFBSSXg2NAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIiAlIiBQUklkNjQgIlxuIiwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wMSwgb3AxLCBoYW5kbGVyLT5vbmFtZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgIGhhbmRsZXItPmNvdW50LCBoYW5kbGVyLT5jb3VudCk7 CiAgICAgICAgIH0KICAgICB9CisjZWxzZQorICAgIG1vbml0b3JfcHJpbnRmKG1vbiwgIkNQVSBz dGF0aXN0aWNzIG5vdCBjb21waWxlZFxuIik7CiAjZW5kaWYKIH0KIAordm9pZCByZWdpc3Rlcl9z dGF0c19oYW5kbGVyKGNvbnN0IGNoYXIgKm5hbWUsIENQVVN0YXRlICplbnYxKQoreworICAgIG1v bml0b3JfcmVnaXN0ZXJfZGV2aWNlX2luZm8obmFtZSwgY3B1X2R1bXBfc3RhdGlzdGljcywgZW52 MSk7Cit9CisKIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8KIHN0YXRpYyBpbmxpbmUgdm9pZCBnZW5f aW50ZXJtZWRpYXRlX2NvZGVfaW50ZXJuYWwoQ1BVU3RhdGUgKmVudiwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVHJhbnNsYXRpb25CbG9jayAqdGIs Ci0tIAoxLjUuNi41Cgo= --0015174c382cff965d0472485d9d--