{"id":807753,"url":"http://patchwork.ozlabs.org/api/patches/807753/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-15-cohuck@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":"<20170830165252.13421-15-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:22","name":"[PULL,14/44] kvm: remove hard dependency on pci","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8c15bfbf9d39ad31ee65a53ecaaba77b3b4a22cc","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-15-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807753/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807753/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@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 3xjBq11RLfz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 03:10:53 +1000 (AEST)","from localhost ([::1]:51698 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6Vu-0000Qn-Rc\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:10:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56829)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Fa-0001za-Kw\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:54:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6FZ-0005GV-Np\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:58 -0400","from mx1.redhat.com ([209.132.183.28]:33718)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6FZ-0005GA-Fd\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:57 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 65B6F7EA9E;\n\tWed, 30 Aug 2017 16:53:56 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id BA2656951E;\n\tWed, 30 Aug 2017 16:53:53 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 65B6F7EA9E","From":"Cornelia Huck ","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:22 +0200","Message-Id":"<20170830165252.13421-15-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 30 Aug 2017 16:53:56 +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] [PULL 14/44] kvm: remove hard dependency on pci","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"The msi routing code in kvm calls some pci functions: provide\nsome stubs to enable builds without pci.\n\nAlso, to make this more obvious, guard them via a pci_available boolean\n(which also can be reused in other places).\n\nFixes: e1d4fb2de (\"kvm-irqchip: x86: add msi route notify fn\")\nFixes: 767a554a0 (\"kvm-all: Pass requester ID to MSI routing functions\")\nReviewed-by: Pierre Morel \nReviewed-by: Thomas Huth \nAcked-by: Christian Borntraeger \nSigned-off-by: Cornelia Huck \n---\n accel/kvm/kvm-all.c | 6 +++---\n hw/pci/pci-stub.c | 14 ++++++++++++++\n hw/pci/pci.c | 2 ++\n include/hw/pci/pci.h | 2 ++\n 4 files changed, 21 insertions(+), 3 deletions(-)","diff":"diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex 46ce479dc3..f85553a851 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -1248,7 +1248,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)\n int virq;\n MSIMessage msg = {0, 0};\n \n- if (dev) {\n+ if (pci_available && dev) {\n msg = pci_get_msi_message(dev, vector);\n }\n \n@@ -1271,7 +1271,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev)\n kroute.u.msi.address_lo = (uint32_t)msg.address;\n kroute.u.msi.address_hi = msg.address >> 32;\n kroute.u.msi.data = le32_to_cpu(msg.data);\n- if (kvm_msi_devid_required()) {\n+ if (pci_available && kvm_msi_devid_required()) {\n kroute.flags = KVM_MSI_VALID_DEVID;\n kroute.u.msi.devid = pci_requester_id(dev);\n }\n@@ -1309,7 +1309,7 @@ int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,\n kroute.u.msi.address_lo = (uint32_t)msg.address;\n kroute.u.msi.address_hi = msg.address >> 32;\n kroute.u.msi.data = le32_to_cpu(msg.data);\n- if (kvm_msi_devid_required()) {\n+ if (pci_available && kvm_msi_devid_required()) {\n kroute.flags = KVM_MSI_VALID_DEVID;\n kroute.u.msi.devid = pci_requester_id(dev);\n }\ndiff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c\nindex ecad664946..d5ce00748e 100644\n--- a/hw/pci/pci-stub.c\n+++ b/hw/pci/pci-stub.c\n@@ -27,6 +27,7 @@\n #include \"hw/pci/msi.h\"\n \n bool msi_nonbroken;\n+bool pci_available;\n \n PciInfoList *qmp_query_pci(Error **errp)\n {\n@@ -38,3 +39,16 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict)\n {\n monitor_printf(mon, \"PCI devices not supported\\n\");\n }\n+\n+/* kvm-all wants this */\n+MSIMessage pci_get_msi_message(PCIDevice *dev, int vector)\n+{\n+ g_assert(false);\n+ return (MSIMessage){};\n+}\n+\n+uint16_t pci_requester_id(PCIDevice *dev)\n+{\n+ g_assert(false);\n+ return 0;\n+}\ndiff --git a/hw/pci/pci.c b/hw/pci/pci.c\nindex 258fbe51e2..26f346db2c 100644\n--- a/hw/pci/pci.c\n+++ b/hw/pci/pci.c\n@@ -49,6 +49,8 @@\n # define PCI_DPRINTF(format, ...) do { } while (0)\n #endif\n \n+bool pci_available = true;\n+\n static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent);\n static char *pcibus_get_dev_path(DeviceState *dev);\n static char *pcibus_get_fw_dev_path(DeviceState *dev);\ndiff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h\nindex e598b095eb..8bb6449dd7 100644\n--- a/include/hw/pci/pci.h\n+++ b/include/hw/pci/pci.h\n@@ -10,6 +10,8 @@\n \n #include \"hw/pci/pcie.h\"\n \n+extern bool pci_available;\n+\n /* PCI bus */\n \n #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))\n","prefixes":["PULL","14/44"]}