Investigate the git history to uncover when and why the VFIO

properties were introduced and update the models. This is mostly

targeting vfio-pci device, since vfio-platform, vfio-ap and vfio-ccw

devices are simpler.

Sort the properties based on the QEMU version in which they were

introduced.

Cc: Tony Krowiak <akrowiak@linux.ibm.com>

Cc: Eric Farman <farman@linux.ibm.com>

Cc: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Kirti Wankhede <kwankhede@nvidia.com>

Reviewed-by: Anthony Krowiak <akrowiak@linux.ibm.com>

Reviewed-by: Eric Farman <farman@linux.ibm.com> # vfio-ccw

Reviewed-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250217173455.449983-1-clg@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/ap.c | 9 ++++

hw/vfio/ccw.c | 15 ++++++

hw/vfio/pci.c | 125 +++++++++++++++++++++++++++++++++++++++++++++

hw/vfio/platform.c | 24 +++++++++

4 files changed, 173 insertions(+)

diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/ap.c

+++ b/hw/vfio/ap.c

@@ -XXX,XX +XXX,XX @@ static void vfio_ap_class_init(ObjectClass *klass, void *data)

dc->hotpluggable = true;

device_class_set_legacy_reset(dc, vfio_ap_reset);

dc->bus_type = TYPE_AP_BUS;

+

+ object_class_property_set_description(klass, /* 3.1 */

+ "sysfsdev",

+ "Host sysfs path of assigned device");

+#ifdef CONFIG_IOMMUFD

+ object_class_property_set_description(klass, /* 9.0 */

+ "iommufd",

+ "Set host IOMMUFD backend device");

+#endif

}

static const TypeInfo vfio_ap_info = {

diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/ccw.c

+++ b/hw/vfio/ccw.c

@@ -XXX,XX +XXX,XX @@ static void vfio_ccw_class_init(ObjectClass *klass, void *data)

cdc->handle_halt = vfio_ccw_handle_halt;

cdc->handle_clear = vfio_ccw_handle_clear;

cdc->handle_store = vfio_ccw_handle_store;

+

+ object_class_property_set_description(klass, /* 2.10 */

+ "sysfsdev",

+ "Host sysfs path of assigned device");

+ object_class_property_set_description(klass, /* 3.0 */

+ "force-orb-pfch",

+ "Force unlimited prefetch");

+#ifdef CONFIG_IOMMUFD

+ object_class_property_set_description(klass, /* 9.0 */

+ "iommufd",

+ "Set host IOMMUFD backend device");

+#endif

+ object_class_property_set_description(klass, /* 9.2 */

+ "loadparm",

+ "Define which devices that can be used for booting");

}

static const TypeInfo vfio_ccw_info = {

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)

pdc->exit = vfio_exitfn;

pdc->config_read = vfio_pci_read_config;

pdc->config_write = vfio_pci_write_config;

+

+ object_class_property_set_description(klass, /* 1.3 */

+ "host",

+ "Host PCI address [domain:]<bus:slot.function> of assigned device");

+ object_class_property_set_description(klass, /* 1.3 */

+ "x-intx-mmap-timeout-ms",

+ "When EOI is not provided by KVM/QEMU, wait time "

+ "(milliseconds) to re-enable device direct access "

+ "after INTx (DEBUG)");

+ object_class_property_set_description(klass, /* 1.5 */

+ "x-vga",

+ "Expose VGA address spaces for device");

+ object_class_property_set_description(klass, /* 2.3 */

+ "x-req",

+ "Disable device request notification support (DEBUG)");

+ object_class_property_set_description(klass, /* 2.4 and 2.5 */

+ "x-no-mmap",

+ "Disable MMAP for device. Allows to trace MMIO "

+ "accesses (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-no-kvm-intx",

+ "Disable direct VFIO->KVM INTx injection. Allows to "

+ "trace INTx interrupts (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-no-kvm-msi",

+ "Disable direct VFIO->KVM MSI injection. Allows to "

+ "trace MSI interrupts (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-no-kvm-msix",

+ "Disable direct VFIO->KVM MSIx injection. Allows to "

+ "trace MSIx interrupts (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-pci-vendor-id",

+ "Override PCI Vendor ID with provided value (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-pci-device-id",

+ "Override PCI device ID with provided value (DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-pci-sub-vendor-id",

+ "Override PCI Subsystem Vendor ID with provided value "

+ "(DEBUG)");

+ object_class_property_set_description(klass, /* 2.5 */

+ "x-pci-sub-device-id",

+ "Override PCI Subsystem Device ID with provided value "

+ "(DEBUG)");

+ object_class_property_set_description(klass, /* 2.6 */

+ "sysfsdev",

+ "Host sysfs path of assigned device");

+ object_class_property_set_description(klass, /* 2.7 */

+ "x-igd-opregion",

+ "Expose host IGD OpRegion to guest");

+ object_class_property_set_description(klass, /* 2.7 (See c4c45e943e51) */

+ "x-igd-gms",

+ "Override IGD data stolen memory size (32MiB units)");

