{"id":807216,"url":"http://patchwork.ozlabs.org/api/patches/807216/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504030416-18618-1-git-send-email-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504030416-18618-1-git-send-email-thuth@redhat.com>","list_archive_url":null,"date":"2017-08-29T18:13:36","name":"[for-2.11] tests: Fix broken ivshmem-server-msi/-irq tests","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2a555b1caa3bd0041002421b5f634219e827285a","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504030416-18618-1-git-send-email-thuth@redhat.com/mbox/","series":[{"id":429,"url":"http://patchwork.ozlabs.org/api/series/429/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=429","date":"2017-08-29T18:13:36","name":"[for-2.11] tests: Fix broken ivshmem-server-msi/-irq tests","version":1,"mbox":"http://patchwork.ozlabs.org/series/429/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807216/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807216/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=thuth@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhcGm712Mz9s9Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 04:14:23 +1000 (AEST)","from localhost ([::1]:46427 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dml1p-0005HN-51\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 14:14:21 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46254)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <thuth@redhat.com>) id 1dml1J-0005H1-Te\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 14:13:50 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <thuth@redhat.com>) id 1dml1E-0001np-Ru\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 14:13:49 -0400","from mx1.redhat.com ([209.132.183.28]:57486)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <thuth@redhat.com>)\n\tid 1dml1E-0001nd-Lw; Tue, 29 Aug 2017 14:13:44 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 57E10C047B86;\n\tTue, 29 Aug 2017 18:13:43 +0000 (UTC)","from thh440s.redhat.com (ovpn-116-54.ams2.redhat.com\n\t[10.36.116.54])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id DB4385D9C8;\n\tTue, 29 Aug 2017 18:13:37 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 57E10C047B86","From":"Thomas Huth <thuth@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Tue, 29 Aug 2017 20:13:36 +0200","Message-Id":"<1504030416-18618-1-git-send-email-thuth@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tTue, 29 Aug 2017 18:13:43 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH for-2.11] tests: Fix broken\n\tivshmem-server-msi/-irq tests","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"qemu-trivial@nongnu.org, Laurent Vivier <lvivier@redhat.com>,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\tDavid Gibson <david@gibson.dropbear.id.au>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Broken with commit b4ba67d9a7025 (\"libqos: Change PCI accessors to take\nopaque BAR handle\") a while ago, but nobody noticed since the tests are\nonly run in SPEED=slow mode: The msix_pba_bar is not correctly initialized\nanymore if bir_pba has the same value as bir_table. With this fix,\n\"make check SPEED=slow\" should work fine again.\n\nFixes: b4ba67d9a702507793c2724e56f98e9b0f7be02b\nSigned-off-by: Thomas Huth <thuth@redhat.com>\n---\n tests/libqos/pci.c | 7 ++++++-\n 1 file changed, 6 insertions(+), 1 deletion(-)","diff":"diff --git a/tests/libqos/pci.c b/tests/libqos/pci.c\nindex 2dcdead..28d576c 100644\n--- a/tests/libqos/pci.c\n+++ b/tests/libqos/pci.c\n@@ -120,6 +120,8 @@ void qpci_msix_enable(QPCIDevice *dev)\n     bir_pba = table & PCI_MSIX_FLAGS_BIRMASK;\n     if (bir_pba != bir_table) {\n         dev->msix_pba_bar = qpci_iomap(dev, bir_pba, NULL);\n+    } else {\n+        dev->msix_pba_bar = dev->msix_table_bar;\n     }\n     dev->msix_pba_off = table & ~PCI_MSIX_FLAGS_BIRMASK;\n \n@@ -138,8 +140,11 @@ void qpci_msix_disable(QPCIDevice *dev)\n     qpci_config_writew(dev, addr + PCI_MSIX_FLAGS,\n                                                 val & ~PCI_MSIX_FLAGS_ENABLE);\n \n+    if (dev->msix_pba_bar.addr != dev->msix_table_bar.addr) {\n+        qpci_iounmap(dev, dev->msix_pba_bar);\n+    }\n     qpci_iounmap(dev, dev->msix_table_bar);\n-    qpci_iounmap(dev, dev->msix_pba_bar);\n+\n     dev->msix_enabled = 0;\n     dev->msix_table_off = 0;\n     dev->msix_pba_off = 0;\n","prefixes":["for-2.11"]}