[libvirt] [PATCH 3/n] conf: move host disk type to util/

Peter Krempa pkrempa at redhat.com
Mon Mar 31 10:05:07 UTC 2014


On 03/27/14 23:08, Eric Blake wrote:
> A continuation of the migration of disk details to virstoragefile.
> This patch moves a single enum, but converting the name has quite
> a bit of fallout.
> 
> * src/conf/domain_conf.h (virDomainDiskType): Move...
> * src/util/virstoragefile.h (virStorageType): ...and rename.
> * src/bhyve/bhyve_command.c (bhyveBuildDiskArgStr)
> (virBhyveProcessBuildLoadCmd): Update clients.
> * src/conf/domain_conf.c (virDomainDiskSourceDefParse)
> (virDomainDiskDefParseXML, virDomainDiskSourceDefFormatInternal)
> (virDomainDiskDefFormat, virDomainDiskGetActualType)
> (virDomainDiskDefForeachPath, virDomainDiskSourceIsBlockType):
> Likewise.
> * src/conf/snapshot_conf.h (_virDomainSnapshotDiskDef): Likewise.
> * src/conf/snapshot_conf.c (virDomainSnapshotDiskDefParseXML)
> (virDomainSnapshotAlignDisks, virDomainSnapshotDiskDefFormat):
> Likewise.
> * src/esx/esx_driver.c (esxAutodetectSCSIControllerModel)
> (esxDomainDefineXML): Likewise.
> * src/locking/domain_lock.c (virDomainLockManagerAddDisk):
> Likewise.
> * src/lxc/lxc_controller.c
> (virLXCControllerSetupLoopDeviceDisk)
> (virLXCControllerSetupNBDDeviceDisk)
> (virLXCControllerSetupLoopDevices, virLXCControllerSetupDisk):
> Likewise.
> * src/parallels/parallels_driver.c (parallelsGetHddInfo):
> Likewise.
> * src/phyp/phyp_driver.c (phypDiskType): Likewise.
> * src/qemu/qemu_command.c (qemuGetDriveSourceString)
> (qemuDomainDiskGetSourceString, qemuBuildDriveStr)
> (qemuBuildCommandLine, qemuParseCommandLineDisk)
> (qemuParseCommandLine): Likewise.
> * src/qemu/qemu_conf.c (qemuCheckSharedDevice)
> (qemuTranslateDiskSourcePool)
> (qemuTranslateSnapshotDiskSourcePool): Likewise.
> * src/qemu/qemu_domain.c (qemuDomainDeviceDefPostParse)
> (qemuDomainDetermineDiskChain): Likewise.
> * src/qemu/qemu_driver.c (qemuDomainGetBlockInfo)
> (qemuDomainSnapshotPrepareDiskExternalBackingInactive)
> (qemuDomainSnapshotPrepareDiskExternalBackingActive)
> (qemuDomainSnapshotPrepareDiskExternalOverlayActive)
> (qemuDomainSnapshotPrepareDiskExternalOverlayInactive)
> (qemuDomainSnapshotPrepareDiskInternal)
> (qemuDomainSnapshotPrepare)
> (qemuDomainSnapshotCreateSingleDiskActive): Likewise.
> * src/qemu/qemu_hotplug.c (qemuDomainChangeEjectableMedia):
> Likewise.
> * src/qemu/qemu_migration.c (qemuMigrationIsSafe): Likewise.
> * src/security/security_apparmor.c
> (AppArmorRestoreSecurityImageLabel)
> (AppArmorSetSecurityImageLabel): Likewise.
> * src/security/security_dac.c (virSecurityDACSetSecurityImageLabel)
> (virSecurityDACRestoreSecurityImageLabelInt)
> (virSecurityDACSetSecurityAllLabel): Likewise.
> * src/security/security_selinux.c
> (virSecuritySELinuxRestoreSecurityImageLabelInt)
> (virSecuritySELinuxSetSecurityImageLabel)
> (virSecuritySELinuxSetSecurityAllLabel): Likewise.
> * src/storage/storage_backend.c (virStorageFileBackendForType):
> Likewise.
> * src/storage/storage_backend_fs.c (virStorageFileBackendFile)
> (virStorageFileBackendBlock): Likewise.
> * src/storage/storage_backend_gluster.c
> (virStorageFileBackendGluster): Likewise.
> * src/vbox/vbox_tmpl.c (vboxDomainGetXMLDesc, vboxAttachDrives)
> (vboxDomainAttachDeviceImpl, vboxDomainDetachDevice): Likewise.
> * src/vmware/vmware_conf.c (vmwareVmxPath): Likewise.
> * src/vmx/vmx.c (virVMXParseDisk, virVMXFormatDisk)
> (virVMXFormatFloppy): Likewise.
> * src/xenxs/xen_sxpr.c (xenParseSxprDisks, xenParseSxpr)
> (xenFormatSxprDisk): Likewise.
> * src/xenxs/xen_xm.c (xenParseXM, xenFormatXMDisk): Likewise.
> * tests/securityselinuxlabeltest.c (testSELinuxLoadDef):
> Likewise.
> * src/libvirt_private.syms (domain_conf.h): Move symbols...
> (virstoragefile.h): ...as appropriate.
> 
> Signed-off-by: Eric Blake <eblake at redhat.com>
> ---
> 
> The fallout is once again rather longer than I would like.  And
> given that there is more to come, I'm not going to push this
> until after the 1.2.3 release.  Peter, let me know if I should
> post these in a repo somewhere to make it easier for you to
> rebase your pending gluster patches on top of this.
> 

ACK, a lot of mechanical changes. Passed my compile test and quick
look-over.

Peter


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140331/f4473071/attachment-0001.sig>


More information about the libvir-list mailing list