From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Jason Wang" <jasowang@redhat.com>,
"Sriram Yagnaraman" <sriram.yagnaraman@est.tech>,
"Keith Busch" <kbusch@kernel.org>,
"Klaus Jensen" <its@irrelevant.dk>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org,
Yui Washizu <yui.washidu@gmail.com>,
Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH 04/14] hw/pci: Add pci-failover
Date: Sat, 02 Dec 2023 17:00:27 +0900 [thread overview]
Message-ID: <20231202-sriov-v1-4-32b3570f7bd6@daynix.com> (raw)
In-Reply-To: <20231202-sriov-v1-0-32b3570f7bd6@daynix.com>
pci-failover allows to create a device capable of failover without
relying on DeviceListener::hide_device(), which intrudes the
pci-device implementation from outside.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
include/hw/pci/pci_device.h | 14 ++++++++++++++
hw/pci/pci.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 57 insertions(+)
diff --git a/include/hw/pci/pci_device.h b/include/hw/pci/pci_device.h
index 8e287c5414..a7bfb192e8 100644
--- a/include/hw/pci/pci_device.h
+++ b/include/hw/pci/pci_device.h
@@ -9,6 +9,11 @@ typedef struct PCIDeviceClass PCIDeviceClass;
DECLARE_OBJ_CHECKERS(PCIDevice, PCIDeviceClass,
PCI_DEVICE, TYPE_PCI_DEVICE)
+#define TYPE_PCI_FAILOVER "pci-failover"
+typedef struct PCIFailoverClass PCIFailoverClass;
+DECLARE_CLASS_CHECKERS(PCIFailoverClass, PCI_FAILOVER, TYPE_PCI_FAILOVER)
+#define PCI_FAILOVER(obj) INTERFACE_CHECK(PciFailover, (obj), TYPE_PCI_FAILOVER)
+
/*
* Implemented by devices that can be plugged on CXL buses. In the spec, this is
* actually a "CXL Component, but we name it device to match the PCI naming.
@@ -162,6 +167,15 @@ struct PCIDevice {
uint32_t acpi_index;
};
+struct PCIFailoverClass {
+ /* private */
+ InterfaceClass parent_class;
+
+ /* public */
+ bool (* set_primary)(DeviceState *dev, const QDict *device_opts,
+ bool from_json, Error **errp);
+};
+
static inline int pci_intx(PCIDevice *pci_dev)
{
return pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1;
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 53c59a5b9f..3d07246f8e 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -46,6 +46,7 @@
#include "hw/pci/msix.h"
#include "hw/hotplug.h"
#include "hw/boards.h"
+#include "qapi/qmp/qdict.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
#include "pci-internal.h"
@@ -2050,6 +2051,40 @@ PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn)
return bus->devices[devfn];
}
+static bool pci_qdev_hide(DeviceClass *dc, const QDict *device_opts,
+ bool from_json, Error **errp)
+{
+ const char *standby_id;
+ DeviceState *dev;
+ ObjectClass *class;
+ ObjectClass *interface;
+
+ if (!device_opts) {
+ return false;
+ }
+
+ if (!qdict_haskey(device_opts, "failover_pair_id")) {
+ return false;
+ }
+
+ standby_id = qdict_get_str(device_opts, "failover_pair_id");
+ dev = qdev_find_recursive(sysbus_get_default(), standby_id);
+ if (!dev) {
+ error_setg(errp, "failover pair not found");
+ return false;
+ }
+
+ class = object_get_class(OBJECT(dev));
+ interface = object_class_dynamic_cast(class, TYPE_PCI_FAILOVER);
+ if (!interface) {
+ error_setg(errp, "failover pair does not support failover");
+ return false;
+ }
+
+ return ((PCIFailoverClass *)interface)->set_primary(dev, device_opts,
+ from_json, errp);
+}
+
#define ONBOARD_INDEX_MAX (16 * 1024 - 1)
static void pci_qdev_realize(DeviceState *qdev, Error **errp)
@@ -2653,6 +2688,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data)
{
DeviceClass *k = DEVICE_CLASS(klass);
+ k->hide = pci_qdev_hide;
k->realize = pci_qdev_realize;
k->unrealize = pci_qdev_unrealize;
k->bus_type = TYPE_PCI_BUS;
@@ -2861,6 +2897,12 @@ static const TypeInfo pci_device_type_info = {
.class_base_init = pci_device_class_base_init,
};
+static const TypeInfo pci_failover_type_info = {
+ .name = TYPE_PCI_FAILOVER,
+ .parent = TYPE_INTERFACE,
+ .class_size = sizeof(PCIFailoverClass),
+};
+
static void pci_register_types(void)
{
type_register_static(&pci_bus_info);
@@ -2870,6 +2912,7 @@ static void pci_register_types(void)
type_register_static(&cxl_interface_info);
type_register_static(&pcie_interface_info);
type_register_static(&pci_device_type_info);
+ type_register_static(&pci_failover_type_info);
}
type_init(pci_register_types)
--
2.43.0
next prev parent reply other threads:[~2023-12-02 8:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-02 8:00 [PATCH 00/14] virtio-net: add support for SR-IOV emulation Akihiko Odaki
2023-12-02 8:00 ` [PATCH 01/14] vfio: Avoid inspecting option QDict for rombar Akihiko Odaki
2023-12-02 8:00 ` [PATCH 02/14] hw/qdev: Remove opts member Akihiko Odaki
2023-12-02 8:00 ` [PATCH 03/14] qdev: Add DeviceClass::hide() Akihiko Odaki
2023-12-02 8:00 ` Akihiko Odaki [this message]
2023-12-02 8:00 ` [PATCH 05/14] virtio-net: Implement pci-failover Akihiko Odaki
2023-12-02 8:00 ` [PATCH 06/14] qdev: Remove DeviceListener::hide_device() Akihiko Odaki
2023-12-02 8:00 ` [PATCH 07/14] hw/pci: Add hide() Akihiko Odaki
2023-12-02 8:00 ` [PATCH 08/14] qdev: Add qdev_device_new_from_qdict() Akihiko Odaki
2023-12-02 8:00 ` [PATCH 09/14] hw/pci: Do not add ROM BAR for SR-IOV VF Akihiko Odaki
2023-12-02 8:00 ` [PATCH 10/14] msix: Call pcie_sriov_vf_register_bar() " Akihiko Odaki
2023-12-02 8:00 ` [PATCH 11/14] pcie_sriov: Release VFs failed to realize Akihiko Odaki
2023-12-02 8:00 ` [PATCH 12/14] pcie_sriov: Allow to specify VF device options Akihiko Odaki
2023-12-02 8:00 ` [PATCH 13/14] virtio-pci: add SR-IOV capability Akihiko Odaki
2023-12-02 8:00 ` [PATCH 14/14] virtio-net: Add " Akihiko Odaki
2023-12-02 8:08 ` [PATCH 00/14] virtio-net: add support for SR-IOV emulation Akihiko Odaki
2023-12-04 9:04 ` Yui Washizu
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=20231202-sriov-v1-4-32b3570f7bd6@daynix.com \
--to=akihiko.odaki@daynix.com \
--cc=alex.williamson@redhat.com \
--cc=berrange@redhat.com \
--cc=clg@redhat.com \
--cc=eduardo@habkost.net \
--cc=its@irrelevant.dk \
--cc=jasowang@redhat.com \
--cc=kbusch@kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sriram.yagnaraman@est.tech \
--cc=yui.washidu@gmail.com \
/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).