virMutexUnlock(&server->lock);
if (qemudOneLoop() < 0) {
virMutexLock(&server->lock);
- DEBUG0("Loop iteration error, exiting\n");
+ DEBUG0("Loop iteration error, exiting");
break;
}
virMutexLock(&server->lock);
for (i = 0, pp = p->list; pp; ++i, pp = pp->next) {
if (pp->type != VIR_CONF_STRING) {
VIR_ERROR(_("remoteReadConfigFile: %s: %s:"
- " must be a string or list of strings\n"),
+ " must be a string or list of strings"),
filename, key);
VIR_FREE(list);
return -1;
default:
VIR_ERROR(_("remoteReadConfigFile: %s: %s:"
- " must be a string or list of strings\n"),
+ " must be a string or list of strings"),
filename, key);
return -1;
}
{
if (p->type != required_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 (required_type));
return -1;
if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) {
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;
}
char *device_link = NULL;
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) {
virReportOOMError();
char *device_link = NULL;
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);
if (dir == NULL) {
}
VIR_DEBUG("Found property key '%s' value '%s' "
- "for device with sysname '%s'\n",
+ "for device with sysname '%s'",
property_key, *property_value,
udev_device_get_sysname(udev_device));
}
VIR_DEBUG("Found sysfs attribute '%s' value '%s' "
- "for device with sysname '%s'\n",
+ "for device with sysname '%s'",
attr_name, *attr_value,
udev_device_get_sysname(udev_device));
if (virBufferError(&buf)) {
virBufferFreeAndReset(&buf);
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;
}
if (!STRPREFIX(filename, "host")) {
VIR_ERROR("SCSI host found, but its udev name '%s' does "
- "not begin with 'host'\n", filename);
+ "not begin with 'host'", filename);
goto out;
}
int ret = -1;
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);
if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) {
if (ret != 0) {
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 {
VIR_DEBUG("Found storage type '%s' for device "
- "with sysfs path '%s'\n",
+ "with sysfs path '%s'",
def->caps->data.storage.drive_type,
def->sysfs_path);
}
}
VIR_INFO("Could not determine device type for device "
- "with sysfs path '%s'\n",
+ "with sysfs path '%s'",
udev_device_get_sysname(device));
ret = -1;
*status >>= 8;
- VIR_DEBUG("rc = %d, status = %d\n",rc, *status);
+ VIR_DEBUG("rc = %d, status = %d",rc, *status);
unlink(filename);
(*insts)[(*nEntries)++] = inst;
} else if (inc) {
- VIR_DEBUG("Instantiating filter %s\n", inc->filterref);
+ VIR_DEBUG("Instantiating filter %s", inc->filterref);
obj = virNWFilterPoolObjFindByName(&driver->pools,
inc->filterref);
if (obj) {
return 1;
}
- VIR_DEBUG("filter name: %s\n", net->filter);
+ VIR_DEBUG("filter name: %s", net->filter);
obj = virNWFilterPoolObjFindByName(&driver->pools, net->filter);
if (!obj) {
#define CHECK_TYPE(name,typ) if (p && p->type != (typ)) { \
qemuReportError(VIR_ERR_INTERNAL_ERROR, \
- "remoteReadConfigFile: %s: %s: expected type " #typ "\n", \
+ "remoteReadConfigFile: %s: %s: expected type " #typ, \
filename, (name)); \
virConfFree(conf); \
return -1; \
}
if (len != 1 || buf[0] != '\1') {
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;
}
unsigned long long cylinderSize = dev->geometry.heads *
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);
/* how many extra bytes we have since we allocate
return -1;
}
- DEBUG("aligned alloc %llu\n", alignedAllocation);
+ DEBUG("aligned alloc %llu", alignedAllocation);
*start = dev->freeExtents[smallestExtent].start;
if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) {
/* counting in byte, we want the last byte of the current sector */
*end -= 1;
- DEBUG("final aligned start %llu, end %llu\n", *start, *end);
+ DEBUG("final aligned start %llu, end %llu", *start, *end);
return 0;
}
if (ret == -1) {
virReportSystemError(errno,
_("Failed to truncate volume with "
- "path '%s' to %ju bytes\n"),
+ "path '%s' to %ju bytes"),
vol->target.path, (intmax_t)size);
}
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);
}
}
if (ret != sizeof(virProxyPacket)) {
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));
goto error;
}
res = request;
if (res->len != sizeof(virProxyPacket)) {
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);
goto error;
}
}
if (ret != sizeof(virProxyPacket)) {
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));
goto error;
}
if ((res->len < sizeof(virProxyPacket)) ||
(res->len > sizeof(virProxyFullPacket))) {
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);
goto error;
}
res->len - ret);
if (ret != (int) (res->len - sizeof(virProxyPacket))) {
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));
goto error;
}
if ((res->version != PROXY_PROTO_VERSION) ||
(res->len < sizeof(virProxyPacket))) {
virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s",
- _("Communication error with proxy: malformed packet\n"));
+ _("Communication error with proxy: malformed packet"));
goto error;
}
if (res->serial != serial) {
ret = ioctl(fd, cmd, (unsigned long) &hc);
if ((ret != -1) && (ret != 0)) {
- DEBUG("Using new hypervisor call: %X\n", ret);
+ DEBUG("Using new hypervisor call: %X", ret);
hv_version = ret;
xen_ioctl_hypercall_cmd = cmd;
goto detect_v2;
cmd = _IOC(_IOC_NONE, 'P', 0, sizeof(v0_hypercall_t));
ret = ioctl(fd, cmd, (unsigned long) &v0_hc);
if ((ret != -1) && (ret != 0)) {
- DEBUG("Using old hypervisor call: %X\n", ret);
+ DEBUG("Using old hypervisor call: %X", ret);
hv_version = ret;
xen_ioctl_hypercall_cmd = cmd;
hypervisor_version = 0;
/* RHEL 5.0 */
dom_interface_version = 3; /* XEN_DOMCTL_INTERFACE_VERSION */
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;
}
/* Fedora 7 */
dom_interface_version = 4; /* XEN_DOMCTL_INTERFACE_VERSION */
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;
}
}
/* xen-3.1 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
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;
}
}
/* Fedora 8 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
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;
}
}
/* Xen 3.2, Fedora 9 */
dom_interface_version = 5; /* XEN_DOMCTL_INTERFACE_VERSION */
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;
}
}
sys_interface_version = 7; /* XEN_SYSCTL_INTERFACE_VERSION */
if (virXen_getdomaininfo(fd, 0, &info) == 1) {
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;
}
hypervisor_version = 1;
sys_interface_version = -1;
if (virXen_getdomaininfo(fd, 0, &info) == 1) {
- DEBUG0("Using hypervisor call v1\n");
+ DEBUG0("Using hypervisor call v1");
goto done;
}
* 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;
virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl %lu",
(unsigned long)IOCTL_PRIVCMD_HYPERCALL);
xenStoreWatchEvent,
conn,
NULL)) < 0)
- DEBUG0("Failed to add event handle, disabling events\n");
+ DEBUG0("Failed to add event handle, disabling events");
#endif //PROXY
return 0;