From nobody Fri May 3 21:43:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599746346; cv=none; d=zohomail.com; s=zohoarc; b=AN/ORvDwp4lqFhjH9twZAdKUJykn3cyMeHbfYFyEFAwgXKeegUJIDh5nPrB33zxE/D/9Inl5lnaHpnJPwmnkYSV6LnVGXPzKORH2TeKSwOMN0mbLDFBoK0/kXtyZ5FgBN88vfSXG+bB+pK7v10BU++R2XiPqRMrxr+ejt1OwR6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599746346; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=I2nL5nubYV63BIiDSxuLpmGc2Alel66jSGDQ6bJQNtI=; b=MBjZ9sZowoBJV/1oRxrqEg+XjVsaiNduVoHvHdIFagFTQHNmcalueCKNst9Etg05XSYB7MSnfRYrNb01WefytekmdaoiM2gErAA5zs/AEqTmn8DvfeP4q4iUe3Ffhvl/blep3+CHAl7EVRazjQ0RPKodLccJ0j8Gsb/WZ51Pb/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 159974634645110.879696024430473; Thu, 10 Sep 2020 06:59:06 -0700 (PDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-317-JZ_7dTakN_CM1gwbuDG76w-1; Thu, 10 Sep 2020 09:59:01 -0400 Received: by mail-wm1-f69.google.com with SMTP id 189so37423wme.5 for ; Thu, 10 Sep 2020 06:59:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id p16sm9522186wro.71.2020.09.10.06.58.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 06:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599746343; 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=I2nL5nubYV63BIiDSxuLpmGc2Alel66jSGDQ6bJQNtI=; b=ELNrUeINlv70F2gy1xqsK5qv+LO8zPM62LJC4dyStdaYSP+mUzd5rXlAcOmauFUWK68159 qkOV5xlyxajGnZw4rlBe3TpNWUZ80376QDdPgMnMwzWHSw+mgozYE3rmyd45lm8eYhN57K lStqEhyHJeEi3lx5MFOzJmCnAgL+RUk= X-MC-Unique: JZ_7dTakN_CM1gwbuDG76w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=I2nL5nubYV63BIiDSxuLpmGc2Alel66jSGDQ6bJQNtI=; b=dZdwqfOwxIn9alDcDJ6GONR/p/ca0WXWKhYKrPBLLtzn4kEYAuNjDG2p3+mrhvblyX gF/f7NOxnv7JFOjgJpw+MQSJ49u9yhkCsIEGg4C1BffZiJK8gGuDSvggAuBxoovsCvj3 l2T3q2lGyc6jL+IRbtBW1zryS5lfj1X3XB9JXaISB4n32jG+3E2plXMJXVtkJD9XMSh2 wVgA1Vj0VaZHlOhao04ENqK+EgoGUQo0lqNQZ53tJgx6/Bno/zLnRQXTZEgvdpSHEjzO fF4N0BCGF7Oiz8jCd7iaOwSMmbBbqqPJI64I7INiDD2T/2qxu2DPOf/UQLvZUFtwPeNf 4YDA== X-Gm-Message-State: AOAM532rEs2bNGQnX8qyCpuZTOr6rNtxqGUfexPvphmo7U9DptbrMxHB L/4qyuZyuPFcgFVvl2kkzS6f8tAh9BleiLbv0RXkphfbz/YFw0LXOGpleOCAzN0h1Sz4QGxv9l7 EUteKLcH9JMyQEg== X-Received: by 2002:a1c:59c2:: with SMTP id n185mr106417wmb.43.1599746339505; Thu, 10 Sep 2020 06:58:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdU15i9on/xEzpzTFJeNDrKwhj18/wXMi72xocKjHs0sI3MuTd2RxP84+HjI55tvZNWr9DSQ== X-Received: by 2002:a1c:59c2:: with SMTP id n185mr106406wmb.43.1599746339336; Thu, 10 Sep 2020 06:58:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Michael Tokarev , Dov Murik , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v2 1/2] hw/timer/hpet: Remove dead code Date: Thu, 10 Sep 2020 15:58:51 +0200 Message-Id: <20200910135852.516809-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910135852.516809-1-philmd@redhat.com> References: <20200910135852.516809-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) This code was never compiled/used, remove it. Reviewed-by: Thomas Huth Signed-off-by: Dov Murik Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/hpet.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 380acfa7c8a..b683f64f1d3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -416,20 +416,6 @@ static void hpet_del_timer(HPETTimer *t) update_irq(t, 0); } =20 -#ifdef HPET_DEBUG -static uint32_t hpet_ram_readb(void *opaque, hwaddr addr) -{ - printf("qemu: hpet_read b at %" PRIx64 "\n", addr); - return 0; -} - -static uint32_t hpet_ram_readw(void *opaque, hwaddr addr) -{ - printf("qemu: hpet_read w at %" PRIx64 "\n", addr); - return 0; -} -#endif - static uint64_t hpet_ram_read(void *opaque, hwaddr addr, unsigned size) { --=20 2.26.2 From nobody Fri May 3 21:43:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599746348; cv=none; d=zohomail.com; s=zohoarc; b=iJY9NpouqSlPtfw4vzHyv43HC2cPJO18e0f95bPWhKs/fzXmz9CNRWPNEzxeVByeVGbx5WAftRThEjaVqpCNx7mS5YkHyMBhVjZvWUCXm8M1whoqOj1/mVfl2onFyOslmoDp/W/v2FnR519lt9fP1CkAUBNbyAhMu9E+kBGAsso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599746348; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZoFYGRmakF5g5oQA1REcNZ0QsgbkYiu/M6HpT8wcTwo=; b=hlT0YdqTZTsuq/l3Fp65fc2jcCZKCJsCwSGiRqa0iUoujUVj8jval7afSpiGj+izmZtNL3maKkqL+/BN2SZxPA7s/VNumd9y24ZDPvV7I8NDJ6boAmu5TrsfQjYl1Zx1DEVn7BgXb5ZEbNCdU/QbEkedTzZPSnI0p6TwtBVUJck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1599746348471143.0559840978774; Thu, 10 Sep 2020 06:59:08 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-474-ixCN4X7HPhKM4liFOiKzYw-1; Thu, 10 Sep 2020 09:59:05 -0400 Received: by mail-wm1-f72.google.com with SMTP id c72so39182wme.4 for ; Thu, 10 Sep 2020 06:59:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id q20sm3640924wmj.5.2020.09.10.06.59.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 06:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599746347; 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=ZoFYGRmakF5g5oQA1REcNZ0QsgbkYiu/M6HpT8wcTwo=; b=QgZOGZh+necEm2rvQ2yrX6TbR51UkqSFsDAp4mk4fkNZAKbBKyxNGpfClT7UfShk3+phqc yiRpEKCp0gjbOFfXVSgwgtXUV9jcJ/ygqAc7h2arbSLuh+XUQkP70uF9wEm/IxtVMOusHg cC3Z7okduE1w0+UuhH1Xu4+Oi2A312U= X-MC-Unique: ixCN4X7HPhKM4liFOiKzYw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZoFYGRmakF5g5oQA1REcNZ0QsgbkYiu/M6HpT8wcTwo=; b=OlfLkOCClDI5dGjIpUPoHw3wNXrZn3SzPOJdBrqB5H+kPFkK/3Ptdjzxb9rPzejkeN FvTZreUAULSFYNuVl7dJGNnRzgaj9tJ0NyOiiF21qldv9ZujkYLwt5jb79pB2TkCOQpV rzETdGL6CoTQ6iDCL2uy9F1J4nlUB8WWlz3kHrmOAU5mkZXlrT+12PNELTYhFzqVrwbx hMGT/vQtCQxNZvaUCsQ9JbzgkCy6nD+S7yT51lJY8JMPyJVmt0nCdpT69DZ4jfytQa/D cUFsRTy1qrfJWRH9ELQONAjmCUddsqEbqvLjxh/n9ttb1stp3hN5hObw8o/2Msp1X6Qx omNQ== X-Gm-Message-State: AOAM531NQTD2lRCUBszVtbZtoZ1J30N1W4e11jXqnHxtHZv/c0U8T3wk UQEj7xS+Nc9CfrxErX0fejx9KdKLtVzGrD0KEj3oScGGTcEhMg/lsRrdd7JiwZTDUTOaTwVj78t X2AAawT6z/oGhBw== X-Received: by 2002:a5d:634d:: with SMTP id b13mr9430866wrw.324.1599746344464; Thu, 10 Sep 2020 06:59:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwy6RIhL+x/0FP0Y9VjyGYMw3xGiuSxmmhaKbxe8cBobjfShD25xqqCwP6BM5Yq37IhOZALSQ== X-Received: by 2002:a5d:634d:: with SMTP id b13mr9430848wrw.324.1599746344288; Thu, 10 Sep 2020 06:59:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Michael Tokarev , Dov Murik , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth Subject: [PATCH v2 2/2] hw/timer/hpet: Fix DPRINTF format string Date: Thu, 10 Sep 2020 15:58:52 +0200 Message-Id: <20200910135852.516809-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200910135852.516809-1-philmd@redhat.com> References: <20200910135852.516809-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Fix building with HPET_DEBUG enabled: hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but t= he argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " =3D %#x\n", addr,= value); ~~~ ^= ~~~~ %#lx hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but t= he argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] value, s->hpet_counter); ^~~~~ Reviewed-by: Thomas Huth Signed-off-by: Dov Murik Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/timer/hpet.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index b683f64f1d3..20bd0388740 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -495,7 +495,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, HPETState *s =3D opaque; uint64_t old_val, new_val, val, index; =20 - DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " =3D %#x\n", addr, = value); + DPRINTF("qemu: Enter hpet_ram_writel at %#" HWADDR_PRIx " =3D %#"PRIx6= 4"\n", + addr, value); index =3D addr; old_val =3D hpet_ram_read(opaque, addr, 4); new_val =3D value; @@ -637,7 +638,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter =3D (s->hpet_counter & 0xffffffff00000000ULL) | value; - DPRINTF("qemu: HPET counter written. ctr =3D %#x -> %" PRIx64 = "\n", + DPRINTF("qemu: HPET counter written. ctr =3D %#" + PRIx64 " -> %#" PRIx64 "\n", value, s->hpet_counter); break; case HPET_COUNTER + 4: @@ -646,7 +648,8 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter =3D (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << = 32); - DPRINTF("qemu: HPET counter + 4 written. ctr =3D %#x -> %" PRI= x64 "\n", + DPRINTF("qemu: HPET counter + 4 written. ctr =3D %#" + PRIx64 " -> %#" PRIx64 "\n", value, s->hpet_counter); break; default: --=20 2.26.2