Failed in applying to current master (
apply log)
src/bhyve/bhyve_capabilities.c | 1 -
src/conf/capabilities.c | 4 ----
src/conf/network_conf.c | 1 -
src/conf/node_device_conf.c | 1 -
src/conf/storage_conf.c | 4 ----
src/cpu/cpu_ppc64.c | 1 -
src/cpu/cpu_ppc64_data.h | 1 -
src/cpu/cpu_x86.c | 1 -
src/cpu/cpu_x86_data.h | 1 -
src/esx/esx_storage_backend_iscsi.c | 2 --
src/esx/esx_storage_backend_vmfs.c | 2 --
src/esx/esx_vi_types.c | 1 -
src/interface/interface_backend_udev.c | 1 -
src/internal.h | 1 +
src/libvirt.c | 3 ---
src/libxl/libxl_logger.c | 1 -
src/locking/lock_daemon.c | 1 -
src/locking/lock_driver_sanlock.c | 4 ----
src/locking/lock_manager.c | 1 -
src/locking/sanlock_helper.c | 2 --
src/logging/log_daemon.c | 1 -
src/lxc/lxc_container.c | 3 ---
src/lxc/lxc_controller.c | 1 -
src/lxc/lxc_driver.c | 1 -
src/lxc/lxc_fuse.c | 3 ---
src/lxc/lxc_native.c | 1 -
src/network/bridge_driver.c | 5 -----
src/network/leaseshelper.c | 2 --
src/node_device/node_device_driver.c | 1 -
src/node_device/node_device_hal.c | 2 --
src/node_device/node_device_udev.h | 1 -
src/nwfilter/nwfilter_ebiptables_driver.c | 1 -
src/openvz/openvz_conf.c | 5 -----
src/openvz/openvz_driver.c | 5 -----
src/phyp/phyp_driver.c | 5 -----
src/qemu/qemu_agent.c | 1 -
src/qemu/qemu_conf.c | 4 ----
src/qemu/qemu_driver.c | 5 -----
src/qemu/qemu_hostdev.c | 1 -
src/qemu/qemu_monitor_json.c | 1 -
src/qemu/qemu_monitor_text.c | 1 -
src/qemu/qemu_security.h | 1 -
src/remote/remote_daemon.c | 1 -
src/rpc/virnetdaemon.c | 1 -
src/rpc/virnetmessage.c | 1 -
src/rpc/virnetservermdns.c | 2 --
src/rpc/virnettlscontext.c | 1 -
src/secret/secret_driver.c | 1 -
src/security/security_apparmor.c | 1 -
src/security/security_driver.c | 1 -
src/security/virt-aa-helper.c | 4 ----
src/storage/parthelper.c | 2 --
src/storage/storage_backend.c | 1 -
src/storage/storage_backend_disk.c | 2 --
src/storage/storage_backend_fs.c | 3 ---
src/storage/storage_backend_iscsi.c | 1 -
src/storage/storage_backend_logical.c | 2 --
src/storage/storage_backend_mpath.c | 1 -
src/storage/storage_backend_scsi.c | 1 -
src/storage/storage_driver.c | 3 ---
src/storage/storage_file_fs.c | 1 -
src/storage/storage_util.c | 2 --
src/test/test_driver.c | 2 --
src/uml/uml_conf.c | 4 ----
src/uml/uml_driver.c | 5 -----
src/util/iohelper.c | 2 --
src/util/viralloc.c | 1 -
src/util/virarptable.c | 2 --
src/util/viraudit.c | 1 -
src/util/virauth.c | 1 -
src/util/virbitmap.c | 5 -----
src/util/virbuffer.c | 3 ---
src/util/vircgroup.c | 4 ----
src/util/vircommand.c | 1 -
src/util/virconf.c | 2 --
src/util/virdnsmasq.c | 5 -----
src/util/virerror.c | 3 ---
src/util/virevent.c | 1 -
src/util/vireventpoll.c | 3 ---
src/util/virfile.c | 1 -
src/util/virfile.h | 1 -
src/util/virgettext.c | 1 -
src/util/virhash.c | 2 --
src/util/virhash.h | 2 --
src/util/virhook.c | 2 --
src/util/virhostcpu.c | 5 -----
src/util/virhostdev.c | 2 --
src/util/virhostmem.c | 5 -----
src/util/viriptables.c | 5 -----
src/util/viriscsi.c | 1 -
src/util/virkeycode.c | 1 -
src/util/virkeyfile.c | 1 -
src/util/virlog.c | 2 --
src/util/virmacaddr.c | 2 --
src/util/virnetdevmacvlan.c | 3 ---
src/util/virnetdevopenvswitch.c | 1 -
src/util/virnetdevtap.c | 3 ---
src/util/virnetdevvportprofile.c | 3 ---
src/util/virnetlink.c | 1 -
src/util/virpci.c | 4 ----
src/util/virprocess.c | 2 --
src/util/virrandom.c | 1 -
src/util/virscsi.c | 3 ---
src/util/virsexpr.c | 4 ----
src/util/virstoragefile.c | 1 -
src/util/virstoragefilebackend.c | 1 -
src/util/virstring.c | 2 --
src/util/virsysinfo.c | 2 --
src/util/virtime.c | 1 -
src/util/virusb.c | 3 ---
src/util/virutil.c | 4 ----
src/util/viruuid.c | 4 ----
src/util/virxml.c | 4 ----
src/vbox/vbox_XPCOMCGlue.c | 1 -
src/vmware/vmware_conf.c | 1 -
src/vz/vz_driver.c | 5 -----
src/xenapi/xenapi_driver.c | 2 --
src/xenapi/xenapi_utils.c | 2 --
tests/commandhelper.c | 3 ---
tests/commandtest.c | 3 ---
tests/cputest.c | 3 ---
tests/domaincapsmock.c | 1 -
tests/domaincapstest.c | 1 -
tests/domainsnapshotxml2xmltest.c | 3 ---
tests/esxutilstest.c | 2 --
tests/eventtest.c | 1 -
tests/fdstreamtest.c | 1 -
tests/genericxml2xmltest.c | 3 ---
tests/interfacexml2xmltest.c | 3 ---
tests/libxlxml2domconfigtest.c | 3 ---
tests/lxcxml2xmltest.c | 3 ---
tests/networkxml2conftest.c | 3 ---
tests/networkxml2xmltest.c | 3 ---
tests/networkxml2xmlupdatetest.c | 3 ---
tests/nodedevxml2xmltest.c | 3 ---
tests/nsstest.c | 1 -
tests/nwfilterxml2xmltest.c | 3 ---
tests/openvzutilstest.c | 2 --
tests/qemuargv2xmltest.c | 3 ---
tests/qemublocktest.c | 1 -
tests/qemucapsprobemock.c | 1 -
tests/qemucpumock.c | 1 -
tests/qemumemlocktest.c | 3 ---
tests/qemumonitortestutils.c | 3 ---
tests/qemuxml2argvtest.c | 3 ---
tests/qemuxml2xmltest.c | 3 ---
tests/seclabeltest.c | 4 ----
tests/secretxml2xmltest.c | 1 -
tests/securityselinuxhelper.c | 2 --
tests/securityselinuxlabeltest.c | 3 ---
tests/securityselinuxtest.c | 3 ---
tests/sexpr2xmltest.c | 2 --
tests/shunloadhelper.c | 1 -
tests/shunloadtest.c | 2 --
tests/sockettest.c | 3 ---
tests/ssh.c | 1 -
tests/storagebackendsheepdogtest.c | 3 ---
tests/storagepoolxml2xmltest.c | 3 ---
tests/storagevolxml2xmltest.c | 3 ---
tests/sysinfotest.c | 3 ---
tests/testutils.c | 4 ----
tests/testutils.h | 1 -
tests/testutilslxc.c | 1 -
tests/testutilsqemu.c | 1 -
tests/testutilsxen.c | 1 -
tests/utiltest.c | 3 ---
tests/vboxsnapshotxmltest.c | 2 --
tests/virauthconfigtest.c | 1 -
tests/virbuftest.c | 3 ---
tests/vircaps2xmltest.c | 1 -
tests/vircapstest.c | 1 -
tests/vircgroupmock.c | 2 --
tests/vircgrouptest.c | 1 -
tests/virconftest.c | 4 ----
tests/virdbustest.c | 1 -
tests/virfiletest.c | 1 -
tests/virfilewrapper.c | 2 --
tests/virhashtest.c | 3 ---
tests/virhostcputest.c | 3 ---
tests/virhostdevtest.c | 2 --
tests/viridentitytest.c | 1 -
tests/virjsontest.c | 3 ---
tests/virkeycodetest.c | 1 -
tests/virkeyfiletest.c | 1 -
tests/virkmodtest.c | 1 -
tests/virlockspacetest.c | 1 -
tests/virmock.h | 2 --
tests/virnetdevmock.c | 2 --
tests/virnetmessagetest.c | 1 -
tests/virnetsockettest.c | 1 -
tests/virnettlscontexttest.c | 1 -
tests/virnettlshelpers.c | 1 -
tests/virnettlssessiontest.c | 1 -
tests/virnwfilterbindingxml2xmltest.c | 3 ---
tests/virpcimock.c | 2 --
tests/virpcitest.c | 2 --
tests/virpolkittest.c | 1 -
tests/virportallocatormock.c | 3 ---
tests/virportallocatortest.c | 1 -
tests/virrandommock.c | 1 -
tests/virresctrltest.c | 1 -
tests/virrotatingfiletest.c | 1 -
tests/virschematest.c | 1 -
tests/virscsitest.c | 1 -
tests/virshtest.c | 2 --
tests/virstoragetest.c | 1 -
tests/virstorageutiltest.c | 1 -
tests/virstringtest.c | 1 -
tests/virsystemdtest.c | 1 -
tests/virtimetest.c | 1 -
tests/virtypedparamtest.c | 1 -
tests/viruritest.c | 1 -
tests/virusbmock.c | 1 -
tests/virusbtest.c | 1 -
tests/vmwarevertest.c | 2 --
tests/vmx2xmltest.c | 2 --
tests/vshtabletest.c | 2 --
tests/xlconfigtest.c | 2 --
tests/xmconfigtest.c | 2 --
tests/xml2sexprtest.c | 3 ---
tests/xml2vmxtest.c | 2 --
tools/virsh-console.c | 3 ---
tools/virsh.c | 5 -----
tools/virsh.h | 3 ---
tools/virt-admin.c | 1 -
tools/virt-host-validate-bhyve.c | 1 -
tools/virt-host-validate-common.c | 2 --
tools/virt-host-validate.c | 2 --
tools/virt-login-shell.c | 3 ---
tools/vsh-table.c | 1 -
tools/vsh.c | 5 -----
tools/vsh.h | 3 ---
tools/wireshark/src/packet-libvirt.c | 1 -
233 files changed, 1 insertion(+), 480 deletions(-)