External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: break some long lines

Browse Source 
As long as I was already touching the function...

* src/qemu/qemu_hotplug.c (qemuDomainChangeGraphics): Line wrap.
This commit is contained in:
Eric Blake 2011-06-06 13:35:41 -06:00
parent ddc5b158d7
commit d7814b21a2
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/qemu/qemu_hotplug.c
View File

@ -1043,12 +1043,14 @@ qemuDomainChangeGraphics(struct qemud_driver *driver,
switch (dev->type) { switch (dev->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC: case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
if ((olddev->data.vnc.autoport != dev->data.vnc.autoport) || if ((olddev->data.vnc.autoport != dev->data.vnc.autoport) ||
(!dev->data.vnc.autoport && (olddev->data.vnc.port != dev->data.vnc.port))) { (!dev->data.vnc.autoport &&
(olddev->data.vnc.port != dev->data.vnc.port))) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change port settings on vnc graphics")); _("cannot change port settings on vnc graphics"));
return -1; return -1;
} }
if (STRNEQ_NULLABLE(olddev->data.vnc.listenAddr, dev->data.vnc.listenAddr)) { if (STRNEQ_NULLABLE(olddev->data.vnc.listenAddr,
dev->data.vnc.listenAddr)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change listen address setting on vnc graphics")); _("cannot change listen address setting on vnc graphics"));
return -1; return -1;
@ -1063,10 +1065,14 @@ qemuDomainChangeGraphics(struct qemud_driver *driver,
* even if new password matches old password */ * even if new password matches old password */
if (olddev->data.vnc.auth.expires || if (olddev->data.vnc.auth.expires ||
dev->data.vnc.auth.expires || dev->data.vnc.auth.expires ||
STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd, dev->data.vnc.auth.passwd)) { STRNEQ_NULLABLE(olddev->data.vnc.auth.passwd,
VIR_DEBUG("Updating password on VNC server %p %p", dev->data.vnc.auth.passwd, driver->vncPassword); dev->data.vnc.auth.passwd)) {
ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DEBUG("Updating password on VNC server %p %p",
&dev->data.vnc.auth, driver->vncPassword); dev->data.vnc.auth.passwd, driver->vncPassword);
ret = qemuDomainChangeGraphicsPasswords(driver, vm,
VIR_DOMAIN_GRAPHICS_TYPE_VNC,
&dev->data.vnc.auth,
driver->vncPassword);
/* Steal the new dev's char * reference */ /* Steal the new dev's char * reference */
VIR_FREE(olddev->data.vnc.auth.passwd); VIR_FREE(olddev->data.vnc.auth.passwd);
@ -1081,18 +1087,22 @@ qemuDomainChangeGraphics(struct qemud_driver *driver,
case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
if ((olddev->data.spice.autoport != dev->data.spice.autoport) || if ((olddev->data.spice.autoport != dev->data.spice.autoport) ||
(!dev->data.spice.autoport && (olddev->data.spice.port != dev->data.spice.port)) || (!dev->data.spice.autoport &&
(!dev->data.spice.autoport && (olddev->data.spice.tlsPort != dev->data.spice.tlsPort))) { (olddev->data.spice.port != dev->data.spice.port)) ||
(!dev->data.spice.autoport &&
(olddev->data.spice.tlsPort != dev->data.spice.tlsPort))) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change port settings on spice graphics")); _("cannot change port settings on spice graphics"));
return -1; return -1;
} }
if (STRNEQ_NULLABLE(olddev->data.spice.listenAddr, dev->data.spice.listenAddr)) { if (STRNEQ_NULLABLE(olddev->data.spice.listenAddr,
dev->data.spice.listenAddr)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change listen address setting on spice graphics")); _("cannot change listen address setting on spice graphics"));
return -1; return -1;
} }
if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { if (STRNEQ_NULLABLE(olddev->data.spice.keymap,
dev->data.spice.keymap)) {
qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot change keymap setting on spice graphics")); _("cannot change keymap setting on spice graphics"));
return -1; return -1;
@ -1102,10 +1112,14 @@ qemuDomainChangeGraphics(struct qemud_driver *driver,
* even if new password matches old password */ * even if new password matches old password */
if (olddev->data.spice.auth.expires || if (olddev->data.spice.auth.expires ||
dev->data.spice.auth.expires || dev->data.spice.auth.expires ||
STRNEQ_NULLABLE(olddev->data.spice.auth.passwd, dev->data.spice.auth.passwd)) { STRNEQ_NULLABLE(olddev->data.spice.auth.passwd,
VIR_DEBUG("Updating password on SPICE server %p %p", dev->data.spice.auth.passwd, driver->spicePassword); dev->data.spice.auth.passwd)) {
ret = qemuDomainChangeGraphicsPasswords(driver, vm, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, VIR_DEBUG("Updating password on SPICE server %p %p",
&dev->data.spice.auth, driver->spicePassword); dev->data.spice.auth.passwd, driver->spicePassword);
ret = qemuDomainChangeGraphicsPasswords(driver, vm,
VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
&dev->data.spice.auth,
driver->spicePassword);
/* Steal the new dev's char * reference */ /* Steal the new dev's char * reference */
VIR_FREE(olddev->data.spice.auth.passwd); VIR_FREE(olddev->data.spice.auth.passwd);