[libvirt PATCH 0/2] remove sheepdog support

Pavel Hrdina posted 2 patches 3 years ago
Failed in applying to current master (apply log)
docs/formatdomain.rst                         |  13 +-
docs/formatstorage.html.in                    |   5 +-
docs/kbase/rpm-deployment.rst                 |   6 -
docs/manpages/virsh.rst                       |   7 +-
docs/schemas/domaincommon.rng                 |   1 -
docs/schemas/storagepool.rng                  |  22 -
docs/storage.html.in                          |  59 ---
libvirt.spec.in                               |  36 --
meson.build                                   |   6 -
meson_options.txt                             |   1 -
mingw-libvirt.spec.in                         |   1 -
po/POTFILES.in                                |   1 -
src/conf/domain_conf.c                        |   1 -
src/conf/storage_conf.c                       |  12 +-
src/conf/storage_conf.h                       |   2 -
src/conf/storage_source_conf.c                |   4 -
src/conf/storage_source_conf.h                |   1 -
src/conf/virstorageobj.c                      |   9 -
src/libvirt-storage.c                         |   1 -
src/libxl/libxl_conf.c                        |   1 -
src/libxl/xen_xl.c                            |   1 -
src/qemu/qemu_block.c                         |  41 --
src/qemu/qemu_command.c                       |  20 -
src/qemu/qemu_domain.c                        |   1 -
src/qemu/qemu_snapshot.c                      |   3 -
src/storage/meson.build                       |  25 --
src/storage/storage_backend.c                 |   6 -
src/storage/storage_backend_sheepdog.c        | 378 ------------------
src/storage/storage_backend_sheepdog.h        |  25 --
src/storage/storage_backend_sheepdog_priv.h   |  30 --
src/storage/storage_driver.c                  |   1 -
.../storage_source_backingstore.c             |  44 --
src/test/test_driver.c                        |   1 -
tests/meson.build                             |   6 -
tests/qemublocktest.c                         |   4 -
.../imagecreate/network-sheepdog-qcow2.json   |  20 -
.../imagecreate/network-sheepdog-qcow2.xml    |  12 -
tests/qemusecuritytest.c                      |   1 -
tests/qemuxml2argvdata/boot-dev+order.xml     |   2 +-
tests/qemuxml2argvdata/boot-order.args        |   2 +-
tests/qemuxml2argvdata/boot-order.xml         |   2 +-
.../disk-network-sheepdog.args                |  30 --
.../disk-network-sheepdog.x86_64-2.12.0.args  |  34 --
.../disk-network-sheepdog.x86_64-latest.args  |  38 --
.../disk-network-sheepdog.xml                 |  37 --
tests/qemuxml2argvtest.c                      |   3 -
tests/qemuxml2xmloutdata/boot-order.xml       |   2 +-
.../disk-network-sheepdog.xml                 |  43 --
tests/qemuxml2xmltest.c                       |   1 -
tests/storagebackendsheepdogtest.c            | 206 ----------
.../storagepoolcapsschemadata/poolcaps-fs.xml |   2 -
.../poolcaps-full.xml                         |   2 -
tests/storagepoolxml2argvtest.c               |   2 -
tests/storagepoolxml2xmlin/pool-sheepdog.xml  |   8 -
tests/storagepoolxml2xmlout/pool-sheepdog.xml |  11 -
tests/storagepoolxml2xmltest.c                |   1 -
tests/storagevolxml2xmlin/vol-sheepdog.xml    |  10 -
tests/storagevolxml2xmlout/vol-sheepdog.xml   |   8 -
tests/storagevolxml2xmltest.c                 |   1 -
.../deflatten-qemu-sheepdog-in.json           |  11 -
.../deflatten-qemu-sheepdog-out.json          |  13 -
tests/virjsontest.c                           |   1 -
tests/virstoragetest.c                        |  21 -
tools/virsh-pool.c                            |   3 -
tools/virsh.c                                 |   3 -
65 files changed, 12 insertions(+), 1293 deletions(-)
delete mode 100644 src/storage/storage_backend_sheepdog.c
delete mode 100644 src/storage/storage_backend_sheepdog.h
delete mode 100644 src/storage/storage_backend_sheepdog_priv.h
delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
delete mode 100644 tests/storagebackendsheepdogtest.c
delete mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml
delete mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml
delete mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml
delete mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml
delete mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-in.json
delete mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-out.json
[libvirt PATCH 0/2] remove sheepdog support
Posted by Pavel Hrdina 3 years ago
This patch series depends on [1] otherwise you will have conflicts when
applying the second patch.

[1] <https://listman.redhat.com/archives/libvir-list/2021-April/msg00735.html>

