qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Eduardo Habkost <ehabkost@redhat.com>,
	David Gibson <david@gibson.dropbear.id.au>,
	Marcel Apfelbaum <marcel@redhat.com>
Subject: [Qemu-devel] [PULL 15/26] pci: conventional-pci-device and pci-express-device interfaces
Date: Sun, 15 Oct 2017 06:23:25 +0300	[thread overview]
Message-ID: <1508036858-13479-16-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1508036858-13479-1-git-send-email-mst@redhat.com>

From: Eduardo Habkost <ehabkost@redhat.com>

Those two interfaces will be used to indicate which device types
support Conventional PCI or PCI Express buses.  Management
software will be able to use the qom-list-types QMP command to
query that information.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/pci/pci.h |  6 ++++++
 hw/pci/pci.c         | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index aa7ef9c..8d02a0a 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -198,6 +198,12 @@ enum {
 #define PCI_DEVICE_GET_CLASS(obj) \
      OBJECT_GET_CLASS(PCIDeviceClass, (obj), TYPE_PCI_DEVICE)
 
+/* Implemented by devices that can be plugged on PCI Express buses */
+#define INTERFACE_PCIE_DEVICE "pci-express-device"
+
+/* Implemented by devices that can be plugged on Conventional PCI buses */
+#define INTERFACE_CONVENTIONAL_PCI_DEVICE "conventional-pci-device"
+
 typedef struct PCIINTxRoute {
     enum {
         PCI_INTX_ENABLED,
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 1e6fb88..1b08e18 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -170,6 +170,16 @@ static const TypeInfo pci_bus_info = {
     .class_init = pci_bus_class_init,
 };
 
+static const TypeInfo pcie_interface_info = {
+    .name          = INTERFACE_PCIE_DEVICE,
+    .parent        = TYPE_INTERFACE,
+};
+
+static const TypeInfo conventional_pci_interface_info = {
+    .name          = INTERFACE_CONVENTIONAL_PCI_DEVICE,
+    .parent        = TYPE_INTERFACE,
+};
+
 static const TypeInfo pcie_bus_info = {
     .name = TYPE_PCIE_BUS,
     .parent = TYPE_PCI_BUS,
@@ -2667,6 +2677,8 @@ static void pci_register_types(void)
 {
     type_register_static(&pci_bus_info);
     type_register_static(&pcie_bus_info);
+    type_register_static(&conventional_pci_interface_info);
+    type_register_static(&pcie_interface_info);
     type_register_static(&pci_device_type_info);
 }
 
-- 
MST

  parent reply	other threads:[~2017-10-15  3:23 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-15  3:22 [Qemu-devel] [PULL 00/26] pc, pci, virtio: fixes, features Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 01/26] xio3130_downstream: Report error if pcie_chassis_add_slot() failed Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 02/26] pci: Set err to errp directly rather than through error_propagate() Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 03/26] fw_cfg: add write callback Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 04/26] hw/misc: add vmcoreinfo device Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 05/26] dump: add guest ELF note Michael S. Tsirkin
2017-10-15  3:22 ` [Qemu-devel] [PULL 06/26] dump: update phys_base header field based on VMCOREINFO content Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 07/26] kdump: set vmcoreinfo location Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 08/26] scripts/dump-guest-memory.py: add vmcoreinfo Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 09/26] MAINTAINERS: add Dump maintainers Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 10/26] virtio/vhost: reset dev->log after syncing Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 11/26] pci: allow 32-bit PCI IO accesses to pass through the PCI bridge Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 12/26] hw/pci-bridge/pcie_pci_bridge: properly handle MSI unavailability case Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 13/26] virtio/pci/migration: Convert to VMState Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 14/26] PCI: PCIe access should always be little endian Michael S. Tsirkin
2017-10-15  3:23 ` Michael S. Tsirkin [this message]
2017-10-15  3:23 ` [Qemu-devel] [PULL 16/26] pci: Add interface names to hybrid PCI devices Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 17/26] pci: Add INTERFACE_PCIE_DEVICE to all PCIe devices Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 18/26] pci: Add INTERFACE_CONVENTIONAL_PCI_DEVICE to Conventional PCI devices Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 19/26] xen/pt: Mark TYPE_XEN_PT_DEVICE as hybrid Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 20/26] pci: Validate interfaces on base_class_init Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 21/26] hw/gen_pcie_root_port: make IO RO 0 on IO disabled Michael S. Tsirkin
2017-10-15  3:23 ` [Qemu-devel] [PULL 22/26] virtio: fix descriptor counting in virtqueue_pop Michael S. Tsirkin
2017-10-15  3:24 ` [Qemu-devel] [PULL 23/26] virtio-pci: Replace modern_as with direct access to modern_bar Michael S. Tsirkin
2017-10-15  3:24 ` [Qemu-devel] [PULL 24/26] isapc: Remove unnecessary migration compatibility code Michael S. Tsirkin
2017-10-15  3:24 ` [Qemu-devel] [PULL 25/26] pc: remove useless hot_add_cpu initialisation Michael S. Tsirkin
2017-10-15  3:24 ` [Qemu-devel] [PULL 26/26] tests/pxe: Test more NICs when running in SPEED=slow mode Michael S. Tsirkin
2017-10-16 17:29 ` [Qemu-devel] [PULL 00/26] pc, pci, virtio: fixes, features Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1508036858-13479-16-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=ehabkost@redhat.com \
    --cc=marcel@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).