+ object_class_property_set_description(klass, /* 2.11 */

+ "x-nv-gpudirect-clique",

+ "Add NVIDIA GPUDirect capability indicating P2P DMA "

+ "clique for device [0-15]");

+ object_class_property_set_description(klass, /* 2.12 */

+ "x-no-geforce-quirks",

+ "Disable GeForce quirks (for NVIDIA Quadro/GRID/Tesla). "

+ "Improves performance");

+ object_class_property_set_description(klass, /* 2.12 */

+ "display",

+ "Enable display support for device, ex. vGPU");

+ object_class_property_set_description(klass, /* 2.12 */

+ "x-msix-relocation",

+ "Specify MSI-X MMIO relocation to the end of specified "

+ "existing BAR or new BAR to avoid virtualization overhead "

+ "due to adjacent device registers");

+ object_class_property_set_description(klass, /* 3.0 */

+ "x-no-kvm-ioeventfd",

+ "Disable registration of ioeventfds with KVM (DEBUG)");

+ object_class_property_set_description(klass, /* 3.0 */

+ "x-no-vfio-ioeventfd",

+ "Disable linking of KVM ioeventfds to VFIO ioeventfds "

+ "(DEBUG)");

+ object_class_property_set_description(klass, /* 3.1 */

+ "x-balloon-allowed",

+ "Override allowing ballooning with device (DEBUG, DANGER)");

+ object_class_property_set_description(klass, /* 3.2 */

+ "xres",

+ "Set X display resolution the vGPU should use");

+ object_class_property_set_description(klass, /* 3.2 */

+ "yres",

+ "Set Y display resolution the vGPU should use");

+ object_class_property_set_description(klass, /* 5.2 */

+ "x-pre-copy-dirty-page-tracking",

+ "Disable dirty pages tracking during iterative phase "

+ "(DEBUG)");

+ object_class_property_set_description(klass, /* 5.2, 8.0 non-experimetal */

+ "enable-migration",

+ "Enale device migration. Also requires a host VFIO PCI "

+ "variant or mdev driver with migration support enabled");

+ object_class_property_set_description(klass, /* 8.1 */

+ "vf-token",

+ "Specify UUID VF token. Required for VF when PF is owned "

+ "by another VFIO driver");

+#ifdef CONFIG_IOMMUFD

+ object_class_property_set_description(klass, /* 9.0 */

+ "iommufd",

+ "Set host IOMMUFD backend device");

+#endif

+ object_class_property_set_description(klass, /* 9.1 */

+ "x-device-dirty-page-tracking",

+ "Disable device dirty page tracking and use "

+ "container-based dirty page tracking (DEBUG)");

+ object_class_property_set_description(klass, /* 9.1 */

+ "migration-events",

+ "Emit VFIO migration QAPI event when a VFIO device "

+ "changes its migration state. For management applications");

+ object_class_property_set_description(klass, /* 9.1 */

+ "skip-vsc-check",

+ "Skip config space check for Vendor Specific Capability. "

+ "Setting to false will enforce strict checking of VSC content "

+ "(DEBUG)");

}

static const TypeInfo vfio_pci_dev_info = {

@@ -XXX,XX +XXX,XX @@ static void vfio_pci_nohotplug_dev_class_init(ObjectClass *klass, void *data)

device_class_set_props(dc, vfio_pci_dev_nohotplug_properties);

dc->hotpluggable = false;

+

+ object_class_property_set_description(klass, /* 3.1 */

+ "ramfb",

+ "Enable ramfb to provide pre-boot graphics for devices "

+ "enabling display option");

+ object_class_property_set_description(klass, /* 8.2 */

+ "x-ramfb-migrate",

+ "Override default migration support for ramfb support "

+ "(DEBUG)");

}

static const TypeInfo vfio_pci_nohotplug_dev_info = {

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/platform.c

+++ b/hw/vfio/platform.c

@@ -XXX,XX +XXX,XX @@ static void vfio_platform_class_init(ObjectClass *klass, void *data)

dc->desc = "VFIO-based platform device assignment";

sbc->connect_irq_notifier = vfio_start_irqfd_injection;

set_bit(DEVICE_CATEGORY_MISC, dc->categories);

+

+ object_class_property_set_description(klass, /* 2.4 */

+ "host",

+ "Host device name of assigned device");

+ object_class_property_set_description(klass, /* 2.4 and 2.5 */

+ "x-no-mmap",

+ "Disable MMAP for device. Allows to trace MMIO "

+ "accesses (DEBUG)");

+ object_class_property_set_description(klass, /* 2.4 */

+ "mmap-timeout-ms",

+ "When EOI is not provided by KVM/QEMU, wait time "

+ "(milliseconds) to re-enable device direct access "

+ "after level interrupt (DEBUG)");

+ object_class_property_set_description(klass, /* 2.4 */

+ "x-irqfd",

+ "Allow disabling irqfd support (DEBUG)");

+ object_class_property_set_description(klass, /* 2.6 */

+ "sysfsdev",

+ "Host sysfs path of assigned device");

+#ifdef CONFIG_IOMMUFD

+ object_class_property_set_description(klass, /* 9.0 */

+ "iommufd",

+ "Set host IOMMUFD backend device");

+#endif

}

