From nobody Sat Feb 7 07:15:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495193193926246.87884984004882; Fri, 19 May 2017 04:26:33 -0700 (PDT) Received: from localhost ([::1]:57950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBg3E-0000JD-HB for importer@patchew.org; Fri, 19 May 2017 07:26:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBfyI-0004K6-Bg for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBfyH-0000vs-FS for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:26 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBfyH-0000vY-9O for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:25 -0400 Received: by mail-wm0-x244.google.com with SMTP id d127so17622474wmf.1 for ; Fri, 19 May 2017 04:21:25 -0700 (PDT) Received: from 640k.lan (94-39-157-43.adsl-ull.clienti.tiscali.it. [94.39.157.43]) by smtp.gmail.com with ESMTPSA id v65sm2640095wmv.5.2017.05.19.04.21.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 May 2017 04:21:23 -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=5HIVcRC7sTaQ4oyVWeVogPL27OYQ23z1XhMRTjFdMXM=; b=IXB+Kv3nuz8FHtdKE3UESvxrkpYOdH9GUWQ55ggUNrwVm/jSwDtJUsJa2mFcgDPqkN E9n4M4lHqP7ypA1XBZ1M7VaFAfJTTvDd14zOnFpC1I+Ul4l+5xw+HmmiBrGFtrfd9qcr 76xz3uMbOSVdBaBiLQsAzmqLP+ux97TP+ZiS9pNbXdxHZOgyHxGORW2IbbkDKvNhGMzg EbGkbCuZwEbEnjqkUJNgxwhmzKX6Fxs2NVTRve2l8nTZ0S75zqn9P0FZztBW2iajsbk0 0GyDGKEnazWGb1DQzIIXkT4SMoQOq2gTOuUr8K6xx7ndDVorwMR5yiMzmgVADoZ4pant SbIw== 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=5HIVcRC7sTaQ4oyVWeVogPL27OYQ23z1XhMRTjFdMXM=; b=Km48HKgmVXBAlClK7+fOjEkt9c1Db0kTRKSisuF2HcR2/NZFvlPr+jC+4/jHkPn2Me hKzWl4wSC+xadks6PpeXRiH94zbYwvKf7d1ybqgFoSmUrmwoYZevMPwstOmTzx56OmGS HWW8pRJYTdXQrxLUQpDpzYdHIAjZmARY/H0TA/cEIJk5bMiM/8Yfvm38HH237o+A1P03 dmxGoPcKW4i8LGt0SyE6YNF0SSBvJxlVqLN/c/ZNv7PDNtleahZW2eFcY6Fzyhw2h28m 3pNEqmUBVDrOUgkgKhFTkLudpqlYJB526UhAp2qVpAWUUFdtY3Lo15Fezkq2ie5tUayR suUw== X-Gm-Message-State: AODbwcD3d2kmC3YxcH9oeeCscOzGQKndTXeA0qeoWHeY40HT/ghL08Xm j643o1Rl5U5YFosOSrQ= X-Received: by 10.28.148.200 with SMTP id w191mr2128056wmd.0.1495192883978; Fri, 19 May 2017 04:21:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 May 2017 13:20:59 +0200 Message-Id: <1495192872-27667-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1495192872-27667-1-git-send-email-pbonzini@redhat.com> References: <1495192872-27667-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 07/20] msix: trace control bit write op X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Peter Xu Meanwhile, abstract a function to detect msix masked bit. Signed-off-by: Peter Xu Message-Id: <1494309644-18743-3-git-send-email-peterx@redhat.com> Acked-by: Michael S. Tsirkin Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/pci/msix.c | 11 +++++++++-- hw/pci/trace-events | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/pci/msix.c b/hw/pci/msix.c index bb54e8b..fc5fe51 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -22,6 +22,7 @@ #include "hw/xen/xen.h" #include "qemu/range.h" #include "qapi/error.h" +#include "trace.h" =20 #define MSIX_CAP_LENGTH 12 =20 @@ -130,10 +131,14 @@ static void msix_handle_mask_update(PCIDevice *dev, i= nt vector, bool was_masked) } } =20 +static bool msix_masked(PCIDevice *dev) +{ + return dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] & MSIX_MASKALL= _MASK; +} + static void msix_update_function_masked(PCIDevice *dev) { - dev->msix_function_masked =3D !msix_enabled(dev) || - (dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] & MSIX_MASKALL_M= ASK); + dev->msix_function_masked =3D !msix_enabled(dev) || msix_masked(dev); } =20 /* Handle MSI-X capability config write. */ @@ -148,6 +153,8 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, return; } =20 + trace_msix_write_config(dev->name, msix_enabled(dev), msix_masked(dev)= ); + was_masked =3D dev->msix_function_masked; msix_update_function_masked(dev); =20 diff --git a/hw/pci/trace-events b/hw/pci/trace-events index 2b9cf24..83c8f5a 100644 --- a/hw/pci/trace-events +++ b/hw/pci/trace-events @@ -7,3 +7,6 @@ pci_update_mappings_add(void *d, uint32_t bus, uint32_t slo= t, uint32_t func, int # hw/pci/pci_host.c pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs= , unsigned val) "%s %02u:%u @0x%x -> 0x%x" pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned off= s, unsigned val) "%s %02u:%u @0x%x <- 0x%x" + +# hw/pci/msix.c +msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %= d masked %d" --=20 1.8.3.1