Commit id '74bbb8c2ec' seems to have mismerged a bit - adding 240 comments out of place. Just clean that up. Signed-off-by: John Ferlan <jferlan(a)redhat.com&gt; --- Pushed as trivial src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a3004d..ad98d68 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -351,8 +351,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "ivshmem-doorbell", /* 240 */ "query-qmp-schema", - - "gluster.debug_level", /* 240 */ + "gluster.debug_level", ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02014c0..9163572 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -386,8 +386,6 @@ typedef enum { /* 240 */ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */ QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */ - - /* 240 */ QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */ QEMU_CAPS_LAST /* this must always be the last item */ -- 2.7.4