[PATCH 21/48] qemu: Retire QEMU_CAPS_BITMAP_MERGE

Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a16abbd02a..5393764844 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -528,7 +528,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ /* 330 */ - "bitmap-merge", /* QEMU_CAPS_BITMAP_MERGE */ + "bitmap-merge", /* X_QEMU_CAPS_BITMAP_MERGE */ "nbd-bitmap", /* QEMU_CAPS_NBD_BITMAP */ "x86-max-cpu", /* QEMU_CAPS_X86_MAX_CPU */ "cpu-unavailable-features", /* QEMU_CAPS_CPU_UNAVAILABLE_FEATURES */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cccb6bad83..813b300838 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -507,7 +507,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ /* 330 */ - QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ + X_QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ QEMU_CAPS_NBD_BITMAP, /* nbd-server-add supports bitmap */ QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */ QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */ -- 2.37.4