Don't break up strings for VIR_WARN messages

The 'warn' level messages are logged in the default settings so may end
up in something which the user looks for. Random line breaks prevent
grepping for the message.

Similarly to 'error' level messages remove the arbitrary line breaks in
the source to make the messages greppable in the source.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 8671644cc8e0e941ae7efe692d9a4a5c6acf308f..1da344f503c83f5d89e81df052f2b20ed41b7d7f 100644 (file)
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -1154,9 +1154,7 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def,
     if (def->namespaceData) {
         bhyveDomainCmdlineDef *bhyvecmd;
 
-        VIR_WARN("Booting the guest using command line pass-through feature, "
-                 "which could potentially cause inconsistent state and "
-                 "upgrade issues");
+        VIR_WARN("Booting the guest using command line pass-through feature, which could potentially cause inconsistent state and upgrade issues");
 
         bhyvecmd = def->namespaceData;
         for (i = 0; i < bhyvecmd->num_args; i++)

diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c
index c2e7d33097481f06c2fa5e2cb76f1e35c7cd5b6a..41d7b1b742e3311a20c366753fbad24932a85fec 100644 (file)
--- a/src/conf/virdomainjob.c
+++ b/src/conf/virdomainjob.c
@@ -432,10 +432,7 @@ virDomainObjBeginJobInternal(virDomainObj *obj,
     if (jobObj->asyncJob && jobObj->asyncStarted)
         asyncDuration = now - jobObj->asyncStarted;
 
-    VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; "
-             "current job is (%s, %s, %s) "
-             "owned by (%llu %s, %llu %s, %llu %s (flags=0x%x)) "
-             "for (%llus, %llus, %llus)",
+    VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; current job is (%s, %s, %s) owned by (%llu %s, %llu %s, %llu %s (flags=0x%x)) for (%llus, %llus, %llus)",
              virDomainJobTypeToString(job),
              virDomainAgentJobTypeToString(agentJob),
              virDomainAsyncJobTypeToString(asyncJob),

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 0f7eb8f48b35087315d976966d2d4b2bb02b7815..3a18d859dc29b48cd22adbd25560157c221cc79c 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2326,9 +2326,8 @@ x86Decode(virCPUDef *cpu,
                                    preferred[0]);
                     return -1;
                 } else {
-                    VIR_WARN("Preferred CPU model %s not allowed by"
-                             " hypervisor; closest supported model will be"
-                             " used", preferred[0]);
+                    VIR_WARN("Preferred CPU model %s not allowed by hypervisor; closest supported model will be used",
+                             preferred[0]);
                 }
             } else {
                 VIR_DEBUG("CPU model %s not allowed by hypervisor; ignoring",

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index cfd783622d17105ca8bc20fd77f1e97ff024fa10..db006ed16f403175bce3434cfdb9d8285fc8ccbb 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -2478,8 +2478,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine,
         } else {
             memset(uuid, 0, VIR_UUID_BUFLEN);
 
-            VIR_WARN("Cannot access UUID, because 'configStatus' property "
-                      "indicates a config problem");
+            VIR_WARN("Cannot access UUID, because 'configStatus' property indicates a config problem");
         }
     }
 

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index b063a44f622976f7855c1bc42ec9f3a82038261c..720ed9bb60003390f05986fc6a0b1a0111da59dc 100644 (file)
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -1839,8 +1839,7 @@ virHostdevReAttachUSBDevices(virHostdevManager *mgr,
         tmp = virUSBDeviceListFind(mgr->activeUSBHostdevs, usb);
 
         if (!tmp) {
-            VIR_WARN("Unable to find device %03d.%03d "
-                     "in list of active USB devices",
+            VIR_WARN("Unable to find device %03d.%03d in list of active USB devices",
                      usbsrc->bus, usbsrc->device);
             continue;
         }
@@ -1881,8 +1880,7 @@ virHostdevReAttachSCSIHostDevices(virHostdevManager *mgr,
      * because qemuProcessStart could fail half way through. */
 
     if (!(tmp = virSCSIDeviceListFind(mgr->activeSCSIHostdevs, scsi))) {
-        VIR_WARN("Unable to find device %s:%u:%u:%llu "
-                 "in list of active SCSI devices",
+        VIR_WARN("Unable to find device %s:%u:%u:%llu in list of active SCSI devices",
                  scsihostsrc->adapter, scsihostsrc->bus,
                  scsihostsrc->target, scsihostsrc->unit);
         return;
@@ -1965,8 +1963,7 @@ virHostdevReAttachSCSIVHostDevices(virHostdevManager *mgr,
 
         if (!(tmp = virSCSIVHostDeviceListFind(mgr->activeSCSIVHostHostdevs,
                                                host))) {
-            VIR_WARN("Unable to find device %s "
-                     "in list of active SCSI_host devices",
+            VIR_WARN("Unable to find device %s in list of active SCSI_host devices",
                      hostsrc->wwpn);
             virObjectUnlock(mgr->activeSCSIVHostHostdevs);
             return;
@@ -2311,8 +2308,7 @@ virHostdevPrepareOneNVMeDevice(virHostdevManager *hostdev_mgr,
         if (drvType == VIR_PCI_STUB_DRIVER_VFIO || STREQ_NULLABLE(drvName, "nvme"))
             continue;
 
-        VIR_WARN("Suspicious NVMe disk assignment. PCI device "
-                 "%s is not an NVMe disk, it has %s driver",
+        VIR_WARN("Suspicious NVMe disk assignment. PCI device %s is not an NVMe disk, it has %s driver",
                  virPCIDeviceGetName(pci), NULLSTR(drvName));
     }
 

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 16e121566369916a781577c1da45df5c02705265..8ab2313668e9e1afa18a45c3fa5f24554eaf3fc1 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -396,8 +396,8 @@ static int netcfConnectNumOfInterfacesImpl(virConnectPtr conn,
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
                  * deleted by other management apps (e.g. virt-manager).
                  */
-                VIR_WARN("couldn't find interface named '%s', might be "
-                         "deleted by other process", names[i]);
+                VIR_WARN("couldn't find interface named '%s', might be deleted by other process",
+                         names[i]);
                 continue;
             }
         }
@@ -487,8 +487,8 @@ static int netcfConnectListInterfacesImpl(virConnectPtr conn,
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
                  * deleted by other management apps (e.g. virt-manager).
                  */
-                VIR_WARN("couldn't find interface named '%s', might be "
-                         "deleted by other process", allnames[i]);
+                VIR_WARN("couldn't find interface named '%s', might be deleted by other process",
+                         allnames[i]);
                 continue;
             }
         }
@@ -669,8 +669,8 @@ netcfConnectListAllInterfaces(virConnectPtr conn,
                 /* Ignore the NETCF_NOERROR, as the interface is very likely
                  * deleted by other management apps (e.g. virt-manager).
                  */
-                VIR_WARN("couldn't find interface named '%s', might be "
-                         "deleted by other process", names[i]);
+                VIR_WARN("couldn't find interface named '%s', might be deleted by other process",
+                         names[i]);
                 continue;
             }
         }

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 2b988157fae9b03f7e069aba3059ae342f98901e..d25b92b4de0c9c61f21459d7c03850bc64ca22b8 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -550,9 +550,7 @@ libxlMakeDomBuildInfo(virDomainDef *def,
         }
 
         if (def->cpu && def->cpu->mode == VIR_CPU_MODE_CUSTOM) {
-            VIR_WARN("Ignoring CPU with mode=custom, update your config to "
-                     "mode=host-passthrough to avoid risk of changed guest "
-                     "semantics when mode=custom is supported in the future");
+            VIR_WARN("Ignoring CPU with mode=custom, update your config to mode=host-passthrough to avoid risk of changed guest semantics when mode=custom is supported in the future");
         }
     }
 

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 42e1408cf31722d99dfd837776b60898e461b4f9..d05972af5bca4210e5f835c386cec714c2f4865f 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1255,8 +1255,8 @@ xenFormatXLCPUID(virConf *conf, virDomainDef *def)
         return 0;
 
     if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
-        VIR_WARN("ignoring CPU mode '%s', only host-passthrough mode "
-                 "is supported", virCPUModeTypeToString(def->cpu->mode));
+        VIR_WARN("ignoring CPU mode '%s', only host-passthrough mode is supported",
+                 virCPUModeTypeToString(def->cpu->mode));
         return 0;
     }
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3ec6d298bd871aec5d9667f74cae2dd7243bd4e7..69eafc110d2f0a8f67e88449fc6e392dc93e83bc 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3556,8 +3556,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver,
             if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
                 goto cleanup;
         } else {
-            VIR_WARN("setting bandwidth on interfaces of "
-                     "type '%s' is not implemented yet: %s",
+            VIR_WARN("setting bandwidth on interfaces of type '%s' is not implemented yet: %s",
                      virDomainNetTypeToString(actualType), virGetLastErrorMessage());
         }
     }

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index e22f77ef83caffae1e5f71d1b48c432b710aab84..2c0bcb9dd3aa68dbb9edb7de1b24f76f4c465881 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -617,8 +617,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver,
                 if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
                     goto cleanup;
             } else {
-                VIR_WARN("setting bandwidth on interfaces of "
-                         "type '%s' is not implemented yet",
+                VIR_WARN("setting bandwidth on interfaces of type '%s' is not implemented yet",
                          virDomainNetTypeToString(type));
             }
         }

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index ecfce5d9a4d01c8c0878cd4ec25a6a4d6f07ce61..4dc3e5424b51c482025b5e358cf498bb36e06f46 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -714,8 +714,8 @@ networkStateInitialize(bool privileged,
 #ifdef WITH_FIREWALLD
     if (!virGDBusHasSystemBus() ||
         !(sysbus = virGDBusGetSystemBus())) {
-        VIR_WARN("DBus not available, disabling firewalld support "
-                 "in bridge_network_driver: %s", virGetLastErrorMessage());
+        VIR_WARN("DBus not available, disabling firewalld support in bridge_network_driver: %s",
+                 virGetLastErrorMessage());
     } else {
         g_dbus_connection_signal_subscribe(sysbus,
                                            NULL,
@@ -1389,12 +1389,7 @@ networkDnsmasqConfContents(virNetworkObj *obj,
     }
 
     if (ipv6def && ipv6SLAAC) {
-        VIR_WARN("For IPv6, when DHCP is specified for one address, then "
-                 "state-full Router Advertising will occur.  The additional "
-                 "IPv6 addresses specified require manually configured guest "
-                 "network to work properly since both state-full (DHCP) "
-                 "and state-less (SLAAC) addressing are not supported "
-                 "on the same network interface.");
+        VIR_WARN("For IPv6, when DHCP is specified for one address, then state-full Router Advertising will occur.  The additional IPv6 addresses specified require manually configured guest network to work properly since both state-full (DHCP) and state-less (SLAAC) addressing are not supported on the same network interface.");
     }
 
     if (networkDnsmasqConfDHCP(&configbuf, ipv4def, def->bridge, &nbleases, dctx) < 0 ||
@@ -2291,9 +2286,7 @@ networkCreateInterfacePool(virNetworkDef *netdef)
                 thisIf->type = VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NETDEV;
                 netdef->forward.nifs++;
             } else {
-                VIR_WARN("VF %zu of SRIOV PF %s couldn't be added to the "
-                         "interface pool because it isn't bound "
-                         "to a network driver - possibly in use elsewhere",
+                VIR_WARN("VF %zu of SRIOV PF %s couldn't be added to the interface pool because it isn't bound to a network driver - possibly in use elsewhere",
                          i, netdef->forward.pfs->dev);
             }
             break;

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index e65dbb93d9a17e5237c12527cfa4de0361cb2794..916c6fafa1b9a557b0dea850eb3f87296c2f857d 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -1331,8 +1331,7 @@ virNWFilterDHCPSnoopThread(void *req0)
                     pcapConf[i].maxQSize) {
                     if (last_displayed_queue - time(0) > 10) {
                         last_displayed_queue = time(0);
-                        VIR_WARN("Worker thread for interface '%s' has a "
-                                 "job queue that is too long",
+                        VIR_WARN("Worker thread for interface '%s' has a job queue that is too long",
                                  req->binding->portdevname);
                     }
                     continue;

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 7986db8e765923426833ec2742068076dc0f9be1..324c2635b4f3c6d57369fe0b8c7f326d23f642a6 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2869,8 +2869,7 @@ qemuBlockRemoveImageMetadata(virQEMUDriver *driver,
 
     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
         if (qemuSecurityMoveImageMetadata(driver, vm, n, NULL) < 0) {
-            VIR_WARN("Unable to remove disk metadata on "
-                     "vm %s from %s (disk target %s)",
+            VIR_WARN("Unable to remove disk metadata on vm %s from %s (disk target %s)",
                      vm->def->name,
                      NULLSTR(n->path),
                      diskTarget);

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5b7423e3541556d9055c8a9b7d7eddf3dd8d9814..a4445ef17ae007a9407112f2163094c223ad5609 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9128,8 +9128,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
                     goto cleanup;
             }
         } else {
-            VIR_WARN("setting bandwidth on interfaces of "
-                     "type '%s' is not implemented yet",
+            VIR_WARN("setting bandwidth on interfaces of type '%s' is not implemented yet",
                      virDomainNetTypeToString(actualType));
         }
     }

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index f2f9cc8a2170d7173e956f7db09ff79d05da51a6..9c3231009639cece525101854fdc820b5d709d5c 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1071,9 +1071,7 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfig *cfg,
             return -1;
 
         if (fwList) {
-            VIR_WARN("Obsolete nvram variable is set while firmware metadata "
-                     "files found. Note that the nvram config file variable is "
-                     "going to be ignored.");
+            VIR_WARN("Obsolete nvram variable is set while firmware metadata files found. Note that the nvram config file variable is going to be ignored.");
             return 0;
         }
 

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 91d57ee60b0fa48c5cf9aa34097a05ece19f01ce..dde257bb7007e2d95018a64448a34b52ead0cee9 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -291,8 +291,7 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObj *vm,
 
     if (n > 0) {
         if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT) {
-            VIR_WARN("Found disks marked for migration but we were not "
-                     "migrating");
+            VIR_WARN("Found disks marked for migration but we were not migrating");
             n = 0;
         }
         for (i = 0; i < n; i++) {
@@ -5140,11 +5139,9 @@ qemuDomainObjEnterMonitorInternal(virDomainObj *obj,
             return -1;
         }
     } else if (obj->job->asyncOwner == virThreadSelfID()) {
-        VIR_WARN("This thread seems to be the async job owner; entering"
-                 " monitor without asking for a nested job is dangerous");
+        VIR_WARN("This thread seems to be the async job owner; entering monitor without asking for a nested job is dangerous");
     } else if (obj->job->owner != virThreadSelfID()) {
-        VIR_WARN("Entering a monitor without owning a job. "
-                 "Job %s owner %s (%llu)",
+        VIR_WARN("Entering a monitor without owning a job. Job %s owner %s (%llu)",
                  virDomainJobTypeToString(obj->job->active),
                  obj->job->ownerAPI, obj->job->owner);
     }
@@ -11094,8 +11091,7 @@ syncNicRxFilterMacAddr(char *ifname, virNetDevRxFilter *guestFilter,
 
         /* set new MAC address from guest to associated macvtap device */
         if (virNetDevSetMAC(ifname, &guestFilter->mac) < 0) {
-            VIR_WARN("Couldn't set new MAC address %s to device %s "
-                     "while responding to NIC_RX_FILTER_CHANGED",
+            VIR_WARN("Couldn't set new MAC address %s to device %s while responding to NIC_RX_FILTER_CHANGED",
                      newMacStr, ifname);
         } else {
             VIR_DEBUG("device %s MAC address set to %s", ifname, newMacStr);
@@ -11127,8 +11123,7 @@ syncNicRxFilterGuestMulticast(char *ifname, virNetDevRxFilter *guestFilter,
             virMacAddrFormat(&guestFilter->multicast.table[i], macstr);
 
             if (virNetDevAddMulti(ifname, &guestFilter->multicast.table[i]) < 0) {
-                VIR_WARN("Couldn't add new multicast MAC address %s to "
-                         "device %s while responding to NIC_RX_FILTER_CHANGED",
+                VIR_WARN("Couldn't add new multicast MAC address %s to device %s while responding to NIC_RX_FILTER_CHANGED",
                          macstr, ifname);
             } else {
                 VIR_DEBUG("Added multicast MAC %s to %s interface",
@@ -11162,8 +11157,7 @@ syncNicRxFilterHostMulticast(char *ifname, virNetDevRxFilter *guestFilter,
             virMacAddrFormat(&hostFilter->multicast.table[i], macstr);
 
             if (virNetDevDelMulti(ifname, &hostFilter->multicast.table[i]) < 0) {
-                VIR_WARN("Couldn't delete multicast MAC address %s from "
-                         "device %s while responding to NIC_RX_FILTER_CHANGED",
+                VIR_WARN("Couldn't delete multicast MAC address %s from device %s while responding to NIC_RX_FILTER_CHANGED",
                          macstr, ifname);
             } else {
                 VIR_DEBUG("Deleted multicast MAC %s from %s interface",
@@ -11196,8 +11190,7 @@ syncNicRxFilterPromiscMode(char *ifname,
 
     if (setpromisc) {
         if (virNetDevSetPromiscuous(ifname, promisc) < 0) {
-            VIR_WARN("Couldn't set PROMISC flag to %s for device %s "
-                     "while responding to NIC_RX_FILTER_CHANGED",
+            VIR_WARN("Couldn't set PROMISC flag to %s for device %s while responding to NIC_RX_FILTER_CHANGED",
                      promisc ? "true" : "false", ifname);
         }
     }
@@ -11214,9 +11207,8 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilter *guestFilter,
         switch (guestFilter->multicast.mode) {
         case VIR_NETDEV_RX_FILTER_MODE_ALL:
             if (virNetDevSetRcvAllMulti(ifname, true) < 0) {
-                VIR_WARN("Couldn't set allmulticast flag to 'on' for "
-                         "device %s while responding to "
-                         "NIC_RX_FILTER_CHANGED", ifname);
+                VIR_WARN("Couldn't set allmulticast flag to 'on' for device %s while responding to NIC_RX_FILTER_CHANGED",
+                         ifname);
             }
             break;
 
@@ -11227,16 +11219,13 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilter *guestFilter,
             }
 
             if (virNetDevSetRcvMulti(ifname, true) < 0) {
-                VIR_WARN("Couldn't set multicast flag to 'on' for "
-                         "device %s while responding to "
-                         "NIC_RX_FILTER_CHANGED", ifname);
+                VIR_WARN("Couldn't set multicast flag to 'on' for device %s while responding to NIC_RX_FILTER_CHANGED",
+                         ifname);
             }
 
             if (virNetDevSetRcvAllMulti(ifname,
                                         guestFilter->multicast.overflow) < 0) {
-                VIR_WARN("Couldn't set allmulticast flag to '%s' for "
-                         "device %s while responding to "
-                         "NIC_RX_FILTER_CHANGED",
+                VIR_WARN("Couldn't set allmulticast flag to '%s' for device %s while responding to NIC_RX_FILTER_CHANGED",
                          virTristateSwitchTypeToString(virTristateSwitchFromBool(guestFilter->multicast.overflow)),
                          ifname);
             }
@@ -11244,15 +11233,12 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilter *guestFilter,
 
         case VIR_NETDEV_RX_FILTER_MODE_NONE:
             if (virNetDevSetRcvAllMulti(ifname, false) < 0) {
-                VIR_WARN("Couldn't set allmulticast flag to 'off' for "
-                         "device %s while responding to "
-                         "NIC_RX_FILTER_CHANGED", ifname);
+                VIR_WARN("Couldn't set allmulticast flag to 'off' for device %s while responding to NIC_RX_FILTER_CHANGED",
+                         ifname);
             }
 
             if (virNetDevSetRcvMulti(ifname, false) < 0) {
-                VIR_WARN("Couldn't set multicast flag to 'off' for "
-                         "device %s while responding to "
-                         "NIC_RX_FILTER_CHANGED",
+                VIR_WARN("Couldn't set multicast flag to 'off' for device %s while responding to NIC_RX_FILTER_CHANGED",
                          ifname);
             }
             break;

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 9957f927f575c5e18d4b72448816794014f24a58..a8292a97826c51596f578306213ce679fd3a7d62 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1318,8 +1318,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDef *def,
         tmp = virPCIDeviceAddressGetIOMMUGroupNum(hostAddr);
 
         if (tmp < 0) {
-            VIR_WARN("Can't look up isolation group for host device "
-                     "%04x:%02x:%02x.%x, device won't be isolated",
+            VIR_WARN("Can't look up isolation group for host device %04x:%02x:%02x.%x, device won't be isolated",
                      hostAddr->domain, hostAddr->bus,
                      hostAddr->slot, hostAddr->function);
             return;
@@ -1362,9 +1361,7 @@ qemuDomainFillDeviceIsolationGroup(virDomainDef *def,
         tmp = qemuDomainFindUnusedIsolationGroup(def);
 
         if (tmp == 0) {
-            VIR_WARN("Can't obtain usable isolation group for interface "
-                     "configured to use hostdev-backed network '%s', "
-                     "device won't be isolated",
+            VIR_WARN("Can't obtain usable isolation group for interface configured to use hostdev-backed network '%s', device won't be isolated",
                      iface->data.network.name);
             return;
         }
@@ -1564,8 +1561,7 @@ qemuDomainCollectPCIAddress(virDomainDef *def G_GNUC_UNUSED,
     if (!info->pciConnectFlags) {
         g_autofree char *addrStr = virPCIDeviceAddressAsString(&info->addr.pci);
 
-        VIR_WARN("qemuDomainDeviceCalculatePCIConnectFlags() thinks that the "
-                 "device with PCI address %s should not have a PCI address",
+        VIR_WARN("qemuDomainDeviceCalculatePCIConnectFlags() thinks that the device with PCI address %s should not have a PCI address",
                  addrStr ? addrStr : "(unknown)");
 
         info->pciConnectFlags = VIR_PCI_CONNECT_TYPE_PCI_DEVICE;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 529e9fe3bec1928091cd30f0215148eba7e87b15..d5e2b37ed5caf676aa4d8fef4c2b5b0efb2a9034 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -3740,14 +3740,12 @@ processNicRxFilterChangedEvent(virQEMUDriver *driver,
     }
 
     if (virDomainDefFindDevice(vm->def, devAlias, &dev, true) < 0) {
-        VIR_WARN("NIC_RX_FILTER_CHANGED event received for "
-                 "non-existent device %s in domain %s",
+        VIR_WARN("NIC_RX_FILTER_CHANGED event received for non-existent device %s in domain %s",
                  devAlias, vm->def->name);
         goto endjob;
     }
     if (dev.type != VIR_DOMAIN_DEVICE_NET) {
-        VIR_WARN("NIC_RX_FILTER_CHANGED event received for "
-                 "non-network device %s in domain %s",
+        VIR_WARN("NIC_RX_FILTER_CHANGED event received for non-network device %s in domain %s",
                  devAlias, vm->def->name);
         goto endjob;
     }
@@ -6390,8 +6388,8 @@ qemuDomainObjStart(virConnectPtr conn,
 
                 return ret;
             } else if (ret < 0) {
-                VIR_WARN("Unable to restore from managed state %s. "
-                         "Maybe the file is corrupted?", managed_save);
+                VIR_WARN("Unable to restore from managed state %s. Maybe the file is corrupted?",
+                         managed_save);
                 return ret;
             } else {
                 VIR_WARN("Ignoring incomplete managed state %s", managed_save);

diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index d8633c6b2864e07dc2386ea8c67c887be5b65df0..ba6e160a2506968b01b02aa594f2192c5f9eabf7 100644 (file)
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1708,8 +1708,7 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw,
     if (!isConfidential &&
         !usesUefiVarsDevice &&
         supportsSecureBoot != requiresSMM) {
-        VIR_WARN("Firmware description '%s' has invalid set of features: "
-                 "%s = %d, %s = %d, %s = %d (isConfidential = %d)",
+        VIR_WARN("Firmware description '%s' has invalid set of features: %s = %d, %s = %d, %s = %d (isConfidential = %d)",
                  filename,
                  qemuFirmwareFeatureTypeToString(QEMU_FIRMWARE_FEATURE_REQUIRES_SMM),
                  requiresSMM,
@@ -1720,8 +1719,7 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw,
                  isConfidential);
     }
     if (hasEnrolledKeys && !supportsSecureBoot) {
-        VIR_WARN("Firmware description '%s' has invalid set of features: "
-                 "%s = %d, %s = %d",
+        VIR_WARN("Firmware description '%s' has invalid set of features: %s = %d, %s = %d",
                  filename,
                  qemuFirmwareFeatureTypeToString(QEMU_FIRMWARE_FEATURE_SECURE_BOOT),
                  supportsSecureBoot,

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b7a282b96e52f6ae6cfb7d73587c393de07fef98..71a64b08793bd5aa2d1048d310d09cd168eddfeb 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1358,8 +1358,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
                     goto cleanup;
             }
         } else {
-            VIR_WARN("setting bandwidth on interfaces of "
-                     "type '%s' is not implemented yet",
+            VIR_WARN("setting bandwidth on interfaces of type '%s' is not implemented yet",
                      virDomainNetTypeToString(actualType));
         }
     }

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ffffeea75cd0df3e07358b4b24a7e512796d7b57..2c36ce83326392e3c73817b1d365e203a4ab6222 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1867,8 +1867,8 @@ qemuMigrationSrcPostcopyFailed(virDomainObj *vm)
         virDomainObjIsFailedPostcopy(vm, vm->job))
         return;
 
-    VIR_WARN("Migration of domain %s failed during post-copy; "
-             "leaving the domain paused", vm->def->name);
+    VIR_WARN("Migration of domain %s failed during post-copy; leaving the domain paused",
+             vm->def->name);
 
     vm->job->asyncPaused = true;
     virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
@@ -1899,8 +1899,8 @@ qemuMigrationDstPostcopyFailed(virDomainObj *vm)
         virDomainObjIsFailedPostcopy(vm, vm->job))
         return;
 
-    VIR_WARN("Incoming migration of domain '%s' failed during post-copy; "
-             "leaving the domain running", vm->def->name);
+    VIR_WARN("Incoming migration of domain '%s' failed during post-copy; leaving the domain running",
+             vm->def->name);
 
     vm->job->asyncPaused = true;
     if (state == VIR_DOMAIN_RUNNING) {
@@ -2532,8 +2532,7 @@ qemuMigrationAnyConnectionClosed(virDomainObj *vm,
             VIR_DEBUG("Migration protocol interrupted in post-copy mode");
             postcopy = true;
         } else {
-            VIR_WARN("Migration of domain %s finished but we don't know if the "
-                     "domain was successfully started on destination or not",
+            VIR_WARN("Migration of domain %s finished but we don't know if the domain was successfully started on destination or not",
                      vm->def->name);
         }
         break;

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 532bb885a335e6fe76a3126ef0001e54b280e69e..7efd3f443a48f4c28b7791641334032281fb0717 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1437,8 +1437,8 @@ qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitor *mon,
     }
 
     if (virJSONValueObjectGetBoolean(data, "connected", &connected) < 0) {
-        VIR_WARN("missing connected state for %s "
-                 "in PR_MANAGER_STATUS_CHANGED event", name);
+        VIR_WARN("missing connected state for %s in PR_MANAGER_STATUS_CHANGED event",
+                 name);
         return;
     }
 

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ec71eaed8762968bfa4a8fc4fad72053f8413cfc..8a0f5d30ac1335e6fb95bd711ed23bdeed130134 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3852,8 +3852,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
             goto cleanup;
         }
         if (ssf < SSF_WARNING_LEVEL) {
-            VIR_WARN("negotiation SSF %d lower than %d will be deprecated. "
-                     "Please upgrade your ciphers.",
+            VIR_WARN("negotiation SSF %d lower than %d will be deprecated. Please upgrade your ciphers.",
                      ssf, SSF_WARNING_LEVEL);
         }
         priv->is_secure = 1;

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index e2967e5e1f551ae7db6d49db6e6a720d616cd8ae..a983686e93e2131cc3322f37e630b5f32ac9851f 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -1266,9 +1266,8 @@ static virNetMessage *virNetServerClientDispatchRead(virNetServerClient *client)
         } else if (!client->nrequests_warning &&
                    client->nrequests_max > 1) {
             client->nrequests_warning = true;
-            VIR_WARN("Client hit max requests limit %zd. This may result "
-                     "in keep-alive timeouts. Consider tuning the "
-                     "max_client_requests server parameter", client->nrequests);
+            VIR_WARN("Client hit max requests limit %zd. This may result in keep-alive timeouts. Consider tuning the max_client_requests server parameter",
+                     client->nrequests);
         }
         virNetServerClientUpdateEvent(client);
 

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 05ab7ec2f9bf3ff38a7f748dcd5d346be73347e3..e7cffa8e59fab468b0ab6b4e749157b131b2ea6b 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -807,8 +807,7 @@ virSecurityDACSetOwnership(virSecurityManager *mgr,
      * not much we can do. XATTRs refcounting is fubar'ed and
      * the only option we have is warn users. */
     if (virSecurityDACRestoreFileLabelInternal(mgr, src, path, remember) < 0)
-        VIR_WARN("Unable to restore label on '%s'. "
-                 "XATTRs might have been left in inconsistent state.",
+        VIR_WARN("Unable to restore label on '%s'. XATTRs might have been left in inconsistent state.",
                  NULLSTR(src ? src->path : path));
 
     virErrorRestore(&origerr);

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 0824217f24696562e7a4c3d7cd18907b1bb496ee..423dcd0bd987572b0b2288f2c08bec7fc33041a7 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -953,9 +953,7 @@ virSecuritySELinuxGenLabel(virSecurityManager *mgr,
                 if (data->alt_domain_context == NULL) {
                     static bool warned;
                     if (!warned) {
-                        VIR_WARN("SELinux policy does not define a domain type for QEMU TCG. "
-                                 "Guest startup may be denied due to missing 'execmem' privilege "
-                                 "unless the 'virt_use_execmem' policy boolean is enabled");
+                        VIR_WARN("SELinux policy does not define a domain type for QEMU TCG. Guest startup may be denied due to missing 'execmem' privilege unless the 'virt_use_execmem' policy boolean is enabled");
                         warned = true;
                     }
                     baselabel = data->domain_context;
@@ -1454,8 +1452,7 @@ virSecuritySELinuxSetFilecon(virSecurityManager *mgr,
          * not much we can do. XATTRs refcounting is fubar'ed and
          * the only option we have is warn users. */
         if (virSecuritySELinuxRestoreFileLabel(mgr, path, remember, false) < 0)
-            VIR_WARN("Unable to restore label on '%s'. "
-                     "XATTRs might have been left in inconsistent state.",
+            VIR_WARN("Unable to restore label on '%s'. XATTRs might have been left in inconsistent state.",
                      path);
 
         virErrorRestore(&origerr);

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 99a68a605323da4b4427a48ce29fd0fe9b6242fc..a55e94e76420717aed91022a09ec9d98cbb9f627 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -306,8 +306,7 @@ virSecurityStackSetHostdevLabel(virSecurityManager *mgr,
                                                   vm,
                                                   dev,
                                                   vroot) < 0) {
-            VIR_WARN("Unable to restore hostdev label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s hostdev=%p",
+            VIR_WARN("Unable to restore hostdev label after failed set label call virDriver=%s driver=%s domain=%s hostdev=%p",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name, dev);
@@ -367,8 +366,7 @@ virSecurityStackSetAllLabel(virSecurityManager *mgr,
                                               vm,
                                               migrated,
                                               chardevStdioLogd) < 0) {
-            VIR_WARN("Unable to restore all labels after failed set label call "
-                     "virDriver=%s driver=%s domain=%s migrated=%d",
+            VIR_WARN("Unable to restore all labels after failed set label call virDriver=%s driver=%s domain=%s migrated=%d",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name, migrated);
@@ -422,8 +420,7 @@ virSecurityStackSetSavedStateLabel(virSecurityManager *mgr,
         if (virSecurityManagerRestoreSavedStateLabel(item->securityManager,
                                                      vm,
                                                      savefile) < 0) {
-            VIR_WARN("Unable to restore saved state label after failed set "
-                     "label call virDriver=%s driver=%s savefile=%s",
+            VIR_WARN("Unable to restore saved state label after failed set label call virDriver=%s driver=%s savefile=%s",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      savefile);
@@ -523,8 +520,7 @@ virSecurityStackSetDaemonSocketLabel(virSecurityManager *mgr,
     for (item = item->prev; item; item = item->prev) {
         if (virSecurityManagerClearSocketLabel(item->securityManager,
                                                vm) < 0) {
-            VIR_WARN("Unable to clear new daemon socket label after failed "
-                     "set label call virDriver=%s driver=%s domain=%s",
+            VIR_WARN("Unable to clear new daemon socket label after failed set label call virDriver=%s driver=%s domain=%s",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name);
@@ -551,8 +547,7 @@ virSecurityStackSetSocketLabel(virSecurityManager *mgr,
     for (item = item->prev; item; item = item->prev) {
         if (virSecurityManagerClearSocketLabel(item->securityManager,
                                                vm) < 0) {
-            VIR_WARN("Unable to clear new socket label after failed "
-                     "set label call virDriver=%s driver=%s domain=%s",
+            VIR_WARN("Unable to clear new socket label after failed set label call virDriver=%s driver=%s domain=%s",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name);
@@ -673,9 +668,7 @@ virSecurityStackSetImageLabel(virSecurityManager *mgr,
                                                 vm,
                                                 src,
                                                 flags) < 0) {
-            VIR_WARN("Unable to restore image label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s src=%p (path=%s) "
-                     "flags=0x%x",
+            VIR_WARN("Unable to restore image label after failed set label call virDriver=%s driver=%s domain=%s src=%p (path=%s) flags=0x%x",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name, src, NULLSTR(src->path), flags);
@@ -746,8 +739,7 @@ virSecurityStackSetMemoryLabel(virSecurityManager *mgr,
         if (virSecurityManagerRestoreMemoryLabel(item->securityManager,
                                                  vm,
                                                  mem) < 0) {
-            VIR_WARN("Unable to restore memory label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s mem=%p",
+            VIR_WARN("Unable to restore memory label after failed set label call virDriver=%s driver=%s domain=%s mem=%p",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name, mem);
@@ -794,8 +786,7 @@ virSecurityStackSetInputLabel(virSecurityManager *mgr,
         if (virSecurityManagerRestoreInputLabel(item->securityManager,
                                                 vm,
                                                 input) < 0) {
-            VIR_WARN("Unable to restore input label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s input=%p",
+            VIR_WARN("Unable to restore input label after failed set label call virDriver=%s driver=%s domain=%s input=%p",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name, input);
@@ -904,8 +895,7 @@ virSecurityStackDomainSetChardevLabel(virSecurityManager *mgr,
                                                   def,
                                                   dev_source,
                                                   chardevStdioLogd) < 0) {
-            VIR_WARN("Unable to restore chardev label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s dev_source=%p",
+            VIR_WARN("Unable to restore chardev label after failed set label call virDriver=%s driver=%s domain=%s dev_source=%p",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      def->name, dev_source);
@@ -955,8 +945,7 @@ virSecurityStackSetTPMLabels(virSecurityManager *mgr,
     for (item = item->prev; item; item = item->prev) {
         if (virSecurityManagerRestoreTPMLabels(item->securityManager,
                                                vm, setTPMStateLabel) < 0) {
-            VIR_WARN("Unable to restore TPM label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s",
+            VIR_WARN("Unable to restore TPM label after failed set label call virDriver=%s driver=%s domain=%s",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      vm->name);
@@ -1004,8 +993,7 @@ virSecurityStackDomainSetNetdevLabel(virSecurityManager *mgr,
     for (item = item->prev; item; item = item->prev) {
         if (virSecurityManagerRestoreNetdevLabel(item->securityManager,
                                                  def, net) < 0) {
-            VIR_WARN("Unable to restore netdev label after failed set label "
-                     "call virDriver=%s driver=%s domain=%s",
+            VIR_WARN("Unable to restore netdev label after failed set label call virDriver=%s driver=%s domain=%s",
                      virSecurityManagerGetVirtDriver(mgr),
                      virSecurityManagerGetDriver(item->securityManager),
                      def->name);

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 29d544d34945c8f287b95491ea89e1c2e5080fe3..25cad4a28d3238b30faa0522464776e7ca25516b 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -331,8 +331,8 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDState *ptr,
         }
 
         virUUIDFormat(def->uuid, uuidstr);
-        VIR_WARN("Storage Pool name='%s' uuid='%s' is tainted by custom "
-                 "config_opts from XML", def->name, uuidstr);
+        VIR_WARN("Storage Pool name='%s' uuid='%s' is tainted by custom config_opts from XML",
+                 def->name, uuidstr);
     }
 
     ptr->starttime = time(0);

diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backend_zfs.c
index 2cb555a6e6110c4b7a52ef1449fa331ce51ade70..064b959bcb304c606f77756002441882925d924d 100644 (file)
--- a/src/storage/storage_backend_zfs.c
+++ b/src/storage/storage_backend_zfs.c
@@ -69,8 +69,7 @@ virStorageBackendZFSVolModeNeeded(void)
 
     ret = virCommandRun(cmd, &exit_code);
     if ((ret < 0) || (exit_code != 2)) {
-        VIR_WARN("Command 'zfs get' either failed "
-                 "to run or exited with unexpected status");
+        VIR_WARN("Command 'zfs get' either failed to run or exited with unexpected status");
         return ret;
     }
 

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index e2b41de1f239a4e20e154eb3f8b7c68534b14e53..78dc9f9f1cce41ca97efacca736b51bf5a4597e7 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -4042,8 +4042,8 @@ virStorageBackendFileSystemMountAddOptions(virCommand *cmd,
             virBufferAsprintf(&buf, "%s,", opts->options[i]);
 
         virUUIDFormat(def->uuid, uuidstr);
-        VIR_WARN("Storage Pool name='%s' uuid='%s' is tainted by custom "
-                 "mount_opts from XML", def->name, uuidstr);
+        VIR_WARN("Storage Pool name='%s' uuid='%s' is tainted by custom mount_opts from XML",
+                 def->name, uuidstr);
     }
 
     virBufferTrim(&buf, ",");

diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c
index 82cea28b202fcf74aebf82f31f8d5c9de1419427..a1f4c25b3d3ba1ef784cc628739defe7b7efe527 100644 (file)
--- a/src/storage_file/storage_file_probe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -883,8 +883,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
     }
 
     if (possibleFormat != VIR_STORAGE_FILE_RAW)
-        VIR_WARN("File %s matches %s magic, but version is wrong. "
-                 "Please report new version to devel@lists.libvirt.org",
+        VIR_WARN("File %s matches %s magic, but version is wrong. Please report new version to devel@lists.libvirt.org",
                  path, virStorageFileFormatTypeToString(possibleFormat));
 
  cleanup:

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 882f9e1f01a4278dc71e943f4cc89ef650fc05e4..65ae9cc65182bc981df2b19712b522a472f4cac5 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -2099,8 +2099,8 @@ vboxDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags
         if (NS_SUCCEEDED(rc))
             gVBoxAPI.deleteConfig(machine);
         else
-            VIR_WARN("Could not cleanup partially created VM after failure, "
-                     "rc=%08x", rc);
+            VIR_WARN("Could not cleanup partially created VM after failure, rc=%08x",
+                     rc);
     }
 
     VBOX_RELEASE(machine);

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 34214b4bf3a5ca371239df25ea138faf20f6f71f..084b4154427f6e0bd5a7a935583b427b41ed6ffb 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2110,8 +2110,7 @@ virVMXParseVNC(virConf *conf, virDomainGraphicsDef **def)
     VIR_FREE(listenAddr);
 
     if (port < 0) {
-        VIR_WARN("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' "
-                  "is missing, the VNC port is unknown");
+        VIR_WARN("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' is missing, the VNC port is unknown");
 
         (*def)->data.vnc.port = 0;
         (*def)->data.vnc.autoport = true;
@@ -3879,8 +3878,7 @@ virVMXFormatVNC(virDomainGraphicsDef *def, virBuffer *buffer)
     virBufferAddLit(buffer, "RemoteDisplay.vnc.enabled = \"true\"\n");
 
     if (def->data.vnc.autoport) {
-        VIR_WARN("VNC autoport is enabled, but the automatically assigned "
-                  "VNC port cannot be read back");
+        VIR_WARN("VNC autoport is enabled, but the automatically assigned VNC port cannot be read back");
     } else {
         if (def->data.vnc.port < 5900 || def->data.vnc.port > 5964) {
             VIR_WARN("VNC port %d it out of [5900..5964] range",

diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index e6dd9533bee403e23a0ee5b5496bb119c676a501..7059f359b69658825d59cd0754201bc4a565654d 100644 (file)
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -3218,8 +3218,7 @@ static int prlsdkConfigureNet(struct _vzDriver *driver G_GNUC_UNUSED,
 
     if (isCt) {
         if (net->model != VIR_DOMAIN_NET_MODEL_UNKNOWN)
-            VIR_WARN("Setting network adapter for containers is not "
-                     "supported by vz driver.");
+            VIR_WARN("Setting network adapter for containers is not supported by vz driver.");
     } else {
         if (net->model == VIR_DOMAIN_NET_MODEL_RTL8139) {
             pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);