static const TypeInfo vfio_platform_dev_info = {

--

2.48.1

Use the common helper warn_report_once() instead of implementing its

own.

Cc: Eric Farman <farman@linux.ibm.com>

Reviewed-by: Eric Farman <farman@linux.ibm.com>

Link: https://lore.kernel.org/qemu-devel/20250214161936.1720039-1-clg@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/ccw.c | 12 ++----------

1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/ccw.c

+++ b/hw/vfio/ccw.c

@@ -XXX,XX +XXX,XX @@ struct VFIOCCWDevice {

EventNotifier crw_notifier;

EventNotifier req_notifier;

bool force_orb_pfch;

- bool warned_orb_pfch;

};

-static inline void warn_once_pfch(VFIOCCWDevice *vcdev, SubchDev *sch,

- const char *msg)

-{

- warn_report_once_cond(&vcdev->warned_orb_pfch,

- "vfio-ccw (devno %x.%x.%04x): %s",

- sch->cssid, sch->ssid, sch->devno, msg);

-}

-

static void vfio_ccw_compute_needs_reset(VFIODevice *vdev)

{

vdev->needs_reset = false;

@@ -XXX,XX +XXX,XX @@ static IOInstEnding vfio_ccw_handle_request(SubchDev *sch)

if (!(sch->orb.ctrl0 & ORB_CTRL0_MASK_PFCH) && vcdev->force_orb_pfch) {

sch->orb.ctrl0 |= ORB_CTRL0_MASK_PFCH;

- warn_once_pfch(vcdev, sch, "PFCH flag forced");

+ warn_report_once("vfio-ccw (devno %x.%x.%04x): PFCH flag forced",

+ sch->cssid, sch->ssid, sch->devno);

}

QEMU_BUILD_BUG_ON(sizeof(region->orb_area) != sizeof(ORB));

--

2.48.1

From: Alex Williamson <alex.williamson@redhat.com>

The memory and IO BARs for devices are only accessible in the D0 power

state. In other power states the PCI spec defines that the device

responds to TLPs and messages with an Unsupported Request response.

To approximate this behavior, consider the BARs as unmapped when the

device is not in the D0 power state. This makes the BARs inaccessible

and has the additional bonus for vfio-pci that we don't attempt to DMA

map BARs for devices in a non-D0 power state.

To support this, an interface is added for devices to register the PM

capability, which allows central tracking to enforce valid transitions

and unmap BARs in non-D0 states.

NB. We currently have device models (eepro100 and pcie_pci_bridge)

that register a PM capability but do not set wmask to enable writes to

the power state field. In order to maintain migration compatibility,

this new helper does not manage the wmask to enable guest writes to

initiate a power state change. The contents and write access of the

PM capability are still managed by the caller.

Cc: Michael S. Tsirkin <mst@redhat.com>

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-2-alex.williamson@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/hw/pci/pci.h | 3 ++

include/hw/pci/pci_device.h | 3 ++

hw/pci/pci.c | 93 ++++++++++++++++++++++++++++++++++++-

hw/pci/trace-events | 2 +

4 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/pci/pci.h

+++ b/include/hw/pci/pci.h

@@ -XXX,XX +XXX,XX @@ enum {

QEMU_PCIE_ARI_NEXTFN_1 = (1 << QEMU_PCIE_ARI_NEXTFN_1_BITNR),

#define QEMU_PCIE_EXT_TAG_BITNR 13

QEMU_PCIE_EXT_TAG = (1 << QEMU_PCIE_EXT_TAG_BITNR),

+#define QEMU_PCI_CAP_PM_BITNR 14

+ QEMU_PCI_CAP_PM = (1 << QEMU_PCI_CAP_PM_BITNR),

};

typedef struct PCIINTxRoute {

@@ -XXX,XX +XXX,XX @@ static inline void pci_irq_deassert(PCIDevice *pci_dev)

MSIMessage pci_get_msi_message(PCIDevice *dev, int vector);

void pci_set_enabled(PCIDevice *pci_dev, bool state);

void pci_set_power(PCIDevice *pci_dev, bool state);

+int pci_pm_init(PCIDevice *pci_dev, uint8_t offset, Error **errp);

#endif

diff --git a/include/hw/pci/pci_device.h b/include/hw/pci/pci_device.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/pci/pci_device.h

+++ b/include/hw/pci/pci_device.h

@@ -XXX,XX +XXX,XX @@ struct PCIDevice {

/* Capability bits */

uint32_t cap_present;

+ /* Offset of PM capability in config space */

+ uint8_t pm_cap;

+

/* Offset of MSI-X capability in config space */

uint8_t msix_cap;

diff --git a/hw/pci/pci.c b/hw/pci/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/pci/pci.c

+++ b/hw/pci/pci.c

@@ -XXX,XX +XXX,XX @@ static void pci_msi_trigger(PCIDevice *dev, MSIMessage msg)

attrs, NULL);

}

+/*

+ * Register and track a PM capability. If wmask is also enabled for the power

+ * state field of the pmcsr register, guest writes may change the device PM

+ * state. BAR access is only enabled while the device is in the D0 state.

+ * Return the capability offset or negative error code.

+ */

+int pci_pm_init(PCIDevice *d, uint8_t offset, Error **errp)

+{

+ int cap = pci_add_capability(d, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF, errp);

+

+ if (cap < 0) {

+ return cap;

+ }

+

+ d->pm_cap = cap;

+ d->cap_present |= QEMU_PCI_CAP_PM;

+

+ return cap;

+}

+

+static uint8_t pci_pm_state(PCIDevice *d)

+{

+ uint16_t pmcsr;

+

+ if (!(d->cap_present & QEMU_PCI_CAP_PM)) {

+ return 0;

+ }

+

+ pmcsr = pci_get_word(d->config + d->pm_cap + PCI_PM_CTRL);

+

+ return pmcsr & PCI_PM_CTRL_STATE_MASK;

+}

+

+/*

+ * Update the PM capability state based on the new value stored in config

+ * space respective to the old, pre-write state provided. If the new value

+ * is rejected (unsupported or invalid transition) restore the old value.

+ * Return the resulting PM state.

+ */

+static uint8_t pci_pm_update(PCIDevice *d, uint32_t addr, int l, uint8_t old)

+{

+ uint16_t pmc;

+ uint8_t new;

+

+ if (!(d->cap_present & QEMU_PCI_CAP_PM) ||

+ !range_covers_byte(addr, l, d->pm_cap + PCI_PM_CTRL)) {

+ return old;

+ }

+

+ new = pci_pm_state(d);

+ if (new == old) {

+ return old;

+ }

+

+ pmc = pci_get_word(d->config + d->pm_cap + PCI_PM_PMC);

+

+ /*

+ * Transitions to D1 & D2 are only allowed if supported. Devices may

+ * only transition to higher D-states or to D0.

+ */

+ if ((!(pmc & PCI_PM_CAP_D1) && new == 1) ||

+ (!(pmc & PCI_PM_CAP_D2) && new == 2) ||

+ (old && new && new < old)) {

+ pci_word_test_and_clear_mask(d->config + d->pm_cap + PCI_PM_CTRL,

+ PCI_PM_CTRL_STATE_MASK);

+ pci_word_test_and_set_mask(d->config + d->pm_cap + PCI_PM_CTRL,

+ old);

+ trace_pci_pm_bad_transition(d->name, pci_dev_bus_num(d),

+ PCI_SLOT(d->devfn), PCI_FUNC(d->devfn),

+ old, new);

+ return old;

+ }

+

+ trace_pci_pm_transition(d->name, pci_dev_bus_num(d), PCI_SLOT(d->devfn),

+ PCI_FUNC(d->devfn), old, new);

+ return new;

+}

+

static void pci_reset_regions(PCIDevice *dev)

{

int r;

@@ -XXX,XX +XXX,XX @@ static void pci_do_device_reset(PCIDevice *dev)

pci_get_word(dev->wmask + PCI_INTERRUPT_LINE) |

pci_get_word(dev->w1cmask + PCI_INTERRUPT_LINE));

dev->config[PCI_CACHE_LINE_SIZE] = 0x0;

+ /* Default PM state is D0 */

+ if (dev->cap_present & QEMU_PCI_CAP_PM) {

+ pci_word_test_and_clear_mask(dev->config + dev->pm_cap + PCI_PM_CTRL,

+ PCI_PM_CTRL_STATE_MASK);

+ }

pci_reset_regions(dev);

pci_update_mappings(dev);

@@ -XXX,XX +XXX,XX @@ static void pci_update_mappings(PCIDevice *d)

continue;

new_addr = pci_bar_address(d, i, r->type, r->size);

- if (!d->enabled) {

+ if (!d->enabled || pci_pm_state(d)) {

new_addr = PCI_BAR_UNMAPPED;

}

@@ -XXX,XX +XXX,XX @@ uint32_t pci_default_read_config(PCIDevice *d,

void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int l)

{

+ uint8_t new_pm_state, old_pm_state = pci_pm_state(d);

int i, was_irq_disabled = pci_irq_disabled(d);

uint32_t val = val_in;

@@ -XXX,XX +XXX,XX @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int

d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask);

d->config[addr + i] &= ~(val & w1cmask); /* W1C: Write 1 to Clear */

}

+

+ new_pm_state = pci_pm_update(d, addr, l, old_pm_state);

+

if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||

ranges_overlap(addr, l, PCI_ROM_ADDRESS, 4) ||

ranges_overlap(addr, l, PCI_ROM_ADDRESS1, 4) ||

- range_covers_byte(addr, l, PCI_COMMAND))

+ range_covers_byte(addr, l, PCI_COMMAND) ||

+ !!new_pm_state != !!old_pm_state) {

pci_update_mappings(d);

+ }

