External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Remove unnecessary trailing \n in log messages

Browse Source
This commit is contained in:
Matthias Bolte 2010-04-02 21:44:04 +02:00
parent d2e0bd1779
commit 49411f029a
13 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/libvirtd.c
View File

@ -2308,7 +2308,7 @@ static void *qemudRunLoop(void *opaque) {
virMutexUnlock(&server->lock); virMutexUnlock(&server->lock);
if (qemudOneLoop() < 0) { if (qemudOneLoop() < 0) {
virMutexLock(&server->lock); virMutexLock(&server->lock);
DEBUG0("Loop iteration error, exiting\n"); DEBUG0("Loop iteration error, exiting");
break; break;
} }
virMutexLock(&server->lock); virMutexLock(&server->lock);
@ -2482,7 +2482,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { for (i = 0, pp = p->list; pp; ++i, pp = pp->next) {
if (pp->type != VIR_CONF_STRING) { if (pp->type != VIR_CONF_STRING) {
VIR_ERROR(_("remoteReadConfigFile: %s: %s:" VIR_ERROR(_("remoteReadConfigFile: %s: %s:"
" must be a string or list of strings\n"), " must be a string or list of strings"),
filename, key); filename, key);
VIR_FREE(list); VIR_FREE(list);
return -1; return -1;
@ -2505,7 +2505,7 @@ remoteConfigGetStringList(virConfPtr conf, const char *key, char ***list_arg,
default: default:
VIR_ERROR(_("remoteReadConfigFile: %s: %s:" VIR_ERROR(_("remoteReadConfigFile: %s: %s:"
" must be a string or list of strings\n"), " must be a string or list of strings"),
filename, key); filename, key);
return -1; return -1;
} }
@ -2521,7 +2521,7 @@ checkType (virConfValuePtr p, const char *filename,
{ {
if (p->type != required_type) { if (p->type != required_type) {
VIR_ERROR(_("remoteReadConfigFile: %s: %s: invalid type:" VIR_ERROR(_("remoteReadConfigFile: %s: %s: invalid type:"
" got %s; expected %s\n"), filename, key, " got %s; expected %s"), filename, key,
virConfTypeName (p->type), virConfTypeName (p->type),
virConfTypeName (required_type)); virConfTypeName (required_type));
return -1; return -1;

2
src/lxc/lxc_driver.c
View File

@ -634,7 +634,7 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) { if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) {
lxcError(VIR_ERR_INTERNAL_ERROR, lxcError(VIR_ERR_INTERNAL_ERROR,
_("Unable to get cgroup for %s\n"), vm->def->name); _("Unable to get cgroup for %s"), vm->def->name);
goto cleanup; goto cleanup;
} }

4
src/node_device/node_device_linux_sysfs.c
View File

@ -302,7 +302,7 @@ int get_physical_function_linux(const char *sysfs_path,
char *device_link = NULL; char *device_link = NULL;
VIR_DEBUG("Attempting to get SR IOV physical function for device " VIR_DEBUG("Attempting to get SR IOV physical function for device "
"with sysfs path '%s'\n", sysfs_path); "with sysfs path '%s'", sysfs_path);
if (virBuildPath(&device_link, sysfs_path, "physfn") == -1) { if (virBuildPath(&device_link, sysfs_path, "physfn") == -1) {
virReportOOMError(); virReportOOMError();
@ -327,7 +327,7 @@ int get_virtual_functions_linux(const char *sysfs_path,
char *device_link = NULL; char *device_link = NULL;
VIR_DEBUG("Attempting to get SR IOV virtual functions for device" VIR_DEBUG("Attempting to get SR IOV virtual functions for device"
"with sysfs path '%s'\n", sysfs_path); "with sysfs path '%s'", sysfs_path);
dir = opendir(sysfs_path); dir = opendir(sysfs_path);
if (dir == NULL) { if (dir == NULL) {

16
src/node_device/node_device_udev.c
View File

@ -131,7 +131,7 @@ static int udevGetDeviceProperty(struct udev_device *udev_device,
} }
VIR_DEBUG("Found property key '%s' value '%s' " VIR_DEBUG("Found property key '%s' value '%s' "
"for device with sysname '%s'\n", "for device with sysname '%s'",
property_key, *property_value, property_key, *property_value,
udev_device_get_sysname(udev_device)); udev_device_get_sysname(udev_device));
@ -220,7 +220,7 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device,
} }
VIR_DEBUG("Found sysfs attribute '%s' value '%s' " VIR_DEBUG("Found sysfs attribute '%s' value '%s' "
"for device with sysname '%s'\n", "for device with sysname '%s'",
attr_name, *attr_value, attr_name, *attr_value,
udev_device_get_sysname(udev_device)); udev_device_get_sysname(udev_device));
@ -330,7 +330,7 @@ static int udevGenerateDeviceName(struct udev_device *device,
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
virBufferFreeAndReset(&buf); virBufferFreeAndReset(&buf);
VIR_ERROR("Buffer error when generating device name for device " VIR_ERROR("Buffer error when generating device name for device "
"with sysname '%s'\n", udev_device_get_sysname(device)); "with sysname '%s'", udev_device_get_sysname(device));
ret = -1; ret = -1;
} }
@ -642,7 +642,7 @@ static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED,
if (!STRPREFIX(filename, "host")) { if (!STRPREFIX(filename, "host")) {
VIR_ERROR("SCSI host found, but its udev name '%s' does " VIR_ERROR("SCSI host found, but its udev name '%s' does "
"not begin with 'host'\n", filename); "not begin with 'host'", filename);
goto out; goto out;
} }
@ -949,7 +949,7 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def)
int ret = -1; int ret = -1;
VIR_INFO("Could not find definitive storage type for device " VIR_INFO("Could not find definitive storage type for device "
"with sysfs path '%s', trying to guess it\n", "with sysfs path '%s', trying to guess it",
def->sysfs_path); def->sysfs_path);
if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) {
@ -962,10 +962,10 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def)
if (ret != 0) { if (ret != 0) {
VIR_INFO("Could not determine storage type for device " VIR_INFO("Could not determine storage type for device "
"with sysfs path '%s'\n", def->sysfs_path); "with sysfs path '%s'", def->sysfs_path);
} else { } else {
VIR_DEBUG("Found storage type '%s' for device " VIR_DEBUG("Found storage type '%s' for device "
"with sysfs path '%s'\n", "with sysfs path '%s'",
def->caps->data.storage.drive_type, def->caps->data.storage.drive_type,
def->sysfs_path); def->sysfs_path);
} }
@ -1131,7 +1131,7 @@ static int udevGetDeviceType(struct udev_device *device,
} }
VIR_INFO("Could not determine device type for device " VIR_INFO("Could not determine device type for device "
"with sysfs path '%s'\n", "with sysfs path '%s'",
udev_device_get_sysname(device)); udev_device_get_sysname(device));
ret = -1; ret = -1;

2
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -2116,7 +2116,7 @@ ebiptablesExecCLI(virBufferPtr buf,
*status >>= 8; *status >>= 8;
VIR_DEBUG("rc = %d, status = %d\n",rc, *status); VIR_DEBUG("rc = %d, status = %d",rc, *status);
unlink(filename); unlink(filename);

4
src/nwfilter/nwfilter_gentech_driver.c
View File

@ -310,7 +310,7 @@ _virNWFilterInstantiateRec(virConnectPtr conn,
(*insts)[(*nEntries)++] = inst; (*insts)[(*nEntries)++] = inst;
} else if (inc) { } else if (inc) {
VIR_DEBUG("Instantiating filter %s\n", inc->filterref); VIR_DEBUG("Instantiating filter %s", inc->filterref);
obj = virNWFilterPoolObjFindByName(&driver->pools, obj = virNWFilterPoolObjFindByName(&driver->pools,
inc->filterref); inc->filterref);
if (obj) { if (obj) {
@ -514,7 +514,7 @@ _virNWFilterInstantiateFilter(virConnectPtr conn,
return 1; return 1;
} }
VIR_DEBUG("filter name: %s\n", net->filter); VIR_DEBUG("filter name: %s", net->filter);
obj = virNWFilterPoolObjFindByName(&driver->pools, net->filter); obj = virNWFilterPoolObjFindByName(&driver->pools, net->filter);
if (!obj) { if (!obj) {

2
src/qemu/qemu_conf.c
View File

@ -140,7 +140,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \ #define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \
qemuReportError(VIR_ERR_INTERNAL_ERROR, \ qemuReportError(VIR_ERR_INTERNAL_ERROR, \
"remoteReadConfigFile: %s: %s: expected type " #typ "\n", \ "remoteReadConfigFile: %s: %s: expected type " #typ, \
filename, (name)); \ filename, (name)); \
virConfFree(conf); \ virConfFree(conf); \
return -1; \ return -1; \

2
src/remote/remote_driver.c
View File

@ -1288,7 +1288,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn,
} }
if (len != 1 || buf[0] != '\1') { if (len != 1 || buf[0] != '\1') {
error (conn, VIR_ERR_RPC, error (conn, VIR_ERR_RPC,
_("server verification (of our certificate or IP address) failed\n")); _("server verification (of our certificate or IP address) failed"));
return NULL; return NULL;
} }

6
src/storage/storage_backend_disk.c
View File

@ -455,7 +455,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
unsigned long long cylinderSize = dev->geometry.heads * unsigned long long cylinderSize = dev->geometry.heads *
dev->geometry.sectors * SECTOR_SIZE; dev->geometry.sectors * SECTOR_SIZE;
DEBUG("find free area: allocation %llu, cyl size %llu\n", allocation, cylinderSize); DEBUG("find free area: allocation %llu, cyl size %llu", allocation, cylinderSize);
int partType = virStorageBackendDiskPartTypeToCreate(pool); int partType = virStorageBackendDiskPartTypeToCreate(pool);
/* how many extra bytes we have since we allocate /* how many extra bytes we have since we allocate
@ -508,7 +508,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
return -1; return -1;
} }
DEBUG("aligned alloc %llu\n", alignedAllocation); DEBUG("aligned alloc %llu", alignedAllocation);
*start = dev->freeExtents[smallestExtent].start; *start = dev->freeExtents[smallestExtent].start;
if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) {
@ -524,7 +524,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool,
/* counting in byte, we want the last byte of the current sector */ /* counting in byte, we want the last byte of the current sector */
*end -= 1; *end -= 1;
DEBUG("final aligned start %llu, end %llu\n", *start, *end); DEBUG("final aligned start %llu, end %llu", *start, *end);
return 0; return 0;
} }

2
src/storage/storage_driver.c
View File

@ -1557,7 +1557,7 @@ storageVolumeZeroSparseFile(virStorageVolDefPtr vol,
if (ret == -1) { if (ret == -1) {
virReportSystemError(errno, virReportSystemError(errno,
_("Failed to truncate volume with " _("Failed to truncate volume with "
"path '%s' to %ju bytes\n"), "path '%s' to %ju bytes"),
vol->target.path, (intmax_t)size); vol->target.path, (intmax_t)size);
} }

14
src/xen/proxy_internal.c
View File

@ -217,7 +217,7 @@ retry:
return (-1); return (-1);
} }
DEBUG("connected to unix socket %s via %d\n", path, fd); DEBUG("connected to unix socket %s via %d", path, fd);
return (fd); return (fd);
} }
@ -395,14 +395,14 @@ retry:
} }
if (ret != sizeof(virProxyPacket)) { if (ret != sizeof(virProxyPacket)) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
_("Communication error with proxy: got %d bytes of %d\n"), _("Communication error with proxy: got %d bytes of %d"),
ret, (int) sizeof(virProxyPacket)); ret, (int) sizeof(virProxyPacket));
goto error; goto error;
} }
res = request; res = request;
if (res->len != sizeof(virProxyPacket)) { if (res->len != sizeof(virProxyPacket)) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
_("Communication error with proxy: expected %d bytes got %d\n"), _("Communication error with proxy: expected %d bytes got %d"),
(int) sizeof(virProxyPacket), res->len); (int) sizeof(virProxyPacket), res->len);
goto error; goto error;
} }
@ -418,7 +418,7 @@ retry:
} }
if (ret != sizeof(virProxyPacket)) { if (ret != sizeof(virProxyPacket)) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
_("Communication error with proxy: got %d bytes of %d\n"), _("Communication error with proxy: got %d bytes of %d"),
ret, (int) sizeof(virProxyPacket)); ret, (int) sizeof(virProxyPacket));
goto error; goto error;
} }
@ -426,7 +426,7 @@ retry:
if ((res->len < sizeof(virProxyPacket)) || if ((res->len < sizeof(virProxyPacket)) ||
(res->len > sizeof(virProxyFullPacket))) { (res->len > sizeof(virProxyFullPacket))) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
_("Communication error with proxy: got %d bytes packet\n"), _("Communication error with proxy: got %d bytes packet"),
res->len); res->len);
goto error; goto error;
} }
@ -436,7 +436,7 @@ retry:
res->len - ret); res->len - ret);
if (ret != (int) (res->len - sizeof(virProxyPacket))) { if (ret != (int) (res->len - sizeof(virProxyPacket))) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, virProxyError(conn, VIR_ERR_INTERNAL_ERROR,
_("Communication error with proxy: got %d bytes of %d\n"), _("Communication error with proxy: got %d bytes of %d"),
ret, (int) sizeof(virProxyPacket)); ret, (int) sizeof(virProxyPacket));
goto error; goto error;
} }
@ -448,7 +448,7 @@ retry:
if ((res->version != PROXY_PROTO_VERSION) || if ((res->version != PROXY_PROTO_VERSION) ||
(res->len < sizeof(virProxyPacket))) { (res->len < sizeof(virProxyPacket))) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s", virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
_("Communication error with proxy: malformed packet\n")); _("Communication error with proxy: malformed packet"));
goto error; goto error;
} }
if (res->serial != serial) { if (res->serial != serial) {

20
src/xen/xen_hypervisor.c
View File

@ -2009,7 +2009,7 @@ xenHypervisorInit(void)
ret = ioctl(fd, cmd, (unsigned long) &hc); ret = ioctl(fd, cmd, (unsigned long) &hc);
if ((ret != -1) && (ret != 0)) { if ((ret != -1) && (ret != 0)) {
DEBUG("Using new hypervisor call: %X\n", ret); DEBUG("Using new hypervisor call: %X", ret);
hv_version = ret; hv_version = ret;
xen_ioctl_hypercall_cmd = cmd; xen_ioctl_hypercall_cmd = cmd;
goto detect_v2; goto detect_v2;
@ -2025,7 +2025,7 @@ xenHypervisorInit(void)
cmd = _IOC(_IOC_NONE, 'P', 0, sizeof(v0_hypercall_t)); cmd = _IOC(_IOC_NONE, 'P', 0, sizeof(v0_hypercall_t));
ret = ioctl(fd, cmd, (unsigned long) &v0_hc); ret = ioctl(fd, cmd, (unsigned long) &v0_hc);
if ((ret != -1) && (ret != 0)) { if ((ret != -1) && (ret != 0)) {
DEBUG("Using old hypervisor call: %X\n", ret); DEBUG("Using old hypervisor call: %X", ret);
hv_version = ret; hv_version = ret;
xen_ioctl_hypercall_cmd = cmd; xen_ioctl_hypercall_cmd = cmd;
hypervisor_version = 0; hypervisor_version = 0;
@ -2062,13 +2062,13 @@ xenHypervisorInit(void)
/* RHEL 5.0 */ /* RHEL 5.0 */
dom_interface_version = 3; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 3; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
DEBUG0("Using hypervisor call v2, sys ver2 dom ver3\n"); DEBUG0("Using hypervisor call v2, sys ver2 dom ver3");
goto done; goto done;
} }
/* Fedora 7 */ /* Fedora 7 */
dom_interface_version = 4; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 4; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
DEBUG0("Using hypervisor call v2, sys ver2 dom ver4\n"); DEBUG0("Using hypervisor call v2, sys ver2 dom ver4");
goto done; goto done;
} }
} }
@ -2078,7 +2078,7 @@ xenHypervisorInit(void)
/* xen-3.1 */ /* xen-3.1 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
DEBUG0("Using hypervisor call v2, sys ver3 dom ver5\n"); DEBUG0("Using hypervisor call v2, sys ver3 dom ver5");
goto done; goto done;
} }
} }
@ -2088,7 +2088,7 @@ xenHypervisorInit(void)
/* Fedora 8 */ /* Fedora 8 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
DEBUG0("Using hypervisor call v2, sys ver4 dom ver5\n"); DEBUG0("Using hypervisor call v2, sys ver4 dom ver5");
goto done; goto done;
} }
} }
@ -2098,7 +2098,7 @@ xenHypervisorInit(void)
/* Xen 3.2, Fedora 9 */ /* Xen 3.2, Fedora 9 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){
DEBUG0("Using hypervisor call v2, sys ver6 dom ver5\n"); DEBUG0("Using hypervisor call v2, sys ver6 dom ver5");
goto done; goto done;
} }
} }
@ -2107,14 +2107,14 @@ xenHypervisorInit(void)
sys_interface_version = 7; /* XEN_SYSCTL_INTERFACE_VERSION */ sys_interface_version = 7; /* XEN_SYSCTL_INTERFACE_VERSION */
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
dom_interface_version = 6; /* XEN_DOMCTL_INTERFACE_VERSION */ dom_interface_version = 6; /* XEN_DOMCTL_INTERFACE_VERSION */
DEBUG0("Using hypervisor call v2, sys ver7 dom ver6\n"); DEBUG0("Using hypervisor call v2, sys ver7 dom ver6");
goto done; goto done;
} }
hypervisor_version = 1; hypervisor_version = 1;
sys_interface_version = -1; sys_interface_version = -1;
if (virXen_getdomaininfo(fd, 0, &info) == 1) { if (virXen_getdomaininfo(fd, 0, &info) == 1) {
DEBUG0("Using hypervisor call v1\n"); DEBUG0("Using hypervisor call v1");
goto done; goto done;
} }
@ -2122,7 +2122,7 @@ xenHypervisorInit(void)
* we failed to make the getdomaininfolist hypercall * we failed to make the getdomaininfolist hypercall
*/ */
DEBUG0("Failed to find any Xen hypervisor method\n"); DEBUG0("Failed to find any Xen hypervisor method");
hypervisor_version = -1; hypervisor_version = -1;
virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu", virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu",
(unsigned long)IOCTL_PRIVCMD_HYPERCALL); (unsigned long)IOCTL_PRIVCMD_HYPERCALL);

2
src/xen/xs_internal.c
View File

@ -342,7 +342,7 @@ xenStoreOpen(virConnectPtr conn,
xenStoreWatchEvent, xenStoreWatchEvent,
conn, conn,
NULL)) < 0) NULL)) < 0)
DEBUG0("Failed to add event handle, disabling events\n"); DEBUG0("Failed to add event handle, disabling events");
#endif //PROXY #endif //PROXY
return 0; return 0;