提交 ebd63e3b 编写于 作者: M Michal Privoznik

qemu_conf.c: Fix naming of *AddRemove* functions

Our naming rules prefer qemuObjectOperation() scheme rather than
qemuOperationObject() for function names. These were not honoured
in recent commits to qemu_conf.c.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
上级 51d66b92
...@@ -1679,7 +1679,7 @@ qemuSharedDeviceEntryRemove(virQEMUDriverPtr driver, ...@@ -1679,7 +1679,7 @@ qemuSharedDeviceEntryRemove(virQEMUDriverPtr driver,
static int static int
qemuAddRemoveSharedDiskInternal(virQEMUDriverPtr driver, qemuSharedDiskAddRemoveInternal(virQEMUDriverPtr driver,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
const char *name, const char *name,
bool addDisk) bool addDisk)
...@@ -1730,7 +1730,7 @@ qemuAddSharedDisk(virQEMUDriverPtr driver, ...@@ -1730,7 +1730,7 @@ qemuAddSharedDisk(virQEMUDriverPtr driver,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
const char *name) const char *name)
{ {
return qemuAddRemoveSharedDiskInternal(driver, disk, name, true); return qemuSharedDiskAddRemoveInternal(driver, disk, name, true);
} }
...@@ -1768,7 +1768,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) ...@@ -1768,7 +1768,7 @@ qemuGetHostdevPath(virDomainHostdevDefPtr hostdev)
static int static int
qemuAddRemoveSharedHostdevInternal(virQEMUDriverPtr driver, qemuSharedHostdevAddRemoveInternal(virQEMUDriverPtr driver,
virDomainHostdevDefPtr hostdev, virDomainHostdevDefPtr hostdev,
const char *name, const char *name,
bool addDevice) bool addDevice)
...@@ -1803,7 +1803,7 @@ qemuAddRemoveSharedHostdevInternal(virQEMUDriverPtr driver, ...@@ -1803,7 +1803,7 @@ qemuAddRemoveSharedHostdevInternal(virQEMUDriverPtr driver,
} }
static int static int
qemuAddRemoveSharedDeviceInternal(virQEMUDriverPtr driver, qemuSharedDeviceAddRemoveInternal(virQEMUDriverPtr driver,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
const char *name, const char *name,
bool addDevice) bool addDevice)
...@@ -1813,10 +1813,10 @@ qemuAddRemoveSharedDeviceInternal(virQEMUDriverPtr driver, ...@@ -1813,10 +1813,10 @@ qemuAddRemoveSharedDeviceInternal(virQEMUDriverPtr driver,
* which is only valid for block disk and scsi host device. * which is only valid for block disk and scsi host device.
*/ */
if (dev->type == VIR_DOMAIN_DEVICE_DISK) if (dev->type == VIR_DOMAIN_DEVICE_DISK)
return qemuAddRemoveSharedDiskInternal(driver, dev->data.disk, return qemuSharedDiskAddRemoveInternal(driver, dev->data.disk,
name, addDevice); name, addDevice);
else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV)
return qemuAddRemoveSharedHostdevInternal(driver, dev->data.hostdev, return qemuSharedHostdevAddRemoveInternal(driver, dev->data.hostdev,
name, addDevice); name, addDevice);
else else
return 0; return 0;
...@@ -1837,7 +1837,7 @@ qemuAddSharedDevice(virQEMUDriverPtr driver, ...@@ -1837,7 +1837,7 @@ qemuAddSharedDevice(virQEMUDriverPtr driver,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
const char *name) const char *name)
{ {
return qemuAddRemoveSharedDeviceInternal(driver, dev, name, true); return qemuSharedDeviceAddRemoveInternal(driver, dev, name, true);
} }
...@@ -1846,7 +1846,7 @@ qemuRemoveSharedDisk(virQEMUDriverPtr driver, ...@@ -1846,7 +1846,7 @@ qemuRemoveSharedDisk(virQEMUDriverPtr driver,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
const char *name) const char *name)
{ {
return qemuAddRemoveSharedDiskInternal(driver, disk, name, false); return qemuSharedDiskAddRemoveInternal(driver, disk, name, false);
} }
...@@ -1864,7 +1864,7 @@ qemuRemoveSharedDevice(virQEMUDriverPtr driver, ...@@ -1864,7 +1864,7 @@ qemuRemoveSharedDevice(virQEMUDriverPtr driver,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
const char *name) const char *name)
{ {
return qemuAddRemoveSharedDeviceInternal(driver, dev, name, false); return qemuSharedDeviceAddRemoveInternal(driver, dev, name, false);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册