if (ranges_overlap(addr, l, PCI_COMMAND, 2)) {

pci_update_irq_disabled(d, was_irq_disabled);

diff --git a/hw/pci/trace-events b/hw/pci/trace-events

index XXXXXXX..XXXXXXX 100644

--- a/hw/pci/trace-events

+++ b/hw/pci/trace-events

@@ -XXX,XX +XXX,XX @@

# See docs/devel/tracing.rst for syntax documentation.

# pci.c

+pci_pm_bad_transition(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, uint8_t old, uint8_t new) "%s %02x:%02x.%x REJECTED PM transition D%d->D%d"

+pci_pm_transition(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, uint8_t old, uint8_t new) "%s %02x:%02x.%x PM transition D%d->D%d"

pci_update_mappings_del(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64

pci_update_mappings_add(const char *dev, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "%s %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64

pci_route_irq(int dev_irq, const char *dev_path, int parent_irq, const char *parent_path) "IRQ %d @%s -> IRQ %d @%s"

--

2.48.1

From: Alex Williamson <alex.williamson@redhat.com>

Switch callers directly initializing the PCI PM capability with

pci_add_capability() to use pci_pm_init().

Cc: Dmitry Fleytman <dmitry.fleytman@gmail.com>

Cc: Akihiko Odaki <akihiko.odaki@daynix.com>

Cc: Jason Wang <jasowang@redhat.com>

Cc: Stefan Weil <sw@weilnetz.de>

Cc: Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>

Cc: Keith Busch <kbusch@kernel.org>

Cc: Klaus Jensen <its@irrelevant.dk>

Cc: Jesper Devantier <foss@defmacro.it>

Cc: Michael S. Tsirkin <mst@redhat.com>

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

Cc: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-3-alex.williamson@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/net/e1000e.c | 3 +--

hw/net/eepro100.c | 4 +---

hw/net/igb.c | 3 +--

hw/nvme/ctrl.c | 3 +--

hw/pci-bridge/pcie_pci_bridge.c | 2 +-

hw/vfio/pci.c | 7 ++++++-

hw/virtio/virtio-pci.c | 3 +--

7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/e1000e.c

+++ b/hw/net/e1000e.c

@@ -XXX,XX +XXX,XX @@ static int

e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc)

{

Error *local_err = NULL;

- int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset,

- PCI_PM_SIZEOF, &local_err);

+ int ret = pci_pm_init(pdev, offset, &local_err);

if (local_err) {

error_report_err(local_err);

diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/eepro100.c

+++ b/hw/net/eepro100.c

@@ -XXX,XX +XXX,XX @@ static void e100_pci_reset(EEPRO100State *s, Error **errp)

if (info->power_management) {

/* Power Management Capabilities */

int cfg_offset = 0xdc;

- int r = pci_add_capability(&s->dev, PCI_CAP_ID_PM,

- cfg_offset, PCI_PM_SIZEOF,

- errp);

+ int r = pci_pm_init(&s->dev, cfg_offset, errp);

if (r < 0) {

return;

}

diff --git a/hw/net/igb.c b/hw/net/igb.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/igb.c

+++ b/hw/net/igb.c

@@ -XXX,XX +XXX,XX @@ static int

igb_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc)

{

Error *local_err = NULL;

- int ret = pci_add_capability(pdev, PCI_CAP_ID_PM, offset,

- PCI_PM_SIZEOF, &local_err);

+ int ret = pci_pm_init(pdev, offset, &local_err);

if (local_err) {

error_report_err(local_err);

diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/nvme/ctrl.c

+++ b/hw/nvme/ctrl.c

@@ -XXX,XX +XXX,XX @@ static int nvme_add_pm_capability(PCIDevice *pci_dev, uint8_t offset)

Error *err = NULL;

int ret;

- ret = pci_add_capability(pci_dev, PCI_CAP_ID_PM, offset,

- PCI_PM_SIZEOF, &err);

+ ret = pci_pm_init(pci_dev, offset, &err);

if (err) {

error_report_err(err);

return ret;

diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/pci-bridge/pcie_pci_bridge.c

+++ b/hw/pci-bridge/pcie_pci_bridge.c

@@ -XXX,XX +XXX,XX @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error **errp)

goto cap_error;

}

- pos = pci_add_capability(d, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF, errp);

+ pos = pci_pm_init(d, 0, errp);

if (pos < 0) {

goto pm_error;

}

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static bool vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)

case PCI_CAP_ID_PM:

vfio_check_pm_reset(vdev, pos);

vdev->pm_cap = pos;

- ret = pci_add_capability(pdev, cap_id, pos, size, errp) >= 0;

+ ret = pci_pm_init(pdev, pos, errp) >= 0;

+ /*

+ * PCI-core config space emulation needs write access to the power

+ * state enabled for tracking BAR mapping relative to PM state.

+ */

+ pci_set_word(pdev->wmask + pos + PCI_PM_CTRL, PCI_PM_CTRL_STATE_MASK);

break;

case PCI_CAP_ID_AF:

vfio_check_af_flr(vdev, pos);

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/virtio-pci.c

+++ b/hw/virtio/virtio-pci.c

@@ -XXX,XX +XXX,XX @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)

pos = pcie_endpoint_cap_init(pci_dev, 0);

assert(pos > 0);

- pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0,

- PCI_PM_SIZEOF, errp);

+ pos = pci_pm_init(pci_dev, 0, errp);

if (pos < 0) {

return;

}

--

2.48.1

From: Alex Williamson <alex.williamson@redhat.com>

This is now redundant to PCIDevice.pm_cap.

Cc: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-4-alex.williamson@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci.h | 1 -

hw/vfio/pci.c | 9 ++++-----

2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.h

+++ b/hw/vfio/pci.h

@@ -XXX,XX +XXX,XX @@ struct VFIOPCIDevice {

int32_t bootindex;

uint32_t igd_gms;

OffAutoPCIBAR msix_relo;

- uint8_t pm_cap;

uint8_t nv_gpudirect_clique;

bool pci_aer;

bool req_enabled;

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static bool vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)

break;

case PCI_CAP_ID_PM:

vfio_check_pm_reset(vdev, pos);

- vdev->pm_cap = pos;

ret = pci_pm_init(pdev, pos, errp) >= 0;

/*

* PCI-core config space emulation needs write access to the power

@@ -XXX,XX +XXX,XX @@ void vfio_pci_pre_reset(VFIOPCIDevice *vdev)

vfio_disable_interrupts(vdev);

/* Make sure the device is in D0 */

- if (vdev->pm_cap) {

+ if (pdev->pm_cap) {

uint16_t pmcsr;

uint8_t state;

- pmcsr = vfio_pci_read_config(pdev, vdev->pm_cap + PCI_PM_CTRL, 2);

+ pmcsr = vfio_pci_read_config(pdev, pdev->pm_cap + PCI_PM_CTRL, 2);

state = pmcsr & PCI_PM_CTRL_STATE_MASK;

if (state) {

pmcsr &= ~PCI_PM_CTRL_STATE_MASK;

- vfio_pci_write_config(pdev, vdev->pm_cap + PCI_PM_CTRL, pmcsr, 2);

+ vfio_pci_write_config(pdev, pdev->pm_cap + PCI_PM_CTRL, pmcsr, 2);

/* vfio handles the necessary delay here */

- pmcsr = vfio_pci_read_config(pdev, vdev->pm_cap + PCI_PM_CTRL, 2);

+ pmcsr = vfio_pci_read_config(pdev, pdev->pm_cap + PCI_PM_CTRL, 2);

state = pmcsr & PCI_PM_CTRL_STATE_MASK;

if (state) {

error_report("vfio: Unable to power on device, stuck in D%d",

--

2.48.1

From: Alex Williamson <alex.williamson@redhat.com>

The pm_cap on the PCIExpressDevice object can be distilled down

to the new instance on the PCIDevice object.

Cc: Michael S. Tsirkin <mst@redhat.com>

Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-5-alex.williamson@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/hw/pci/pcie.h | 2 --

hw/pci-bridge/pcie_pci_bridge.c | 1 -

hw/virtio/virtio-pci.c | 8 +++-----

3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/pci/pcie.h

+++ b/include/hw/pci/pcie.h

@@ -XXX,XX +XXX,XX @@ typedef enum {

struct PCIExpressDevice {

/* Offset of express capability in config space */

uint8_t exp_cap;

- /* Offset of Power Management capability in config space */

- uint8_t pm_cap;

/* SLOT */

bool hpev_notified; /* Logical AND of conditions for hot plug event.

diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/pci-bridge/pcie_pci_bridge.c

+++ b/hw/pci-bridge/pcie_pci_bridge.c

@@ -XXX,XX +XXX,XX @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error **errp)

if (pos < 0) {

goto pm_error;

}

- d->exp.pm_cap = pos;

pci_set_word(d->config + pos + PCI_PM_PMC, 0x3);

pcie_cap_arifwd_init(d);

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/virtio-pci.c

+++ b/hw/virtio/virtio-pci.c

@@ -XXX,XX +XXX,XX @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)

return;

}

- pci_dev->exp.pm_cap = pos;

-

/*

* Indicates that this function complies with revision 1.2 of the

* PCI Power Management Interface Specification.

@@ -XXX,XX +XXX,XX @@ static bool virtio_pci_no_soft_reset(PCIDevice *dev)

{

uint16_t pmcsr;

- if (!pci_is_express(dev) || !dev->exp.pm_cap) {

+ if (!pci_is_express(dev) || !(dev->cap_present & QEMU_PCI_CAP_PM)) {

return false;

}

- pmcsr = pci_get_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL);

+ pmcsr = pci_get_word(dev->config + dev->pm_cap + PCI_PM_CTRL);

/*

* When No_Soft_Reset bit is set and the device

@@ -XXX,XX +XXX,XX @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type)

if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {

pci_word_test_and_clear_mask(

- dev->config + dev->exp.pm_cap + PCI_PM_CTRL,

+ dev->config + dev->pm_cap + PCI_PM_CTRL,

PCI_PM_CTRL_STATE_MASK);

}

}

--

2.48.1

From: Alex Williamson <alex.williamson@redhat.com>

We want the device in the D0 power state going into reset, but the

config write can enable the BARs in the address space, which are

then removed from the address space once we clear the memory enable

bit in the command register. Re-order to clear the command bit

first, so the power state change doesn't enable the BARs.

Cc: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-6-alex.williamson@redhat.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci.c | 18 +++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ void vfio_pci_pre_reset(VFIOPCIDevice *vdev)

vfio_disable_interrupts(vdev);

+ /*

+ * Stop any ongoing DMA by disconnecting I/O, MMIO, and bus master.

+ * Also put INTx Disable in known state.

+ */

+ cmd = vfio_pci_read_config(pdev, PCI_COMMAND, 2);

+ cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |

+ PCI_COMMAND_INTX_DISABLE);

+ vfio_pci_write_config(pdev, PCI_COMMAND, cmd, 2);

+

/* Make sure the device is in D0 */

if (pdev->pm_cap) {

uint16_t pmcsr;

@@ -XXX,XX +XXX,XX @@ void vfio_pci_pre_reset(VFIOPCIDevice *vdev)

}

}

}

-

- /*

- * Stop any ongoing DMA by disconnecting I/O, MMIO, and bus master.

- * Also put INTx Disable in known state.

- */

- cmd = vfio_pci_read_config(pdev, PCI_COMMAND, 2);

- cmd &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER |

- PCI_COMMAND_INTX_DISABLE);

- vfio_pci_write_config(pdev, PCI_COMMAND, cmd, 2);

}

void vfio_pci_post_reset(VFIOPCIDevice *vdev)

--

2.48.1

From: Tomita Moeko <tomitamoeko@gmail.com>

As suggested by Cédric, I'm glad to be a maintainer of vfio-igd.

Signed-off-by: Tomita Moeko <tomitamoeko@gmail.com>

Reviewed-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250227162741.9860-1-tomitamoeko@gmail.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

MAINTAINERS | 9 ++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS

index XXXXXXX..XXXXXXX 100644

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ M: Cédric Le Goater <clg@redhat.com>

S: Supported

F: hw/vfio/*

F: include/hw/vfio/

-F: docs/igd-assign.txt

F: docs/devel/migration/vfio.rst

F: qapi/vfio.json

+vfio-igd

+M: Alex Williamson <alex.williamson@redhat.com>

+M: Cédric Le Goater <clg@redhat.com>

+M: Tomita Moeko <tomitamoeko@gmail.com>

+S: Supported

+F: hw/vfio/igd.c

+F: docs/igd-assign.txt

+

vfio-ccw

M: Eric Farman <farman@linux.ibm.com>

M: Matthew Rosato <mjrosato@linux.ibm.com>

--

2.48.1

From: Eric Auger <eric.auger@redhat.com>

As an outcome of KVM forum 2024 "vfio-platform: live and let die?"

talk, let's deprecate vfio-platform devices.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Link: https://lore.kernel.org/qemu-devel/20250305124225.952791-1-eric.auger@redhat.com

[ clg: Fixed spelling in vfio-amd-xgbe section ]

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

docs/about/deprecated.rst | 25 +++++++++++++++++++++++++

hw/vfio/amd-xgbe.c | 2 ++

hw/vfio/calxeda-xgmac.c | 2 ++

hw/vfio/platform.c | 1 +

4 files changed, 30 insertions(+)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst

index XXXXXXX..XXXXXXX 100644

--- a/docs/about/deprecated.rst

+++ b/docs/about/deprecated.rst

@@ -XXX,XX +XXX,XX @@ Stream ``reconnect`` (since 9.2)

The ``reconnect`` option only allows specifiying second granularity timeouts,

which is not enough for all types of use cases, use ``reconnect-ms`` instead.

+VFIO device options

+'''''''''''''''''''

+

+``-device vfio-calxeda-xgmac`` (since 10.0)

+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+The vfio-calxeda-xgmac device allows to assign a host Calxeda Highbank

+10Gb XGMAC Ethernet controller device ("calxeda,hb-xgmac" compatibility

+string) to a guest. Calxeda HW has been ewasted now and there is no point

+keeping that device.

+

+``-device vfio-amd-xgbe`` (since 10.0)

+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+The vfio-amd-xgbe device allows to assign a host AMD 10GbE controller

+to a guest ("amd,xgbe-seattle-v1a" compatibility string). AMD "Seattle"

+is not supported anymore and there is no point keeping that device.

+

+``-device vfio-platform`` (since 10.0)

+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

+The vfio-platform device allows to assign a host platform device

+to a guest in a generic manner. Integrating a new device into

+the vfio-platform infrastructure requires some adaptation at

+both kernel and qemu level. No such attempt has been done for years

+and the conclusion is that vfio-platform has not got any traction.

+PCIe passthrough shall be the mainline solution.

+

CPU device properties

'''''''''''''''''''''

diff --git a/hw/vfio/amd-xgbe.c b/hw/vfio/amd-xgbe.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/amd-xgbe.c

+++ b/hw/vfio/amd-xgbe.c

@@ -XXX,XX +XXX,XX @@

#include "hw/vfio/vfio-amd-xgbe.h"

#include "migration/vmstate.h"

#include "qemu/module.h"

+#include "qemu/error-report.h"

static void amd_xgbe_realize(DeviceState *dev, Error **errp)

{

VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev);

VFIOAmdXgbeDeviceClass *k = VFIO_AMD_XGBE_DEVICE_GET_CLASS(dev);

+ warn_report("-device vfio-amd-xgbe is deprecated");

vdev->compat = g_strdup("amd,xgbe-seattle-v1a");

vdev->num_compat = 1;

diff --git a/hw/vfio/calxeda-xgmac.c b/hw/vfio/calxeda-xgmac.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/calxeda-xgmac.c

+++ b/hw/vfio/calxeda-xgmac.c

@@ -XXX,XX +XXX,XX @@

#include "hw/vfio/vfio-calxeda-xgmac.h"

#include "migration/vmstate.h"

#include "qemu/module.h"

+#include "qemu/error-report.h"

static void calxeda_xgmac_realize(DeviceState *dev, Error **errp)

{

VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev);

VFIOCalxedaXgmacDeviceClass *k = VFIO_CALXEDA_XGMAC_DEVICE_GET_CLASS(dev);

+ warn_report("-device vfio-calxeda-xgmac is deprecated");

vdev->compat = g_strdup("calxeda,hb-xgmac");

vdev->num_compat = 1;

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/platform.c

+++ b/hw/vfio/platform.c

@@ -XXX,XX +XXX,XX @@ static void vfio_platform_realize(DeviceState *dev, Error **errp)

VFIODevice *vbasedev = &vdev->vbasedev;

int i;

+ warn_report("-device vfio-platform is deprecated");

qemu_mutex_init(&vdev->intp_mutex);

trace_vfio_platform_realize(vbasedev->sysfsdev ?

--

2.48.1

From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>

It's possible for {load,save}_cleanup SaveVMHandlers to get called without

the corresponding {load,save}_setup handler being called first.

One such example is if {load,save}_setup handler of a proceeding device

returns error.

In this case the migration core cleanup code will call all corresponding

cleanup handlers, even for these devices which haven't had its setup

handler called.

Since this behavior can generate some surprises let's clearly document it

in these SaveVMHandlers description.

Reviewed-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>

Link: https://lore.kernel.org/qemu-devel/991636623fb780350f493b5f045cb17e13ce4c0f.1741124640.git.maciej.szmigiero@oracle.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/migration/register.h | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/migration/register.h b/include/migration/register.h

index XXXXXXX..XXXXXXX 100644

--- a/include/migration/register.h

+++ b/include/migration/register.h

@@ -XXX,XX +XXX,XX @@ typedef struct SaveVMHandlers {

/**

* @save_cleanup

*

- * Uninitializes the data structures on the source

+ * Uninitializes the data structures on the source.

+ * Note that this handler can be called even if save_setup

+ * wasn't called earlier.

*

* @opaque: data pointer passed to register_savevm_live()

*/

@@ -XXX,XX +XXX,XX @@ typedef struct SaveVMHandlers {

* @load_cleanup

*

* Uninitializes the data structures on the destination.

+ * Note that this handler can be called even if load_setup

+ * wasn't called earlier.

*

* @opaque: data pointer passed to register_savevm_live()

*

--

2.48.1

From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>

This function name conflicts with one used by a future generic thread pool

function and it was only used by one test anyway.

Update the trace event name in thread_pool_submit_aio() accordingly.

Acked-by: Fabiano Rosas <farosas@suse.de>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>

Link: https://lore.kernel.org/qemu-devel/6830f07777f939edaf0a2d301c39adcaaf3817f0.1741124640.git.maciej.szmigiero@oracle.com

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/block/thread-pool.h | 3 +--

tests/unit/test-thread-pool.c | 6 +++---

util/thread-pool.c | 7 +------

util/trace-events | 2 +-

4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/include/block/thread-pool.h b/include/block/thread-pool.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/thread-pool.h

+++ b/include/block/thread-pool.h

@@ -XXX,XX +XXX,XX @@ ThreadPool *thread_pool_new(struct AioContext *ctx);

void thread_pool_free(ThreadPool *pool);

/*

- * thread_pool_submit* API: submit I/O requests in the thread's

+ * thread_pool_submit_{aio,co} API: submit I/O requests in the thread's

* current AioContext.

*/

BlockAIOCB *thread_pool_submit_aio(ThreadPoolFunc *func, void *arg,

BlockCompletionFunc *cb, void *opaque);

int coroutine_fn thread_pool_submit_co(ThreadPoolFunc *func, void *arg);

-void thread_pool_submit(ThreadPoolFunc *func, void *arg);

void thread_pool_update_params(ThreadPool *pool, struct AioContext *ctx);

diff --git a/tests/unit/test-thread-pool.c b/tests/unit/test-thread-pool.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/unit/test-thread-pool.c