Pavel Hrdina (2):
  tests: use RBD instead of sheepdog
  remove sheepdog support from libvirt

 docs/formatdomain.rst                         |  13 +-
 docs/formatstorage.html.in                    |   5 +-
 docs/kbase/rpm-deployment.rst                 |   6 -
 docs/manpages/virsh.rst                       |   7 +-
 docs/schemas/domaincommon.rng                 |   1 -
 docs/schemas/storagepool.rng                  |  22 -
 docs/storage.html.in                          |  59 ---
 libvirt.spec.in                               |  36 --
 meson.build                                   |   6 -
 meson_options.txt                             |   1 -
 mingw-libvirt.spec.in                         |   1 -
 po/POTFILES.in                                |   1 -
 src/conf/domain_conf.c                        |   1 -
 src/conf/storage_conf.c                       |  12 +-
 src/conf/storage_conf.h                       |   2 -
 src/conf/storage_source_conf.c                |   4 -
 src/conf/storage_source_conf.h                |   1 -
 src/conf/virstorageobj.c                      |   9 -
 src/libvirt-storage.c                         |   1 -
 src/libxl/libxl_conf.c                        |   1 -
 src/libxl/xen_xl.c                            |   1 -
 src/qemu/qemu_block.c                         |  41 --
 src/qemu/qemu_command.c                       |  20 -
 src/qemu/qemu_domain.c                        |   1 -
 src/qemu/qemu_snapshot.c                      |   3 -
 src/storage/meson.build                       |  25 --
 src/storage/storage_backend.c                 |   6 -
 src/storage/storage_backend_sheepdog.c        | 378 ------------------
 src/storage/storage_backend_sheepdog.h        |  25 --
 src/storage/storage_backend_sheepdog_priv.h   |  30 --
 src/storage/storage_driver.c                  |   1 -
 .../storage_source_backingstore.c             |  44 --
 src/test/test_driver.c                        |   1 -
 tests/meson.build                             |   6 -
 tests/qemublocktest.c                         |   4 -
 .../imagecreate/network-sheepdog-qcow2.json   |  20 -
 .../imagecreate/network-sheepdog-qcow2.xml    |  12 -
 tests/qemusecuritytest.c                      |   1 -
 tests/qemuxml2argvdata/boot-dev+order.xml     |   2 +-
 tests/qemuxml2argvdata/boot-order.args        |   2 +-
 tests/qemuxml2argvdata/boot-order.xml         |   2 +-
 .../disk-network-sheepdog.args                |  30 --
 .../disk-network-sheepdog.x86_64-2.12.0.args  |  34 --
 .../disk-network-sheepdog.x86_64-latest.args  |  38 --
 .../disk-network-sheepdog.xml                 |  37 --
 tests/qemuxml2argvtest.c                      |   3 -
 tests/qemuxml2xmloutdata/boot-order.xml       |   2 +-
 .../disk-network-sheepdog.xml                 |  43 --
 tests/qemuxml2xmltest.c                       |   1 -
 tests/storagebackendsheepdogtest.c            | 206 ----------
 .../storagepoolcapsschemadata/poolcaps-fs.xml |   2 -
 .../poolcaps-full.xml                         |   2 -
 tests/storagepoolxml2argvtest.c               |   2 -
 tests/storagepoolxml2xmlin/pool-sheepdog.xml  |   8 -
 tests/storagepoolxml2xmlout/pool-sheepdog.xml |  11 -
 tests/storagepoolxml2xmltest.c                |   1 -
 tests/storagevolxml2xmlin/vol-sheepdog.xml    |  10 -
 tests/storagevolxml2xmlout/vol-sheepdog.xml   |   8 -
 tests/storagevolxml2xmltest.c                 |   1 -
 .../deflatten-qemu-sheepdog-in.json           |  11 -
 .../deflatten-qemu-sheepdog-out.json          |  13 -
 tests/virjsontest.c                           |   1 -
 tests/virstoragetest.c                        |  21 -
 tools/virsh-pool.c                            |   3 -
 tools/virsh.c                                 |   3 -
 65 files changed, 12 insertions(+), 1293 deletions(-)
 delete mode 100644 src/storage/storage_backend_sheepdog.c
 delete mode 100644 src/storage/storage_backend_sheepdog.h
 delete mode 100644 src/storage/storage_backend_sheepdog_priv.h
 delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.json
 delete mode 100644 tests/qemublocktestdata/imagecreate/network-sheepdog-qcow2.xml
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.xml
 delete mode 100644 tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
 delete mode 100644 tests/storagebackendsheepdogtest.c
 delete mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml
 delete mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml
 delete mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml
 delete mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml
 delete mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-in.json
 delete mode 100644 tests/virjsondata/deflatten-qemu-sheepdog-out.json

-- 
2.30.2