- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/7] Switch over qemu command line capabilities to virBitmap
by Jiri Denemark 24 Feb '11

24 Feb '11

There are two main reasons behind this patchset: - we are getting very close to 64 flags which is the maximum we can use with unsigned long long - by using LL constants in enum we already violates C99 constraint that enum values have to fit into int Patches 3/7 and 5/7 are fully and 4/7 mostly mechanical. 6/7 and 7/7 need to be squashed into a single patch but are provided separately for easier review. Changes in version 2 are described in each patch separately. Jiri Denemark (7): util: Use unsigned long as a base type for virBitmap util: Add API for converting virBitmap into printable string qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* qemu: Use helper functions for handling cmd line capabilities qemu: Rename qemud\?CmdFlags to qemuCaps qemu: Switch over command line capabilities to virBitmap tests: Use virBitmap for qemu command line caps cfg.mk | 3 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 238 +++++++++----- src/qemu/qemu_capabilities.h | 152 +++++---- src/qemu/qemu_command.c | 392 +++++++++++----------- src/qemu/qemu_command.h | 30 +- src/qemu/qemu_driver.c | 48 ++-- src/qemu/qemu_hotplug.c | 162 +++++----- src/qemu/qemu_hotplug.h | 32 +- src/qemu/qemu_migration.c | 22 +- src/qemu/qemu_process.c | 29 +- src/util/bitmap.c | 51 +++- src/util/bitmap.h | 3 + tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 747 +++++++++++++++++++++--------------------- tests/qemuxml2argvtest.c | 474 +++++++++++++------------- 16 files changed, 1263 insertions(+), 1123 deletions(-) -- 1.7.4.1

2 21

[libvirt] [PATCH 1/2] libvirt/qemu - support updating inactive domains (take 2)
by KAMEZAWA Hiroyuki 24 Feb '11

24 Feb '11

>From d6c65102224c493f67008b6521b0115d798f5a67 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa(a)bluextal.(none)> Date: Thu, 24 Feb 2011 12:14:25 +0900 Subject: [PATCH 1/2] libvirt/qemu - support updating inactive domains. Now, virsh attach-disk/detach-disk has --persistent option and it can update XML definition of inactive domains. But, it's only supported in Xen. This patch adds support for attach-disk/detach-disk for qemu. Changelog v1->v2: - fixed TABs - fixed PCI address assignment for VIRTIO driver. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 168 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 158 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8b15a3e..e75478a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4085,14 +4085,164 @@ cleanup: return ret; } -static int qemudDomainAttachDeviceFlags(virDomainPtr dom, +static int qemuDomainFindDiskByName(virDomainDefPtr vmdef, const char *name) +{ + virDomainDiskDefPtr vdisk; + int i; + + for (i = 0; i < vmdef->ndisks; i++) { + vdisk = vmdef->disks[i]; + if (!strcmp(vdisk->dst, name)) + return i; + } + return -1; +} +/* + * Attach a device given by XML, the change will be persistent + * and domain XML definition file is updated. + */ +static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr newdev) +{ + virDomainDiskDefPtr disk; + + /* At first, check device confliction */ + switch(newdev->type) { + case VIR_DOMAIN_DEVICE_DISK: + disk = newdev->data.disk; + if (qemuDomainFindDiskByName(vmdef, disk->dst) >= 0) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("target %s already exists."), disk->dst); + return -1; + } + + if (virDomainDiskInsert(vmdef, disk)) { + virReportOOMError(); + return -1; + } + if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { + /* + * Address/Drive information is NULL. If virtio, PCI address + * shoule be fixed. Other devices as IDE, SCSI...will get ID + * automatically + */ + qemuDomainAssignPCIAddresses(vmdef); + + } + newdev->data.disk = NULL; + break; + default: + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Sorry, the device is not suppored for now")); + return -1; + } + + return 0; +} + +static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr device) +{ + int x; + virDomainDiskDefPtr disk; + + switch(device->type) { + case VIR_DOMAIN_DEVICE_DISK: + disk = device->data.disk; + x = qemuDomainFindDiskByName(vmdef, disk->dst); + if (x < 0) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("target %s doesn't exist."), disk->dst); + return -1; + } + virDomainDiskRemove(vmdef, x); + break; + default: + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Sorry, the device is not suppored for now")); + return -1; + } + return 0; +} + +static int qemuDomainModifyDevicePersistent(virDomainPtr dom, const char *xml, - unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); + unsigned int attach) +{ + struct qemud_driver *driver; + virDomainDeviceDefPtr device; + virDomainDefPtr vmdef; + virDomainObjPtr vm; + int ret = -1; + + if (!dom || !dom->conn || !dom->name || !xml) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("internal error : %s"), __FUNCTION__); + return -1; + } + + if (dom->conn->flags & VIR_CONNECT_RO) return -1; + + driver = dom->conn->privateData; + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, _("cannot find domain '%s'"), + dom->name); + goto unlock_out; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) { + /* + * For now, just allow updating inactive domains. Further development + * will allow updating both active domain and its config file at + * the same time. + */ + qemuReportError(VIR_ERR_INVALID_ARG, + _("cannot update alive domain : %s"), __FUNCTION__); + goto endjob; + } + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + + if (!vmdef) + goto endjob; + + device = virDomainDeviceDefParse(driver->caps, + vmdef, xml, VIR_DOMAIN_XML_INACTIVE); + if (!device) + goto endjob; + + if (attach) { + ret = qemuDomainAttachDevicePersistent(vmdef, device); + if (ret < 0) + goto out; + } else { + ret = qemuDomainDetachDevicePersistent(vmdef, device); + if (ret < 0) + goto out; } + ret = virDomainSaveConfig(driver->configDir, vmdef); + +out: + virDomainDeviceDefFree(device); +endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; + if (vm) + virDomainObjUnlock(vm); + /* Note: insert of newdev is done by copy */ +unlock_out: + qemuDriverUnlock(driver); + return ret; +} + +static int qemudDomainAttachDeviceFlags(virDomainPtr dom, + const char *xml, + unsigned int flags) { + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 1); return qemudDomainAttachDevice(dom, xml); } @@ -4306,11 +4456,9 @@ cleanup: static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { - if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; - } + + if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) + return qemuDomainModifyDevicePersistent(dom, xml, 0); return qemudDomainDetachDevice(dom, xml); } -- 1.7.1

2 8

[libvirt] [PATCH 2/2] Ignore backing file errors in FS storage pool (v2)
by Philipp Hahn 24 Feb '11

24 Feb '11

Currently a single storage volume with a broken backing file will disable the whole storage pool. This can happen when the backing file is on some unavailable network storage or if the backing volume is deleted, while the storage volumes using it are not. Since the storage pool then can not be re-activated, re-creating the missing or deleting the now useless volumes using libvirt only is impossible. To "fix" this case, all errors detected during storage pool activation are now (silently) ignored. Errors are still logged by the called functions, which have more knowledge on the detailed error condition. To reproduce: dir=$(mktemp -d) virsh pool-create-as tmp dir '' '' '' '' "$dir" virsh vol-create-as --format qcow2 tmp back 1G virsh vol-create-as --format qcow2 --backing-vol-format qcow2 --backing-vol back tmp cow 1G virsh vol-delete --pool tmp back virsh pool-refresh tmp After the last step, the pool will be gone (because it was not persistent). As long as the now broken image stays in the directory, you will not be able to re-create or re-start the pool. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/storage/storage_backend_fs.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[libvirt] [PATCH 2/2] Ignore backing file errors in FS storage pool
by Philipp Hahn 24 Feb '11

24 Feb '11

Currently a single storage volume with a broken backing file will disable the whole storage pool. This can happen when the backing file is on some unavailable network storage or if the backing volume is deleted, while the storage volumes using it are not. Since the storage pool then can not be re-activated, re-creating the missing or deleting the now useless volumes using libvirt only is impossible. To "fix" this case, all errors detected during storage pool activation are now (silently) ignored. Errors are still logged by the called functions, which have more knowledge on the detailed error condition. To reproduce: dir=$(mktemp -d) virsh pool-create-as tmp dir '' '' '' '' "$dir" virsh vol-create-as --format qcow2 tmp back 1G virsh vol-create-as --format qcow2 --backing-vol-format qcow2 --backing-vol back tmp cow 1G virsh vol-delete --pool tmp back virsh pool-refresh tmp After the last step, the pool will be gone (because it was not persistent). As long as the now broken image stays in the directory, you will not be able to re-create or re-start the pool. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/storage/storage_backend_fs.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

1 0

[libvirt] Invitation to connect on LinkedIn
by Lyre Li 24 Feb '11

24 Feb '11

LinkedIn ------------ I'd like to add you to my professional network on LinkedIn. - Lyre Lyre Li Engineer at Skybility China Confirm that you know Lyre Li https://www.linkedin.com/e/k4zv0-gkj412ae-3z/isd/2389916274/QzDJLaNZ/ -- (c) 2011, LinkedIn Corporation

1 0

[libvirt] [PATCH] Add APIs for killing off processes inside a cgroup
by Daniel P. Berrange 24 Feb '11

24 Feb '11

The virCgroupKill method kills all PIDs found in a cgroup The virCgroupKillRecursively method does this recursively for child cgroups. The virCgroupKillPainfully method does a recursive kill several times in a row until everything has really died --- src/libvirt_private.syms | 3 + src/util/cgroup.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/cgroup.h | 4 + 3 files changed, 236 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 797a670..989b3eb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -74,6 +74,9 @@ virCgroupGetMemoryHardLimit; virCgroupGetMemorySoftLimit; virCgroupGetMemoryUsage; virCgroupGetSwapHardLimit; +virCgroupKill; +virCgroupKillRecursive; +virCgroupKillPainfully; virCgroupMounted; virCgroupRemove; virCgroupSetBlkioWeight; diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b71eef9..2c7efb4 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -23,6 +23,7 @@ #include <stdbool.h> #include <sys/stat.h> #include <sys/types.h> +#include <signal.h> #include <libgen.h> #include <dirent.h> @@ -32,6 +33,7 @@ #include "cgroup.h" #include "logging.h" #include "files.h" +#include "hash.h" #define CGROUP_MAX_VAL 512 @@ -258,6 +260,19 @@ static int virCgroupPathOfController(virCgroupPtr group, const char *key, char **path) { + if (controller == -1) { + int i; + for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { + if (group->controllers[i].mountPoint && + group->controllers[i].placement) { + controller = i; + break; + } + } + } + if (controller == -1) + return -ENOSYS; + if (group->controllers[controller].mountPoint == NULL) return -ENOENT; @@ -1291,3 +1306,217 @@ int virCgroupGetFreezerState(virCgroupPtr group, char **state) VIR_CGROUP_CONTROLLER_CPU, "freezer.state", state); } + +static int virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids) +{ + int rc; + int killedAny = 0; + char *keypath = NULL; + bool done = false; + VIR_DEBUG("group=%p path=%s signum=%d pids=%p", group, group->path, signum, pids); + + rc = virCgroupPathOfController(group, -1, "tasks", &keypath); + if (rc != 0) { + VIR_DEBUG("No path of %s, tasks", group->path); + return rc; + } + + /* PIDs may be forking as we kill them, so loop + * until there are no new PIDs found + */ + while (!done) { + done = true; + FILE *fp; + if (!(fp = fopen(keypath, "r"))) { + rc = -errno; + VIR_DEBUG("Failed to read %s: %m\n", keypath); + goto cleanup; + } else { + while (!feof(fp)) { + unsigned long pid; + if (fscanf(fp, "%lu", &pid) != 1) { + if (feof(fp)) + break; + rc = -errno; + break; + } + if (virHashLookup(pids, (void*)pid)) + continue; + + VIR_DEBUG("pid=%lu", pid); + if (kill((pid_t)pid, signum) < 0) { + if (errno != ESRCH) { + rc = -errno; + goto cleanup; + } + /* Leave RC == 0 since we didn't kill one */ + } else { + killedAny = 1; + done = false; + } + + virHashAddEntry(pids, (void*)pid, (void*)1); + } + fclose(fp); + } + } + + rc = killedAny ? 1 : 0; + +cleanup: + VIR_FREE(keypath); + + return rc; +} + + +static unsigned long virCgroupPidCode(const void *name) +{ + return (unsigned long)name; +} +static bool virCgroupPidEqual(const void *namea, const void *nameb) +{ + return namea == nameb; +} +static void *virCgroupPidCopy(const void *name) +{ + return (void*)name; +} + +/* + * Returns + * < 0 : errno that occurred + * 0 : no PIDs killed + * 1 : at least one PID killed + */ +int virCgroupKill(virCgroupPtr group, int signum) +{ + VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum); + int rc; + /* The 'tasks' file in cgroups can contain duplicated + * pids, so we use a hash to track which we've already + * killed. + */ + virHashTablePtr pids = virHashCreateFull(100, + NULL, + virCgroupPidCode, + virCgroupPidEqual, + virCgroupPidCopy, + NULL); + + rc = virCgroupKillInternal(group, signum, pids); + + virHashFree(pids); + + return rc; +} + + +static int virCgroupKillRecursiveInternal(virCgroupPtr group, int signum, virHashTablePtr pids, bool dormdir) +{ + int rc; + int killedAny = 0; + char *keypath = NULL; + DIR *dp; + virCgroupPtr subgroup = NULL; + struct dirent *ent; + VIR_DEBUG("group=%p path=%s signum=%d pids=%p", group, group->path, signum, pids); + + rc = virCgroupPathOfController(group, -1, "", &keypath); + if (rc != 0) { + VIR_DEBUG("No path of %s, tasks", group->path); + return rc; + } + + if ((rc = virCgroupKillInternal(group, signum, pids)) != 0) + return rc; + + VIR_DEBUG("Iterate over children of %s", keypath); + if (!(dp = opendir(keypath))) { + rc = -errno; + return rc; + } + + while ((ent = readdir(dp))) { + char *subpath; + + if (STREQ(ent->d_name, ".")) + continue; + if (STREQ(ent->d_name, "..")) + continue; + if (ent->d_type != DT_DIR) + continue; + + VIR_DEBUG("Process subdir %s", ent->d_name); + if (virAsprintf(&subpath, "%s/%s", group->path, ent->d_name) < 0) { + rc = -ENOMEM; + goto cleanup; + } + + if ((rc = virCgroupNew(subpath, &subgroup)) != 0) + goto cleanup; + + if ((rc = virCgroupKillRecursiveInternal(subgroup, signum, pids, true)) < 0) + goto cleanup; + if (rc == 1) + killedAny = 1; + + if (dormdir) + virCgroupRemove(subgroup); + + virCgroupFree(&subgroup); + } + + rc = killedAny; + +cleanup: + virCgroupFree(&subgroup); + closedir(dp); + + return rc; +} + +int virCgroupKillRecursive(virCgroupPtr group, int signum) +{ + int rc; + VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum); + virHashTablePtr pids = virHashCreateFull(100, + NULL, + virCgroupPidCode, + virCgroupPidEqual, + virCgroupPidCopy, + NULL); + + rc = virCgroupKillRecursiveInternal(group, signum, pids, false); + + virHashFree(pids); + + return rc; +} + + +int virCgroupKillPainfully(virCgroupPtr group) +{ + int i; + int rc; + VIR_DEBUG("cgroup=%p path=%s", group, group->path); + for (i = 0 ; i < 15 ; i++) { + int signum; + if (i == 0) + signum = SIGTERM; + else if (i == 8) + signum = SIGKILL; + else + signum = 0; /* Just check for existance */ + + rc = virCgroupKillRecursive(group, signum); + VIR_DEBUG("Iteration %d rc=%d", i, rc); + /* If rc == -1 we hit error, if 0 we ran out of PIDs */ + if (rc <= 0) + break; + + usleep(200 * 1000); + } + VIR_DEBUG("Complete %d", rc); + return rc; +} diff --git a/src/util/cgroup.h b/src/util/cgroup.h index f1bdd0f..d468cb3 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -90,4 +90,8 @@ int virCgroupRemove(virCgroupPtr group); void virCgroupFree(virCgroupPtr *group); bool virCgroupMounted(virCgroupPtr cgroup, int controller); +int virCgroupKill(virCgroupPtr group, int signum); +int virCgroupKillRecursive(virCgroupPtr group, int signum); +int virCgroupKillPainfully(virCgroupPtr group); + #endif /* CGROUP_H */ -- 1.7.4

3 7

[libvirt] NIC Bonding in libvirt
by Shi Jin 24 Feb '11

24 Feb '11

Hi there, >From http://wiki.libvirt.org/page/FAQ, it says: Network interface management: Any host running the libvirt daemon can be used to manage physical and logical network interfaces. Enumerate existing interfaces, as well as configure (and create) interfaces, bridges, vlans, and bond devices. This is with the help of netcf.<br/><br/>For more info, see: https://fedorahosted.org/netcf/ It suggests that NIC bonding (teaming) is supported in libvirt but all I can find is this page http://wiki.libvirt.org/page/TodoNICBonding which has nothing in it. Can anyone advise on which stage this work is at and where to get more information on it. My simplistic thought is to have a bridge on a bonded device but that seems to have ARP problems according to https://bugzilla.redhat.com/show_bug.cgi?id=584872 and https://lists.linux-foundation.org/pipermail/bridge/2007-April/005376.html. Thank you very much. Shi -- Shi Jin, PhD

2 1

[libvirt] [PATCH 1/2] libvirt/qemu : allow persistent modification of disks via A(De)ttachDeviceFlags
by KAMEZAWA Hiroyuki 24 Feb '11

24 Feb '11

Sorry, pervious mail was sent to wrong list... == >From 030135224dd6563af0fb8615dc6a4b8e6084410d Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa(a)bluextal.(none)> Date: Wed, 23 Feb 2011 15:25:26 +0900 Subject: [PATCH 1/2] libvirt/qemu : support attach/detach-disk --persistent Now, only Xen supports 'virsh attach/detach-disk XXXX --persistent', modifying inactive domain definition via virsh. This patch adds a support for qemu. With this patch, virsh attach/detach-disk --persistent works well with qemu. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> --- src/qemu/qemu_driver.c | 170 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 163 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f25a2a..703f86a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4082,16 +4082,174 @@ cleanup: return ret; } +static int qemuDomainFindDiskByName(virDomainDefPtr vmdef, const char *name) +{ + virDomainDiskDefPtr vdisk; + int i; + + for (i = 0; i < vmdef->ndisks; i++) { + vdisk = vmdef->disks[i]; + if (!strcmp(vdisk->dst, name)) + return i; + } + return -1; +} +/* + * Attach a device given by XML, the change will be persistent + * and domain XML definition file is updated. + */ +static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr newdev) +{ + virDomainDiskDefPtr disk; + + /* At first, check device confliction */ + switch(newdev->type) { + case VIR_DOMAIN_DEVICE_DISK: + disk = newdev->data.disk; + if (qemuDomainFindDiskByName(vmdef, disk->dst) >= 0) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("target %s already exists."), disk->dst); + return -1; + } + + if (virDomainDiskInsert(vmdef, disk)) { + virReportOOMError(); + return -1; + } + if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + /* + * Address/Drive information is NULL. If virtio, PCI address + * shoule be fixed. Other devices as IDE, SCSI...will get ID + * automatically + */ + qemuDomainAssignPCIAddresses(vmdef); + + } + newdev->data.disk = NULL; + break; + default: + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Sorry, the device is not suppored for now")); + return -1; + } + + return 0; +} + +static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef, + virDomainDeviceDefPtr device) +{ + int x; + virDomainDiskDefPtr disk; + + switch(device->type) { + case VIR_DOMAIN_DEVICE_DISK: + disk = device->data.disk; + x = qemuDomainFindDiskByName(vmdef, disk->dst); + if (x < 0) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("target %s doesn't exist."), disk->dst); + return -1; + } + virDomainDiskRemove(vmdef, x); + break; + default: + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Sorry, the device is not suppored for now")); + return -1; + } + return 0; +} + +static int qemuDomainModifyDevicePersistent(virDomainPtr dom, + const char *xml, + unsigned int attach) +{ + struct qemud_driver *driver; + virDomainDeviceDefPtr device; + virDomainDefPtr vmdef; + virDomainObjPtr vm; + int ret = -1; + + if (!dom || !dom->conn || !dom->name || !xml) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("internal error : %s"), __FUNCTION__); + return -1; + } + + if (dom->conn->flags & VIR_CONNECT_RO) + return -1; + + driver = dom->conn->privateData; + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + qemuReportError(VIR_ERR_NO_DOMAIN, _("cannot find domain '%s'"), + dom->name); + goto unlock_out; + } + + if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) { + /* + * For now, just allow updating inactive domains. Further development + * will allow updating both active domain and its config file at + * the same time. + */ + qemuReportError(VIR_ERR_INVALID_ARG, + _("cannot update alive domain : %s"), __FUNCTION__); + goto endjob; + } + vmdef = virDomainObjGetPersistentDef(driver->caps, vm); + + if (!vmdef) + goto endjob; + + device = virDomainDeviceDefParse(driver->caps, + vmdef, xml, VIR_DOMAIN_XML_INACTIVE); + if (!device) + goto endjob; + + if (attach) { + ret = qemuDomainAttachDevicePersistent(vmdef, device); + if (ret < 0) + goto out; + } else { + ret = qemuDomainDetachDevicePersistent(vmdef, device); + if (ret < 0) + goto out; + } + ret = virDomainSaveConfig(driver->configDir, vmdef); + +out: + virDomainDeviceDefFree(device); +endjob: + if (qemuDomainObjEndJob(vm) == 0) + vm = NULL; + if (vm) + virDomainObjUnlock(vm); + /* Note: insert of newdev is done by copy */ +unlock_out: + qemuDriverUnlock(driver); + return ret; +} + static int qemudDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; + /* + * Because we can't update the live guest and XML + * in atomic, limiting modification as only-acrive and + * only-inactive. Need some idea to update both at the same time. + */ + return qemuDomainModifyDevicePersistent(dom, xml, 1); } - return qemudDomainAttachDevice(dom, xml); + if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) + return qemudDomainAttachDevice(dom, xml); + + return -1; } @@ -4304,9 +4462,7 @@ static int qemudDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) { if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - qemuReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot modify the persistent configuration of a domain")); - return -1; + return qemuDomainModifyDevicePersistent(dom, xml, 0); } return qemudDomainDetachDevice(dom, xml); -- 1.7.1

2 3

[libvirt] [PATCH] Allow hash tables to use generic pointers as keys
by Daniel P. Berrange 23 Feb '11

23 Feb '11

Relax the restriction that the hash table key must be a string by allowing an arbitrary hash code generator + comparison func to be provided * util/hash.c, util/hash.h: Allow any pointer as a key * internal.h: Include stdbool.h as standard. * conf/domain_conf.c, conf/domain_conf.c, conf/nwfilter_params.c, nwfilter/nwfilter_gentech_driver.c, nwfilter/nwfilter_gentech_driver.h, nwfilter/nwfilter_learnipaddr.c, qemu/qemu_command.c, qemu/qemu_driver.c, qemu/qemu_process.c, uml/uml_driver.c, xen/xm_internal.c: s/char */void */ in hash callbacks --- src/conf/domain_conf.c | 24 ++++---- src/conf/nwfilter_params.c | 12 ++-- src/internal.h | 1 + src/lxc/lxc_driver.c | 4 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.h | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 4 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 8 ++-- src/qemu/qemu_process.c | 4 +- src/uml/uml_driver.c | 4 +- src/util/hash.c | 92 +++++++++++++++++++++++--------- src/util/hash.h | 24 ++++++--- src/xen/xm_internal.c | 8 ++-- 14 files changed, 122 insertions(+), 69 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b97c1f0..651e2dc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -392,7 +392,7 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE static void -virDomainObjListDeallocator(void *payload, const char *name ATTRIBUTE_UNUSED) +virDomainObjListDeallocator(void *payload, const void *name ATTRIBUTE_UNUSED) { virDomainObjPtr obj = payload; virDomainObjLock(obj); @@ -416,7 +416,7 @@ void virDomainObjListDeinit(virDomainObjListPtr doms) static int virDomainObjListSearchID(const void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, const void *data) { virDomainObjPtr obj = (virDomainObjPtr)payload; @@ -457,7 +457,7 @@ virDomainObjPtr virDomainFindByUUID(const virDomainObjListPtr doms, } static int virDomainObjListSearchName(const void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, const void *data) { virDomainObjPtr obj = (virDomainObjPtr)payload; @@ -8435,7 +8435,7 @@ void virDomainObjUnlock(virDomainObjPtr obj) } -static void virDomainObjListCountActive(void *payload, const char *name ATTRIBUTE_UNUSED, void *data) +static void virDomainObjListCountActive(void *payload, const void *name ATTRIBUTE_UNUSED, void *data) { virDomainObjPtr obj = payload; int *count = data; @@ -8445,7 +8445,7 @@ static void virDomainObjListCountActive(void *payload, const char *name ATTRIBUT virDomainObjUnlock(obj); } -static void virDomainObjListCountInactive(void *payload, const char *name ATTRIBUTE_UNUSED, void *data) +static void virDomainObjListCountInactive(void *payload, const void *name ATTRIBUTE_UNUSED, void *data) { virDomainObjPtr obj = payload; int *count = data; @@ -8471,7 +8471,7 @@ struct virDomainIDData { int *ids; }; -static void virDomainObjListCopyActiveIDs(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +static void virDomainObjListCopyActiveIDs(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr obj = payload; struct virDomainIDData *data = opaque; @@ -8497,7 +8497,7 @@ struct virDomainNameData { char **const names; }; -static void virDomainObjListCopyInactiveNames(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +static void virDomainObjListCopyInactiveNames(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr obj = payload; struct virDomainNameData *data = opaque; @@ -8754,7 +8754,7 @@ virDomainSnapshotObjPtr virDomainSnapshotAssignDef(virDomainSnapshotObjListPtr s /* Snapshot Obj List functions */ static void virDomainSnapshotObjListDeallocator(void *payload, - const char *name ATTRIBUTE_UNUSED) + const void *name ATTRIBUTE_UNUSED) { virDomainSnapshotObjPtr obj = payload; @@ -8783,7 +8783,7 @@ struct virDomainSnapshotNameData { }; static void virDomainSnapshotObjListCopyNames(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainSnapshotObjPtr obj = payload; @@ -8821,7 +8821,7 @@ cleanup: } static void virDomainSnapshotObjListCount(void *payload ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { int *count = data; @@ -8839,7 +8839,7 @@ int virDomainSnapshotObjListNum(virDomainSnapshotObjListPtr snapshots) } static int virDomainSnapshotObjListSearchName(const void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, const void *data) { virDomainSnapshotObjPtr obj = (virDomainSnapshotObjPtr)payload; @@ -8870,7 +8870,7 @@ struct snapshot_has_children { }; static void virDomainSnapshotCountChildren(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { virDomainSnapshotObjPtr obj = payload; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index cd94b30..fbd42cd 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -35,7 +35,7 @@ #define VIR_FROM_THIS VIR_FROM_NWFILTER static void -hashDealloc(void *payload, const char *name ATTRIBUTE_UNUSED) +hashDealloc(void *payload, const void *name ATTRIBUTE_UNUSED) { VIR_FREE(payload); } @@ -157,7 +157,7 @@ struct addToTableStruct { static void -addToTable(void *payload, const char *name, void *data) +addToTable(void *payload, const void *name, void *data) { struct addToTableStruct *atts = (struct addToTableStruct *)data; char *val; @@ -172,10 +172,10 @@ addToTable(void *payload, const char *name, void *data) return; } - if (virNWFilterHashTablePut(atts->target, name, val, 1) != 0) { + if (virNWFilterHashTablePut(atts->target, (const char *)name, val, 1) != 0) { virNWFilterReportError(VIR_ERR_INTERNAL_ERROR, _("Could not put variable '%s' into hashmap"), - name); + (const char *)name); atts->errOccurred = 1; VIR_FREE(val); } @@ -265,13 +265,13 @@ struct formatterParam { static void -_formatParameterAttrs(void *payload, const char *name, void *data) +_formatParameterAttrs(void *payload, const void *name, void *data) { struct formatterParam *fp = (struct formatterParam *)data; virBufferVSprintf(fp->buf, "%s<parameter name='%s' value='%s'/>\n", fp->indent, - name, + (const char *)name, (char *)payload); } diff --git a/src/internal.h b/src/internal.h index e263684..be97801 100644 --- a/src/internal.h +++ b/src/internal.h @@ -8,6 +8,7 @@ # include <errno.h> # include <limits.h> # include <verify.h> +# include <stdbool.h> # if STATIC_ANALYSIS # undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble. */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a17b0b6..625777a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1968,7 +1968,7 @@ struct lxcAutostartData { }; static void -lxcAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +lxcAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr vm = payload; const struct lxcAutostartData *data = opaque; @@ -2015,7 +2015,7 @@ lxcAutostartConfigs(lxc_driver_t *driver) { } static void -lxcReconnectVM(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr vm = payload; lxc_driver_t *driver = opaque; diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index d81aac8..facad13 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -1012,7 +1012,7 @@ virNWFilterTeardownFilter(const virDomainNetDefPtr net) void virNWFilterDomainFWUpdateCB(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { virDomainObjPtr obj = payload; diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 271bf85..fa86030 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -64,7 +64,7 @@ virNWFilterHashTablePtr virNWFilterCreateVarHashmap(char *macaddr, char *ipaddr); void virNWFilterDomainFWUpdateCB(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name, void *data); #endif diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 8bd7b50..0e0370a 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -189,7 +189,7 @@ virNWFilterLockIface(const char *ifname) { static void -freeIfaceLock(void *payload, const char *name ATTRIBUTE_UNUSED) { +freeIfaceLock(void *payload, const void *name ATTRIBUTE_UNUSED) { VIR_FREE(payload); } @@ -287,7 +287,7 @@ virNWFilterLookupLearnReq(int ifindex) { static void -freeLearnReqEntry(void *payload, const char *name ATTRIBUTE_UNUSED) { +freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) { virNWFilterIPAddrLearnReqFree(payload); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a41859c..e68a698 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -747,7 +747,7 @@ cleanup: static void qemuDomainPCIAddressSetFreeEntry(void *payload, - const char *name ATTRIBUTE_UNUSED) + const void *name ATTRIBUTE_UNUSED) { VIR_FREE(payload); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f25a2a..fa96094 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -133,7 +133,7 @@ struct qemuAutostartData { }; static void -qemuAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +qemuAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr vm = payload; struct qemuAutostartData *data = opaque; @@ -273,7 +273,7 @@ err_exit: } static void qemuDomainSnapshotLoad(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { virDomainObjPtr vm = (virDomainObjPtr)payload; @@ -6502,7 +6502,7 @@ struct snap_remove { }; static void qemuDomainSnapshotDiscardChildren(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { virDomainSnapshotObjPtr snap = payload; @@ -6533,7 +6533,7 @@ struct snap_reparent { static void qemuDomainSnapshotReparentChildren(void *payload, - const char *name ATTRIBUTE_UNUSED, + const void *name ATTRIBUTE_UNUSED, void *data) { virDomainSnapshotObjPtr snap = payload; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9c5ea63..e418c37 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -949,7 +949,7 @@ qemuProcessFindCharDevicePTYs(virDomainObjPtr vm, return 0; } -static void qemuProcessFreePtyPath(void *payload, const char *name ATTRIBUTE_UNUSED) +static void qemuProcessFreePtyPath(void *payload, const void *name ATTRIBUTE_UNUSED) { VIR_FREE(payload); } @@ -1783,7 +1783,7 @@ struct qemuProcessReconnectData { * and re-reserve the security labels in use */ static void -qemuProcessReconnect(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +qemuProcessReconnect(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr obj = payload; struct qemuProcessReconnectData *data = opaque; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 2af8002..7cacadb 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -149,7 +149,7 @@ struct umlAutostartData { }; static void -umlAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +umlAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr vm = payload; const struct umlAutostartData *data = opaque; @@ -508,7 +508,7 @@ umlActive(void) { } static void -umlShutdownOneVM(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaque) +umlShutdownOneVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) { virDomainObjPtr dom = payload; struct uml_driver *driver = opaque; diff --git a/src/util/hash.c b/src/util/hash.c index d7950b9..aa658d4 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -43,7 +43,7 @@ typedef struct _virHashEntry virHashEntry; typedef virHashEntry *virHashEntryPtr; struct _virHashEntry { struct _virHashEntry *next; - char *name; + void *name; void *payload; int valid; }; @@ -56,25 +56,48 @@ struct _virHashTable { int size; int nbElems; virHashDeallocator f; + virHashCode code; + virHashEqual equal; + virHashCopy copy; + virHashRelease release; }; -/* - * virHashComputeKey: - * Calculate the hash key - */ -static unsigned long -virHashComputeKey(virHashTablePtr table, const char *name) +static unsigned long virHashStrCode(const void *name) { + const char *str = name; unsigned long value = 0L; char ch; - if (name != NULL) { - value += 30 * (*name); - while ((ch = *name++) != 0) { + if (str != NULL) { + value += 30 * (*str); + while ((ch = *str++) != 0) { value = value ^ ((value << 5) + (value >> 3) + (unsigned long) ch); } } + return value; +} + +static bool virHashStrEqual(const void *namea, const void *nameb) +{ + return strcmp(namea, nameb) == 0 ? true : false; +} + +static void *virHashStrCopy(const void *name) +{ + return strdup(name); +} + +static void virHashStrRelease(void *name) +{ + VIR_FREE(name); +} + + +static unsigned long +virHashComputeKey(virHashTablePtr table, const void *name) +{ + unsigned long value = table->code(name); return (value % table->size); } @@ -87,8 +110,9 @@ virHashComputeKey(virHashTablePtr table, const char *name) * * Returns the newly created object, or NULL if an error occured. */ -virHashTablePtr -virHashCreate(int size, virHashDeallocator deallocator) +virHashTablePtr virHashCreateFull(int size, virHashDeallocator deallocator, + virHashCode code, virHashEqual equal, + virHashCopy copy, virHashRelease release) { virHashTablePtr table = NULL; @@ -103,6 +127,10 @@ virHashCreate(int size, virHashDeallocator deallocator) table->size = size; table->nbElems = 0; table->f = deallocator; + table->code = code; + table->equal = equal; + table->copy = copy; + table->release = release; if (VIR_ALLOC_N(table->table, size) < 0) { virReportOOMError(); VIR_FREE(table); @@ -112,6 +140,17 @@ virHashCreate(int size, virHashDeallocator deallocator) return table; } +virHashTablePtr +virHashCreate(int size, virHashDeallocator deallocator) +{ + return virHashCreateFull(size, + deallocator, + virHashStrCode, + virHashStrEqual, + virHashStrCopy, + virHashStrRelease); +} + /** * virHashGrow: * @table: the hash table @@ -232,7 +271,8 @@ virHashFree(virHashTablePtr table) next = iter->next; if ((table->f != NULL) && (iter->payload != NULL)) table->f(iter->payload, iter->name); - VIR_FREE(iter->name); + if (table->release) + table->release(iter->name); iter->payload = NULL; if (!inside_table) VIR_FREE(iter); @@ -247,7 +287,7 @@ virHashFree(virHashTablePtr table) } static int -virHashAddOrUpdateEntry(virHashTablePtr table, const char *name, +virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, void *userdata, virHashDeallocator f, bool is_update) { @@ -270,13 +310,13 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const char *name, } else { for (insert = &(table->table[key]); insert->next != NULL; insert = insert->next) { - if (STREQ(insert->name, name)) { + if (table->equal(insert->name, name)) { found = true; break; } len++; } - if (STREQ(insert->name, name)) + if (table->equal(insert->name, name)) found = true; } @@ -300,7 +340,7 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const char *name, } } - new_name = strdup(name); + new_name = table->copy(name); if (new_name == NULL) { virReportOOMError(); if (insert != NULL) @@ -335,7 +375,7 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const char *name, * Returns 0 the addition succeeded and -1 in case of error. */ int -virHashAddEntry(virHashTablePtr table, const char *name, void *userdata) +virHashAddEntry(virHashTablePtr table, const void *name, void *userdata) { return virHashAddOrUpdateEntry(table, name, userdata, NULL, false); } @@ -354,7 +394,7 @@ virHashAddEntry(virHashTablePtr table, const char *name, void *userdata) * Returns 0 the addition succeeded and -1 in case of error. */ int -virHashUpdateEntry(virHashTablePtr table, const char *name, +virHashUpdateEntry(virHashTablePtr table, const void *name, void *userdata, virHashDeallocator f) { return virHashAddOrUpdateEntry(table, name, userdata, f, true); @@ -370,7 +410,7 @@ virHashUpdateEntry(virHashTablePtr table, const char *name, * Returns the a pointer to the userdata */ void * -virHashLookup(virHashTablePtr table, const char *name) +virHashLookup(virHashTablePtr table, const void *name) { unsigned long key; virHashEntryPtr entry; @@ -383,7 +423,7 @@ virHashLookup(virHashTablePtr table, const char *name) if (table->table[key].valid == 0) return (NULL); for (entry = &(table->table[key]); entry != NULL; entry = entry->next) { - if (STREQ(entry->name, name)) + if (table->equal(entry->name, name)) return (entry->payload); } return (NULL); @@ -419,7 +459,7 @@ virHashSize(virHashTablePtr table) * Returns 0 if the removal succeeded and -1 in case of error or not found. */ int -virHashRemoveEntry(virHashTablePtr table, const char *name, +virHashRemoveEntry(virHashTablePtr table, const void *name, virHashDeallocator f) { unsigned long key; @@ -435,11 +475,12 @@ virHashRemoveEntry(virHashTablePtr table, const char *name, } else { for (entry = &(table->table[key]); entry != NULL; entry = entry->next) { - if (STREQ(entry->name, name)) { + if (table->equal(entry->name, name)) { if ((f != NULL) && (entry->payload != NULL)) f(entry->payload, entry->name); entry->payload = NULL; - VIR_FREE(entry->name); + if (table->release) + table->release(entry->name); if (prev) { prev->next = entry->next; VIR_FREE(entry); @@ -523,7 +564,8 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, virHashDealloc if (iter(entry->payload, entry->name, data)) { count++; f(entry->payload, entry->name); - VIR_FREE(entry->name); + if (table->release) + table->release(entry->name); table->nbElems--; if (prev) { prev->next = entry->next; diff --git a/src/util/hash.h b/src/util/hash.h index cf08e1a..6316fd9 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -29,7 +29,7 @@ typedef virHashTable *virHashTablePtr; * * Callback to free data from a hash. */ -typedef void (*virHashDeallocator) (void *payload, const char *name); +typedef void (*virHashDeallocator) (void *payload, const void *name); /** * virHashIterator: * @payload: the data in the hash @@ -38,7 +38,7 @@ typedef void (*virHashDeallocator) (void *payload, const char *name); * * Callback to process a hash entry during iteration */ -typedef void (*virHashIterator) (void *payload, const char *name, void *data); +typedef void (*virHashIterator) (void *payload, const void *name, void *data); /** * virHashSearcher * @payload: the data in the hash @@ -49,13 +49,23 @@ typedef void (*virHashIterator) (void *payload, const char *name, void *data); * Returns 1 if the hash entry is desired, 0 to move * to next entry */ -typedef int (*virHashSearcher) (const void *payload, const char *name, +typedef int (*virHashSearcher) (const void *payload, const void *name, const void *data); +typedef unsigned long (*virHashCode)(const void *name); +typedef bool (*virHashEqual)(const void *namea, const void *nameb); +typedef void *(*virHashCopy)(const void *name); +typedef void (*virHashRelease)(void *name); + /* * Constructor and destructor. */ virHashTablePtr virHashCreate(int size, virHashDeallocator f); +virHashTablePtr virHashCreateFull(int size, virHashDeallocator f, + virHashCode code, + virHashEqual equal, + virHashCopy copy, + virHashRelease release); void virHashFree(virHashTablePtr table); int virHashSize(virHashTablePtr table); @@ -63,21 +73,21 @@ int virHashSize(virHashTablePtr table); * Add a new entry to the hash table. */ int virHashAddEntry(virHashTablePtr table, - const char *name, void *userdata); + const void *name, void *userdata); int virHashUpdateEntry(virHashTablePtr table, - const char *name, + const void *name, void *userdata, virHashDeallocator f); /* * Remove an entry from the hash table. */ int virHashRemoveEntry(virHashTablePtr table, - const char *name, virHashDeallocator f); + const void *name, virHashDeallocator f); /* * Retrieve the userdata. */ -void *virHashLookup(virHashTablePtr table, const char *name); +void *virHashLookup(virHashTablePtr table, const void *name); /* diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 27cc387..fe7e533 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -139,7 +139,7 @@ static int xenInotifyActive(virConnectPtr conn) /* Release memory associated with a cached config object */ -static void xenXMConfigFree(void *payload, const char *key ATTRIBUTE_UNUSED) { +static void xenXMConfigFree(void *payload, const void *key ATTRIBUTE_UNUSED) { xenXMConfCachePtr entry = (xenXMConfCachePtr)payload; virDomainDefFree(entry->def); VIR_FREE(entry); @@ -151,7 +151,7 @@ struct xenXMConfigReaperData { }; /* Remove any configs which were not refreshed recently */ -static int xenXMConfigReaper(const void *payload, const char *key ATTRIBUTE_UNUSED, const void *data) { +static int xenXMConfigReaper(const void *payload, const void *key ATTRIBUTE_UNUSED, const void *data) { const struct xenXMConfigReaperData *args = data; xenXMConfCachePtr entry = (xenXMConfCachePtr)payload; @@ -938,7 +938,7 @@ cleanup: /* * Hash table iterator to search for a domain based on UUID */ -static int xenXMDomainSearchForUUID(const void *payload, const char *name ATTRIBUTE_UNUSED, const void *data) { +static int xenXMDomainSearchForUUID(const void *payload, const void *name ATTRIBUTE_UNUSED, const void *data) { const unsigned char *wantuuid = (const unsigned char *)data; const xenXMConfCachePtr entry = (const xenXMConfCachePtr)payload; @@ -1235,7 +1235,7 @@ struct xenXMListIteratorContext { char ** names; }; -static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, void *data) { +static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) { struct xenXMListIteratorContext *ctx = data; virDomainPtr dom = NULL; -- 1.7.4

3 3

[libvirt] [PATCH] Allow 32-on-64 execution for LXC guests
by Daniel P. Berrange 23 Feb '11

23 Feb '11

Using the 'personality(2)' system call, we can make a container on an x86_64 host appear to be i686. Likewise for most other Linux 64bit arches. * src/lxc/lxc_conf.c: Fill in 32bit capabilities for x86_64 hosts * src/lxc/lxc_container.h, src/lxc/lxc_container.c: Add API to check if an arch has a 32bit alternative * src/lxc/lxc_controller.c: Set the process personality when starting guest --- src/lxc/lxc_conf.c | 25 ++++++++++++++++++++++++- src/lxc/lxc_container.c | 21 +++++++++++++++++++++ src/lxc/lxc_container.h | 2 ++ src/lxc/lxc_controller.c | 26 ++++++++++++++++++++++++-- 4 files changed, 71 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 59d1161..226a57e 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -36,6 +36,7 @@ #include "logging.h" #include "uuid.h" #include "configmake.h" +#include "lxc_container.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -45,6 +46,7 @@ virCapsPtr lxcCapsInit(void) struct utsname utsname; virCapsPtr caps; virCapsGuestPtr guest; + const char *altArch; uname(&utsname); @@ -73,7 +75,7 @@ virCapsPtr lxcCapsInit(void) if ((guest = virCapabilitiesAddGuest(caps, "exe", utsname.machine, - sizeof(int) == 4 ? 32 : 8, + sizeof(void*) == 4 ? 32 : 64, LIBEXECDIR "/libvirt_lxc", NULL, 0, @@ -88,6 +90,27 @@ virCapsPtr lxcCapsInit(void) NULL) == NULL) goto error; + /* On 64-bit hosts, we can use personality() to request a 32bit process */ + if ((altArch = lxcContainerGetAlt32bitArch(utsname.machine)) != NULL) { + if ((guest = virCapabilitiesAddGuest(caps, + "exe", + altArch, + 32, + LIBEXECDIR "/libvirt_lxc", + NULL, + 0, + NULL)) == NULL) + goto error; + + if (virCapabilitiesAddGuestDomain(guest, + "lxc", + NULL, + NULL, + 0, + NULL) == NULL) + goto error; + } + /* LXC Requires an emulator in the XML */ virCapabilitiesSetEmulatorRequired(caps); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 269dc97..9830b71 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -837,6 +837,27 @@ static int userns_supported(void) #endif } +const char *lxcContainerGetAlt32bitArch(const char *arch) +{ + /* Any Linux 64bit arch which has a 32bit + * personality available should be listed here */ + if (STREQ(arch, "x86_64")) + return "i686"; + if (STREQ(arch, "s390x")) + return "s390"; + if (STREQ(arch, "ppc64")) + return "ppc"; + if (STREQ(arch, "parisc64")) + return "parisc"; + if (STREQ(arch, "sparc64")) + return "sparc"; + if (STREQ(arch, "mips64")) + return "mips"; + + return NULL; +} + + /** * lxcContainerStart: * @def: pointer to virtual machine structure diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index 75c8836..5e08d45 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -55,4 +55,6 @@ int lxcContainerStart(virDomainDefPtr def, int lxcContainerAvailable(int features); +const char *lxcContainerGetAlt32bitArch(const char *arch); + #endif /* LXC_CONTAINER_H */ diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 28cbe57..61e21c3 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1,6 +1,5 @@ /* - * Copyright (C) 2010 Red Hat, Inc. - * Copyright IBM Corp. 2008 + * Copyright (C) 2010 Red Hat, Inc. Copyright IBM Corp. 2008 * * lxc_controller.c: linux container process controller * @@ -29,6 +28,8 @@ #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> +#include <sys/utsname.h> +#include <sys/personality.h> #include <unistd.h> #include <paths.h> #include <errno.h> @@ -565,6 +566,25 @@ static int lxcControllerCleanupInterfaces(unsigned int nveths, return 0; } +static int lxcSetPersonality(virDomainDefPtr def) +{ + struct utsname utsname; + const char *altArch; + + uname(&utsname); + + altArch = lxcContainerGetAlt32bitArch(utsname.machine); + if (altArch && + STREQ(def->os.arch, altArch)) { + if (personality(PER_LINUX32) < 0) { + virReportSystemError(errno, _("Unable to request personality for %s on %s"), + altArch, utsname.machine); + return -1; + } + } + return 0; +} + #ifndef MS_REC # define MS_REC 16384 #endif @@ -684,6 +704,8 @@ lxcControllerRun(virDomainDefPtr def, } } + if (lxcSetPersonality(def) < 0) + goto cleanup; if ((container = lxcContainerStart(def, nveths, -- 1.7.4

2 1

[libvirt] [PATCH] Put <stdbool.h> into internal.h so it is available everywhere
by Daniel P. Berrange 23 Feb '11

23 Feb '11

Remove the <stdbool.h> header from all source files / headers and just put it into internal.h * src/internal.h: Add <stdbool.h> --- daemon/dispatch.c | 1 - src/conf/capabilities.h | 2 -- src/conf/nwfilter_conf.h | 1 - src/conf/storage_encryption_conf.h | 1 - src/driver.h | 1 - src/esx/esx_util.h | 2 -- src/fdstream.h | 1 - src/internal.h | 1 + src/lxc/lxc_driver.c | 1 - src/lxc/veth.c | 1 - src/nodeinfo.c | 1 - src/opennebula/one_driver.c | 1 - src/qemu/qemu_conf.h | 1 - src/qemu/qemu_driver.c | 1 - src/qemu/qemu_hotplug.h | 2 -- src/secret/secret_driver.c | 1 - src/security/security_apparmor.c | 1 - src/security/virt-aa-helper.c | 1 - src/storage/storage_backend.h | 1 - src/storage/storage_backend_fs.c | 1 - src/util/bitmap.h | 1 - src/util/cgroup.c | 1 - src/util/command.c | 1 - src/util/files.h | 1 - src/util/hash.c | 1 - src/util/network.h | 1 - src/util/storage_file.h | 1 - src/util/threadpool.c | 2 -- src/util/threads.h | 2 -- src/util/util.h | 1 - src/util/virtaudit.h | 1 - src/vbox/vbox_XPCOMCGlue.c | 1 - src/vbox/vbox_tmpl.c | 1 - src/vmx/vmx.h | 2 -- src/xen/xend_internal.c | 1 - src/xen/xend_internal.h | 1 - tests/nwfilterxml2xmltest.c | 1 - tests/qemuargv2xmltest.c | 1 - tests/qemuxml2argvtest.c | 1 - tools/console.c | 1 - 40 files changed, 1 insertions(+), 45 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index 3397a00..dc3b48a 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> -#include <stdbool.h> #include "dispatch.h" #include "remote.h" diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 759265d..96bf0a2 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -24,8 +24,6 @@ #ifndef __VIR_CAPABILITIES_H # define __VIR_CAPABILITIES_H -# include <stdbool.h> - # include "internal.h" # include "util.h" # include "buf.h" diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 5db4658..40da8c3 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -28,7 +28,6 @@ # include <stdint.h> # include <stddef.h> -# include <stdbool.h> # include "internal.h" diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h index c722cc6..fa5f3cb 100644 --- a/src/conf/storage_encryption_conf.h +++ b/src/conf/storage_encryption_conf.h @@ -27,7 +27,6 @@ # include "buf.h" # include "util.h" -# include <stdbool.h> # include <libxml/tree.h> enum virStorageEncryptionSecretType { diff --git a/src/driver.h b/src/driver.h index 7451004..c65a4b9 100644 --- a/src/driver.h +++ b/src/driver.h @@ -7,7 +7,6 @@ # define __VIR_DRIVER_H__ # include "config.h" -# include <stdbool.h> # include <libxml/uri.h> diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 4cbf9b7..d00e28a 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -1,4 +1,3 @@ - /* * esx_util.h: utility functions for the VMware ESX driver * @@ -23,7 +22,6 @@ #ifndef __ESX_UTIL_H__ # define __ESX_UTIL_H__ -# include <stdbool.h> # include <libxml/uri.h> # include "internal.h" diff --git a/src/fdstream.h b/src/fdstream.h index f8d22d5..53cbaa7 100644 --- a/src/fdstream.h +++ b/src/fdstream.h @@ -24,7 +24,6 @@ # define __VIR_FDSTREAM_H_ # include "internal.h" -# include <stdbool.h> int virFDStreamOpen(virStreamPtr st, int fd); diff --git a/src/internal.h b/src/internal.h index e263684..be97801 100644 --- a/src/internal.h +++ b/src/internal.h @@ -8,6 +8,7 @@ # include <errno.h> # include <limits.h> # include <verify.h> +# include <stdbool.h> # if STATIC_ANALYSIS # undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble. */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a17b0b6..70e74d5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -27,7 +27,6 @@ #include <fcntl.h> #include <sched.h> #include <sys/utsname.h> -#include <stdbool.h> #include <string.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 78e011e..65ff5d8 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -13,7 +13,6 @@ #include <config.h> #include <string.h> -#include <stdbool.h> #include <stdio.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/src/nodeinfo.c b/src/nodeinfo.c index f4ea36e..5d40aca 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -23,7 +23,6 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 75d7b9a..a0654e2 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -25,7 +25,6 @@ #include <fcntl.h> #include <sched.h> #include <sys/utsname.h> -#include <stdbool.h> #include <string.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index af1be2e..7c6fde7 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -25,7 +25,6 @@ # define __QEMUD_CONF_H # include <config.h> -# include <stdbool.h> # include "ebtables.h" # include "internal.h" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8b15a3e..0baff56 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -29,7 +29,6 @@ #include <dirent.h> #include <limits.h> #include <string.h> -#include <stdbool.h> #include <stdio.h> #include <stdarg.h> #include <stdlib.h> diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 217785d..1c96444 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -24,8 +24,6 @@ #ifndef __QEMU_HOTPLUG_H__ # define __QEMU_HOTPLUG_H__ -# include <stdbool.h> - # include "qemu_conf.h" # include "domain_conf.h" diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index c5a876b..5ca5006 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -24,7 +24,6 @@ #include <dirent.h> #include <fcntl.h> -#include <stdbool.h> #include <string.h> #include <sys/stat.h> #include <unistd.h> diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 7dc01ac..deb4181 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -23,7 +23,6 @@ #include <errno.h> #include <unistd.h> #include <wait.h> -#include <stdbool.h> #include "internal.h" diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index b91cf98..77df514 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -24,7 +24,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <getopt.h> -#include <stdbool.h> #include <sys/utsname.h> #include <locale.h> diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 6f395c7..65cbd7e 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -25,7 +25,6 @@ # define __VIR_STORAGE_BACKEND_H__ # include <stdint.h> -# include <stdbool.h> # include "internal.h" # include "storage_conf.h" diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index ff39d48..c33fb05 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -26,7 +26,6 @@ #include <sys/statvfs.h> #include <sys/types.h> #include <sys/stat.h> -#include <stdbool.h> #include <stdio.h> #include <dirent.h> #include <errno.h> diff --git a/src/util/bitmap.h b/src/util/bitmap.h index 08515d1..0541112 100644 --- a/src/util/bitmap.h +++ b/src/util/bitmap.h @@ -25,7 +25,6 @@ # include "internal.h" -# include <stdbool.h> # include <sys/types.h> diff --git a/src/util/cgroup.c b/src/util/cgroup.c index b71eef9..a1299aa 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -20,7 +20,6 @@ #include <string.h> #include <errno.h> #include <stdlib.h> -#include <stdbool.h> #include <sys/stat.h> #include <sys/types.h> #include <libgen.h> diff --git a/src/util/command.c b/src/util/command.c index 0d5cb79..ff2bd46 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -23,7 +23,6 @@ #include <poll.h> #include <stdarg.h> -#include <stdbool.h> #include <stdlib.h> #include <sys/stat.h> #include <sys/wait.h> diff --git a/src/util/files.h b/src/util/files.h index 744ba93..5137fb3 100644 --- a/src/util/files.h +++ b/src/util/files.h @@ -26,7 +26,6 @@ #ifndef __VIR_FILES_H_ # define __VIR_FILES_H_ -# include <stdbool.h> # include <stdio.h> # include "internal.h" diff --git a/src/util/hash.c b/src/util/hash.c index d7950b9..3ab73dd 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -22,7 +22,6 @@ #include <config.h> #include <string.h> -#include <stdbool.h> #include <stdlib.h> #include "virterror_internal.h" diff --git a/src/util/network.h b/src/util/network.h index 0b43bf6..ed0b78c 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -19,7 +19,6 @@ # include <sys/un.h> # endif # include <netdb.h> -# include <stdbool.h> # include <netinet/in.h> typedef struct { diff --git a/src/util/storage_file.h b/src/util/storage_file.h index 04c1bb2..f1bdd02 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -25,7 +25,6 @@ # define __VIR_STORAGE_FILE_H__ # include "util.h" -# include <stdbool.h> enum virStorageFileFormat { VIR_STORAGE_FILE_AUTO_SAFE = -2, diff --git a/src/util/threadpool.c b/src/util/threadpool.c index 1213862..8217591 100644 --- a/src/util/threadpool.c +++ b/src/util/threadpool.c @@ -25,8 +25,6 @@ #include <config.h> -#include <stdbool.h> - #include "threadpool.h" #include "memory.h" #include "threads.h" diff --git a/src/util/threads.h b/src/util/threads.h index 35e319e..c129301 100644 --- a/src/util/threads.h +++ b/src/util/threads.h @@ -22,8 +22,6 @@ #ifndef __THREADS_H_ # define __THREADS_H_ -# include <stdbool.h> - # include "internal.h" typedef struct virMutex virMutex; diff --git a/src/util/util.h b/src/util/util.h index c822174..5f6473c 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -31,7 +31,6 @@ # include <sys/select.h> # include <sys/types.h> # include <stdarg.h> -# include <stdbool.h> # ifndef MIN # define MIN(a, b) ((a) < (b) ? (a) : (b)) diff --git a/src/util/virtaudit.h b/src/util/virtaudit.h index 6c4deeb..a558a17 100644 --- a/src/util/virtaudit.h +++ b/src/util/virtaudit.h @@ -24,7 +24,6 @@ # define __LIBVIRT_AUDIT_H__ # include "internal.h" -# include <stdbool.h> enum virAuditRecordType { VIR_AUDIT_RECORD_MACHINE_CONTROL, diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index fbe210c..0caeef9 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -34,7 +34,6 @@ #include <stdlib.h> #include <dlfcn.h> -#include <stdbool.h> #include "vbox_XPCOMCGlue.h" #include "internal.h" diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 1c4e46f..8848cc0 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -35,7 +35,6 @@ #include <config.h> #include <sys/utsname.h> -#include <stdbool.h> #include <unistd.h> #include "internal.h" diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index c317108..4d54660 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -23,8 +23,6 @@ #ifndef __VIR_VMX_H__ # define __VIR_VMX_H__ -# include <stdbool.h> - # include "internal.h" # include "conf.h" # include "domain_conf.h" diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index e811b86..bfaed65 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -21,7 +21,6 @@ #include <unistd.h> #include <string.h> #include <stdlib.h> -#include <stdbool.h> #include <math.h> #include <stdarg.h> #include <netinet/in.h> diff --git a/src/xen/xend_internal.h b/src/xen/xend_internal.h index c90c572..805cf91 100644 --- a/src/xen/xend_internal.h +++ b/src/xen/xend_internal.h @@ -18,7 +18,6 @@ # include <sys/types.h> # include <stdint.h> -# include <stdbool.h> # include <libxml/uri.h> # include "internal.h" diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c index 9cad913..575177a 100644 --- a/tests/nwfilterxml2xmltest.c +++ b/tests/nwfilterxml2xmltest.c @@ -4,7 +4,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <stdbool.h> #include <sys/types.h> #include <fcntl.h> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 7499ba0..cfcd824 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -4,7 +4,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <stdbool.h> #include <sys/types.h> #include <fcntl.h> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4817d51..a026473 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -4,7 +4,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <stdbool.h> #include <sys/types.h> #include <fcntl.h> diff --git a/tools/console.c b/tools/console.c index e126320..224cf03 100644 --- a/tools/console.c +++ b/tools/console.c @@ -34,7 +34,6 @@ # include <errno.h> # include <unistd.h> # include <signal.h> -# include <stdbool.h> # include "internal.h" # include "console.h" -- 1.7.4

2 3

[libvirt] [PATCH] virsh: Make <mac> required when device-detaching interface
by Michal Privoznik 23 Feb '11

23 Feb '11

Problem is, if user does not specify mac address in input XML, we generate a random one, which is why device-detach fails giving a confusing error message. Therefore <mac> needs to be required. --- tools/virsh.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2837e0f..dfb48d2 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8580,9 +8580,12 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; char *from; char *buffer; - int ret = TRUE; + int ret = FALSE; int found; unsigned int flags; + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; + int mac_cnt; if (!vshConnectionUsability(ctl, ctl->conn)) return FALSE; @@ -8592,14 +8595,41 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) from = vshCommandOptString(cmd, "file", &found); if (!found) { - virDomainFree(dom); - return FALSE; + goto cleanup; } if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - virDomainFree(dom); - return FALSE; + goto cleanup; + } + + xml = xmlReadDoc((const xmlChar *) buffer, "interface.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOWARNING); + + if (!xml) { + vshError(ctl, "%s", _("input XML is not valid")); + goto cleanup; + } + + ctxt = xmlXPathNewContext(xml); + mac_cnt = virXPathNodeSet("/interface/mac", ctxt, NULL); + + switch(mac_cnt) { + case 1: + break; + + case 0: + case -1: + vshError(ctl, "%s", _("You must specify mac address in xml file")); + goto cleanup; + break; + + default: + vshError(ctl, "%s", _("You must specify exactly one mac address in" + " xml file")); + goto cleanup; + break; } if (vshCommandOptBool(cmd, "persistent")) { @@ -8610,18 +8640,23 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) } else { ret = virDomainDetachDevice(dom, buffer); } - VIR_FREE(buffer); if (ret < 0) { + ret = FALSE; vshError(ctl, _("Failed to detach device from %s"), from); - virDomainFree(dom); - return FALSE; - } else { - vshPrint(ctl, "%s", _("Device detached successfully\n")); + goto cleanup; } + vshPrint(ctl, "%s", _("Device detached successfully\n")); + ret = TRUE; + +cleanup: + xmlXPathFreeContext(ctxt); + if (xml) + xmlFreeDoc(xml); + VIR_FREE(buffer); virDomainFree(dom); - return TRUE; + return ret; } -- 1.7.4

5 4

[libvirt] [PATCH] libxenlight driver
by Jim Fehlig 23 Feb '11

23 Feb '11

Here's the latest version of a libxenlight driver for libvirt. I've added a per-domain libxl_ctx in addition to the driver wide context. The former is stored in virDomainObject privateData and used for operations on the domain. The latter is stored in driver private data and is used for non-domain related libxl calls, e.g. getVersion, getNodeInfo, etc. This approach was suggested by Ian Jackson and Stefano Stabellini and appears to be working much better than a single, driver wide libxl_ctx. I no longer have the restart issues described in the first patch posting [1]. Your review and comments are much appreciated! Thanks, Jim [1] https://www.redhat.com/archives/libvir-list/2011-February/msg00409.html

3 3

[libvirt] [RFC] virt-disk : a command line tool for modify domain XML's disk of inactive domains.
by KAMEZAWA Hiroyuki 23 Feb '11

23 Feb '11

Hi, now, with qemu, virsh attach-disk doesn't work with inactive disks and we need to edit XML with virsh edit. IIUC, libvirt and virsh is designed as it is. But I want to modify domain XML via commandline tools - for middleware, which modify domains by scripting. - for concsoles, where curses can't work correctly. - for me, I can't remember XML definition detaisl ;) So, I write one. Following script is a script for modify domain XML and allows - add disks - delete disks - show list of disks I think most of elements defined in http://libvirt.org/formatdomain.html#elementsDisks is supported. But I'm an only qemu user and didn't test with Xen and other VMs. What I wanted to hear opinions as 'RFC' is - Can this be shipped with libvirt as one of a tool ? (with more documents) (If so, we'll write other scripts for cpu,network,memory,etc...) - If not, what is the best way other than making this as my house script ? I'm grad if this is shipped with libvirt is because catching new definition of XML is easy. - Doesn't this one work with your environment ? Example) [root@bluextal pydom]# ./virt-disk.py --domain Guest02 --virtio --source /dev/iscsi_lvm/disk02 Name : vdb Device Type : block Media Type : disk Bus Type : virtio Driver Name : qemu Driver Type : raw Driver Cache : default ReadWrite : ReadWrite Source : /dev/iscsi_lvm/disk02 Address: : AutoFill Add this device Y/N ? y [root@bluextal pydom]# virsh dumpxml Guest02 <domain type='kvm'> ..... <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/iscsi_lvm/disk02'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </disk> == Thanks, -Kame == #!/usr/bin/python # # # 'virt-disk' is a command for maintaining disk entities in XML description # of libvirt's VM definition. Default vm assumes 'qemu' # # Copyright (C) 2011 Fujitsu LTD. # # KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> # # Usage: # # Brief help is # %virt-disk --help # # When you want to see list of disks of domain # %virt-disk --domain <domain name> --list # # When you want to remove 'vdb' # %virt-disk --domain <domain name> --delete vdb # # When you want to add block device as virtio block device. # %virt-disk --domain <domain name> --virtio --source /dev/to/mydisk # # When you want to add an IDE cdrom # %virt-disk --domain <domain name> --ide --media cdrom # --source /path/to/ISO.img # # When you want to add a network image as virtio disk. # %virt-disk --domain <domain name> --type network --protocol sheepdog # --host address:port --source resource_name --virtio # # This commad does # # - parse options. # - connect libvirt and get domain xml # - add all devices to disks[] List. # - add all pci address to PCIS[] List # - create new BlockDevice object with regard to options. # - create a XML entry of device # - insert and save it. # import xml.dom import xml.dom.minidom import os import stat import sys import libvirt import re,string from xml.dom import Node from optparse import OptionParser,OptionGroup PCIS = [] disks = [] class Address : pci = [] drive = [] def __init__(self, type) : self.type = type self.domain = None self.bus = None self.slot = None self.function = None self.controller = None self.function = None if type == 'pci' : PCIS.append(self) class BlockDevice : def __init__(self) : self.type = None self.media = None self.driver_cache = None self.driver_name = None self.driver_type = None self.driver_error_policy = None self.driver_io = None self.source = None self.protocol = None self.protocol_addr = None self.protocol_port = None self.target_dev = None self.target_bus = None self.readonly = False self.address_type = None self.address_bus = '' self.address_domain = '' self.address_function = '' self.address_slot = '' self.address_controller= '' self.address_unit='' self.boot_order = None self.shareable = False self.serial = None self.encrypt_format = None self.encrypt_type = None self.encrypt_uuid = None def get_attr(self, name, attr) : x = name.getAttribute(attr) if x == '' : return None return x def find_element(self, ent, name) : for member in ent.childNodes : if member.nodeName == name : return member return None def parse_info(self, name) : # parsing <disk ..... self.type = self.get_attr(name, 'type') self.media = self.get_attr(name, 'device') # parsing <driver .... driver = self.find_element(name, 'driver') if driver != None : self.driver_name = self.get_attr(driver, 'name') if self.driver_name == 'qemu' : self.driver_type = self.get_attr(driver, 'type') self.driver_cache = self.get_attr(driver, 'cache') self.driver_error_policy =\ self.get_attr(driver, 'error_policy') self.driver_io = self.get_attr(driver, 'io') # parsing <source source = self.find_element(name, 'source') if source != None : self.source = self.get_attr(source, 'dev') if self.source == None : self.source = self.get_attr(source, 'file') if self.source == None : self.protocol = self.get_attr(source, 'protocol') self.source = self.get_attr(source, 'name') else : self.source = None # # check protocol and host, port # if self.protocol != None : source = self.find_element(name, 'source') host = self.find_element(source, 'host') if host != None : self.protocol_host = self.get_attr(host, 'host') self.protocol_port = self.get_attr(host, 'port') # parsing <target target = self.find_element(name, 'target') if target != None : self.target_dev = self.get_attr(target, 'dev') self.target_bus = self.get_attr(target, 'bus') # check readonly if self.find_element(name, 'readonly') != None : self.readonly = True # check shareable if self.find_element(name, 'shareable') != None: self.shareable = True # check boot order boot = self.find_element(name, 'boot') if boot != None : self.boot_order = self.get_attr(boot, 'order') # check shareable if self.find_element(name, 'shareable') != None : self.shareable = True # check address address = self.find_element(name, 'address') if address != None : self.address_type = self.get_attr(address, 'type') if self.address_type == 'pci' : self.address_bus = self.get_attr(address, 'bus') self.address_slot = self.get_attr(address, 'slot') self.address_function = self.get_attr(address, 'function') self.address_domain = self.get_attr(address, 'domain') elif self.address_type == 'drive' : self.address_bus = self.get_attr(address, 'bus') self.address_controller = self.get_attr(address, 'controller') self.address_unit = self.get_attr(address, 'unit') # check serial ID serial = self.find_element(name, 'serial') if serial != None : for member in serial.childNodes : if member.nodeType == Node.TEXT_NODE : self.serial = member.data # check encryption encrypt = self.find_element(name, 'encryption') if encrypt != None : self.encrypt_format = self.get_attr(encrypt, 'format') sec = self.find_element(encrypt, 'secret') if sec != None : self.encrypt_type = self.get_attr(sec, 'type') self.encrypt_uuid = self.get_attr(sec, 'uuid') return True def show_ent(self, name, value) : if value != None : print '%-16s:\t%s' %(name, value) def show(self) : self.show_ent('Name', self.target_dev) self.show_ent('Device Type', self.type) self.show_ent('Media Type', self.media) self.show_ent('Bus Type', self.target_bus) self.show_ent('Driver Name', self.driver_name) self.show_ent('Driver Type', self.driver_type) self.show_ent('Driver Cache', self.driver_cache) self.show_ent('Driver I/O', self.driver_io) self.show_ent('Error Policy', self.driver_error_policy) if self.readonly : self.show_ent('ReadWrite', 'ReadOnly') else : self.show_ent('ReadWrite', 'ReadWrite') if self.shareable : self.show_ent('Shareable', 'Yes') self.show_ent('Device Boot Order',self.boot_order) self.show_ent('Protocol', self.protocol) self.show_ent('Hostname', self.protocol_addr) self.show_ent('Port', self.protocol_port) self.show_ent('Source', self.source) if self.address_type == None : self.show_ent('Address:', 'AutoFill') elif self.address_type == 'pci' : x = '%s/%s/%s' %\ (self.address_bus, self.address_slot, self.address_function) self.show_ent('PCI Address', x) elif self.address_type == 'drive' : x = '%s/%s/%s'\ %(self.address_controller, self.address_bus, self.address_unit) self.show_ent('Drive Index', x) if self.serial != None : self.show_ent('Serial', self.serial) if self.encrypt_format != None : self.show_ent('Encryption', self.encrypt_format) self.show_ent(' Type', self.encrypt_type) self.show_ent(' UUID', self.encrypt_uuid) def is_block_device(node) : if node.nodeName == 'disk' : return True return False def parse_address(addr) : type = addr.getAttribute('type') ent = Address(type) if ent.type == 'pci' : ent.bus = addr.getAttribute('bus') ent.slot = addr.getAttribute('slot') ent.function = addr.getAttribute('function') ent.domain = addr.getAttribute('domain') elif ent.type == 'drive' : ent.controller = addr.getAttribute('controller') ent.bus = addr.getAttribute('bus') ent.unit = addr.getAttribute('unit') # Nothing happens return True def check_pci_conflict(bus, slot, function) : sloti = int(slot, 16) for addr in PCIS : if int(addr.slot, 16) == sloti : return True return False def get_free_pci_slot(devname) : for i in range(3, 31) : #qemu allows only 32 slots x = str(i) if not check_pci_conflict('0x00', x, '0x00') : slot = '0x%02x'%(i) return ['0x00', slot, '0x00'] return [] def check_get_free_scsi_slot(index) : addr = scsi_index_to_addr(index) conflict = False for disk in disks : if disk.target_device != scsi: continue if disk.target_controller == addr[0] and\ disk.target_bus == addr[1] and\ disk.target_units == addr[2] : conflict = True break if conflict == False: return addr return [] def check_drive_conflict(type, controller, bus, unit) : for addr in drives : conflict = False for disk in disks : if disk.target_bus != 'type' : continue if disk.address_controller == controller and\ disk.address_bus == bus and\ disk.address_unit == unit : conflict = True break return conflict return True def check_device_conflict(devices, name) : for dev in devices : if dev.target_dev == name : return True return False def gen_scsi_name_from_index(index) : name = 'sd' if index < 26 : name = name + chr(ord('a') + index) elif index < (26 + (26 * 26)) : x = index / 26 - 1 y = index % 26 name = name + chr(ord('a') + x) name = name + chr(ord('a') + y) else : x = (index / 26 - 1) / 26 - 1 y = (index / 26 - 1) % 26 x = index % 26 name = name + chr(ord('a') + x) name = name + chr(ord('a') + y) name = name + chr(ord('a') + z) return name def gen_device_name(devices, head) : if head == 'hd' : for x in 'abcd' : name = 'hd' + x if not check_device_conflict(devices, name) : return name if head == 'vd' : for x in range(0, 26) : name = head + chr(ord('a') + x) if not check_device_conflict(devices, name) : return name if head == 'sd' : for index in range(0, 18278) : name = gen_scsi_name_from_index(index) if not check_device_conflict(devices, name) : return name return None # # Commandline Parser # Using optparse package. Deafault value is below. # usage='usage:%prog --domain Domain <options>....' parser = OptionParser(usage) def help_choice(help, list, default) : help = help + " " help = help + ",".join(list) if (default == True) : help = help + " default: %default" return help parser.add_option('-c', '--connect', action='store', type='string', dest='connect_uri', help='libvirtd connect URI') parser.add_option('-d', '--domain', action='store', type='string',dest="domain", help='domain name.') parser.add_option('-l', '--list', action='store_true', dest='show_list', help='see device list') parser.add_option('--delete', action='store', dest='delete', type='string' , help='remove device') # # 'block' or 'file' can be detected by --source option. # typeChoices=('block','file','network','dir') parser.add_option('--type', choices=typeChoices, dest='type', type='choice', help=help_choice('device type:', typeChoices, False)) mediaChoices=('disk','cdrom') parser.add_option('--media', choices=mediaChoices, type='choice',dest="media", help=help_choice('media type:', mediaChoices, True)) parser.add_option('--source', action='store', type='string', dest='source', help='select source file/device to be shown as disk') protocolChoices=('nbd','rbd', 'sheepdog') parser.add_option('--protocol', choices=protocolChoices, type='choice', dest='protocol', help=help_choice('netdisk protocol:', protocolChoices, False)) parser.add_option('--host', action='store', type='string', dest='host', help='<host:port> for rbd and sheepdog, network devices') parser.add_option('--devname', action='store', type='string', dest='devname', help='device name to be shown to guest(auto at default)') qemu_group = OptionGroup(parser, "Qemu Options") qemuFormatChoices=('raw','bochs','qcow2','qed') qemu_group.add_option('--qemu_disk_format', choices=qemuFormatChoices, type='choice', dest='qemu_format', help=help_choice('disk format(qemu):',qemuFormatChoices, True)) ioChoices=('threads','native') qemu_group.add_option('--io',choices=ioChoices, type='choice', dest='io', help=help_choice('io option(qemu):', ioChoices, False)) cacheChoices=('none','writeback','writethrough','default') qemu_group.add_option('--cache', choices=cacheChoices, type='choice', dest='cache', help=help_choice('cache policy:(qemu)', cacheChoices, True)) errorChoices=('stop','ignore','enospace') parser.add_option('--error_policy', choices=errorChoices, type='choice', dest='error_policy', help=help_choice('error policy:', errorChoices, False)) xen_group = OptionGroup(parser, "Xen Options") xenDriverChoices=('tap','tap2','phy','file') xen_group.add_option('--driver', choices=xenDriverChoices, type='choice', dest='driver_name', help=help_choice('Xen driver type:', xenDriverChoices, False)) xen_group.add_option('--aio', action='store_true', dest='xen_aio', help='using Xen aio driver') parser.add_option('--virtio', action='store_true', dest='virtio', help='create a virtio device') parser.add_option('--readonly', action='store_true', dest='readonly', help='attach device as read only') parser.add_option('--scsi', action='store_true', dest='scsi', help='create a scsi device') parser.add_option('--ide', action='store_true', dest='ide', help='create a ide device') parser.add_option('--pci', action='store', dest='pci', type='string', help='customize pci resource by hand as bus:slot:function') parser.add_option('--drive_id', action='store', dest='drive_id', type='string', help='customize ide/scsi resource ID as controller:bus:unit') parser.add_option('--yes', action='store_true', dest='yes', help='don\'t ask before save') parser.add_option('--nosave', action='store_true', dest='nosave', help='show created device XML instead of saving.') parser.add_option('--boot_order', action='store', dest='boot_order', type='int', help='boot order of the device', metavar='Num') parser.add_option('--shareable', action='store_true', dest='shareable', help='the device can be shareable between device') parser.add_option('--serial', action='store', dest='serial', type='string', help='optional serial ID of the device') EncChoices = ['qcow'] qemu_group.add_option('--encryption_format', choices=EncChoices, type='choice', dest='encryption_format', metavar='qcow', help='Only \"qcow\" is supported') EncTypeChoices =['passphrase'] qemu_group.add_option('--encryption_type', choices=EncTypeChoices, type='choice', dest='encryption_type', help=help_choice('encription_type', EncTypeChoices, True)) qemu_group.add_option('--encryption_uuid', action='store', metavar='UUID', dest='encryption_uuid', help='UUID for encrypted deivce') parser.add_option_group(qemu_group) parser.add_option_group(xen_group) parser.set_defaults(list=False, media='disk') parser.set_defaults(qemu_format='raw', cache='default', media='disk') parser.set_defaults(virtio=False, readonly=False, scsi=False, ide=False) parser.set_defaults(xen_aio=False,) parser.set_defaults(yes=False) (options, args) = parser.parse_args(sys.argv) # # Confirm domain XML is not updated since we opened it. # def check_domain_unchanged(origin, domain): if origin != domain.XMLDesc(0) : print 'Domain file may be updated while we open' print 'please retry' exit(1) # # Connect libvirt and get domain information. # if options.domain == None : print 'please specify domain to be modified' exit(1) try : conn = libvirt.open(options.connect_uri) except: print 'Can\'t connect libvirt with URI %s'%(options.connect_uri) exit(1) conn_uri = conn.getURI() info = re.split(':/', conn_uri) # From the name of connection URI, we detect vmname. vmname = info[0] # domain look up. domain = conn.lookupByName(options.domain) if domain == None: print 'Can\'t find domain %s' %(options.domain) exit(1) # read XML description. origin = domain.XMLDesc(0) dom = xml.dom.minidom.parseString(domain.XMLDesc(0)) # At 1st, we need to find <device> block. names = dom.getElementsByTagName('devices') if (names == None) : print '<device> element not found in %s\n' % filename exit(1) for devices in names : if devices.hasChildNodes() : for name in devices.childNodes : if (is_block_device(name)) : disk = BlockDevice() disk.parse_info(name) disks.append(disk) if name.hasChildNodes() : for elem in name.childNodes : if elem.nodeName == 'address' : addr = parse_address(elem) # # Show List. # if options.show_list == True : for disk in disks : disk.show() print '' exit(0) # delete is easy. if options.delete != None : disk = None for name in devices.childNodes : if (not is_block_device(name)) : continue disk = BlockDevice() disk.parse_info(name) if disk.target_dev == options.delete : devices.removeChild(name) break disk = None if disk == None : print 'no such device %s'%(options.delete) exit(1) if not options.yes : print 'You\'ll delete this device!' disk.show() x = raw_input('Really delete Y/N ? ') if x != 'Y' and x != 'y' : exit(0) str = dom.toxml() check_domain_unchanged(origin, domain) conn.defineXML(str) exit(1) # # Build a newdisk information from command line options # and default values. # newdisk = BlockDevice() if options.type != None : newdisk.type = options.type newdisk.media = options.media # # qemu only has a drive name as 'qemu'. 'type' and 'cache' are selectable. # if vmname == 'qemu' : newdisk.driver_name = 'qemu' newdisk.driver_type = options.qemu_format if options.cache == None : newdisk.driver_cache = 'default' else : newdisk.driver_cache = options.cache else : # Xen can select drive name. newdisk.driver_name = options.driver_name if options.xen_aio == True : newdisk.driver_type = 'aio' if options.error_policy != None : newdisk.driver_error_policy = options.error_policy if options.io != None : newdisk.io = options.io # Make readonly if crdom is specified. if options.media == 'cdrom' or options.readonly == True: newdisk.readonly = True; # Check Device Name and detect device bus from device name. if options.devname != None : if re.match('vd[a-z]', options.devname) : newdisk.target_dev = options.devname newdisk.target_bus = 'virtio' elif re.match('hd[a-d]', options.devname) : newdisk.target_dev = options.devname newdisk.target_bus = 'ide' elif re.match('sd[a-z]', options.devname) : newdisk.target_dev = options.devname newdisk.target_bus = 'scsi' else : newdisk.target_dev = options.devname # # Define device name automatically with regard to the bus. # if options.virtio == True : newdisk.target_bus = 'virtio' if options.devname == None: newdisk.target_dev = gen_device_name(disks, 'vd') if newdisk.target_dev == None: print 'failed to define virtio drive name as vd*' print 'please define by hand with --devname' exit(1) elif options.ide == True : newdisk.target_bus = 'ide' if options.devname == None: newdisk.target_dev = gen_device_name(disks, 'hd') if newdisk.target_dev == None : print 'failed to define ide drive name as hd*' print 'please define by hand with --devname' exit(1) elif options.scsi == True : newdisk.target_bus = 'scsi' if options.devname == None: newdisk.target_dev = gen_device_name(disks, 'sd') if newdisk.target_dev == None : print 'failed to define scsi drive name as sd*' print 'please define by hand with --devname' exit(1) # # If we can't detelct target bus, retrun error. # if newdisk.target_bus == None : print 'need to specify device name or target bus for drive' exit(1) # # If there is a device with the same name, error. # if check_device_conflict(disks, newdisk.target_dev) : print 'device name conflicts %s' %(newdisk.target_dev) print 'please specify an other name with --devname' # # Handle 'source' type. # if options.source != None and options.protocol == None: # No network case. check local FS. # Only absolute path is allowed. if options.source[0] != '/' : print 'please use absolute path for source %s:' %(options.source) exit(1) try: mode = os.stat(options.source)[stat.ST_MODE] except: print 'can\'t handle file %s' %(options.source) exit(1) # # check 'file' and 'block' # newdisk.source = options.source if stat.S_ISREG(mode) != 0: if newdisk.type == None : newdisk.type = 'file' if newdisk.type != 'file' : print '%s specified in --source is file' %(options.source) exit(1) if stat.S_ISBLK(mode) != 0 : if newdisk.type == None : newdisk.type = 'block' if newdisk.type != 'block' : print '%s specified in --source is blkdev' %(options.source) exit(1) if newdisk.type == None : print 'can\'t detect source type %s'%(options.source) elif options.type == 'network' : if options.protocol == None : print 'need to select protocol for network drive.' exit(1) newdisk.protocol = options.protocol if options.source == None : print 'source name for network should be privded --soruce' exit(1) newdisk.source = options.source if not re.match('[0-9a-zA-z\._-]+:[0-9]+', options.host) : print 'host should be specified in address:port manner' exit(1) (addr, port) = re.split(':', options.host) newdisk.protocol_addr = addr newdisk.protocol_port = port if options.media != 'cdrom' and options.source == None : print 'you need to specify source if not cdrom' exit(1) # # Define PCI/IDE/SCSI drive address. # (Usually, all this will be defined automatically.) # # format check if options.pci != None : if options.drive_id != None : print 'pci address and drive-id cannot be set at the same time' exit(1) if not re.match("0x[0-9a-f]+:0x[0-9a-f]+:0x[0-9-a-f]", options.pci) : print 'bad pci address ',options.pci print '0xXX:0xXX:0xXX is expected',options.pci exit(1) if options.drive_id != None : if not re.match("[0-9]+:[0-9]+:[0-9]+", options.drive_id) : print 'bad drive_id address', options.drive_id exit(1) # define BUS ID. # # In this case, device name should meet bus ID(especially IDE), # which the user specified. The user should specify device # name by himself. # if options.pci != None or options.drive_id != None : if options.devname == None : print 'We recommend that --drive_id should be used with --devname', print 'device name <-> drive ID relationship is at random, now' if options.pci != None : pci = re.split(':', options.pci) if '0x00' != pci[0] : print 'only bus 0x00 can be used in pci' exit(1) if check_pci_conflict(pci[0], pci[1], pci[2]) : print 'bus %s conflicts' % (options.pci) newdisk.address_type = 'pci' newdisk.address_bus = pci[0] newdisk.address_slot = pci[1] newdisk.address_function = pci[2] elif options.drive_id != None : drive = re.split(':', options.drive_id) if options.ide == True : if check_drive_conflict('ide', drive[0],drive[1],drive[2]) : print 'drive %s conflicts' % (options.drive_id) else : if check_drive_conflict('scsi',drive[0], drive[1], drive[2]) : print 'drive %s conflicts' % (options.drive_id) newdisk.address_type = 'drive' newdisk.address_controller = drive[0] newdisk.address_bus = drive[1] newdisk.address_unit = drive[2] if options.boot_order != None : newdisk.boot_order = str(options.boot_order) if options.shareable == True: newdisk.shareab;e = True if options.serial != None : newdisk.serial = options.serial # # Handle encryption # if options.encryption_format != None : if options.encryption_type == None or\ options.encryption_uuid == None : print 'encryption passphrase or UUID is not specified' exit(1) newdisk.encrypt_format = options.encryption_format newdisk.encrypt_type = options.encryption_type newdisk.encrypt_uuid = options.encryption_uuid # # Okay, we got all required information. Show the newdisk. # if options.yes != True : newdisk.show() # # Build XML from 'newdisk' # def append_attribute(doc, elem, attr, value) : x = doc.createAttribute(attr) elem.setAttributeNode(x) elem.setAttribute(attr, value) def append_text(doc, elem, text) : x = doc.createTextNode(text) elem.appendChild(x) def append_element(doc, parent, name, level) : append_text(doc, parent, '\n') while level > 0 : append_text(doc, parent, ' ') level = level - 1 element = doc.createElement(name) parent.appendChild(element) return element # <disk .... element = dom.createElement('disk') append_attribute(dom, element, 'device', newdisk.media) append_attribute(dom, element, 'type', newdisk.type) # # <driver ... # child = append_element(dom, element, 'driver', 3) append_attribute(dom, child, 'name', newdisk.driver_name) append_attribute(dom, child, 'type', newdisk.driver_type) if newdisk.driver_cache != None : append_attribute(dom, child, 'cache', newdisk.driver_cache) if newdisk.driver_error_policy != None : append_attribute(dom, child, 'error_policy', newdisk.driver_error_policy) if newdisk.driver_io != None : append_attribute(dom, child, 'io', newdisk.driver_io) # # <source.... # if newdisk.type == 'file' and newdisk.source != None: child = append_element(dom, element, 'source', 3) append_attribute(dom, child, 'file', options.source) elif newdisk.type == 'block' and newdisk.source != None: child = append_element(dom, element, 'source', 3) append_attribute(dom, child, 'dev', options.source) elif newdisk.type == 'network' and newdisk.protocol != None: child = append_element(dom, element, 'source', 3) append_attribute(dom, child, 'protocol', options.protocol) append_attribute(dom, child, 'name', options.source) host = append_element(dom, child, 'host', 4) address = re.split(':',options.host) append_attribute(dom, host, 'name', address[0]) append_attribute(dom, host, 'port', address[1]) # # <target.... # child = append_element(dom, element, 'target', 3) append_attribute(dom, child, 'dev', newdisk.target_dev) append_attribute(dom, child, 'bus', newdisk.target_bus) # # <address..... # libvirt will do auto-fill in typical case. # if newdisk.address_type != None : child = append_element(dom, element, 'address', 3) append_attribute(dom, child, 'type', newdisk.address_type) if newdisk.address_type == 'pci' : append_attribute(dom, child, 'bus', newdisk.address_bus) append_attribute(dom, child, 'slot', newdisk.address_slot) append_attribute(dom, child, 'function', newdisk.address_function) append_attribute(dom, child, 'domain', '0x0000') elif newdisk.address_type == 'drive' : append_attribute(dom, child, 'controller', newdisk.address_controller) append_attribute(dom, child, 'unit', newdisk.address_unit) append_attribute(dom, child, 'bus', newdisk.address_bus) append_attribute(dom, child, 'domain', '0x0000') # # <readonly # if newdisk.readonly == True: append_element(dom, element, 'readonly', 3) # # <shareable # if newdisk.shareable == True: append_element(dom, element, 'readonly', 3) # # <boot # if newdisk.boot_order != None: child = append_element(dom, element, 'boot', 3) append_attribute(dom, child, 'order', newdisk.boot_order) # # <serial # if newdisk.serial != None: child = append_element(dom, element, 'serial', 3) append_text(dom, child, newdisk.serial) # # <encryption # if newdisk.encrypt_format != None : child = append_element(dom, element, 'encryption', 3) append_attribute(dom, child, 'format', newdisk.encrypt_format) secret = append_element(dom, child, 'secret', 4) append_attribute(dom, secret, 'type', newdisk.encrypt_type) append_attribute(dom, secret, 'uuid', newdisk.encrypt_uuid) append_text(dom, child, '\n') # indent for </disk> append_text(dom, element, '\n') append_text(dom, element, ' ') if options.nosave == True : print '' print element.toxml('utf-8') exit(0) # # Insert newdisk to the tail of disks. # for devices in names : if not devices.hasChildNodes() : continue for name in devices.childNodes : if name.nodeName == 'controller' : break if name == None : append_text(dom, devices, ' ') x = dom.createTextNode('\n') devices.appendChild(element) devices.insertBefore(x, name) else: devices.insertBefore(element, name) x = dom.createTextNode('\n ') devices.insertBefore(x, name) if not options.yes : x = raw_input('Add this device Y/N ? ') if x != 'y' and x != 'Y' : exit(1) str = dom.toxml('utf-8') check_domain_unchanged(origin, domain) try: conn.defineXML(str) except: print 'Failed'

3 14

[libvirt] [PATCH] Fix off-by-1 in virFileAbsPath.
by Daniel P. Berrange 22 Feb '11

22 Feb '11

The virFileAbsPath was not taking into account the '/' directory separator when allocating memory for combining cwd + path. Convert to use virAsprintf to avoid this type of bug completely. * src/util/util.c: Convert virFileAbsPath to use virAsprintf --- src/util/util.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 965e96d..452f592 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1990,30 +1990,23 @@ cleanup: int virFileAbsPath(const char *path, char **abspath) { char *buf; - int cwdlen; if (path[0] == '/') { - buf = strdup(path); - if (buf == NULL) - return(-1); + if (!(*abspath = strdup(path))) + return -1; } else { buf = getcwd(NULL, 0); if (buf == NULL) - return(-1); + return -1; - cwdlen = strlen(buf); - /* cwdlen includes the null terminator */ - if (VIR_REALLOC_N(buf, cwdlen + strlen(path) + 1) < 0) { + if (virAsprintf(abspath, "%s/%s", buf, path) < 0) { VIR_FREE(buf); errno = ENOMEM; - return(-1); + return -1; } - - buf[cwdlen] = '/'; - strcpy(&buf[cwdlen + 1], path); + VIR_FREE(buf); } - *abspath = buf; return 0; } -- 1.7.4

2 2

[libvirt] [PATCH] Fix off-by-1 in virFileAbsPath.
by Daniel P. Berrange 22 Feb '11

22 Feb '11

The virFileAbsPath was not taking into account the '/' directory separator when allocating memory for combining cwd + path. Convert to use virAsprintf to avoid this type of bug completely. * src/util/util.c: Convert virFileAbsPath to use virAsprintf --- src/util/util.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 965e96d..452f592 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1990,30 +1990,23 @@ cleanup: int virFileAbsPath(const char *path, char **abspath) { char *buf; - int cwdlen; if (path[0] == '/') { - buf = strdup(path); - if (buf == NULL) - return(-1); + if (!(*abspath = strdup(path))) + return -1; } else { buf = getcwd(NULL, 0); if (buf == NULL) - return(-1); + return -1; - cwdlen = strlen(buf); - /* cwdlen includes the null terminator */ - if (VIR_REALLOC_N(buf, cwdlen + strlen(path) + 1) < 0) { + if (virAsprintf(abspath, "%s/%s", buf, path) < 0) { VIR_FREE(buf); errno = ENOMEM; - return(-1); + return -1; } - - buf[cwdlen] = '/'; - strcpy(&buf[cwdlen + 1], path); + VIR_FREE(buf); } - *abspath = buf; return 0; } -- 1.7.4

2 1

[libvirt] [PATCH] Fix discard of expected errors
by Daniel P. Berrange 22 Feb '11

22 Feb '11

In a couple of commands virsh catches & ignores errors, but fails to reset last_error. Thus the error is ignored, but still reported to the user. * tools/virsh.c: Reset last_error if ignoring an error --- tools/virsh.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2837e0f..62fca17 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2122,6 +2122,9 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if (last_error->code != VIR_ERR_NO_SUPPORT) { virDomainFree(dom); return FALSE; + } else { + virFreeError(last_error); + last_error = NULL; } } else { /* Only print something if a security model is active */ @@ -2498,6 +2501,8 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) if (!tmp || virStrToLong_i(tmp + 1, &tmp, 10, &count) < 0) count = -1; } + virFreeError(last_error); + last_error = NULL; VIR_FREE(xml); } -- 1.7.4

2 1

[libvirt] [PATCH] Make LXC container startup/shutdown/I/O more robust
by Daniel P. Berrange 22 Feb '11

22 Feb '11

The current LXC I/O controller looks for HUP to detect when a guest has quit. This isn't reliable as during initial bootup it is possible that 'init' will close the console and let mingetty re-open it. The shutdown of containers was also flakey because it only killed the libvirt I/O controller and expected container processes to gracefully follow. Change the I/O controller such that when it see HUP or an I/O error, it uses kill($PID, 0) to see if the process has really quit. Change the container shutdown sequence to use the virCgroupKillPainfully function to ensure every really goes away * docs/drvlxc.html.in: Document that certain cgroups controllers are now mandatory * src/lxc/lxc_controller.c: Check if PID is still alive before quitting on I/O error/HUP * src/lxc/lxc_driver.c: Use virCgroupKillPainfully --- docs/drvlxc.html.in | 18 ++++++ src/lxc/lxc_controller.c | 42 ++++++++++---- src/lxc/lxc_driver.c | 142 ++++++++++++++++------------------------------ 3 files changed, 98 insertions(+), 104 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 35058c4..3e715b1 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -9,6 +9,24 @@ light-weight "application container" which does not have it's own root image. Y start it using </p> +<h2>Cgroups Requirements</h2> + +<p> +The libvirt LXC driver requires that certain cgroups controllers are +mounted on the host OS. The minimum required controllers are 'cpuacct', +'memory' and 'devices', while recommended extra controllers are +'cpu', 'freezer' and 'blkio'. The /etc/cgconfig.conf & cgconfig +init service used to mount cgroups at host boot time. To manually +mount them use. NB, the blkio controller in some kernels will not +allow creation of nested sub-directories which will prevent correct +operation of the libvirt LXC driver. On such kernels the blkio controller +must not be mounted. +</p> + +<pre> + # mount -t cgroup cgroup /dev/cgroup -o cpuacct,memory,devices,cpu,freezer,blkio +</pre> + <h3>Example config version 1</h3> <p></p> <pre> diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index b742a33..0cd7dc4 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -31,6 +31,7 @@ #include <sys/un.h> #include <unistd.h> #include <paths.h> +#include <errno.h> #include <fcntl.h> #include <signal.h> #include <getopt.h> @@ -119,12 +120,10 @@ static int lxcSetContainerResources(virDomainDefPtr def) virReportSystemError(-rc, _("Unable to set memory limit for domain %s"), def->name); - /* Don't fail if we can't set memory due to lack of kernel support */ - if (rc != -ENOENT) - goto cleanup; + goto cleanup; } - if(def->mem.hard_limit) { + if (def->mem.hard_limit) { rc = virCgroupSetMemoryHardLimit(cgroup, def->mem.hard_limit); if (rc != 0) { virReportSystemError(-rc, @@ -134,7 +133,7 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } - if(def->mem.soft_limit) { + if (def->mem.soft_limit) { rc = virCgroupSetMemorySoftLimit(cgroup, def->mem.soft_limit); if (rc != 0) { virReportSystemError(-rc, @@ -144,7 +143,7 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } - if(def->mem.swap_hard_limit) { + if (def->mem.swap_hard_limit) { rc = virCgroupSetSwapHardLimit(cgroup, def->mem.swap_hard_limit); if (rc != 0) { virReportSystemError(-rc, @@ -323,6 +322,18 @@ ignorable_epoll_accept_errno(int errnum) || errnum == EWOULDBLOCK); } +static bool +lxcPidGone(pid_t container) +{ + waitpid(container, NULL, WNOHANG); + + if (kill(container, 0) < 0 && + errno == ESRCH) + return true; + + return false; +} + /** * lxcControllerMain * @monitor: server socket fd to accept client requests @@ -340,7 +351,8 @@ ignorable_epoll_accept_errno(int errnum) static int lxcControllerMain(int monitor, int client, int appPty, - int contPty) + int contPty, + pid_t container) { int rc = -1; int epollFd; @@ -446,7 +458,13 @@ static int lxcControllerMain(int monitor, ++numActive; } } else if (epollEvent.events & EPOLLHUP) { - VIR_DEBUG("EPOLLHUP from fd %d", epollEvent.data.fd); + if (lxcPidGone(container)) + goto cleanup; + curFdOff = epollEvent.data.fd == appPty ? 0 : 1; + if (fdArray[curFdOff].active) { + fdArray[curFdOff].active = 0; + --numActive; + } continue; } else { lxcError(VIR_ERR_INTERNAL_ERROR, @@ -485,7 +503,9 @@ static int lxcControllerMain(int monitor, --numActive; fdArray[curFdOff].active = 0; } else if (-1 == rc) { - goto cleanup; + if (lxcPidGone(container)) + goto cleanup; + continue; } } @@ -564,7 +584,7 @@ lxcControllerRun(virDomainDefPtr def, int rc = -1; int control[2] = { -1, -1}; int containerPty = -1; - char *containerPtyPath; + char *containerPtyPath = NULL; pid_t container = -1; virDomainFSDefPtr root; char *devpts = NULL; @@ -683,7 +703,7 @@ lxcControllerRun(virDomainDefPtr def, if (lxcControllerClearCapabilities() < 0) goto cleanup; - rc = lxcControllerMain(monitor, client, appPty, containerPty); + rc = lxcControllerMain(monitor, client, appPty, containerPty, container); cleanup: VIR_FREE(devptmx); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 625777a..e47c201 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -953,36 +953,16 @@ cleanup: * @driver: pointer to driver structure * @vm: pointer to VM to clean up * - * waitpid() on the container process. kill and wait the tty process - * This is called by both lxcDomainDestroy and lxcSigHandler when a - * container exits. - * - * Returns 0 on success or -1 in case of error + * Cleanout resources associated with the now dead VM + * */ -static int lxcVmCleanup(lxc_driver_t *driver, +static void lxcVmCleanup(lxc_driver_t *driver, virDomainObjPtr vm) { - int rc = 0; - int waitRc; - int childStatus = -1; virCgroupPtr cgroup; int i; lxcDomainObjPrivatePtr priv = vm->privateData; - while (((waitRc = waitpid(vm->pid, &childStatus, 0)) == -1) && - errno == EINTR) - ; /* empty */ - - if ((waitRc != vm->pid) && (errno != ECHILD)) { - virReportSystemError(errno, - _("waitpid failed to wait for container %d: %d"), - vm->pid, waitRc); - rc = -1; - } else if (WIFEXITED(childStatus)) { - VIR_DEBUG("container exited with rc: %d", WEXITSTATUS(childStatus)); - rc = -1; - } - /* now that we know it's stopped call the hook if present */ if (virHookPresent(VIR_HOOK_DRIVER_LXC)) { char *xml = virDomainDefFormat(vm->def, 0); @@ -1022,8 +1002,6 @@ static int lxcVmCleanup(lxc_driver_t *driver, vm->def->id = -1; vm->newDef = NULL; } - - return rc; } /** @@ -1182,11 +1160,10 @@ error: static int lxcVmTerminate(lxc_driver_t *driver, - virDomainObjPtr vm, - int signum) + virDomainObjPtr vm) { - if (signum == 0) - signum = SIGINT; + virCgroupPtr group = NULL; + int rc; if (vm->pid <= 0) { lxcError(VIR_ERR_INTERNAL_ERROR, @@ -1194,18 +1171,30 @@ static int lxcVmTerminate(lxc_driver_t *driver, return -1; } - if (kill(vm->pid, signum) < 0) { - if (errno != ESRCH) { - virReportSystemError(errno, - _("Failed to kill pid %d"), - vm->pid); - return -1; - } - } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &group, 0) != 0) + return -1; + rc = virCgroupKillPainfully(group); + if (rc < 0) { + virReportSystemError(-rc, "%s", + _("Failed to kill container PIDs")); + rc = -1; + goto cleanup; + } + if (rc == 1) { + lxcError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Some container PIDs refused to die")); + rc = -1; + goto cleanup; + } + lxcVmCleanup(driver, vm); vm->state = VIR_DOMAIN_SHUTDOWN; - return lxcVmCleanup(driver, vm); + rc = 0; + +cleanup: + virCgroupFree(&group); + return rc; } static void lxcMonitorEvent(int watch, @@ -1229,7 +1218,7 @@ static void lxcMonitorEvent(int watch, goto cleanup; } - if (lxcVmTerminate(driver, vm, SIGINT) < 0) { + if (lxcVmTerminate(driver, vm) < 0) { virEventRemoveHandle(watch); } else { event = virDomainEventNewFromObj(vm, @@ -1544,7 +1533,7 @@ static int lxcVmStart(virConnectPtr conn, VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, 0); + lxcVmTerminate(driver, vm); goto cleanup; } @@ -1712,55 +1701,6 @@ cleanup: return dom; } -/** - * lxcDomainShutdown: - * @dom: pointer to domain to shutdown - * - * Sends SIGINT to container root process to request it to shutdown - * - * Returns 0 on success or -1 in case of error - */ -static int lxcDomainShutdown(virDomainPtr dom) -{ - lxc_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - virDomainEventPtr event = NULL; - int ret = -1; - - lxcDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, dom->uuid); - if (!vm) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(dom->uuid, uuidstr); - lxcError(VIR_ERR_NO_DOMAIN, - _("No domain with matching uuid '%s'"), uuidstr); - goto cleanup; - } - - if (!virDomainObjIsActive(vm)) { - lxcError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); - goto cleanup; - } - - ret = lxcVmTerminate(driver, vm, 0); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN); - if (!vm->persistent) { - virDomainRemoveInactive(&driver->domains, vm); - vm = NULL; - } - -cleanup: - if (vm) - virDomainObjUnlock(vm); - if (event) - lxcDomainEventQueue(driver, event); - lxcDriverUnlock(driver); - return ret; -} - static int lxcDomainEventRegister(virConnectPtr conn, @@ -1928,7 +1868,7 @@ static int lxcDomainDestroy(virDomainPtr dom) goto cleanup; } - ret = lxcVmTerminate(driver, vm, SIGKILL); + ret = lxcVmTerminate(driver, vm); event = virDomainEventNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); @@ -2057,7 +1997,7 @@ lxcReconnectVM(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque) VIR_EVENT_HANDLE_ERROR | VIR_EVENT_HANDLE_HANGUP, lxcMonitorEvent, vm, NULL)) < 0) { - lxcVmTerminate(driver, vm, 0); + lxcVmTerminate(driver, vm); goto cleanup; } } else { @@ -2124,8 +2064,24 @@ static int lxcStartup(int privileged) rc = virCgroupForDriver("lxc", &lxc_driver->cgroup, privileged, 1); if (rc < 0) { char buf[1024]; - VIR_WARN("Unable to create cgroup for driver: %s", + VIR_WARN("Unable to create cgroup, disabling LXC driver: %s", virStrerror(-rc, buf, sizeof(buf))); + goto cleanup; + } + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_CPUACCT)) { + VIR_WARN0("Unable to find 'cpuacct' cgroups controller mount"); + goto cleanup; + } + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_DEVICES)) { + VIR_WARN0("Unable to find 'devices' cgroups controller mount"); + goto cleanup; + } + if (!virCgroupMounted(lxc_driver->cgroup, + VIR_CGROUP_CONTROLLER_MEMORY)) { + VIR_WARN0("Unable to find 'memory' cgroups controller mount"); + goto cleanup; } /* Call function to load lxc driver configuration information */ @@ -2845,7 +2801,7 @@ static virDriver lxcDriver = { lxcDomainLookupByName, /* domainLookupByName */ lxcDomainSuspend, /* domainSuspend */ lxcDomainResume, /* domainResume */ - lxcDomainShutdown, /* domainShutdown */ + NULL, /* domainShutdown */ NULL, /* domainReboot */ lxcDomainDestroy, /* domainDestroy */ lxcGetOSType, /* domainGetOSType */ -- 1.7.4

1 0

[libvirt] [PATCH] security: avoid memory leak
by Eric Blake 22 Feb '11

22 Feb '11

Leak introduced in commit d6623003. * src/qemu/qemu_driver.c (qemuSecurityInit): Avoid leak on failure. * src/security/security_stack.c (virSecurityStackClose): Avoid leaking component drivers. --- src/qemu/qemu_driver.c | 5 ++++- src/security/security_stack.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f25a2a..8b15a3e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -204,8 +204,11 @@ qemuSecurityInit(struct qemud_driver *driver) goto error; if (!(driver->securityManager = virSecurityManagerNewStack(mgr, - dac))) + dac))) { + + virSecurityManagerFree(dac); goto error; + } } else { driver->securityManager = mgr; } diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 79b3e1f..64f745a 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -61,8 +61,13 @@ virSecurityStackOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) } static int -virSecurityStackClose(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityStackClose(virSecurityManagerPtr mgr) { + virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); + + virSecurityManagerFree(priv->primary); + virSecurityManagerFree(priv->secondary); + return 0; } -- 1.7.4

2 2

[libvirt] [PATCH] RFC: experimental libvirtd upstart job
by apevec＠gmail.com 22 Feb '11

22 Feb '11

From: Alan Pevec <apevec(a)redhat.com> To install it, disable libvirtd sysv initscript: chkconfig libvirtd off service libvirtd stop and enable libvirtd upstart job: cp /usr/share/doc/libvirt-*/libvirtd.upstart \ /etc/init/libvirtd.conf initctl reload-configuration initctl start libvirtd Test: initctl status libvirtd libvirtd start/running, process 3929 killall -9 libvirtd initctl status libvirtd libvirtd start/running, process 4047 --- daemon/Makefile.am | 1 + daemon/libvirtd.upstart | 47 +++++++++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 1 + 3 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 daemon/libvirtd.upstart diff --git a/daemon/Makefile.am b/daemon/Makefile.am index cdf0f75..a4ebcf8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = \ remote_generate_stubs.pl \ libvirtd.conf \ libvirtd.init.in \ + libvirtd.upstart \ libvirtd.policy-0 \ libvirtd.policy-1 \ libvirtd.sasl \ diff --git a/daemon/libvirtd.upstart b/daemon/libvirtd.upstart new file mode 100644 index 0000000..40d5fa3 --- /dev/null +++ b/daemon/libvirtd.upstart @@ -0,0 +1,47 @@ +# libvirtd upstart job +# +# XXX wait for rc to get all dependent initscripts started +# from sysv libvirtd initscript: Required-Start: $network messagebus +start on stopped rc RUNLEVEL=[345] +stop on runlevel [016] +respawn +# default rate limit is 10x/5s +#respawn limit 10 5 + +# DAEMON_COREFILE_LIMIT in /etc/sysconfig/libvirtd doesn't have effect +# must set resource limits here +#limit core unlimited unlimited + +# documented http://upstart.ubuntu.com/wiki/Stanzas#pid +# but not accepted by upstart-0.6.5 +#pid file /var/run/libvirtd.pid + +env PIDFILE=/var/run/libvirtd.pid + +script + LIBVIRTD_CONFIG= + LIBVIRTD_ARGS= + KRB5_KTNAME=/etc/libvirt/krb5.tab + + test -f /etc/sysconfig/libvirtd && . /etc/sysconfig/libvirtd + + export QEMU_AUDIO_DRV + export SDL_AUDIODRIVER + + LIBVIRTD_CONFIG_ARGS= + if [ -n "$LIBVIRTD_CONFIG" ] + then + LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" + else + true + fi + + mkdir -p /var/cache/libvirt + rm -rf /var/cache/libvirt/* + KRB5_KTNAME=$KRB5_KTNAME /usr/sbin/libvirtd $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS +end script + +post-stop script + rm -f $PIDFILE + rm -rf /var/cache/libvirt/* +end script diff --git a/libvirt.spec.in b/libvirt.spec.in index a29693a..365000c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -854,6 +854,7 @@ fi %{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/rc.d/init.d/libvirtd +%doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %if %{with_dtrace} -- 1.7.3.4

3 3

[libvirt] [PATCH] Expose name + UUID to LXC containers via env variables
by Daniel P. Berrange 22 Feb '11

22 Feb '11

When spawning 'init' in the container, set LIBVIRT_LXC_UUID=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX LIBVIRT_LXC_NAME=YYYYYYYYYYYY to allow guest software to detect & identify that they are in a container * src/lxc/lxc_container.c: Set LIBVIRT_LXC_UUID and LIBVIRT_LXC_NAME env vars --- src/lxc/lxc_container.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d973984..269dc97 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -52,6 +52,7 @@ #include "util.h" #include "memory.h" #include "veth.h" +#include "uuid.h" #include "files.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -102,6 +103,20 @@ struct __lxc_child_argv { */ static int lxcContainerExecInit(virDomainDefPtr vmDef) { + char *uuidenv, *nameenv; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(vmDef->uuid, uuidstr); + + if (virAsprintf(&uuidenv, "LIBVIRT_LXC_UUID=%s", uuidstr) < 0) { + virReportOOMError(); + return -1; + } + if (virAsprintf(&nameenv, "LIBVIRT_LXC_NAME=%s", vmDef->name) < 0) { + virReportOOMError(); + return -1; + } + const char *const argv[] = { vmDef->os.init, NULL, @@ -109,6 +124,8 @@ static int lxcContainerExecInit(virDomainDefPtr vmDef) const char *const envp[] = { "PATH=/bin:/sbin", "TERM=linux", + uuidenv, + nameenv, NULL, }; -- 1.7.4

2 2

[libvirt] [PATCH] Fix group/mode for /dev/pts inside LXC container
by Daniel P. Berrange 22 Feb '11

22 Feb '11

Normal practice for /dev/pts is to have it mode=620,gid=5 but LXC was leaving mode=000,gid=0 preventing unprivilegd users in the guest use of PTYs * src/lxc/lxc_controller.c: Fix /dev/pts setup --- src/lxc/lxc_controller.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index b742a33..d047f60 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -629,7 +629,7 @@ lxcControllerRun(virDomainDefPtr def, } VIR_DEBUG("Mouting 'devpts' on %s", devpts); - if (mount("devpts", devpts, "devpts", 0, "newinstance,ptmxmode=0666") < 0) { + if (mount("devpts", devpts, "devpts", 0, "newinstance,ptmxmode=0666,mode=0620,gid=5") < 0) { virReportSystemError(errno, _("Failed to mount devpts on %s"), devpts); -- 1.7.4

2 1

[libvirt] [libvirt-php] About the inconsistency in libvirt-php
by Lyre 22 Feb '11

22 Feb '11

Hi all: I noticed that there's some inconsistent behaviors in libvirt-php, and wondering what's the best way to handle them. In libvirt-php: libvirt_list_domains() returns an array of all domain resource; libvirt_list_active_domains() returns an array of running domain ids; libvirt_list_defined_domains() returns an array of defined domain names. and libvirt_list_storagepools() returns an array of actived storagepool names. In my opinion, returning an array of names would be better when listing all kinds of objects. And the naming convenances, let's take domains as an example. libvirt-php provied libvirt_list_domains() for all domains, which has no corresponding function in libvirt. libvirt_list_active_domains() for running domains, corresponding to virConnectListDomains() in libvirt. libvirt_list_defined_domains() for defined domains, corresponding to virConnectListDefinedDomains() in libvirt. I believe it is fine. However, for defined objects, sometimes it used term "defined" (libvirt_list_defined_domains), and sometimes use term "inactive" (libvirt_get_inactive_domain_count) in contrast to "active". Which would be better?

5 13

[libvirt] hello, Would I request some support about libvirt API?
by Saint yeyo 22 Feb '11

22 Feb '11

Hello, honorific developers, I'm a rookie came here to study something about libvirt, I find it a little bit difficult for me to use the API, there is absence of explanation of specific functions and examples. May I ask some kind of you who provide some docs about that for me, I'll very appreciate for you. Thank you! Best regard!

1 0

[libvirt] [libvirt-php 0/1] Added many apis for storagepool
by Lyre 22 Feb '11

22 Feb '11

Hi all: This patch added the followings for storagepool: libvirt_storagepool_get_uuid_string libvirt_storagepool_get_name libvirt_storagepool_lookup_by_uuid_string libvirt_storagepool_get_xml_desc libvirt_storagepool_define_xml libvirt_storagepool_undefine libvirt_storagepool_create libvirt_storagepool_destroy libvirt_storagepool_is_active libvirt_storagepool_get_volume_count libvirt_storagepool_refresh libvirt_storagepool_set_autostart libvirt_storagepool_get_autostart These functions were taken from my own branch of original php-libvirt, with some modification, and litte tests. I've put the function prototype in git log, but it seems not a good idea. Maybe I should provie the documents as well. In my original branch, I've extended php-libvirt a lot with their own documents. But I'm not able to simply merge it into libvirt-php: there're too many functions , some designs are really problematical, libvirt-php have indent the source. The documents may be not welly written, some statment don't looks like native English, since I'm not English speaker. I'm tring to find a way to move the source to into libvirt-php, currently it was copy & paste with some adjustment. Lyre (1): storagepool: added apis for control and query src/libvirt.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/php_libvirt.h | 13 +++ 2 files changed, 239 insertions(+), 0 deletions(-)

2 5

[libvirt] [libvirt-php] Fixed checking for libxml2 and prerequisites
by Lyre 22 Feb '11

22 Feb '11

Repalced AM_PATH_XML2 with with the script borrowed from libvirt, which was borrowed from xmlsec. modified: configure.ac modified: src/Makefile.am --- configure.ac | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/Makefile.am | 4 ++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ac31bd0..b87c7f9 100644 --- a/configure.ac +++ b/configure.ac @@ -10,12 +10,58 @@ AC_PROG_CC AC_LANG([C]) AC_PROG_INSTALL AC_PROG_SED +AC_PROG_AWK AC_CHECK_TOOL([STRIP], [strip]) AC_CHECK_TOOL([ECHO], [echo]) AC_CHECK_TOOL([RM], [rm]) -dnl Check for libxml2 -AM_PATH_XML2([2.0.0]) +dnl Need to test if pkg-config exists +PKG_PROG_PKG_CONFIG + +dnl ========================================================================== +dnl required minimum version of libxml2 +dnl replace "2.0.0" with an appropriate one +dnl ========================================================================== +LIBXML_REQUIRED="2.0.0" + +dnl ========================================================================== +dnl find libxml2 library, borrowed from xmlsec +dnl ========================================================================== +LIBXML_CONFIG="xml2-config" +LIBXML_CFLAGS="" +LIBXML_LIBS="" +LIBXML_FOUND="no" + +AC_ARG_WITH([libxml], AC_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) +if test "x$with_libxml" = "xno" ; then + AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) + AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) +elif test "x$with_libxml" = "x" && test "x$PKG_CONFIG" != "x" ; then + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, [LIBXML_FOUND=yes], [LIBXML_FOUND=no]) +fi +if test "$LIBXML_FOUND" = "no" ; then + if test "x$with_libxml" != "x" ; then + LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG + fi + AC_MSG_CHECKING(libxml2 $LIBXML_CONFIG >= $LIBXML_REQUIRED ) + if ! $LIBXML_CONFIG --version > /dev/null 2>&1 ; then + AC_MSG_ERROR([Could not find libxml2 anywhere (see config.log for details).]) + fi + vers=`$LIBXML_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + minvers=`echo $LIBXML_REQUIRED | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge "$minvers" ; then + LIBXML_LIBS="`$LIBXML_CONFIG --libs`" + LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`" + LIBXML_FOUND="yes" + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR( + [You need at least libxml2 $LIBXML_REQUIRED for this version of libvirt]) + fi +fi + +AC_SUBST([LIBXML_CFLAGS]) +AC_SUBST([LIBXML_LIBS]) dnl Specific XML catalog file for validation of generated html AC_ARG_WITH([xml-catalog-file], diff --git a/src/Makefile.am b/src/Makefile.am index 9e89f9f..1826b09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,8 @@ EXTRA_DIST = libvirt.c php_libvirt.h all-am: build clean-temp build: - $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(XML_CPPFLAGS) - $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(XML_LIBS) + $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(LIBXML_CFLAGS) + $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(LIBXML_LIBS) $(ECHO) "Extension compiled as $(PACKAGE).so" install-exec-local: -- 1.7.1

2 1

[libvirt] [PATCH] storage: make debug log more useful
by Osier Yang 22 Feb '11

22 Feb '11

"__func__" should be replaced with "__FUNCTION__" instead for better portability, however, VIR_DEBUG already prints the function name, so it's useless, replace it with more useful log. * src/storage/storage_backend_mpath.c --- src/storage/storage_backend_mpath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 2e85561..2d48a9d 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -316,7 +316,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, { int retval = 0; - VIR_DEBUG("in %s", __func__); + VIR_DEBUG("conn=%p, pool=%p", conn, pool); pool->def->allocation = pool->def->capacity = pool->def->available = 0; -- 1.7.4

2 2

[libvirt] [PATCH] virsh: replace vshPrint with vshPrintExtra for snapshot list
by Osier Yang 22 Feb '11

22 Feb '11

Otherwise extra information will be printed even if "--quiet" is specified. * tools/virsh.c --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ce275f1..2837e0f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10000,8 +10000,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (numsnaps < 0) goto cleanup; - vshPrint(ctl, " %-20s %-25s %s\n", _("Name"), _("Creation Time"), _("State")); - vshPrint(ctl, "---------------------------------------------------\n"); + vshPrintExtra(ctl, " %-20s %-25s %s\n", _("Name"), _("Creation Time"), _("State")); + vshPrintExtra(ctl, "---------------------------------------------------\n"); if (numsnaps) { if (VIR_ALLOC_N(names, numsnaps) < 0) -- 1.7.4

2 2

[libvirt] [libvirt-php] rewrite checking for libxml2
by Lyre 22 Feb '11

22 Feb '11

Dropped the complex macro AM_PATH_XML2. * configure.ac: repalce the AM_PATH_XML2 with the script borrowed from libvirt, which was borrowed from xmlsec. * src/Makefile.am: changed XML_CPPFLAGS to XML_CFLAGS --- aclocal.m4 | 347 +++++++++++++++++++++++++------------------------------ configure.ac | 43 +++++++- src/Makefile.am | 2 +- 3 files changed, 199 insertions(+), 193 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index da878b3..45dac6f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,200 +13,167 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],, -[m4_warning([this file was generated for autoconf 2.66. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Configure paths for LIBXML2 -# Mike Hommey 2004-06-19 -# use CPPFLAGS instead of CFLAGS -# Toshio Kuratomi 2001-04-21 -# Adapted from: -# Configure paths for GLIB -# Owen Taylor 97-11-3 - -dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS -dnl -AC_DEFUN([AM_PATH_XML2],[ -AC_ARG_WITH(xml-prefix, - [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], - xml_config_prefix="$withval", xml_config_prefix="") -AC_ARG_WITH(xml-exec-prefix, - [ --with-xml-exec-prefix=PFX Exec prefix where libxml is installed (optional)], - xml_config_exec_prefix="$withval", xml_config_exec_prefix="") -AC_ARG_ENABLE(xmltest, - [ --disable-xmltest Do not try to compile and run a test LIBXML program],, - enable_xmltest=yes) - - if test x$xml_config_exec_prefix != x ; then - xml_config_args="$xml_config_args" - if test x${XML2_CONFIG+set} != xset ; then - XML2_CONFIG=$xml_config_exec_prefix/bin/xml2-config - fi - fi - if test x$xml_config_prefix != x ; then - xml_config_args="$xml_config_args --prefix=$xml_config_prefix" - if test x${XML2_CONFIG+set} != xset ; then - XML2_CONFIG=$xml_config_prefix/bin/xml2-config - fi - fi +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. - AC_PATH_PROG(XML2_CONFIG, xml2-config, no) - min_xml_version=ifelse([$1], ,2.0.0,[$1]) - AC_MSG_CHECKING(for libxml - version >= $min_xml_version) - no_xml="" - if test "$XML2_CONFIG" = "no" ; then - no_xml=yes - else - XML_CPPFLAGS=`$XML2_CONFIG $xml_config_args --cflags` - XML_LIBS=`$XML2_CONFIG $xml_config_args --libs` - xml_config_major_version=`$XML2_CONFIG $xml_config_args --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'` - xml_config_minor_version=`$XML2_CONFIG $xml_config_args --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'` - xml_config_micro_version=`$XML2_CONFIG $xml_config_args --version | \ - sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\3/'` - if test "x$enable_xmltest" = "xyes" ; then - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" - LIBS="$XML_LIBS $LIBS" -dnl -dnl Now check if the installed libxml is sufficiently new. -dnl (Also sanity checks the results of xml2-config to some extent) -dnl - rm -f conf.xmltest - AC_TRY_RUN([ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <libxml/xmlversion.h> - -int -main() -{ - int xml_major_version, xml_minor_version, xml_micro_version; - int major, minor, micro; - char *tmp_version; - - system("touch conf.xmltest"); - - /* Capture xml2-config output via autoconf/configure variables */ - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = (char *)strdup("$min_xml_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) { - printf("%s, bad version string from xml2-config\n", "$min_xml_version"); - exit(1); - } - free(tmp_version); - - /* Capture the version information from the header files */ - tmp_version = (char *)strdup(LIBXML_DOTTED_VERSION); - if (sscanf(tmp_version, "%d.%d.%d", &xml_major_version, &xml_minor_version, &xml_micro_version) != 3) { - printf("%s, bad version string from libxml includes\n", "LIBXML_DOTTED_VERSION"); - exit(1); - } - free(tmp_version); - - /* Compare xml2-config output to the libxml headers */ - if ((xml_major_version != $xml_config_major_version) || - (xml_minor_version != $xml_config_minor_version) || - (xml_micro_version != $xml_config_micro_version)) - { - printf("*** libxml header files (version %d.%d.%d) do not match\n", - xml_major_version, xml_minor_version, xml_micro_version); - printf("*** xml2-config (version %d.%d.%d)\n", - $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); - return 1; - } -/* Compare the headers to the library to make sure we match */ - /* Less than ideal -- doesn't provide us with return value feedback, - * only exits if there's a serious mismatch between header and library. - */ - LIBXML_TEST_VERSION; - - /* Test that the library is greater than our minimum version */ - if ((xml_major_version > major) || - ((xml_major_version == major) && (xml_minor_version > minor)) || - ((xml_major_version == major) && (xml_minor_version == minor) && - (xml_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of libxml (%d.%d.%d) was found.\n", - xml_major_version, xml_minor_version, xml_micro_version); - printf("*** You need a version of libxml newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** libxml is always available from ftp://ftp.xmlsoft.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the xml2-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); - printf("*** correct copy of xml2-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - return 1; -} -],, no_xml=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - fi - fi +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED - if test "x$no_xml" = x ; then - AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$XML2_CONFIG" = "no" ; then - echo "*** The xml2-config script installed by LIBXML could not be found" - echo "*** If libxml was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the XML2_CONFIG environment variable to the" - echo "*** full path to xml2-config." - else - if test -f conf.xmltest ; then - : - else - echo "*** Could not run libxml test program, checking why..." - CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" - LIBS="$LIBS $XML_LIBS" - AC_TRY_LINK([ -#include <libxml/xmlversion.h> -#include <stdio.h> -], [ LIBXML_TEST_VERSION; return 0;], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding LIBXML or finding the wrong" - echo "*** version of LIBXML. If it is not finding LIBXML, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means LIBXML was incorrectly installed" - echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" - echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - - XML_CPPFLAGS="" - XML_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(XML_CPPFLAGS) - AC_SUBST(XML_LIBS) - rm -f conf.xmltest -]) + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # diff --git a/configure.ac b/configure.ac index ac31bd0..7c64c86 100644 --- a/configure.ac +++ b/configure.ac @@ -14,8 +14,47 @@ AC_CHECK_TOOL([STRIP], [strip]) AC_CHECK_TOOL([ECHO], [echo]) AC_CHECK_TOOL([RM], [rm]) -dnl Check for libxml2 -AM_PATH_XML2([2.0.0]) +dnl ========================================================================== +dnl required minimum version of libxml2 +dnl replace "2.0.0" with an appropriate one +dnl ========================================================================== +LIBXML_REQUIRED="2.0.0" + +dnl ========================================================================== +dnl find libxml2 library, borrowed from xmlsec +dnl ========================================================================== +LIBXML_CONFIG="xml2-config" +LIBXML_CFLAGS="" +LIBXML_LIBS="" +LIBXML_FOUND="no" + +AC_ARG_WITH([libxml], AC_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) +if test "x$with_libxml" = "xno" ; then + AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) + AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) +elif test "x$with_libxml" = "x" && test "x$PKG_CONFIG" != "x" ; then + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, [LIBXML_FOUND=yes], [LIBXML_FOUND=no]) +fi +if test "$LIBXML_FOUND" = "no" ; then + if test "x$with_libxml" != "x" ; then + LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG + fi + AC_MSG_CHECKING(libxml2 $LIBXML_CONFIG >= $LIBXML_REQUIRED ) + if ! $LIBXML_CONFIG --version > /dev/null 2>&1 ; then + AC_MSG_ERROR([Could not find libxml2 anywhere (see config.log for details).]) + fi + vers=`$LIBXML_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + minvers=`echo $LIBXML_REQUIRED | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge "$minvers" ; then + LIBXML_LIBS="`$LIBXML_CONFIG --libs`" + LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`" + LIBXML_FOUND="yes" + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR( + [You need at least libxml2 $LIBXML_REQUIRED for this version of libvirt]) + fi +fi dnl Specific XML catalog file for validation of generated html AC_ARG_WITH([xml-catalog-file], diff --git a/src/Makefile.am b/src/Makefile.am index 9e89f9f..f7dcffc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ EXTRA_DIST = libvirt.c php_libvirt.h all-am: build clean-temp build: - $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(XML_CPPFLAGS) + $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(XML_CFLAGS) $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(XML_LIBS) $(ECHO) "Extension compiled as $(PACKAGE).so" -- 1.7.1

5 9

[libvirt] [RFC PATCH 0/2] audit cgroup ACL actions in qemu
by Eric Blake 22 Feb '11

22 Feb '11

I'm following up on danpb's patches to add initial audit support to qemu actions (see around commit 8dc136b in Oct 2010). Another useful thing to audit is all changes to the device ACL whitelist via the cgroup device controller - namely, any time that the qemu cgroup is altered to allow or deny access to a (set of) devices. I saw an alternate suggestion for collecting the needed audit information by using an inotify script outside of libvirt that monitors changes to the cgroup file system corresponding to each qemu instance; however, this had the drawback that it can only monitor that a change is being attempted, but not the actual change being made. It is necessary to use libvirt to provide the audit information, in order to have a rich enough set of information to make the audit worthwhile. I believe this patch series catches all instances where libvirt modifies the whitelist for a qemu instance, but I didn't do anything for when libvirt first creates a separate cgroup device whitelist as part of starting a new guest. Also, I'm not sure if the amount of information passed to the audit is adequate, or if it needs tweaking. Also, libvirt blindly passes a long list of paths through the low-level util/cgroup.c functions, including non-devices where it ignores the EINVAL failure later. But this could pollute the audit log with entries corresponding to cases where altering the actual cgroup was never even attempted. Should I tweak things to only do an audit when an actual cgroup change was attempted (perhaps by modifying util/cgroup.c to return 0 on success, 1 on skip, and -errno on failure, rather than the current -EINVAL on skip)? This is post-0.8.8 material. Eric Blake (2): audit: prepare qemu for listing vm in cgroup audits audit: add qemu hooks for auditing cgroup events src/qemu/qemu_audit.c | 48 ++++++++++++++++++++++++++++++- src/qemu/qemu_audit.h | 9 +++++- src/qemu/qemu_cgroup.c | 73 +++++++++++++++++++++++++++++++---------------- src/qemu/qemu_cgroup.h | 21 ++++++-------- src/qemu/qemu_driver.c | 12 +++++-- src/qemu/qemu_hotplug.c | 7 ++-- 6 files changed, 124 insertions(+), 46 deletions(-) -- 1.7.4

2 4

[libvirt] [PATCH] build: fix broken mingw cross-compilation
by Eric Blake 21 Feb '11

21 Feb '11

Two regressions: Commit df1011ca broke builds for systems that lack devmapper (non-Linux, as well as Linux with ./autogen.sh --without-libvirtd and without the libraries present). Commit ce6fd650 broke cross-compilation, due to a gnulib bug. * .gnulib: Update to latest, for cross-compilation fix. * src/util/util.c (virIsDevMapperDevice): Provide stub for platforms not using storage driver. * configure.ac (devmapper): Arrange to define HAVE_LIBDEVMAPPER_H. devmapper issue reported by Wen Congyang. --- Thankfully, neither regression was in the 0.8.7 release. Pushing this under the build-breaker rule, as verified by ./autobuild.sh. * .gnulib aa0f5d7...17adb5d (9): > longlong: skip, rather than fail, on cross-compilation > * NEWS: Mention 2011-02-08 change to stdlib. > getloadavg: Add comments about platforms. > getloadavg: Fix link error on Solaris 2.6. > * lib/getloadavg.c (getloadavg) [sgi]: Make ldav_off of type ptrdiff_t. > Oops, fix syntax error in last config.rpath commit. > havelib: Fix comments. > havelib: Update config.rpath. > getloadavg test: Add some plausibility checks. .gnulib | 2 +- configure.ac | 2 +- src/util/util.c | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index aa0f5d7..17adb5d 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit aa0f5d7586efe7044f6ca9e07be3f579ee0d5618 +Subproject commit 17adb5d75404cf6cdde0eb3b2edc6110d9fa8001 diff --git a/configure.ac b/configure.ac index f79babb..2b26e57 100644 --- a/configure.ac +++ b/configure.ac @@ -1711,12 +1711,12 @@ if test "$with_storage_mpath" = "yes"; then save_LIBS="$LIBS" save_CFLAGS="$CFLAGS" DEVMAPPER_FOUND=yes - AC_CHECK_HEADER([libdevmapper.h],,[DEVMAPPER_FOUND=no]) AC_CHECK_LIB([devmapper], [dm_task_run],,[DEVMAPPER_FOUND=no]) DEVMAPPER_LIBS="-ldevmapper" LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" fi + AC_CHECK_HEADERS([libdevmapper.h],,[DEVMAPPER_FOUND=no]) if test "$DEVMAPPER_FOUND" = "no" ; then AC_MSG_ERROR([You must install device-mapper-devel/libdevmapper >= $DEVMAPPER_REQUIRED to compile libvirt]) fi diff --git a/src/util/util.c b/src/util/util.c index a7ce4b3..cbdae67 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -45,7 +45,9 @@ #include <string.h> #include <signal.h> #include <termios.h> -#include <libdevmapper.h> +#if HAVE_LIBDEVMAPPER_H +# include <libdevmapper.h> +#endif #include "c-ctype.h" #ifdef HAVE_PATHS_H @@ -3125,6 +3127,7 @@ virTimestamp(void) return timestamp; } +#if HAVE_LIBDEVMAPPER_H bool virIsDevMapperDevice(const char *devname) { @@ -3137,3 +3140,9 @@ virIsDevMapperDevice(const char *devname) return false; } +#else +bool virIsDevMapperDevice(const char *devname ATTRIBUTE_UNUSED) +{ + return false; +} +#endif -- 1.7.4

2 2

[libvirt] [PATCH 1/2] virt-pki-validate: behave when CERTTOOL is missing
by Dan Kenigsberg 21 Feb '11

21 Feb '11

--- tools/virt-pki-validate.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 207fa76..96659cf 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -14,7 +14,7 @@ PORT=16514 # First get certtool # CERTOOL=`which certtool 2>/dev/null` -if [ ! -x $CERTOOL ] +if [ ! -x "$CERTOOL" ] then echo "Could not locate the certtool program" echo "make sure the gnutls-utils (or gnutls-bin) package is installed" -- 1.7.4

3 7

[libvirt] [PATCH 0/8] Refactored SEXPR and XM code
by Markus Groß 21 Feb '11

21 Feb '11

Hi, this is a reworked version of my patch that refactors the XM and SEXPR parsing routines from the xen-unified driver into a seperate directory (xenxs; x for xm and s for sexpr). This way different xen-drivers besides xen-unified are able to use the parsing functionality. For example the upcoming XenLight (libxl) driver. Because the XM functions reuse code from the SEXPR parsing functions I had to move the SEXPR functions too. To use the XM parsing functions one includes "xen_xm.h" and for SEXPR parsing "xen_sxpr.h". The first patch just moves the sexpr.c.h files to src/util. The second patch moves some general sexpr functions from xen-unified to the sexpr unit. With the patches 3 and 4 the SEXPR parsing/formatting functions from xen-unified are moved to a new unit xen_sxpr.c. Patches 5 and 6 do the same for the XM functions. Patch 7 removes driver-references from the function names in xenxs. Some parsing functions required a driver object to fetch the tty path and vncport. I removed all references to a specific driver and added additional parameters as a replacement. The tests sexpr2xml, xmconfig and xml2sexpr are adapted and show no error. Thanks in advance for your comments about this. Markus Groß (8): Moved SEXPR unit to utils Moved some SEXPR functions from xen-unified Moved SEXPR parsing functions to xenxs Moved SEXPR formatting functions to xenxs Moved XM parsing functions to xenxs Moved XM formatting functions to xenxs Renamed functions in xenxs Added to AUTHORS AUTHORS | 1 + po/POTFILES.in | 2 + src/Makefile.am | 16 +- src/{xen => util}/sexpr.c | 64 + src/{xen => util}/sexpr.h | 6 + src/xen/xen_driver.c | 19 +- src/xen/xend_internal.c | 6668 +++++++++++++++------------------------------ src/xen/xend_internal.h | 30 - src/xen/xm_internal.c | 1702 +------------ src/xen/xm_internal.h | 3 - src/xenxs/xen_sxpr.c | 2197 +++++++++++++++ src/xenxs/xen_sxpr.h | 66 + src/xenxs/xen_xm.c | 1724 ++++++++++++ src/xenxs/xen_xm.h | 39 + src/xenxs/xenxs_private.h | 63 + tests/sexpr2xmltest.c | 12 +- tests/xmconfigtest.c | 5 +- tests/xml2sexprtest.c | 3 +- 18 files changed, 6437 insertions(+), 6183 deletions(-) rename src/{xen => util}/sexpr.c (90%) rename src/{xen => util}/sexpr.h (88%) create mode 100644 src/xenxs/xen_sxpr.c create mode 100644 src/xenxs/xen_sxpr.h create mode 100644 src/xenxs/xen_xm.c create mode 100644 src/xenxs/xen_xm.h create mode 100644 src/xenxs/xenxs_private.h -- 1.7.4.1

3 19

[libvirt] [PATCH] protect the scsi controller to be deleted when it is in use
by Wen Congyang 21 Feb '11

21 Feb '11

Steps to reproduce this bug: 1. virsh attach-disk domain --source imagefile --target sdb --sourcetype file --driver qemu --subdriver raw 2. virsh detach-device controller.xml # remove scsi controller 0 3. virsh detach-disk domain sdb error: Failed to detach disk error: operation failed: detaching scsi0-0-1 device failed: Device 'scsi0-0-1' not found I think we should not detach a controller when it is used by some other device. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/qemu/qemu_hotplug.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fb9db5a..2c8bc3b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1297,6 +1297,56 @@ cleanup: return ret; } +static bool qemuDomainDiskControllerIsBusy(virDomainObjPtr vm, + virDomainControllerDefPtr detach) +{ + int i; + virDomainDiskDefPtr disk; + + for (i = 0; i < vm->def->ndisks; i++) { + disk = vm->def->disks[i]; + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + /* the disk does not use disk controller */ + continue; + + /* check whether the disk uses this type controller */ + if (disk->bus == VIR_DOMAIN_DISK_BUS_IDE && + detach->type != VIR_DOMAIN_CONTROLLER_TYPE_IDE) + continue; + if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC && + detach->type != VIR_DOMAIN_CONTROLLER_TYPE_FDC) + continue; + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + detach->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + continue; + + if (disk->info.addr.drive.controller == detach->idx) + return true; + } + + return false; +} + +static bool qemuDomainControllerIsBusy(virDomainObjPtr vm, + virDomainControllerDefPtr detach) +{ + switch (detach->type) { + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + return qemuDomainDiskControllerIsBusy(vm, detach); + + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + default: + /* libvirt does not support sata controller, and does not support to + * detach virtio and smart card controller. + */ + return true; + } +} + int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev, @@ -1329,6 +1379,12 @@ int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver, goto cleanup; } + if (qemuDomainControllerIsBusy(vm, detach)) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be detached: device is busy")); + goto cleanup; + } + if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { if (qemuAssignDeviceControllerAlias(detach) < 0) goto cleanup; -- 1.7.1

3 2

[libvirt] [PATCH] maint: fix grammar in error message
by Eric Blake 21 Feb '11

21 Feb '11

* python/tests/create.py: Use correct wording. --- Pushed under the trivial rule. python/tests/create.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/tests/create.py b/python/tests/create.py index 4e5f644..95e31a9 100755 --- a/python/tests/create.py +++ b/python/tests/create.py @@ -40,13 +40,13 @@ elif kernelOv.find('xen0'): initrdU = "/boot/initrd-" + kernelOv.replace('xen0', 'xenU') + ".img" if not os.access(kernelU, os.R_OK): - print "Did not found the guest kernel %s" % (kernelU) + print "Did not find the guest kernel %s" % (kernelU) sys.exit(1) kernelU = "<kernel>" + kernelU + "</kernel>" if not os.access(initrdU, os.R_OK): - print "Did not found the guest initrd %s" % (initrdU) + print "Did not find the guest initrd %s" % (initrdU) initrdU = "" else: initrdU = "<initrd>" + initrdU + "</initrd>" -- 1.7.4

1 0

[libvirt] [PATCHv2 0/3] more VPATH build fixes
by Eric Blake 21 Feb '11

21 Feb '11

Technically, this is a v2 of messages I've sent before, but now provided as a single series; see each commit for earlier references. I tested these on top of this unreviewed patch: https://www.redhat.com/archives/libvir-list/2011-February/msg00616.html but suspect that they will trivially rebase. I tested six combinations: in-tree incremental git checkout (my usual dev tree) in-tree fresh clone git checkout in-tree expanded tarball outside git VPATH fresh clone git checkout (note that ./autogen.sh tries to do an in-tree build as the very first thing, but './autogen.sh --help' is sufficient to stop things before ./configure, to set up the VPATH) VPATH incremental git checkout VPATH expanded tarball outside git In each combination, I tested that 'make distcheck' and './autobuild.sh' were able to succeed, including full mingw cross-compilation. That made testing this rather time-consuming in relation to the size of the diffstat. Eric Blake (3): build: don't require pod2man for tarball builds maint: fix 'make dist' in VPATH build autobuild.sh: use VPATH build .gitignore | 1 + autobuild.sh | 10 +++++----- bootstrap.conf | 10 ++++++++++ daemon/.gitignore | 3 ++- daemon/Makefile.am | 10 ++++++---- docs/Makefile.am | 2 +- tools/Makefile.am | 15 ++++++++------- 7 files changed, 33 insertions(+), 18 deletions(-) -- 1.7.4

2 7

[libvirt] [PATCH 0/2 v3] Add support for multiple serial ports into the Xen driver
by Michal Novotny 21 Feb '11

21 Feb '11

Hi, this is the patch to add support for multiple serial ports to the libvirt Xen driver. It support both old style (serial = "pty") and new style (serial = [ "/dev/ttyS0", "/dev/ttyS1" ]) definition and tests for xml2sexpr, sexpr2xml and xmconfig have been added as well. Written and tested on RHEL-5 Xen dom0 and working as designed but the Xen version have to have patch for RHBZ #614004 but this patch is for upstream version of libvirt. Also, this patch is addressing issue described in RHBZ #670789. Differences between v2 and v3: * Fixed handling of port number in virDomainChrDefParseTargetXML() * Fixed serial port handling if we have definition of device in non-zero port number * Added second test for first port undefined (i.e. port value > 0 for just one serial port) Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> Michal Novotny (2): Fix virDomainChrDefParseTargetXML() to parse the target port if available Add support for multiple serial ports into the Xen driver src/conf/domain_conf.c | 7 +- src/xen/xend_internal.c | 86 ++++++++++-- src/xen/xm_internal.c | 137 ++++++++++++++++--- .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 1 + .../sexpr2xml-fv-serial-dev-2-ports.xml | 53 ++++++++ .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 1 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 49 +++++++ tests/sexpr2xmltest.c | 2 + .../test-fullvirt-serial-dev-2-ports.cfg | 25 ++++ .../test-fullvirt-serial-dev-2-ports.xml | 55 ++++++++ .../test-fullvirt-serial-dev-2nd-port.cfg | 25 ++++ .../test-fullvirt-serial-dev-2nd-port.xml | 53 ++++++++ tests/xmconfigtest.c | 2 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.xml | 44 +++++++ .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2nd-port.xml | 40 ++++++ tests/xml2sexprtest.c | 2 + 18 files changed, 546 insertions(+), 38 deletions(-) create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml create mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml create mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml -- 1.7.3.2

2 9

[libvirt] [PATCH] maint: kill all remaining uses of old DEBUG macro
by Eric Blake 21 Feb '11

21 Feb '11

Done mechanically with: $ git grep -l '\bDEBUG0\? *(' | xargs -L1 sed -i 's/\bDEBUG0\? *(/VIR_&/' followed by manual deletion of qemudDebug in daemon/libvirtd.c, along with a single 'make syntax-check' fallout in the same file, and the actual deletion in src/util/logging.h. * src/util/logging.h (DEBUG, DEBUG0): Delete. * daemon/libvirtd.h (qemudDebug): Likewise. * global: Change remaining clients over to VIR_DEBUG counterpart. --- Obviously a post-0.8.8 cleanup, but I might as well get feedback on it now. daemon/dispatch.c | 8 +- daemon/event.c | 12 +- daemon/libvirtd.c | 32 +- daemon/libvirtd.h | 4 +- daemon/mdns.c | 2 +- daemon/remote.c | 2 +- daemon/stream.c | 24 +- .../0004-implement-the-public-APIs.patch | 4 +- examples/domain-events/events-c/event-test.c | 28 +- src/datatypes.c | 72 ++-- src/driver.c | 2 +- src/libvirt-qemu.c | 2 +- src/libvirt.c | 398 ++++++++++---------- src/lxc/lxc_container.c | 16 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 8 +- src/lxc/veth.c | 10 +- src/node_device/node_device_hal.c | 18 +- src/qemu/qemu_driver.c | 44 ++-- src/qemu/qemu_monitor.c | 104 +++--- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_monitor_text.c | 18 +- src/remote/remote_driver.c | 112 +++--- src/security/security_dac.c | 2 +- src/storage/storage_backend_disk.c | 8 +- src/test/test_driver.c | 2 +- src/util/logging.h | 10 +- src/util/util.c | 6 +- src/vbox/vbox_driver.c | 16 +- src/vbox/vbox_tmpl.c | 258 +++++++------- src/xen/xen_driver.c | 28 +- src/xen/xen_hypervisor.c | 20 +- src/xen/xen_inotify.c | 20 +- src/xen/xend_internal.c | 10 +- src/xen/xm_internal.c | 12 +- src/xen/xs_internal.c | 12 +- 36 files changed, 660 insertions(+), 668 deletions(-) diff --git a/daemon/dispatch.c b/daemon/dispatch.c index bf2ac73..3397a00 100644 --- a/daemon/dispatch.c +++ b/daemon/dispatch.c @@ -141,7 +141,7 @@ remoteSerializeError(struct qemud_client *client, unsigned int len; struct qemud_client_message *msg = NULL; - DEBUG("prog=%d ver=%d proc=%d type=%d serial=%d, msg=%s", + VIR_DEBUG("prog=%d ver=%d proc=%d type=%d serial=%d, msg=%s", program, version, procedure, type, serial, rerr->message ? *rerr->message : "(none)"); @@ -372,7 +372,7 @@ remoteDispatchClientRequest(struct qemud_server *server, remote_error rerr; bool qemu_call; - DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d", + VIR_DEBUG("prog=%d ver=%d type=%d status=%d serial=%d proc=%d", msg->hdr.prog, msg->hdr.vers, msg->hdr.type, msg->hdr.status, msg->hdr.serial, msg->hdr.proc); @@ -631,7 +631,7 @@ remoteSendStreamData(struct qemud_client *client, struct qemud_client_message *msg; XDR xdr; - DEBUG("client=%p stream=%p data=%p len=%d", client, stream, data, len); + VIR_DEBUG("client=%p stream=%p data=%p len=%d", client, stream, data, len); if (VIR_ALLOC(msg) < 0) { return -1; @@ -682,7 +682,7 @@ remoteSendStreamData(struct qemud_client *client, xdr_destroy (&xdr); - DEBUG("Total %d", msg->bufferOffset); + VIR_DEBUG("Total %d", msg->bufferOffset); } if (data) msg->streamTX = 1; diff --git a/daemon/event.c b/daemon/event.c index 4c97fb9..1a31717 100644 --- a/daemon/event.c +++ b/daemon/event.c @@ -37,7 +37,7 @@ #include "util.h" #include "ignore-value.h" -#define EVENT_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__) +#define EVENT_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) static int virEventInterruptLocked(void); @@ -390,7 +390,7 @@ static int virEventDispatchTimeouts(void) { int i; /* Save this now - it may be changed during dispatch */ int ntimeouts = eventLoop.timeoutsCount; - DEBUG("Dispatch %d", ntimeouts); + VIR_DEBUG("Dispatch %d", ntimeouts); if (gettimeofday(&tv, NULL) < 0) { return -1; @@ -435,7 +435,7 @@ static int virEventDispatchTimeouts(void) { */ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { int i, n; - DEBUG("Dispatch %d", nfds); + VIR_DEBUG("Dispatch %d", nfds); /* NB, use nfds not eventLoop.handlesCount, because new * fds might be added on end of list, and they're not @@ -449,7 +449,7 @@ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { if (i == eventLoop.handlesCount) break; - DEBUG("i=%d w=%d", i, eventLoop.handles[i].watch); + VIR_DEBUG("i=%d w=%d", i, eventLoop.handles[i].watch); if (eventLoop.handles[i].deleted) { EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i, eventLoop.handles[i].watch, eventLoop.handles[i].fd); @@ -480,7 +480,7 @@ static int virEventDispatchHandles(int nfds, struct pollfd *fds) { static int virEventCleanupTimeouts(void) { int i; size_t gap; - DEBUG("Cleanup %zu", eventLoop.timeoutsCount); + VIR_DEBUG("Cleanup %zu", eventLoop.timeoutsCount); /* Remove deleted entries, shuffling down remaining * entries as needed to form contiguous series @@ -523,7 +523,7 @@ static int virEventCleanupTimeouts(void) { static int virEventCleanupHandles(void) { int i; size_t gap; - DEBUG("Cleanup %zu", eventLoop.handlesCount); + VIR_DEBUG("Cleanup %zu", eventLoop.handlesCount); /* Remove deleted entries, shuffling down remaining * entries as needed to form contiguous series diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index f4b3327..b2e5e20 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1,7 +1,7 @@ /* * libvirtd.c: daemon start of day, guest process & i/o management * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -310,7 +310,7 @@ remoteInitializeGnuTLS (void) if (remoteCheckCertFile("CA certificate", ca_file) < 0) return -1; - qemudDebug ("loading CA cert from %s", ca_file); + VIR_DEBUG("loading CA cert from %s", ca_file); err = gnutls_certificate_set_x509_trust_file (x509_cred, ca_file, GNUTLS_X509_FMT_PEM); if (err < 0) { @@ -324,7 +324,7 @@ remoteInitializeGnuTLS (void) if (remoteCheckCertFile("CA revocation list", crl_file) < 0) return -1; - DEBUG("loading CRL from %s", crl_file); + VIR_DEBUG("loading CRL from %s", crl_file); err = gnutls_certificate_set_x509_crl_file (x509_cred, crl_file, GNUTLS_X509_FMT_PEM); if (err < 0) { @@ -339,7 +339,7 @@ remoteInitializeGnuTLS (void) return -1; if (remoteCheckCertFile("server key", key_file) < 0) return -1; - DEBUG("loading cert and key from %s and %s", cert_file, key_file); + VIR_DEBUG("loading cert and key from %s and %s", cert_file, key_file); err = gnutls_certificate_set_x509_key_file (x509_cred, cert_file, key_file, @@ -1150,7 +1150,7 @@ remoteCheckDN (const char *dname) } /* Print the client's DN. */ - DEBUG(_("remoteCheckDN: failed: client DN is %s"), dname); + VIR_DEBUG("remoteCheckDN: failed: client DN is %s", dname); return 0; /* Not found. */ } @@ -1531,7 +1531,7 @@ void qemudDispatchClientFailure(struct qemud_client *client) { for (i = 0 ; i < VIR_DOMAIN_EVENT_ID_LAST ; i++) { if (client->domainEventCallbackID[i] != -1) { - DEBUG("Deregistering to relay remote events %d", i); + VIR_DEBUG("Deregistering to relay remote events %d", i); virConnectDomainEventDeregisterAny(client->conn, client->domainEventCallbackID[i]); } @@ -1678,7 +1678,7 @@ static ssize_t qemudClientReadBuf(struct qemud_client *client, return -1; } - /*qemudDebug ("qemudClientRead: len = %d", len);*/ + /* VIR_DEBUG("qemudClientRead: len = %d", len);*/ if (!client->tlssession) { char ebuf[1024]; @@ -1812,7 +1812,7 @@ static ssize_t qemudClientRead(struct qemud_client *client) { */ static void qemudDispatchClientRead(struct qemud_server *server, struct qemud_client *client) { - /*qemudDebug ("qemudDispatchClientRead: mode = %d", client->mode);*/ + /* VIR_DEBUG("qemudDispatchClientRead: mode = %d", client->mode);*/ readmore: if (qemudClientRead(client) < 0) @@ -1830,14 +1830,14 @@ readmore: if (!xdr_u_int(&x, &len)) { xdr_destroy (&x); - DEBUG0("Failed to decode packet length"); + VIR_DEBUG0("Failed to decode packet length"); qemudDispatchClientFailure(client); return; } xdr_destroy (&x); if (len < REMOTE_MESSAGE_HEADER_XDR_LEN) { - DEBUG("Packet length %u too small", len); + VIR_DEBUG("Packet length %u too small", len); qemudDispatchClientFailure(client); return; } @@ -1846,7 +1846,7 @@ readmore: len -= REMOTE_MESSAGE_HEADER_XDR_LEN; if (len > REMOTE_MESSAGE_MAX) { - DEBUG("Packet length %u too large", len); + VIR_DEBUG("Packet length %u too large", len); qemudDispatchClientFailure(client); return; } @@ -2283,10 +2283,10 @@ static void qemudInactiveTimer(int timerid, void *data) { if (virStateActive() || server->clients) { - DEBUG0("Timer expired but still active, not shutting down"); + VIR_DEBUG0("Timer expired but still active, not shutting down"); virEventUpdateTimeoutImpl(timerid, -1); } else { - DEBUG0("Timer expired and inactive, shutting down"); + VIR_DEBUG0("Timer expired and inactive, shutting down"); server->quitEventThread = 1; } } @@ -2357,14 +2357,14 @@ static void *qemudRunLoop(void *opaque) { if (timeout > 0) { if (timerActive) { if (server->clients) { - DEBUG("Deactivating shutdown timer %d", timerid); + VIR_DEBUG("Deactivating shutdown timer %d", timerid); virEventUpdateTimeoutImpl(timerid, -1); timerActive = 0; } } else { if (!virStateActive() && !server->clients) { - DEBUG("Activating shutdown timer %d", timerid); + VIR_DEBUG("Activating shutdown timer %d", timerid); virEventUpdateTimeoutImpl(timerid, timeout * 1000); timerActive = 1; } @@ -2374,7 +2374,7 @@ static void *qemudRunLoop(void *opaque) { virMutexUnlock(&server->lock); if (qemudOneLoop() < 0) { virMutexLock(&server->lock); - DEBUG0("Loop iteration error, exiting"); + VIR_DEBUG0("Loop iteration error, exiting"); break; } virMutexLock(&server->lock); diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index af20e56..7da3cfd 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -1,7 +1,7 @@ /* * libvirtd.h: daemon data structure definitions * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -128,8 +128,6 @@ # endif # endif -# define qemudDebug DEBUG - /* Whether we're passing reads & writes through a sasl SSF */ enum qemud_sasl_ssf { QEMUD_SASL_SSF_NONE = 0, diff --git a/daemon/mdns.c b/daemon/mdns.c index ae8dc40..8be3aa9 100644 --- a/daemon/mdns.c +++ b/daemon/mdns.c @@ -42,7 +42,7 @@ #include "event.h" #include "memory.h" -#define AVAHI_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__) +#define AVAHI_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) struct libvirtd_mdns_entry { char *type; diff --git a/daemon/remote.c b/daemon/remote.c index d53b466..c5509ad 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -62,7 +62,7 @@ #include "libvirt/libvirt-qemu.h" #define VIR_FROM_THIS VIR_FROM_REMOTE -#define REMOTE_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__) +#define REMOTE_DEBUG(fmt, ...) VIR_DEBUG(fmt, __VA_ARGS__) static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); diff --git a/daemon/stream.c b/daemon/stream.c index cac54ea..967aea2 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -82,7 +82,7 @@ remoteStreamEvent(virStreamPtr st, int events, void *opaque) goto cleanup; } - DEBUG("st=%p events=%d", st, events); + VIR_DEBUG("st=%p events=%d", st, events); if (events & VIR_STREAM_EVENT_WRITABLE) { if (remoteStreamHandleWrite(client, stream) < 0) { @@ -149,7 +149,7 @@ remoteStreamFilter(struct qemud_client *client, if (msg->hdr.serial == stream->serial && msg->hdr.proc == stream->procedure && msg->hdr.type == REMOTE_STREAM) { - DEBUG("Incoming rx=%p serial=%d proc=%d status=%d", + VIR_DEBUG("Incoming rx=%p serial=%d proc=%d status=%d", stream->rx, msg->hdr.proc, msg->hdr.serial, msg->hdr.status); /* If there are queued packets, we need to queue all further @@ -207,7 +207,7 @@ remoteCreateClientStream(virConnectPtr conn, { struct qemud_client_stream *stream; - DEBUG("proc=%d serial=%d", hdr->proc, hdr->serial); + VIR_DEBUG("proc=%d serial=%d", hdr->proc, hdr->serial); if (VIR_ALLOC(stream) < 0) return NULL; @@ -241,7 +241,7 @@ void remoteFreeClientStream(struct qemud_client *client, if (!stream) return; - DEBUG("proc=%d serial=%d", stream->procedure, stream->serial); + VIR_DEBUG("proc=%d serial=%d", stream->procedure, stream->serial); msg = stream->rx; while (msg) { @@ -265,7 +265,7 @@ int remoteAddClientStream(struct qemud_client *client, { struct qemud_client_stream *tmp = client->streams; - DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial); + VIR_DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial); if (virStreamEventAddCallback(stream->st, 0, remoteStreamEvent, client, NULL) < 0) @@ -328,7 +328,7 @@ int remoteRemoveClientStream(struct qemud_client *client, struct qemud_client_stream *stream) { - DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial); + VIR_DEBUG("client=%p proc=%d serial=%d", client, stream->procedure, stream->serial); struct qemud_client_stream *curr = client->streams; struct qemud_client_stream *prev = NULL; @@ -381,7 +381,7 @@ remoteStreamHandleWriteData(struct qemud_client *client, remote_error rerr; int ret; - DEBUG("stream=%p proc=%d serial=%d len=%d offset=%d", + VIR_DEBUG("stream=%p proc=%d serial=%d len=%d offset=%d", stream, msg->hdr.proc, msg->hdr.serial, msg->bufferLength, msg->bufferOffset); memset(&rerr, 0, sizeof rerr); @@ -426,7 +426,7 @@ remoteStreamHandleFinish(struct qemud_client *client, remote_error rerr; int ret; - DEBUG("stream=%p proc=%d serial=%d", + VIR_DEBUG("stream=%p proc=%d serial=%d", stream, msg->hdr.proc, msg->hdr.serial); memset(&rerr, 0, sizeof rerr); @@ -460,7 +460,7 @@ remoteStreamHandleAbort(struct qemud_client *client, { remote_error rerr; - DEBUG("stream=%p proc=%d serial=%d", + VIR_DEBUG("stream=%p proc=%d serial=%d", stream, msg->hdr.proc, msg->hdr.serial); memset(&rerr, 0, sizeof rerr); @@ -495,7 +495,7 @@ remoteStreamHandleWrite(struct qemud_client *client, { struct qemud_client_message *msg, *tmp; - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); msg = stream->rx; while (msg && !stream->closed) { @@ -550,7 +550,7 @@ remoteStreamHandleRead(struct qemud_client *client, size_t bufferLen = REMOTE_MESSAGE_PAYLOAD_MAX; int ret; - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); /* Shouldn't ever be called unless we're marked able to * transmit, but doesn't hurt to check */ @@ -603,7 +603,7 @@ remoteStreamMessageFinished(struct qemud_client *client, stream = stream->next; } - DEBUG("Message client=%p stream=%p proc=%d serial=%d", client, stream, msg->hdr.proc, msg->hdr.serial); + VIR_DEBUG("Message client=%p stream=%p proc=%d serial=%d", client, stream, msg->hdr.proc, msg->hdr.serial); if (stream) { stream->tx = 1; diff --git a/docs/api_extension/0004-implement-the-public-APIs.patch b/docs/api_extension/0004-implement-the-public-APIs.patch index 96c3439..7f13f0a 100644 --- a/docs/api_extension/0004-implement-the-public-APIs.patch +++ b/docs/api_extension/0004-implement-the-public-APIs.patch @@ -62,7 +62,7 @@ index 629d97b..1b39210 100644 + unsigned int flags) +{ + virConnectPtr conn; -+ DEBUG("domain=%p, nvcpus=%u, flags=%u", domain, nvcpus, flags); ++ VIR_DEBUG("domain=%p, nvcpus=%u, flags=%u", domain, nvcpus, flags); + + virResetLastError(); + @@ -125,7 +125,7 @@ index 629d97b..1b39210 100644 +virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) +{ + virConnectPtr conn; -+ DEBUG("domain=%p, flags=%u", domain, flags); ++ VIR_DEBUG("domain=%p, flags=%u", domain, flags); + + virResetLastError(); + diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 74eabba..6e3a160 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -10,9 +10,9 @@ # include <sys/poll.h> # include <libvirt/libvirt.h> -# define DEBUG0(fmt) printf("%s:%d :: " fmt "\n", \ +# define VIR_DEBUG0(fmt) printf("%s:%d :: " fmt "\n", \ __func__, __LINE__) -# define DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", \ +# define VIR_DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", \ __func__, __LINE__, __VA_ARGS__) # define STREQ(a,b) (strcmp(a,b) == 0) @@ -300,7 +300,7 @@ int myEventAddHandleFunc(int fd, int event, void *opaque, virFreeCallback ff) { - DEBUG("Add handle %d %d %p %p", fd, event, cb, opaque); + VIR_DEBUG("Add handle %d %d %p %p", fd, event, cb, opaque); h_fd = fd; h_event = myEventHandleTypeToPollEvent(event); h_cb = cb; @@ -311,14 +311,14 @@ int myEventAddHandleFunc(int fd, int event, void myEventUpdateHandleFunc(int fd, int event) { - DEBUG("Updated Handle %d %d", fd, event); + VIR_DEBUG("Updated Handle %d %d", fd, event); h_event = myEventHandleTypeToPollEvent(event); return; } int myEventRemoveHandleFunc(int fd) { - DEBUG("Removed Handle %d", fd); + VIR_DEBUG("Removed Handle %d", fd); h_fd = 0; if (h_ff) (h_ff)(h_opaque); @@ -330,7 +330,7 @@ int myEventAddTimeoutFunc(int timeout, void *opaque, virFreeCallback ff) { - DEBUG("Adding Timeout %d %p %p", timeout, cb, opaque); + VIR_DEBUG("Adding Timeout %d %p %p", timeout, cb, opaque); t_active = 1; t_timeout = timeout; t_cb = cb; @@ -341,13 +341,13 @@ int myEventAddTimeoutFunc(int timeout, void myEventUpdateTimeoutFunc(int timer ATTRIBUTE_UNUSED, int timeout) { - /*DEBUG("Timeout updated %d %d", timer, timeout);*/ + /*VIR_DEBUG("Timeout updated %d %d", timer, timeout);*/ t_timeout = timeout; } int myEventRemoveTimeoutFunc(int timer) { - DEBUG("Timeout removed %d", timer); + VIR_DEBUG("Timeout removed %d", timer); t_active = 0; if (t_ff) (t_ff)(t_opaque); @@ -408,7 +408,7 @@ int main(int argc, char **argv) sigaction(SIGTERM, &action_stop, NULL); sigaction(SIGINT, &action_stop, NULL); - DEBUG0("Registering domain event cbs"); + VIR_DEBUG0("Registering domain event cbs"); /* Add 2 callbacks to prove this works with more than just one */ callback1ret = virConnectDomainEventRegister(dconn, myDomainEventCallback1, @@ -464,15 +464,15 @@ int main(int argc, char **argv) } if (sts == 0) { - /* DEBUG0("Poll timeout"); */ + /* VIR_DEBUG0("Poll timeout"); */ continue; } if (sts < 0 ) { - DEBUG0("Poll failed"); + VIR_DEBUG0("Poll failed"); continue; } if ( pfd.revents & POLLHUP ) { - DEBUG0("Reset by peer"); + VIR_DEBUG0("Reset by peer"); return -1; } @@ -485,7 +485,7 @@ int main(int argc, char **argv) } - DEBUG0("Deregistering event handlers"); + VIR_DEBUG0("Deregistering event handlers"); virConnectDomainEventDeregister(dconn, myDomainEventCallback1); virConnectDomainEventDeregisterAny(dconn, callback2ret); virConnectDomainEventDeregisterAny(dconn, callback3ret); @@ -495,7 +495,7 @@ int main(int argc, char **argv) virConnectDomainEventDeregisterAny(dconn, callback7ret); } - DEBUG0("Closing connection"); + VIR_DEBUG0("Closing connection"); if( dconn && virConnectClose(dconn)<0 ) { printf("error closing\n"); } diff --git a/src/datatypes.c b/src/datatypes.c index d870e5d..0e99268 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -243,7 +243,7 @@ failed: */ static void virReleaseConnect(virConnectPtr conn) { - DEBUG("release connection %p", conn); + VIR_DEBUG("release connection %p", conn); /* make sure to release the connection lock before we call the * close callbacks, otherwise we will deadlock if an error @@ -311,7 +311,7 @@ virUnrefConnect(virConnectPtr conn) { return -1; } virMutexLock(&conn->lock); - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; refs = conn->refs; if (refs == 0) { @@ -389,9 +389,9 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { goto error; } conn->refs++; - DEBUG("New hash entry %p", ret); + VIR_DEBUG("New hash entry %p", ret); } else { - DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); + VIR_DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); } ret->refs++; virMutexUnlock(&conn->lock); @@ -423,7 +423,7 @@ virReleaseDomain(virDomainPtr domain) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(domain->uuid, uuidstr); - DEBUG("release domain %p %s %s", domain, domain->name, uuidstr); + VIR_DEBUG("release domain %p %s %s", domain, domain->name, uuidstr); if (virHashRemoveEntry(conn->domains, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -440,7 +440,7 @@ virReleaseDomain(virDomainPtr domain) { VIR_FREE(domain); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -470,7 +470,7 @@ virUnrefDomain(virDomainPtr domain) { return -1; } virMutexLock(&domain->conn->lock); - DEBUG("unref domain %p %s %d", domain, domain->name, domain->refs); + VIR_DEBUG("unref domain %p %s %d", domain, domain->name, domain->refs); domain->refs--; refs = domain->refs; if (refs == 0) { @@ -572,7 +572,7 @@ virReleaseNetwork(virNetworkPtr network) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(network->uuid, uuidstr); - DEBUG("release network %p %s %s", network, network->name, uuidstr); + VIR_DEBUG("release network %p %s %s", network, network->name, uuidstr); if (virHashRemoveEntry(conn->networks, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -586,7 +586,7 @@ virReleaseNetwork(virNetworkPtr network) { VIR_FREE(network); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -617,7 +617,7 @@ virUnrefNetwork(virNetworkPtr network) { return -1; } virMutexLock(&network->conn->lock); - DEBUG("unref network %p %s %d", network, network->name, network->refs); + VIR_DEBUG("unref network %p %s %d", network, network->name, network->refs); network->refs--; refs = network->refs; if (refs == 0) { @@ -756,7 +756,7 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) { static void virReleaseInterface(virInterfacePtr iface) { virConnectPtr conn = iface->conn; - DEBUG("release interface %p %s", iface, iface->name); + VIR_DEBUG("release interface %p %s", iface, iface->name); if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) { /* unlock before reporting error because error report grabs lock */ @@ -773,7 +773,7 @@ virReleaseInterface(virInterfacePtr iface) { VIR_FREE(iface); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -804,7 +804,7 @@ virUnrefInterface(virInterfacePtr iface) { return -1; } virMutexLock(&iface->conn->lock); - DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs); + VIR_DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs); iface->refs--; refs = iface->refs; if (refs == 0) { @@ -909,7 +909,7 @@ virReleaseStoragePool(virStoragePoolPtr pool) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(pool->uuid, uuidstr); - DEBUG("release pool %p %s %s", pool, pool->name, uuidstr); + VIR_DEBUG("release pool %p %s %s", pool, pool->name, uuidstr); if (virHashRemoveEntry(conn->storagePools, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -923,7 +923,7 @@ virReleaseStoragePool(virStoragePoolPtr pool) { VIR_FREE(pool); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -954,7 +954,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) { return -1; } virMutexLock(&pool->conn->lock); - DEBUG("unref pool %p %s %d", pool, pool->name, pool->refs); + VIR_DEBUG("unref pool %p %s %d", pool, pool->name, pool->refs); pool->refs--; refs = pool->refs; if (refs == 0) { @@ -1066,7 +1066,7 @@ error: static void virReleaseStorageVol(virStorageVolPtr vol) { virConnectPtr conn = vol->conn; - DEBUG("release vol %p %s", vol, vol->name); + VIR_DEBUG("release vol %p %s", vol, vol->name); if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -1081,7 +1081,7 @@ virReleaseStorageVol(virStorageVolPtr vol) { VIR_FREE(vol); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -1112,7 +1112,7 @@ virUnrefStorageVol(virStorageVolPtr vol) { return -1; } virMutexLock(&vol->conn->lock); - DEBUG("unref vol %p %s %d", vol, vol->name, vol->refs); + VIR_DEBUG("unref vol %p %s %d", vol, vol->name, vol->refs); vol->refs--; refs = vol->refs; if (refs == 0) { @@ -1205,7 +1205,7 @@ error: static void virReleaseNodeDevice(virNodeDevicePtr dev) { virConnectPtr conn = dev->conn; - DEBUG("release dev %p %s", dev, dev->name); + VIR_DEBUG("release dev %p %s", dev, dev->name); if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -1220,7 +1220,7 @@ virReleaseNodeDevice(virNodeDevicePtr dev) { VIR_FREE(dev); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -1246,7 +1246,7 @@ virUnrefNodeDevice(virNodeDevicePtr dev) { int refs; virMutexLock(&dev->conn->lock); - DEBUG("unref dev %p %s %d", dev, dev->name, dev->refs); + VIR_DEBUG("unref dev %p %s %d", dev, dev->name, dev->refs); dev->refs--; refs = dev->refs; if (refs == 0) { @@ -1348,7 +1348,7 @@ virReleaseSecret(virSecretPtr secret) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(secret->uuid, uuidstr); - DEBUG("release secret %p %s", secret, uuidstr); + VIR_DEBUG("release secret %p %s", secret, uuidstr); if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -1362,7 +1362,7 @@ virReleaseSecret(virSecretPtr secret) { VIR_FREE(secret); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -1391,7 +1391,7 @@ virUnrefSecret(virSecretPtr secret) { return -1; } virMutexLock(&secret->conn->lock); - DEBUG("unref secret %p %p %d", secret, secret->uuid, secret->refs); + VIR_DEBUG("unref secret %p %p %d", secret, secret->uuid, secret->refs); secret->refs--; refs = secret->refs; if (refs == 0) { @@ -1429,12 +1429,12 @@ error: static void virReleaseStream(virStreamPtr st) { virConnectPtr conn = st->conn; - DEBUG("release dev %p", st); + VIR_DEBUG("release dev %p", st); st->magic = -1; VIR_FREE(st); - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -1449,7 +1449,7 @@ int virUnrefStream(virStreamPtr st) { int refs; virMutexLock(&st->conn->lock); - DEBUG("unref stream %p %d", st, st->refs); + VIR_DEBUG("unref stream %p %d", st, st->refs); st->refs--; refs = st->refs; if (refs == 0) { @@ -1554,7 +1554,7 @@ virReleaseNWFilter(virNWFilterPtr nwfilter) char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(nwfilter->uuid, uuidstr); - DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuidstr); + VIR_DEBUG("release nwfilter %p %s %s", nwfilter, nwfilter->name, uuidstr); if (virHashRemoveEntry(conn->nwfilters, uuidstr, NULL) < 0) { virMutexUnlock(&conn->lock); @@ -1568,7 +1568,7 @@ virReleaseNWFilter(virNWFilterPtr nwfilter) VIR_FREE(nwfilter); if (conn) { - DEBUG("unref connection %p %d", conn, conn->refs); + VIR_DEBUG("unref connection %p %d", conn, conn->refs); conn->refs--; if (conn->refs == 0) { virReleaseConnect(conn); @@ -1600,7 +1600,7 @@ virUnrefNWFilter(virNWFilterPtr nwfilter) return -1; } virMutexLock(&nwfilter->conn->lock); - DEBUG("unref pool %p %s %d", nwfilter, nwfilter->name, nwfilter->refs); + VIR_DEBUG("unref pool %p %s %d", nwfilter, nwfilter->name, nwfilter->refs); nwfilter->refs--; refs = nwfilter->refs; if (refs == 0) { @@ -1652,9 +1652,9 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name) goto error; } domain->refs++; - DEBUG("New hash entry %p", ret); + VIR_DEBUG("New hash entry %p", ret); } else { - DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); + VIR_DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1); } ret->refs++; virMutexUnlock(&domain->conn->lock); @@ -1673,7 +1673,7 @@ static void virReleaseDomainSnapshot(virDomainSnapshotPtr snapshot) { virDomainPtr domain = snapshot->domain; - DEBUG("release snapshot %p %s", snapshot, snapshot->name); + VIR_DEBUG("release snapshot %p %s", snapshot, snapshot->name); if (virHashRemoveEntry(domain->snapshots, snapshot->name, NULL) < 0) { virMutexUnlock(&domain->conn->lock); @@ -1687,7 +1687,7 @@ virReleaseDomainSnapshot(virDomainSnapshotPtr snapshot) VIR_FREE(snapshot); if (domain) { - DEBUG("unref domain %p %d", domain, domain->refs); + VIR_DEBUG("unref domain %p %d", domain, domain->refs); domain->refs--; if (domain->refs == 0) { virReleaseDomain(domain); @@ -1709,7 +1709,7 @@ virUnrefDomainSnapshot(virDomainSnapshotPtr snapshot) } virMutexLock(&snapshot->domain->conn->lock); - DEBUG("unref snapshot %p %s %d", snapshot, snapshot->name, snapshot->refs); + VIR_DEBUG("unref snapshot %p %s %d", snapshot, snapshot->name, snapshot->refs); snapshot->refs--; refs = snapshot->refs; if (refs == 0) { diff --git a/src/driver.c b/src/driver.c index 6e4aa9f..f882ea1 100644 --- a/src/driver.c +++ b/src/driver.c @@ -53,7 +53,7 @@ virDriverLoadModule(const char *name) if (moddir == NULL) moddir = DEFAULT_DRIVER_DIR; - DEBUG("Module load %s", name); + VIR_DEBUG("Module load %s", name); if (virAsprintf(&modfile, "%s/libvirt_driver_%s.so", moddir, name) < 0) return NULL; diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 2c418f8..d914ac8 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -42,7 +42,7 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, { virConnectPtr conn; - DEBUG("domain=%p, cmd=%s, result=%p, flags=%u", domain, cmd, result, flags); + VIR_DEBUG("domain=%p, cmd=%s, result=%p, flags=%u", domain, cmd, result, flags); virResetLastError(); diff --git a/src/libvirt.c b/src/libvirt.c index f65cc24..e4b451e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -326,7 +326,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { _domname = (dom)->name; \ } \ \ - DEBUG("dom=%p, (VM: name=%s, uuid=%s), " fmt, \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s), " fmt, \ dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__) #define VIR_DOMAIN_DEBUG0(dom) VIR_DOMAIN_DEBUG(dom, "%s", "") @@ -358,7 +358,7 @@ virInitialize(void) virLogSetFromEnv(); - DEBUG0("register drivers"); + VIR_DEBUG0("register drivers"); #if HAVE_WINSOCK2_H if (winsock_init () == -1) return -1; @@ -529,7 +529,7 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) return -1; } - DEBUG ("registering %s as network driver %d", + VIR_DEBUG ("registering %s as network driver %d", driver->name, virNetworkDriverTabCount); virNetworkDriverTab[virNetworkDriverTabCount] = driver; @@ -562,7 +562,7 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) return -1; } - DEBUG ("registering %s as interface driver %d", + VIR_DEBUG ("registering %s as interface driver %d", driver->name, virInterfaceDriverTabCount); virInterfaceDriverTab[virInterfaceDriverTabCount] = driver; @@ -595,7 +595,7 @@ virRegisterStorageDriver(virStorageDriverPtr driver) return -1; } - DEBUG ("registering %s as storage driver %d", + VIR_DEBUG ("registering %s as storage driver %d", driver->name, virStorageDriverTabCount); virStorageDriverTab[virStorageDriverTabCount] = driver; @@ -628,7 +628,7 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) return -1; } - DEBUG ("registering %s as device driver %d", + VIR_DEBUG ("registering %s as device driver %d", driver->name, virDeviceMonitorTabCount); virDeviceMonitorTab[virDeviceMonitorTabCount] = driver; @@ -661,7 +661,7 @@ virRegisterSecretDriver(virSecretDriverPtr driver) return -1; } - DEBUG ("registering %s as secret driver %d", + VIR_DEBUG ("registering %s as secret driver %d", driver->name, virSecretDriverTabCount); virSecretDriverTab[virSecretDriverTabCount] = driver; @@ -694,7 +694,7 @@ virRegisterNWFilterDriver(virNWFilterDriverPtr driver) return -1; } - DEBUG ("registering %s as network filter driver %d", + VIR_DEBUG ("registering %s as network filter driver %d", driver->name, virNWFilterDriverTabCount); virNWFilterDriverTab[virNWFilterDriverTabCount] = driver; @@ -713,7 +713,7 @@ virRegisterNWFilterDriver(virNWFilterDriverPtr driver) int virRegisterDriver(virDriverPtr driver) { - DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); + VIR_DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); if (virInitialize() < 0) return -1; @@ -736,7 +736,7 @@ virRegisterDriver(virDriverPtr driver) return -1; } - DEBUG ("registering %s as driver %d", + VIR_DEBUG ("registering %s as driver %d", driver->name, virDriverTabCount); virDriverTab[virDriverTabCount] = driver; @@ -876,7 +876,7 @@ int virGetVersion(unsigned long *libVer, const char *type, unsigned long *typeVer) { - DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); + VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); if (!initialized) if (virInitialize() < 0) @@ -983,7 +983,7 @@ do_open (const char *name, if (!name || name[0] == '\0') { char *defname = getenv("LIBVIRT_DEFAULT_URI"); if (defname && *defname) { - DEBUG("Using LIBVIRT_DEFAULT_URI %s", defname); + VIR_DEBUG("Using LIBVIRT_DEFAULT_URI %s", defname); name = defname; } else { name = NULL; @@ -1008,7 +1008,7 @@ do_open (const char *name, goto failed; } - DEBUG("name \"%s\" to URI components:\n" + VIR_DEBUG("name \"%s\" to URI components:\n" " scheme %s\n" " opaque %s\n" " authority %s\n" @@ -1022,7 +1022,7 @@ do_open (const char *name, NULLSTR(ret->uri->user), ret->uri->port, NULLSTR(ret->uri->path)); } else { - DEBUG0("no name, allowing driver auto-select"); + VIR_DEBUG0("no name, allowing driver auto-select"); } /* Cleansing flags */ @@ -1058,10 +1058,10 @@ do_open (const char *name, goto failed; } - DEBUG("trying driver %d (%s) ...", + VIR_DEBUG("trying driver %d (%s) ...", i, virDriverTab[i]->name); res = virDriverTab[i]->open (ret, auth, flags); - DEBUG("driver %d %s returned %s", + VIR_DEBUG("driver %d %s returned %s", i, virDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1083,7 +1083,7 @@ do_open (const char *name, for (i = 0; i < virNetworkDriverTabCount; i++) { res = virNetworkDriverTab[i]->open (ret, auth, flags); - DEBUG("network driver %d %s returned %s", + VIR_DEBUG("network driver %d %s returned %s", i, virNetworkDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1098,7 +1098,7 @@ do_open (const char *name, for (i = 0; i < virInterfaceDriverTabCount; i++) { res = virInterfaceDriverTab[i]->open (ret, auth, flags); - DEBUG("interface driver %d %s returned %s", + VIR_DEBUG("interface driver %d %s returned %s", i, virInterfaceDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1114,7 +1114,7 @@ do_open (const char *name, /* Secondary driver for storage. Optional */ for (i = 0; i < virStorageDriverTabCount; i++) { res = virStorageDriverTab[i]->open (ret, auth, flags); - DEBUG("storage driver %d %s returned %s", + VIR_DEBUG("storage driver %d %s returned %s", i, virStorageDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1130,7 +1130,7 @@ do_open (const char *name, /* Node driver (optional) */ for (i = 0; i < virDeviceMonitorTabCount; i++) { res = virDeviceMonitorTab[i]->open (ret, auth, flags); - DEBUG("node driver %d %s returned %s", + VIR_DEBUG("node driver %d %s returned %s", i, virDeviceMonitorTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1146,7 +1146,7 @@ do_open (const char *name, /* Secret manipulation driver. Optional */ for (i = 0; i < virSecretDriverTabCount; i++) { res = virSecretDriverTab[i]->open (ret, auth, flags); - DEBUG("secret driver %d %s returned %s", + VIR_DEBUG("secret driver %d %s returned %s", i, virSecretDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1162,7 +1162,7 @@ do_open (const char *name, /* Network filter driver. Optional */ for (i = 0; i < virNWFilterDriverTabCount; i++) { res = virNWFilterDriverTab[i]->open (ret, auth, flags); - DEBUG("nwfilter driver %d %s returned %s", + VIR_DEBUG("nwfilter driver %d %s returned %s", i, virNWFilterDriverTab[i]->name, res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : @@ -1213,7 +1213,7 @@ virConnectOpen (const char *name) if (virInitialize() < 0) goto error; - DEBUG("name=%s", name); + VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, 0); if (!ret) goto error; @@ -1247,7 +1247,7 @@ virConnectOpenReadOnly(const char *name) if (virInitialize() < 0) goto error; - DEBUG("name=%s", name); + VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, VIR_CONNECT_RO); if (!ret) goto error; @@ -1285,7 +1285,7 @@ virConnectOpenAuth(const char *name, if (virInitialize() < 0) goto error; - DEBUG("name=%s, auth=%p, flags=%d", NULLSTR(name), auth, flags); + VIR_DEBUG("name=%s, auth=%p, flags=%d", NULLSTR(name), auth, flags); ret = do_open (name, auth, flags); if (!ret) goto error; @@ -1311,7 +1311,7 @@ int virConnectClose(virConnectPtr conn) { int ret = -1; - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1356,7 +1356,7 @@ virConnectRef(virConnectPtr conn) return -1; } virMutexLock(&conn->lock); - DEBUG("conn=%p refs=%d", conn, conn->refs); + VIR_DEBUG("conn=%p refs=%d", conn, conn->refs); conn->refs++; virMutexUnlock(&conn->lock); return 0; @@ -1370,7 +1370,7 @@ int virDrvSupportsFeature (virConnectPtr conn, int feature) { int ret; - DEBUG("conn=%p, feature=%d", conn, feature); + VIR_DEBUG("conn=%p, feature=%d", conn, feature); virResetLastError(); @@ -1406,7 +1406,7 @@ const char * virConnectGetType(virConnectPtr conn) { const char *ret; - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1439,7 +1439,7 @@ virConnectGetType(virConnectPtr conn) int virConnectGetVersion(virConnectPtr conn, unsigned long *hvVer) { - DEBUG("conn=%p, hvVer=%p", conn, hvVer); + VIR_DEBUG("conn=%p, hvVer=%p", conn, hvVer); virResetLastError(); @@ -1483,7 +1483,7 @@ int virConnectGetLibVersion(virConnectPtr conn, unsigned long *libVer) { int ret = -1; - DEBUG("conn=%p, libVir=%p", conn, libVer); + VIR_DEBUG("conn=%p, libVir=%p", conn, libVer); virResetLastError(); @@ -1528,7 +1528,7 @@ error: char * virConnectGetHostname (virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1571,7 +1571,7 @@ char * virConnectGetURI (virConnectPtr conn) { char *name; - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1609,7 +1609,7 @@ error: char * virConnectGetSysinfo (virConnectPtr conn, unsigned int flags) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1648,7 +1648,7 @@ int virConnectGetMaxVcpus(virConnectPtr conn, const char *type) { - DEBUG("conn=%p, type=%s", conn, type); + VIR_DEBUG("conn=%p, type=%s", conn, type); virResetLastError(); @@ -1684,7 +1684,7 @@ error: int virConnectListDomains(virConnectPtr conn, int *ids, int maxids) { - DEBUG("conn=%p, ids=%p, maxids=%d", conn, ids, maxids); + VIR_DEBUG("conn=%p, ids=%p, maxids=%d", conn, ids, maxids); virResetLastError(); @@ -1723,7 +1723,7 @@ error: int virConnectNumOfDomains(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -1794,7 +1794,7 @@ virDomainPtr virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - DEBUG("conn=%p, xmlDesc=%s, flags=%d", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%d", conn, xmlDesc, flags); virResetLastError(); @@ -1860,7 +1860,7 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc, virDomainPtr virDomainLookupByID(virConnectPtr conn, int id) { - DEBUG("conn=%p, id=%d", conn, id); + VIR_DEBUG("conn=%p, id=%d", conn, id); virResetLastError(); @@ -1905,7 +1905,7 @@ virDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); - DEBUG("conn=%p, uuid=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuid=%s", conn, uuidstr); virResetLastError(); @@ -1948,7 +1948,7 @@ virDomainPtr virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); virResetLastError(); @@ -1987,7 +1987,7 @@ error: virDomainPtr virDomainLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, name); virResetLastError(); @@ -2303,7 +2303,7 @@ int virDomainRestore(virConnectPtr conn, const char *from) { char filepath[4096]; - DEBUG("conn=%p, from=%s", conn, from); + VIR_DEBUG("conn=%p, from=%s", conn, from); virResetLastError(); @@ -2547,7 +2547,7 @@ error: const char * virDomainGetName(virDomainPtr domain) { - DEBUG("domain=%p", domain); + VIR_DEBUG("domain=%p", domain); virResetLastError(); @@ -3091,7 +3091,7 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, const char *nativeConfig, unsigned int flags) { - DEBUG("conn=%p, format=%s config=%s flags=%u", conn, nativeFormat, nativeConfig, flags); + VIR_DEBUG("conn=%p, format=%s config=%s flags=%u", conn, nativeFormat, nativeConfig, flags); virResetLastError(); @@ -3143,7 +3143,7 @@ char *virConnectDomainXMLToNative(virConnectPtr conn, const char *domainXml, unsigned int flags) { - DEBUG("conn=%p, format=%s xml=%s flags=%u", conn, nativeFormat, domainXml, flags); + VIR_DEBUG("conn=%p, format=%s xml=%s flags=%u", conn, nativeFormat, domainXml, flags); virResetLastError(); @@ -4011,7 +4011,7 @@ error: int virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) { - DEBUG("conn=%p, info=%p", conn, info); + VIR_DEBUG("conn=%p, info=%p", conn, info); virResetLastError(); @@ -4053,7 +4053,7 @@ error: char * virConnectGetCapabilities (virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -4068,7 +4068,7 @@ virConnectGetCapabilities (virConnectPtr conn) ret = conn->driver->getCapabilities (conn); if (!ret) goto error; - DEBUG("conn=%p ret=%s", conn, ret); + VIR_DEBUG("conn=%p ret=%s", conn, ret); return ret; } @@ -4092,7 +4092,7 @@ error: unsigned long long virNodeGetFreeMemory(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -4726,7 +4726,7 @@ error: */ virDomainPtr virDomainDefineXML(virConnectPtr conn, const char *xml) { - DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, xml); virResetLastError(); @@ -4812,7 +4812,7 @@ error: int virConnectNumOfDefinedDomains(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -4851,7 +4851,7 @@ error: int virConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -5487,7 +5487,7 @@ error: int virNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel) { - DEBUG("conn=%p secmodel=%p", conn, secmodel); + VIR_DEBUG("conn=%p secmodel=%p", conn, secmodel); if (!VIR_IS_CONNECT(conn)) { virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); @@ -5807,7 +5807,7 @@ int virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, int startCell, int maxCells) { - DEBUG("conn=%p, freeMems=%p, startCell=%d, maxCells=%d", + VIR_DEBUG("conn=%p, freeMems=%p, startCell=%d, maxCells=%d", conn, freeMems, startCell, maxCells); virResetLastError(); @@ -5855,7 +5855,7 @@ error: virConnectPtr virNetworkGetConnect (virNetworkPtr net) { - DEBUG("net=%p", net); + VIR_DEBUG("net=%p", net); virResetLastError(); @@ -5878,7 +5878,7 @@ virNetworkGetConnect (virNetworkPtr net) int virConnectNumOfNetworks(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -5916,7 +5916,7 @@ error: int virConnectListNetworks(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -5957,7 +5957,7 @@ error: int virConnectNumOfDefinedNetworks(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -5996,7 +5996,7 @@ int virConnectListDefinedNetworks(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -6040,7 +6040,7 @@ error: virNetworkPtr virNetworkLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, name); virResetLastError(); @@ -6085,7 +6085,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(uuid, uuidstr); - DEBUG("conn=%p, uuid=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuid=%s", conn, uuidstr); virResetLastError(); @@ -6128,7 +6128,7 @@ virNetworkPtr virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); virResetLastError(); @@ -6167,7 +6167,7 @@ error: virNetworkPtr virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) { - DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); virResetLastError(); @@ -6212,7 +6212,7 @@ error: virNetworkPtr virNetworkDefineXML(virConnectPtr conn, const char *xml) { - DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, xml); virResetLastError(); @@ -6256,7 +6256,7 @@ error: int virNetworkUndefine(virNetworkPtr network) { virConnectPtr conn; - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6299,7 +6299,7 @@ int virNetworkCreate(virNetworkPtr network) { virConnectPtr conn; - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6344,7 +6344,7 @@ int virNetworkDestroy(virNetworkPtr network) { virConnectPtr conn; - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6387,7 +6387,7 @@ error: int virNetworkFree(virNetworkPtr network) { - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6429,7 +6429,7 @@ virNetworkRef(virNetworkPtr network) return -1; } virMutexLock(&network->conn->lock); - DEBUG("network=%p refs=%d", network, network->refs); + VIR_DEBUG("network=%p refs=%d", network, network->refs); network->refs++; virMutexUnlock(&network->conn->lock); return 0; @@ -6447,7 +6447,7 @@ virNetworkRef(virNetworkPtr network) const char * virNetworkGetName(virNetworkPtr network) { - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6471,7 +6471,7 @@ virNetworkGetName(virNetworkPtr network) int virNetworkGetUUID(virNetworkPtr network, unsigned char *uuid) { - DEBUG("network=%p, uuid=%p", network, uuid); + VIR_DEBUG("network=%p, uuid=%p", network, uuid); virResetLastError(); @@ -6508,7 +6508,7 @@ int virNetworkGetUUIDString(virNetworkPtr network, char *buf) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("network=%p, buf=%p", network, buf); + VIR_DEBUG("network=%p, buf=%p", network, buf); virResetLastError(); @@ -6548,7 +6548,7 @@ char * virNetworkGetXMLDesc(virNetworkPtr network, int flags) { virConnectPtr conn; - DEBUG("network=%p, flags=%d", network, flags); + VIR_DEBUG("network=%p, flags=%d", network, flags); virResetLastError(); @@ -6593,7 +6593,7 @@ char * virNetworkGetBridgeName(virNetworkPtr network) { virConnectPtr conn; - DEBUG("network=%p", network); + VIR_DEBUG("network=%p", network); virResetLastError(); @@ -6636,7 +6636,7 @@ virNetworkGetAutostart(virNetworkPtr network, int *autostart) { virConnectPtr conn; - DEBUG("network=%p, autostart=%p", network, autostart); + VIR_DEBUG("network=%p, autostart=%p", network, autostart); virResetLastError(); @@ -6682,7 +6682,7 @@ virNetworkSetAutostart(virNetworkPtr network, int autostart) { virConnectPtr conn; - DEBUG("network=%p, autostart=%d", network, autostart); + VIR_DEBUG("network=%p, autostart=%d", network, autostart); virResetLastError(); @@ -6731,7 +6731,7 @@ error: virConnectPtr virInterfaceGetConnect (virInterfacePtr iface) { - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -6754,7 +6754,7 @@ virInterfaceGetConnect (virInterfacePtr iface) int virConnectNumOfInterfaces(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -6793,7 +6793,7 @@ error: int virConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -6834,7 +6834,7 @@ error: int virConnectNumOfDefinedInterfaces(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -6875,7 +6875,7 @@ virConnectListDefinedInterfaces(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -6918,7 +6918,7 @@ error: virInterfacePtr virInterfaceLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, name); virResetLastError(); @@ -6960,7 +6960,7 @@ error: virInterfacePtr virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) { - DEBUG("conn=%p, macstr=%s", conn, macstr); + VIR_DEBUG("conn=%p, macstr=%s", conn, macstr); virResetLastError(); @@ -7001,7 +7001,7 @@ error: const char * virInterfaceGetName(virInterfacePtr iface) { - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -7027,7 +7027,7 @@ virInterfaceGetName(virInterfacePtr iface) const char * virInterfaceGetMACString(virInterfacePtr iface) { - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -7061,7 +7061,7 @@ char * virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("iface=%p, flags=%d", iface, flags); + VIR_DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); @@ -7105,7 +7105,7 @@ error: virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - DEBUG("conn=%p, xml=%s, flags=%d", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%d", conn, xml, flags); virResetLastError(); @@ -7150,7 +7150,7 @@ error: int virInterfaceUndefine(virInterfacePtr iface) { virConnectPtr conn; - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -7193,7 +7193,7 @@ int virInterfaceCreate(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("iface=%p, flags=%d", iface, flags); + VIR_DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); @@ -7238,7 +7238,7 @@ int virInterfaceDestroy(virInterfacePtr iface, unsigned int flags) { virConnectPtr conn; - DEBUG("iface=%p, flags=%d", iface, flags); + VIR_DEBUG("iface=%p, flags=%d", iface, flags); virResetLastError(); @@ -7295,7 +7295,7 @@ virInterfaceRef(virInterfacePtr iface) return -1; } virMutexLock(&iface->conn->lock); - DEBUG("iface=%p refs=%d", iface, iface->refs); + VIR_DEBUG("iface=%p refs=%d", iface, iface->refs); iface->refs++; virMutexUnlock(&iface->conn->lock); return 0; @@ -7313,7 +7313,7 @@ virInterfaceRef(virInterfacePtr iface) int virInterfaceFree(virInterfacePtr iface) { - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -7347,7 +7347,7 @@ virInterfaceFree(virInterfacePtr iface) virConnectPtr virStoragePoolGetConnect (virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -7370,7 +7370,7 @@ virStoragePoolGetConnect (virStoragePoolPtr pool) int virConnectNumOfStoragePools (virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -7412,7 +7412,7 @@ virConnectListStoragePools (virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -7454,7 +7454,7 @@ error: int virConnectNumOfDefinedStoragePools(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -7497,7 +7497,7 @@ virConnectListDefinedStoragePools(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -7555,7 +7555,7 @@ virConnectFindStoragePoolSources(virConnectPtr conn, const char *srcSpec, unsigned int flags) { - DEBUG("conn=%p, type=%s, src=%s, flags=%u", conn, type ? type : "", srcSpec ? srcSpec : "", flags); + VIR_DEBUG("conn=%p, type=%s, src=%s, flags=%u", conn, type ? type : "", srcSpec ? srcSpec : "", flags); virResetLastError(); @@ -7603,7 +7603,7 @@ virStoragePoolPtr virStoragePoolLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, name); virResetLastError(); @@ -7646,7 +7646,7 @@ virStoragePoolPtr virStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - DEBUG("conn=%p, uuid=%s", conn, uuid); + VIR_DEBUG("conn=%p, uuid=%s", conn, uuid); virResetLastError(); @@ -7690,7 +7690,7 @@ virStoragePoolLookupByUUIDString(virConnectPtr conn, const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); virResetLastError(); @@ -7728,7 +7728,7 @@ error: virStoragePoolPtr virStoragePoolLookupByVolume(virStorageVolPtr vol) { - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -7770,7 +7770,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); virResetLastError(); @@ -7819,7 +7819,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, xml); virResetLastError(); @@ -7866,7 +7866,7 @@ virStoragePoolBuild(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - DEBUG("pool=%p, flags=%u", pool, flags); + VIR_DEBUG("pool=%p, flags=%u", pool, flags); virResetLastError(); @@ -7909,7 +7909,7 @@ int virStoragePoolUndefine(virStoragePoolPtr pool) { virConnectPtr conn; - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -7954,7 +7954,7 @@ virStoragePoolCreate(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -8001,7 +8001,7 @@ int virStoragePoolDestroy(virStoragePoolPtr pool) { virConnectPtr conn; - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -8048,7 +8048,7 @@ virStoragePoolDelete(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - DEBUG("pool=%p, flags=%u", pool, flags); + VIR_DEBUG("pool=%p, flags=%u", pool, flags); virResetLastError(); @@ -8092,7 +8092,7 @@ error: int virStoragePoolFree(virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -8136,7 +8136,7 @@ virStoragePoolRef(virStoragePoolPtr pool) return -1; } virMutexLock(&pool->conn->lock); - DEBUG("pool=%p refs=%d", pool, pool->refs); + VIR_DEBUG("pool=%p refs=%d", pool, pool->refs); pool->refs++; virMutexUnlock(&pool->conn->lock); return 0; @@ -8158,7 +8158,7 @@ virStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - DEBUG("pool=%p flags=%u", pool, flags); + VIR_DEBUG("pool=%p flags=%u", pool, flags); virResetLastError(); @@ -8201,7 +8201,7 @@ error: const char* virStoragePoolGetName(virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -8227,7 +8227,7 @@ int virStoragePoolGetUUID(virStoragePoolPtr pool, unsigned char *uuid) { - DEBUG("pool=%p, uuid=%p", pool, uuid); + VIR_DEBUG("pool=%p, uuid=%p", pool, uuid); virResetLastError(); @@ -8264,7 +8264,7 @@ virStoragePoolGetUUIDString(virStoragePoolPtr pool, char *buf) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("pool=%p, buf=%p", pool, buf); + VIR_DEBUG("pool=%p, buf=%p", pool, buf); virResetLastError(); @@ -8305,7 +8305,7 @@ virStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info) { virConnectPtr conn; - DEBUG("pool=%p, info=%p", pool, info); + VIR_DEBUG("pool=%p, info=%p", pool, info); virResetLastError(); @@ -8355,7 +8355,7 @@ virStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { virConnectPtr conn; - DEBUG("pool=%p, flags=%u", pool, flags); + VIR_DEBUG("pool=%p, flags=%u", pool, flags); virResetLastError(); @@ -8402,7 +8402,7 @@ virStoragePoolGetAutostart(virStoragePoolPtr pool, int *autostart) { virConnectPtr conn; - DEBUG("pool=%p, autostart=%p", pool, autostart); + VIR_DEBUG("pool=%p, autostart=%p", pool, autostart); virResetLastError(); @@ -8448,7 +8448,7 @@ virStoragePoolSetAutostart(virStoragePoolPtr pool, int autostart) { virConnectPtr conn; - DEBUG("pool=%p, autostart=%d", pool, autostart); + VIR_DEBUG("pool=%p, autostart=%d", pool, autostart); virResetLastError(); @@ -8492,7 +8492,7 @@ error: int virStoragePoolNumOfVolumes(virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -8534,7 +8534,7 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, int maxnames) { - DEBUG("pool=%p, names=%p, maxnames=%d", pool, names, maxnames); + VIR_DEBUG("pool=%p, names=%p, maxnames=%d", pool, names, maxnames); virResetLastError(); @@ -8582,7 +8582,7 @@ error: virConnectPtr virStorageVolGetConnect (virStorageVolPtr vol) { - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -8609,7 +8609,7 @@ virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { - DEBUG("pool=%p, name=%s", pool, name); + VIR_DEBUG("pool=%p, name=%s", pool, name); virResetLastError(); @@ -8654,7 +8654,7 @@ virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, const char *key) { - DEBUG("conn=%p, key=%s", conn, key); + VIR_DEBUG("conn=%p, key=%s", conn, key); virResetLastError(); @@ -8697,7 +8697,7 @@ virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, const char *path) { - DEBUG("conn=%p, path=%s", conn, path); + VIR_DEBUG("conn=%p, path=%s", conn, path); virResetLastError(); @@ -8739,7 +8739,7 @@ error: const char* virStorageVolGetName(virStorageVolPtr vol) { - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -8765,7 +8765,7 @@ virStorageVolGetName(virStorageVolPtr vol) const char* virStorageVolGetKey(virStorageVolPtr vol) { - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -8795,7 +8795,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc, unsigned int flags) { - DEBUG("pool=%p, flags=%u", pool, flags); + VIR_DEBUG("pool=%p, flags=%u", pool, flags); virResetLastError(); @@ -8846,7 +8846,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, virStorageVolPtr clonevol, unsigned int flags) { - DEBUG("pool=%p, flags=%u, clonevol=%p", pool, flags, clonevol); + VIR_DEBUG("pool=%p, flags=%u, clonevol=%p", pool, flags, clonevol); virResetLastError(); @@ -8899,7 +8899,7 @@ virStorageVolDelete(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - DEBUG("vol=%p, flags=%u", vol, flags); + VIR_DEBUG("vol=%p, flags=%u", vol, flags); virResetLastError(); @@ -8990,7 +8990,7 @@ error: int virStorageVolFree(virStorageVolPtr vol) { - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -9033,7 +9033,7 @@ virStorageVolRef(virStorageVolPtr vol) return -1; } virMutexLock(&vol->conn->lock); - DEBUG("vol=%p refs=%d", vol, vol->refs); + VIR_DEBUG("vol=%p refs=%d", vol, vol->refs); vol->refs++; virMutexUnlock(&vol->conn->lock); return 0; @@ -9054,7 +9054,7 @@ virStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info) { virConnectPtr conn; - DEBUG("vol=%p, info=%p", vol, info); + VIR_DEBUG("vol=%p, info=%p", vol, info); virResetLastError(); @@ -9103,7 +9103,7 @@ virStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags) { virConnectPtr conn; - DEBUG("vol=%p, flags=%u", vol, flags); + VIR_DEBUG("vol=%p, flags=%u", vol, flags); virResetLastError(); @@ -9151,7 +9151,7 @@ char * virStorageVolGetPath(virStorageVolPtr vol) { virConnectPtr conn; - DEBUG("vol=%p", vol); + VIR_DEBUG("vol=%p", vol); virResetLastError(); @@ -9195,7 +9195,7 @@ error: int virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) { - DEBUG("conn=%p, cap=%s, flags=%d", conn, NULLSTR(cap), flags); + VIR_DEBUG("conn=%p, cap=%s, flags=%d", conn, NULLSTR(cap), flags); virResetLastError(); @@ -9246,7 +9246,7 @@ virNodeListDevices(virConnectPtr conn, char **const names, int maxnames, unsigned int flags) { - DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%d", + VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%d", conn, cap, names, maxnames, flags); virResetLastError(); @@ -9288,7 +9288,7 @@ error: */ virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%p", conn, name); + VIR_DEBUG("conn=%p, name=%p", conn, name); virResetLastError(); @@ -9331,7 +9331,7 @@ error: */ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9367,7 +9367,7 @@ error: */ const char *virNodeDeviceGetName(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); if (!VIR_IS_CONNECTED_NODE_DEVICE(dev)) { virLibNodeDeviceError(VIR_ERR_INVALID_NODE_DEVICE, __FUNCTION__); @@ -9389,7 +9389,7 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev) */ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9421,7 +9421,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) */ int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9460,7 +9460,7 @@ int virNodeDeviceListCaps(virNodeDevicePtr dev, char **const names, int maxnames) { - DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d", + VIR_DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d", dev, dev ? dev->conn : NULL, names, maxnames); virResetLastError(); @@ -9498,7 +9498,7 @@ error: */ int virNodeDeviceFree(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9541,7 +9541,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) return -1; } virMutexLock(&dev->conn->lock); - DEBUG("dev=%p refs=%d", dev, dev->refs); + VIR_DEBUG("dev=%p refs=%d", dev, dev->refs); dev->refs++; virMutexUnlock(&dev->conn->lock); return 0; @@ -9569,7 +9569,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) int virNodeDeviceDettach(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9612,7 +9612,7 @@ error: int virNodeDeviceReAttach(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9657,7 +9657,7 @@ error: int virNodeDeviceReset(virNodeDevicePtr dev) { - DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); + VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); virResetLastError(); @@ -9747,7 +9747,7 @@ error: int virNodeDeviceDestroy(virNodeDevicePtr dev) { - DEBUG("dev=%p", dev); + VIR_DEBUG("dev=%p", dev); virResetLastError(); @@ -9813,7 +9813,7 @@ virConnectDomainEventRegister(virConnectPtr conn, void *opaque, virFreeCallback freecb) { - DEBUG("conn=%p, cb=%p, opaque=%p, freecb=%p", conn, cb, opaque, freecb); + VIR_DEBUG("conn=%p, cb=%p, opaque=%p, freecb=%p", conn, cb, opaque, freecb); virResetLastError(); if (!VIR_IS_CONNECT(conn)) { @@ -9858,7 +9858,7 @@ int virConnectDomainEventDeregister(virConnectPtr conn, virConnectDomainEventCallback cb) { - DEBUG("conn=%p, cb=%p", conn, cb); + VIR_DEBUG("conn=%p, cb=%p", conn, cb); virResetLastError(); @@ -9900,7 +9900,7 @@ error: virConnectPtr virSecretGetConnect (virSecretPtr secret) { - DEBUG("secret=%p", secret); + VIR_DEBUG("secret=%p", secret); virResetLastError(); @@ -10007,7 +10007,7 @@ error: virSecretPtr virSecretLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - DEBUG("conn=%p, uuid=%s", conn, uuid); + VIR_DEBUG("conn=%p, uuid=%s", conn, uuid); virResetLastError(); @@ -10052,7 +10052,7 @@ virSecretPtr virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); virResetLastError(); @@ -10097,7 +10097,7 @@ virSecretLookupByUsage(virConnectPtr conn, int usageType, const char *usageID) { - DEBUG("conn=%p, usageType=%d usageID=%s", conn, usageType, NULLSTR(usageID)); + VIR_DEBUG("conn=%p, usageType=%d usageID=%s", conn, usageType, NULLSTR(usageID)); virResetLastError(); @@ -10227,7 +10227,7 @@ int virSecretGetUUIDString(virSecretPtr secret, char *buf) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("secret=%p, buf=%p", secret, buf); + VIR_DEBUG("secret=%p, buf=%p", secret, buf); virResetLastError(); @@ -10268,7 +10268,7 @@ error: int virSecretGetUsageType(virSecretPtr secret) { - DEBUG("secret=%p", secret); + VIR_DEBUG("secret=%p", secret); virResetLastError(); @@ -10299,7 +10299,7 @@ virSecretGetUsageType(virSecretPtr secret) const char * virSecretGetUsageID(virSecretPtr secret) { - DEBUG("secret=%p", secret); + VIR_DEBUG("secret=%p", secret); virResetLastError(); @@ -10530,7 +10530,7 @@ virSecretRef(virSecretPtr secret) return -1; } virMutexLock(&secret->conn->lock); - DEBUG("secret=%p refs=%d", secret, secret->refs); + VIR_DEBUG("secret=%p refs=%d", secret, secret->refs); secret->refs++; virMutexUnlock(&secret->conn->lock); return 0; @@ -10547,7 +10547,7 @@ virSecretRef(virSecretPtr secret) int virSecretFree(virSecretPtr secret) { - DEBUG("secret=%p", secret); + VIR_DEBUG("secret=%p", secret); virResetLastError(); @@ -10589,7 +10589,7 @@ virStreamNew(virConnectPtr conn, { virStreamPtr st; - DEBUG("conn=%p, flags=%u", conn, flags); + VIR_DEBUG("conn=%p, flags=%u", conn, flags); virResetLastError(); @@ -10627,7 +10627,7 @@ virStreamRef(virStreamPtr stream) return -1; } virMutexLock(&stream->conn->lock); - DEBUG("stream=%p refs=%d", stream, stream->refs); + VIR_DEBUG("stream=%p refs=%d", stream, stream->refs); stream->refs++; virMutexUnlock(&stream->conn->lock); return 0; @@ -10702,7 +10702,7 @@ int virStreamSend(virStreamPtr stream, const char *data, size_t nbytes) { - DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); + VIR_DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); virResetLastError(); @@ -10797,7 +10797,7 @@ int virStreamRecv(virStreamPtr stream, char *data, size_t nbytes) { - DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); + VIR_DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); virResetLastError(); @@ -10873,7 +10873,7 @@ int virStreamSendAll(virStreamPtr stream, char *bytes = NULL; int want = 1024*64; int ret = -1; - DEBUG("stream=%p, handler=%p, opaque=%p", stream, handler, opaque); + VIR_DEBUG("stream=%p, handler=%p, opaque=%p", stream, handler, opaque); virResetLastError(); @@ -10970,7 +10970,7 @@ int virStreamRecvAll(virStreamPtr stream, char *bytes = NULL; int want = 1024*64; int ret = -1; - DEBUG("stream=%p, handler=%p, opaque=%p", stream, handler, opaque); + VIR_DEBUG("stream=%p, handler=%p, opaque=%p", stream, handler, opaque); virResetLastError(); @@ -11042,7 +11042,7 @@ int virStreamEventAddCallback(virStreamPtr stream, void *opaque, virFreeCallback ff) { - DEBUG("stream=%p, events=%d, cb=%p, opaque=%p, ff=%p", stream, events, cb, opaque, ff); + VIR_DEBUG("stream=%p, events=%d, cb=%p, opaque=%p, ff=%p", stream, events, cb, opaque, ff); virResetLastError(); @@ -11084,7 +11084,7 @@ error: int virStreamEventUpdateCallback(virStreamPtr stream, int events) { - DEBUG("stream=%p, events=%d", stream, events); + VIR_DEBUG("stream=%p, events=%d", stream, events); virResetLastError(); @@ -11120,7 +11120,7 @@ error: */ int virStreamEventRemoveCallback(virStreamPtr stream) { - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); virResetLastError(); @@ -11163,7 +11163,7 @@ error: */ int virStreamFinish(virStreamPtr stream) { - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); virResetLastError(); @@ -11204,7 +11204,7 @@ error: */ int virStreamAbort(virStreamPtr stream) { - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); virResetLastError(); @@ -11246,7 +11246,7 @@ error: */ int virStreamFree(virStreamPtr stream) { - DEBUG("stream=%p", stream); + VIR_DEBUG("stream=%p", stream); virResetLastError(); @@ -11276,7 +11276,7 @@ int virStreamFree(virStreamPtr stream) */ int virDomainIsActive(virDomainPtr dom) { - DEBUG("dom=%p", dom); + VIR_DEBUG("dom=%p", dom); virResetLastError(); @@ -11376,7 +11376,7 @@ error: */ int virNetworkIsActive(virNetworkPtr net) { - DEBUG("net=%p", net); + VIR_DEBUG("net=%p", net); virResetLastError(); @@ -11411,7 +11411,7 @@ error: */ int virNetworkIsPersistent(virNetworkPtr net) { - DEBUG("net=%p", net); + VIR_DEBUG("net=%p", net); virResetLastError(); @@ -11445,7 +11445,7 @@ error: */ int virStoragePoolIsActive(virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -11480,7 +11480,7 @@ error: */ int virStoragePoolIsPersistent(virStoragePoolPtr pool) { - DEBUG("pool=%p", pool); + VIR_DEBUG("pool=%p", pool); virResetLastError(); @@ -11516,7 +11516,7 @@ error: int virConnectNumOfNWFilters(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -11555,7 +11555,7 @@ error: int virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) { - DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); + VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -11599,7 +11599,7 @@ error: virNWFilterPtr virNWFilterLookupByName(virConnectPtr conn, const char *name) { - DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, name); virResetLastError(); @@ -11641,7 +11641,7 @@ error: virNWFilterPtr virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - DEBUG("conn=%p, uuid=%s", conn, uuid); + VIR_DEBUG("conn=%p, uuid=%s", conn, uuid); virResetLastError(); @@ -11684,7 +11684,7 @@ virNWFilterPtr virNWFilterLookupByUUIDString(virConnectPtr conn, const char *uuidstr) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); + VIR_DEBUG("conn=%p, uuidstr=%s", conn, uuidstr); virResetLastError(); @@ -11722,7 +11722,7 @@ error: int virNWFilterFree(virNWFilterPtr nwfilter) { - DEBUG("nwfilter=%p", nwfilter); + VIR_DEBUG("nwfilter=%p", nwfilter); virResetLastError(); @@ -11750,7 +11750,7 @@ virNWFilterFree(virNWFilterPtr nwfilter) const char * virNWFilterGetName(virNWFilterPtr nwfilter) { - DEBUG("nwfilter=%p", nwfilter); + VIR_DEBUG("nwfilter=%p", nwfilter); virResetLastError(); @@ -11774,7 +11774,7 @@ virNWFilterGetName(virNWFilterPtr nwfilter) int virNWFilterGetUUID(virNWFilterPtr nwfilter, unsigned char *uuid) { - DEBUG("nwfilter=%p, uuid=%p", nwfilter, uuid); + VIR_DEBUG("nwfilter=%p, uuid=%p", nwfilter, uuid); virResetLastError(); @@ -11811,7 +11811,7 @@ int virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) { unsigned char uuid[VIR_UUID_BUFLEN]; - DEBUG("nwfilter=%p, buf=%p", nwfilter, buf); + VIR_DEBUG("nwfilter=%p, buf=%p", nwfilter, buf); virResetLastError(); @@ -11850,7 +11850,7 @@ error: virNWFilterPtr virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) { - DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); virResetLastError(); @@ -11898,7 +11898,7 @@ int virNWFilterUndefine(virNWFilterPtr nwfilter) { virConnectPtr conn; - DEBUG("nwfilter=%p", nwfilter); + VIR_DEBUG("nwfilter=%p", nwfilter); virResetLastError(); @@ -11945,7 +11945,7 @@ char * virNWFilterGetXMLDesc(virNWFilterPtr nwfilter, int flags) { virConnectPtr conn; - DEBUG("nwfilter=%p, flags=%d", nwfilter, flags); + VIR_DEBUG("nwfilter=%p, flags=%d", nwfilter, flags); virResetLastError(); @@ -12003,7 +12003,7 @@ virNWFilterRef(virNWFilterPtr nwfilter) return -1; } virMutexLock(&nwfilter->conn->lock); - DEBUG("nwfilter=%p refs=%d", nwfilter, nwfilter->refs); + VIR_DEBUG("nwfilter=%p refs=%d", nwfilter, nwfilter->refs); nwfilter->refs++; virMutexUnlock(&nwfilter->conn->lock); return 0; @@ -12020,7 +12020,7 @@ virNWFilterRef(virNWFilterPtr nwfilter) */ int virInterfaceIsActive(virInterfacePtr iface) { - DEBUG("iface=%p", iface); + VIR_DEBUG("iface=%p", iface); virResetLastError(); @@ -12054,7 +12054,7 @@ error: */ int virConnectIsEncrypted(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -12091,7 +12091,7 @@ error: */ int virConnectIsSecure(virConnectPtr conn) { - DEBUG("conn=%p", conn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); @@ -12451,7 +12451,7 @@ int virConnectDomainEventDeregisterAny(virConnectPtr conn, int callbackID) { - DEBUG("conn=%p, callbackID=%d", conn, callbackID); + VIR_DEBUG("conn=%p, callbackID=%d", conn, callbackID); virResetLastError(); @@ -12681,7 +12681,7 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, unsigned int flags) { virConnectPtr conn; - DEBUG("snapshot=%p, flags=%d", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=%d", snapshot, flags); virResetLastError(); @@ -12950,7 +12950,7 @@ virDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - DEBUG("snapshot=%p, flags=%u", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=%u", snapshot, flags); virResetLastError(); @@ -12996,7 +12996,7 @@ virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, { virConnectPtr conn; - DEBUG("snapshot=%p, flags=%u", snapshot, flags); + VIR_DEBUG("snapshot=%p, flags=%u", snapshot, flags); virResetLastError(); @@ -13034,7 +13034,7 @@ error: int virDomainSnapshotFree(virDomainSnapshotPtr snapshot) { - DEBUG("snapshot=%p", snapshot); + VIR_DEBUG("snapshot=%p", snapshot); virResetLastError(); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a735eb7..d973984 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -227,7 +227,7 @@ static int lxcContainerWaitForContinue(int control) } VIR_FORCE_CLOSE(control); - DEBUG0("Received container continue message"); + VIR_DEBUG0("Received container continue message"); return 0; } @@ -258,12 +258,12 @@ static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, goto error_out; } - DEBUG("Renaming %s to %s", veths[i], newname); + VIR_DEBUG("Renaming %s to %s", veths[i], newname); rc = setInterfaceName(veths[i], newname); if (rc < 0) goto error_out; - DEBUG("Enabling %s", newname); + VIR_DEBUG("Enabling %s", newname); rc = vethInterfaceUpOrDown(newname, 1); if (rc < 0) goto error_out; @@ -854,18 +854,18 @@ int lxcContainerStart(virDomainDefPtr def, flags = CLONE_NEWPID|CLONE_NEWNS|CLONE_NEWUTS|CLONE_NEWIPC|SIGCHLD; if (userns_supported()) { - DEBUG0("Enable user namespaces"); + VIR_DEBUG0("Enable user namespaces"); flags |= CLONE_NEWUSER; } if (def->nets != NULL) { - DEBUG0("Enable network namespaces"); + VIR_DEBUG0("Enable network namespaces"); flags |= CLONE_NEWNET; } pid = clone(lxcContainerChild, stacktop, flags, &args); VIR_FREE(stack); - DEBUG("clone() completed, new container PID is %d", pid); + VIR_DEBUG("clone() completed, new container PID is %d", pid); if (pid < 0) { virReportSystemError(errno, "%s", @@ -897,7 +897,7 @@ int lxcContainerAvailable(int features) flags |= CLONE_NEWNET; if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) { - DEBUG0("Unable to allocate stack"); + VIR_DEBUG0("Unable to allocate stack"); return -1; } @@ -907,7 +907,7 @@ int lxcContainerAvailable(int features) VIR_FREE(stack); if (cpid < 0) { char ebuf[1024]; - DEBUG("clone call returned %s, container support is not enabled", + VIR_DEBUG("clone call returned %s, container support is not enabled", virStrerror(errno, ebuf, sizeof ebuf)); return -1; } else { diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0db6673..b742a33 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -446,7 +446,7 @@ static int lxcControllerMain(int monitor, ++numActive; } } else if (epollEvent.events & EPOLLHUP) { - DEBUG("EPOLLHUP from fd %d", epollEvent.data.fd); + VIR_DEBUG("EPOLLHUP from fd %d", epollEvent.data.fd); continue; } else { lxcError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0f78579..a17b0b6 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -979,7 +979,7 @@ static int lxcVmCleanup(lxc_driver_t *driver, vm->pid, waitRc); rc = -1; } else if (WIFEXITED(childStatus)) { - DEBUG("container exited with rc: %d", WEXITSTATUS(childStatus)); + VIR_DEBUG("container exited with rc: %d", WEXITSTATUS(childStatus)); rc = -1; } @@ -1086,18 +1086,18 @@ static int lxcSetupInterfaces(virConnectPtr conn, break; } - DEBUG("bridge: %s", bridge); + VIR_DEBUG("bridge: %s", bridge); if (NULL == bridge) { lxcError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to get bridge for interface")); goto error_exit; } - DEBUG0("calling vethCreate()"); + VIR_DEBUG0("calling vethCreate()"); parentVeth = def->nets[i]->ifname; if (vethCreate(&parentVeth, &containerVeth) < 0) goto error_exit; - DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVeth); + VIR_DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVeth); if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = parentVeth; diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 14cfaa2..78e011e 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -99,13 +99,13 @@ int vethCreate(char** veth1, char** veth2) int vethDev = 0; bool veth1_alloc = false; - DEBUG("veth1: %s veth2: %s", NULLSTR(*veth1), NULLSTR(*veth2)); + VIR_DEBUG("veth1: %s veth2: %s", NULLSTR(*veth1), NULLSTR(*veth2)); if (*veth1 == NULL) { vethDev = getFreeVethName(veth1, vethDev); if (vethDev < 0) return vethDev; - DEBUG("Assigned veth1: %s", *veth1); + VIR_DEBUG("Assigned veth1: %s", *veth1); veth1_alloc = true; } argv[3] = *veth1; @@ -118,11 +118,11 @@ int vethCreate(char** veth1, char** veth2) VIR_FREE(*veth1); return vethDev; } - DEBUG("Assigned veth2: %s", *veth2); + VIR_DEBUG("Assigned veth2: %s", *veth2); } argv[8] = *veth2; - DEBUG("veth1: %s veth2: %s", *veth1, *veth2); + VIR_DEBUG("veth1: %s veth2: %s", *veth1, *veth2); rc = virRun(argv, &cmdResult); if (rc != 0 || @@ -156,7 +156,7 @@ int vethDelete(const char *veth) const char *argv[] = {"ip", "link", "del", veth, NULL}; int cmdResult = 0; - DEBUG("veth: %s", veth); + VIR_DEBUG("veth: %s", veth); rc = virRun(argv, &cmdResult); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 547e5ca..3af2bcf 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -483,7 +483,7 @@ static void dev_create(const char *udi) return; failure: - DEBUG("FAILED TO ADD dev %s", name); + VIR_DEBUG("FAILED TO ADD dev %s", name); cleanup: VIR_FREE(privData); virNodeDeviceDefFree(def); @@ -503,7 +503,7 @@ static void dev_refresh(const char *udi) */ virNodeDeviceObjRemove(&driverState->devs, dev); } else - DEBUG("no device named %s", name); + VIR_DEBUG("no device named %s", name); nodeDeviceUnlock(driverState); if (dev) { @@ -514,7 +514,7 @@ static void dev_refresh(const char *udi) static void device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, const char *udi) { - DEBUG0(hal_name(udi)); + VIR_DEBUG0(hal_name(udi)); dev_create(udi); } @@ -527,11 +527,11 @@ static void device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, nodeDeviceLock(driverState); dev = virNodeDeviceFindByName(&driverState->devs,name); - DEBUG0(name); + VIR_DEBUG0(name); if (dev) virNodeDeviceObjRemove(&driverState->devs, dev); else - DEBUG("no device named %s", name); + VIR_DEBUG("no device named %s", name); nodeDeviceUnlock(driverState); } @@ -545,12 +545,12 @@ static void device_cap_added(LibHalContext *ctx, nodeDeviceLock(driverState); dev = virNodeDeviceFindByName(&driverState->devs,name); nodeDeviceUnlock(driverState); - DEBUG("%s %s", cap, name); + VIR_DEBUG("%s %s", cap, name); if (dev) { (void)gather_capability(ctx, udi, cap, &dev->def->caps); virNodeDeviceObjUnlock(dev); } else { - DEBUG("no device named %s", name); + VIR_DEBUG("no device named %s", name); } } @@ -560,7 +560,7 @@ static void device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, const char *cap) { const char *name = hal_name(udi); - DEBUG("%s %s", cap, name); + VIR_DEBUG("%s %s", cap, name); dev_refresh(udi); } @@ -573,7 +573,7 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, dbus_bool_t is_added ATTRIBUTE_UNUSED) { const char *name = hal_name(udi); - DEBUG("%s %s", name, key); + VIR_DEBUG("%s %s", name, key); dev_refresh(udi); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 82a2210..21bb77d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1949,7 +1949,7 @@ qemudInitCpuAffinity(virDomainObjPtr vm) unsigned char *cpumap; int cpumaplen; - DEBUG0("Setting CPU affinity"); + VIR_DEBUG0("Setting CPU affinity"); if (nodeGetInfo(NULL, &nodeinfo) < 0) return -1; @@ -2636,7 +2636,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, hookData.vm = vm; hookData.driver = driver; - DEBUG0("Beginning VM startup process"); + VIR_DEBUG0("Beginning VM startup process"); if (virDomainObjIsActive(vm)) { qemuReportError(VIR_ERR_OPERATION_INVALID, @@ -2648,18 +2648,18 @@ static int qemudStartVMDaemon(virConnectPtr conn, * runtime state to vm->def that won't be persisted. This let's us * report implicit runtime defaults in the XML, like vnc listen/socket */ - DEBUG0("Setting current domain def as transient"); + VIR_DEBUG0("Setting current domain def as transient"); if (virDomainObjSetDefTransient(driver->caps, vm, true) < 0) goto cleanup; vm->def->id = driver->nextvmid++; /* Must be run before security labelling */ - DEBUG0("Preparing host devices"); + VIR_DEBUG0("Preparing host devices"); if (qemuPrepareHostDevices(driver, vm->def) < 0) goto cleanup; - DEBUG0("Preparing chr devices"); + VIR_DEBUG0("Preparing chr devices"); if (virDomainChrDefForeach(vm->def, true, qemuPrepareChardevDevice, @@ -2668,14 +2668,14 @@ static int qemudStartVMDaemon(virConnectPtr conn, /* If you are using a SecurityDriver with dynamic labelling, then generate a security label for isolation */ - DEBUG0("Generating domain security label (if required)"); + VIR_DEBUG0("Generating domain security label (if required)"); if (virSecurityManagerGenLabel(driver->securityManager, vm) < 0) { qemuDomainSecurityLabelAudit(vm, false); goto cleanup; } qemuDomainSecurityLabelAudit(vm, true); - DEBUG0("Generating setting domain security labels (if required)"); + VIR_DEBUG0("Generating setting domain security labels (if required)"); if (virSecurityManagerSetAllLabel(driver->securityManager, vm, stdin_path) < 0) goto cleanup; @@ -2686,7 +2686,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, */ struct stat stdin_sb; - DEBUG0("setting security label on pipe used for migration"); + VIR_DEBUG0("setting security label on pipe used for migration"); if (fstat(stdin_fd, &stdin_sb) < 0) { virReportSystemError(errno, @@ -2700,7 +2700,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, /* Ensure no historical cgroup for this VM is lying around bogus * settings */ - DEBUG0("Ensuring no historical cgroup is lying around"); + VIR_DEBUG0("Ensuring no historical cgroup is lying around"); qemuRemoveCgroup(driver, vm, 1); if (vm->def->ngraphics == 1) { @@ -2746,17 +2746,17 @@ static int qemudStartVMDaemon(virConnectPtr conn, goto cleanup; } - DEBUG0("Creating domain log file"); + VIR_DEBUG0("Creating domain log file"); if ((logfile = qemudLogFD(driver, vm->def->name, false)) < 0) goto cleanup; - DEBUG0("Determining emulator version"); + VIR_DEBUG0("Determining emulator version"); if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, NULL, &qemuCmdFlags) < 0) goto cleanup; - DEBUG0("Setting up domain cgroup (if required)"); + VIR_DEBUG0("Setting up domain cgroup (if required)"); if (qemuSetupCgroup(driver, vm) < 0) goto cleanup; @@ -2765,7 +2765,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, goto cleanup; } - DEBUG0("Preparing monitor state"); + VIR_DEBUG0("Preparing monitor state"); if (qemuPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0) goto cleanup; @@ -2800,7 +2800,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, * use in hotplug */ if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { - DEBUG0("Assigning domain PCI addresses"); + VIR_DEBUG0("Assigning domain PCI addresses"); /* Populate cache with current addresses */ if (priv->pciaddrs) { qemuDomainPCIAddressSetFree(priv->pciaddrs); @@ -2819,7 +2819,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, priv->persistentAddrs = 0; } - DEBUG0("Building emulator command line"); + VIR_DEBUG0("Building emulator command line"); if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON != 0, qemuCmdFlags, migrateFrom, stdin_fd, @@ -2916,27 +2916,27 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (ret == -1) /* The VM failed to start */ goto cleanup; - DEBUG0("Waiting for monitor to show up"); + VIR_DEBUG0("Waiting for monitor to show up"); if (qemudWaitForMonitor(driver, vm, pos) < 0) goto cleanup; - DEBUG0("Detecting VCPU PIDs"); + VIR_DEBUG0("Detecting VCPU PIDs"); if (qemuDetectVcpuPIDs(driver, vm) < 0) goto cleanup; - DEBUG0("Setting any required VM passwords"); + VIR_DEBUG0("Setting any required VM passwords"); if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0) goto cleanup; /* If we have -device, then addresses are assigned explicitly. * If not, then we have to detect dynamic ones here */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { - DEBUG0("Determining domain device PCI addresses"); + VIR_DEBUG0("Determining domain device PCI addresses"); if (qemuInitPCIAddresses(driver, vm) < 0) goto cleanup; } - DEBUG0("Setting initial memory amount"); + VIR_DEBUG0("Setting initial memory amount"); qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorSetBalloon(priv->mon, vm->def->mem.cur_balloon) < 0) { qemuDomainObjExitMonitorWithDriver(driver, vm); @@ -2945,7 +2945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, qemuDomainObjExitMonitorWithDriver(driver, vm); if (!start_paused) { - DEBUG0("Starting domain CPUs"); + VIR_DEBUG0("Starting domain CPUs"); /* Allow the CPUS to start executing */ if (doStartCPUs(driver, vm, conn) < 0) { if (virGetLastError() == NULL) @@ -2956,7 +2956,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, } - DEBUG0("Writing domain status to disk"); + VIR_DEBUG0("Writing domain status to disk"); if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) goto cleanup; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index e3d0a0f..dfb1aad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -903,7 +903,7 @@ int qemuMonitorEmitGraphics(qemuMonitorPtr mon, int qemuMonitorSetCapabilities(qemuMonitorPtr mon) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -924,7 +924,7 @@ qemuMonitorStartCPUs(qemuMonitorPtr mon, virConnectPtr conn) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -944,7 +944,7 @@ int qemuMonitorStopCPUs(qemuMonitorPtr mon) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -963,7 +963,7 @@ qemuMonitorStopCPUs(qemuMonitorPtr mon) int qemuMonitorSystemPowerdown(qemuMonitorPtr mon) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -983,7 +983,7 @@ int qemuMonitorGetCPUInfo(qemuMonitorPtr mon, int **pids) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1002,7 +1002,7 @@ int qemuMonitorGetBalloonInfo(qemuMonitorPtr mon, unsigned long *currmem) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1023,7 +1023,7 @@ int qemuMonitorGetMemoryStats(qemuMonitorPtr mon, unsigned int nr_stats) { int ret; - DEBUG("mon=%p stats=%p nstats=%u", mon, stats, nr_stats); + VIR_DEBUG("mon=%p stats=%p nstats=%u", mon, stats, nr_stats); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1048,7 +1048,7 @@ int qemuMonitorGetBlockStatsInfo(qemuMonitorPtr mon, long long *errs) { int ret; - DEBUG("mon=%p dev=%s", mon, devname); + VIR_DEBUG("mon=%p dev=%s", mon, devname); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1074,7 +1074,7 @@ int qemuMonitorGetBlockExtent(qemuMonitorPtr mon, unsigned long long *extent) { int ret; - DEBUG("mon=%p, fd=%d, devname=%p", + VIR_DEBUG("mon=%p, fd=%d, devname=%p", mon, mon->fd, devname); if (mon->json) @@ -1090,7 +1090,7 @@ int qemuMonitorSetVNCPassword(qemuMonitorPtr mon, const char *password) { int ret; - DEBUG("mon=%p, password=%p", + VIR_DEBUG("mon=%p, password=%p", mon, password); if (!mon) { @@ -1136,7 +1136,7 @@ int qemuMonitorSetPassword(qemuMonitorPtr mon, if (!protocol) return -1; - DEBUG("mon=%p, protocol=%s, password=%p, action_if_connected=%s", + VIR_DEBUG("mon=%p, protocol=%s, password=%p, action_if_connected=%s", mon, protocol, password, action_if_connected); if (!mon) { @@ -1168,7 +1168,7 @@ int qemuMonitorExpirePassword(qemuMonitorPtr mon, if (!protocol) return -1; - DEBUG("mon=%p, protocol=%s, expire_time=%s", + VIR_DEBUG("mon=%p, protocol=%s, expire_time=%s", mon, protocol, expire_time); if (!mon) { @@ -1191,7 +1191,7 @@ int qemuMonitorSetBalloon(qemuMonitorPtr mon, unsigned long newmem) { int ret; - DEBUG("mon=%p newmem=%lu", mon, newmem); + VIR_DEBUG("mon=%p newmem=%lu", mon, newmem); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1210,7 +1210,7 @@ int qemuMonitorSetBalloon(qemuMonitorPtr mon, int qemuMonitorSetCPU(qemuMonitorPtr mon, int cpu, int online) { int ret; - DEBUG("mon=%p cpu=%d online=%d", mon, cpu, online); + VIR_DEBUG("mon=%p cpu=%d online=%d", mon, cpu, online); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1231,7 +1231,7 @@ int qemuMonitorEjectMedia(qemuMonitorPtr mon, bool force) { int ret; - DEBUG("mon=%p devname=%s force=%d", mon, devname, force); + VIR_DEBUG("mon=%p devname=%s force=%d", mon, devname, force); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1253,7 +1253,7 @@ int qemuMonitorChangeMedia(qemuMonitorPtr mon, const char *format) { int ret; - DEBUG("mon=%p devname=%s newmedia=%s format=%s", + VIR_DEBUG("mon=%p devname=%s newmedia=%s format=%s", mon, devname, newmedia, format); if (!mon) { @@ -1276,7 +1276,7 @@ int qemuMonitorSaveVirtualMemory(qemuMonitorPtr mon, const char *path) { int ret; - DEBUG("mon=%p offset=%llu length=%zu path=%s", + VIR_DEBUG("mon=%p offset=%llu length=%zu path=%s", mon, offset, length, path); if (!mon) { @@ -1298,7 +1298,7 @@ int qemuMonitorSavePhysicalMemory(qemuMonitorPtr mon, const char *path) { int ret; - DEBUG("mon=%p offset=%llu length=%zu path=%s", + VIR_DEBUG("mon=%p offset=%llu length=%zu path=%s", mon, offset, length, path); if (!mon) { @@ -1319,7 +1319,7 @@ int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon, unsigned long bandwidth) { int ret; - DEBUG("mon=%p bandwidth=%lu", mon, bandwidth); + VIR_DEBUG("mon=%p bandwidth=%lu", mon, bandwidth); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1339,7 +1339,7 @@ int qemuMonitorSetMigrationDowntime(qemuMonitorPtr mon, unsigned long long downtime) { int ret; - DEBUG("mon=%p downtime=%llu", mon, downtime); + VIR_DEBUG("mon=%p downtime=%llu", mon, downtime); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1362,7 +1362,7 @@ int qemuMonitorGetMigrationStatus(qemuMonitorPtr mon, unsigned long long *total) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1390,7 +1390,7 @@ int qemuMonitorMigrateToHost(qemuMonitorPtr mon, int port) { int ret; - DEBUG("mon=%p hostname=%s port=%d flags=%u", + VIR_DEBUG("mon=%p hostname=%s port=%d flags=%u", mon, hostname, port, flags); if (!mon) { @@ -1412,7 +1412,7 @@ int qemuMonitorMigrateToCommand(qemuMonitorPtr mon, const char * const *argv) { int ret; - DEBUG("mon=%p argv=%p flags=%u", + VIR_DEBUG("mon=%p argv=%p flags=%u", mon, argv, flags); if (!mon) { @@ -1435,7 +1435,7 @@ int qemuMonitorMigrateToFile(qemuMonitorPtr mon, unsigned long long offset) { int ret; - DEBUG("mon=%p argv=%p target=%s offset=%llu flags=%u", + VIR_DEBUG("mon=%p argv=%p target=%s offset=%llu flags=%u", mon, argv, target, offset, flags); if (!mon) { @@ -1463,7 +1463,7 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon, const char *unixfile) { int ret; - DEBUG("mon=%p, unixfile=%s flags=%u", + VIR_DEBUG("mon=%p, unixfile=%s flags=%u", mon, unixfile, flags); if (!mon) { @@ -1482,7 +1482,7 @@ int qemuMonitorMigrateToUnix(qemuMonitorPtr mon, int qemuMonitorMigrateCancel(qemuMonitorPtr mon) { int ret; - DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p", mon); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1501,7 +1501,7 @@ int qemuMonitorAddUSBDisk(qemuMonitorPtr mon, const char *path) { int ret; - DEBUG("mon=%p path=%s", mon, path); + VIR_DEBUG("mon=%p path=%s", mon, path); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1522,7 +1522,7 @@ int qemuMonitorAddUSBDeviceExact(qemuMonitorPtr mon, int dev) { int ret; - DEBUG("mon=%p bus=%d dev=%d", mon, bus, dev); + VIR_DEBUG("mon=%p bus=%d dev=%d", mon, bus, dev); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1542,7 +1542,7 @@ int qemuMonitorAddUSBDeviceMatch(qemuMonitorPtr mon, int product) { int ret; - DEBUG("mon=%p vendor=%d product=%d", + VIR_DEBUG("mon=%p vendor=%d product=%d", mon, vendor, product); if (!mon) { @@ -1564,7 +1564,7 @@ int qemuMonitorAddPCIHostDevice(qemuMonitorPtr mon, virDomainDevicePCIAddress *guestAddr) { int ret; - DEBUG("mon=%p domain=%d bus=%d slot=%d function=%d", + VIR_DEBUG("mon=%p domain=%d bus=%d slot=%d function=%d", mon, hostAddr->domain, hostAddr->bus, hostAddr->slot, hostAddr->function); @@ -1588,7 +1588,7 @@ int qemuMonitorAddPCIDisk(qemuMonitorPtr mon, virDomainDevicePCIAddress *guestAddr) { int ret; - DEBUG("mon=%p path=%s bus=%s", + VIR_DEBUG("mon=%p path=%s bus=%s", mon, path, bus); if (!mon) { @@ -1610,7 +1610,7 @@ int qemuMonitorAddPCINetwork(qemuMonitorPtr mon, virDomainDevicePCIAddress *guestAddr) { int ret; - DEBUG("mon=%p nicstr=%s", mon, nicstr); + VIR_DEBUG("mon=%p nicstr=%s", mon, nicstr); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1630,7 +1630,7 @@ int qemuMonitorRemovePCIDevice(qemuMonitorPtr mon, virDomainDevicePCIAddress *guestAddr) { int ret; - DEBUG("mon=%p domain=%d bus=%d slot=%d function=%d", + VIR_DEBUG("mon=%p domain=%d bus=%d slot=%d function=%d", mon, guestAddr->domain, guestAddr->bus, guestAddr->slot, guestAddr->function); @@ -1653,7 +1653,7 @@ int qemuMonitorSendFileHandle(qemuMonitorPtr mon, int fd) { int ret; - DEBUG("mon=%p, fdname=%s fd=%d", + VIR_DEBUG("mon=%p, fdname=%s fd=%d", mon, fdname, fd); if (!mon) { @@ -1674,7 +1674,7 @@ int qemuMonitorCloseFileHandle(qemuMonitorPtr mon, const char *fdname) { int ret; - DEBUG("mon=%p fdname=%s", + VIR_DEBUG("mon=%p fdname=%s", mon, fdname); if (!mon) { @@ -1695,7 +1695,7 @@ int qemuMonitorAddHostNetwork(qemuMonitorPtr mon, const char *netstr) { int ret; - DEBUG("mon=%p netstr=%s", + VIR_DEBUG("mon=%p netstr=%s", mon, netstr); if (!mon) { @@ -1717,7 +1717,7 @@ int qemuMonitorRemoveHostNetwork(qemuMonitorPtr mon, const char *netname) { int ret; - DEBUG("mon=%p netname=%s", + VIR_DEBUG("mon=%p netname=%s", mon, netname); if (!mon) { @@ -1738,7 +1738,7 @@ int qemuMonitorAddNetdev(qemuMonitorPtr mon, const char *netdevstr) { int ret; - DEBUG("mon=%p netdevstr=%s", + VIR_DEBUG("mon=%p netdevstr=%s", mon, netdevstr); if (!mon) { @@ -1759,7 +1759,7 @@ int qemuMonitorRemoveNetdev(qemuMonitorPtr mon, const char *alias) { int ret; - DEBUG("mon=%p alias=%s", + VIR_DEBUG("mon=%p alias=%s", mon, alias); if (!mon) { @@ -1780,7 +1780,7 @@ int qemuMonitorGetPtyPaths(qemuMonitorPtr mon, virHashTablePtr paths) { int ret; - DEBUG("mon=%p", + VIR_DEBUG("mon=%p", mon); if (!mon) { @@ -1801,7 +1801,7 @@ int qemuMonitorAttachPCIDiskController(qemuMonitorPtr mon, const char *bus, virDomainDevicePCIAddress *guestAddr) { - DEBUG("mon=%p type=%s", mon, bus); + VIR_DEBUG("mon=%p type=%s", mon, bus); int ret; if (!mon) { @@ -1824,7 +1824,7 @@ int qemuMonitorAttachDrive(qemuMonitorPtr mon, virDomainDevicePCIAddress *controllerAddr, virDomainDeviceDriveAddress *driveAddr) { - DEBUG("mon=%p drivestr=%s domain=%d bus=%d slot=%d function=%d", + VIR_DEBUG("mon=%p drivestr=%s domain=%d bus=%d slot=%d function=%d", mon, drivestr, controllerAddr->domain, controllerAddr->bus, controllerAddr->slot, controllerAddr->function); @@ -1847,7 +1847,7 @@ int qemuMonitorAttachDrive(qemuMonitorPtr mon, int qemuMonitorGetAllPCIAddresses(qemuMonitorPtr mon, qemuMonitorPCIAddress **addrs) { - DEBUG("mon=%p addrs=%p", mon, addrs); + VIR_DEBUG("mon=%p addrs=%p", mon, addrs); int ret; if (!mon) { @@ -1866,7 +1866,7 @@ int qemuMonitorGetAllPCIAddresses(qemuMonitorPtr mon, int qemuMonitorDriveDel(qemuMonitorPtr mon, const char *drivestr) { - DEBUG("mon=%p drivestr=%s", mon, drivestr); + VIR_DEBUG("mon=%p drivestr=%s", mon, drivestr); int ret; if (!mon) { @@ -1885,7 +1885,7 @@ int qemuMonitorDriveDel(qemuMonitorPtr mon, int qemuMonitorDelDevice(qemuMonitorPtr mon, const char *devalias) { - DEBUG("mon=%p devalias=%s", mon, devalias); + VIR_DEBUG("mon=%p devalias=%s", mon, devalias); int ret; if (!mon) { @@ -1905,7 +1905,7 @@ int qemuMonitorDelDevice(qemuMonitorPtr mon, int qemuMonitorAddDevice(qemuMonitorPtr mon, const char *devicestr) { - DEBUG("mon=%p device=%s", mon, devicestr); + VIR_DEBUG("mon=%p device=%s", mon, devicestr); int ret; if (!mon) { @@ -1924,7 +1924,7 @@ int qemuMonitorAddDevice(qemuMonitorPtr mon, int qemuMonitorAddDrive(qemuMonitorPtr mon, const char *drivestr) { - DEBUG("mon=%p drive=%s", mon, drivestr); + VIR_DEBUG("mon=%p drive=%s", mon, drivestr); int ret; if (!mon) { @@ -1945,7 +1945,7 @@ int qemuMonitorSetDrivePassphrase(qemuMonitorPtr mon, const char *alias, const char *passphrase) { - DEBUG("mon=%p alias=%s passphrase=%p(value hidden)", mon, alias, passphrase); + VIR_DEBUG("mon=%p alias=%s passphrase=%p(value hidden)", mon, alias, passphrase); int ret; if (!mon) { @@ -1965,7 +1965,7 @@ int qemuMonitorCreateSnapshot(qemuMonitorPtr mon, const char *name) { int ret; - DEBUG("mon=%p, name=%s",mon,name); + VIR_DEBUG("mon=%p, name=%s",mon,name); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -1984,7 +1984,7 @@ int qemuMonitorLoadSnapshot(qemuMonitorPtr mon, const char *name) { int ret; - DEBUG("mon=%p, name=%s",mon,name); + VIR_DEBUG("mon=%p, name=%s",mon,name); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2003,7 +2003,7 @@ int qemuMonitorDeleteSnapshot(qemuMonitorPtr mon, const char *name) { int ret; - DEBUG("mon=%p, name=%s",mon,name); + VIR_DEBUG("mon=%p, name=%s",mon,name); if (!mon) { qemuReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2025,7 +2025,7 @@ int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, { int ret; - DEBUG("mon=%p, cmd=%s, reply=%p, hmp=%d", mon, cmd, reply, hmp); + VIR_DEBUG("mon=%p, cmd=%s, reply=%p, hmp=%d", mon, cmd, reply, hmp); if (mon->json) ret = qemuMonitorJSONArbitraryCommand(mon, cmd, reply, hmp); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d5e8d37..e6903a1 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2326,7 +2326,7 @@ int qemuMonitorJSONDriveDel(qemuMonitorPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; - DEBUG("JSONDriveDel drivestr=%s", drivestr); + VIR_DEBUG("JSONDriveDel drivestr=%s", drivestr); cmd = qemuMonitorJSONMakeCommand("drive_del", "s:id", drivestr, NULL); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 6d0ba4c..9acf65f 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -445,7 +445,7 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, if (VIR_REALLOC_N(cpupids, ncpupids+1) < 0) goto error; - DEBUG("vcpu=%d pid=%d", vcpu, tid); + VIR_DEBUG("vcpu=%d pid=%d", vcpu, tid); cpupids[ncpupids++] = tid; lastVcpu = vcpu; @@ -480,7 +480,7 @@ static int parseMemoryStat(char **text, unsigned int tag, if (STRPREFIX (*text, search)) { *text += strlen(search); if (virStrToLong_ull (*text, &dummy, 10, &value)) { - DEBUG ("error reading %s: %s", search, *text); + VIR_DEBUG ("error reading %s: %s", search, *text); return 0; } @@ -671,21 +671,21 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, if (STRPREFIX (p, "rd_bytes=")) { p += 9; if (virStrToLong_ll (p, &dummy, 10, rd_bytes) == -1) - DEBUG ("error reading rd_bytes: %s", p); + VIR_DEBUG ("error reading rd_bytes: %s", p); } else if (STRPREFIX (p, "wr_bytes=")) { p += 9; if (virStrToLong_ll (p, &dummy, 10, wr_bytes) == -1) - DEBUG ("error reading wr_bytes: %s", p); + VIR_DEBUG ("error reading wr_bytes: %s", p); } else if (STRPREFIX (p, "rd_operations=")) { p += 14; if (virStrToLong_ll (p, &dummy, 10, rd_req) == -1) - DEBUG ("error reading rd_req: %s", p); + VIR_DEBUG ("error reading rd_req: %s", p); } else if (STRPREFIX (p, "wr_operations=")) { p += 14; if (virStrToLong_ll (p, &dummy, 10, wr_req) == -1) - DEBUG ("error reading wr_req: %s", p); + VIR_DEBUG ("error reading wr_req: %s", p); } else - DEBUG ("unknown block stat near %s", p); + VIR_DEBUG ("unknown block stat near %s", p); /* Skip to next label. */ p = strchr (p, ' '); @@ -2355,7 +2355,7 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon, goto cleanup; } - DEBUG("TextDelDevice devalias=%s", devalias); + VIR_DEBUG("TextDelDevice devalias=%s", devalias); if (qemuMonitorCommand(mon, cmd, &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, _("cannot detach %s device"), devalias); @@ -2471,7 +2471,7 @@ int qemuMonitorTextDriveDel(qemuMonitorPtr mon, char *reply = NULL; char *safedev; int ret = -1; - DEBUG("TextDriveDel drivestr=%s", drivestr); + VIR_DEBUG("TextDriveDel drivestr=%s", drivestr); if (!(safedev = qemuMonitorEscapeArg(drivestr))) { virReportOOMError(); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 4ca0d3b..0be9c56 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -515,7 +515,7 @@ doRemoteOpen (virConnectPtr conn, if (!pkipath) goto out_of_memory; var->ignore = 1; } else { - DEBUG("passing through variable '%s' ('%s') to remote end", + VIR_DEBUG("passing through variable '%s' ('%s') to remote end", var->name, var->value); } } @@ -571,7 +571,7 @@ doRemoteOpen (virConnectPtr conn, goto failed; } - DEBUG("proceeding with name = %s", name); + VIR_DEBUG("proceeding with name = %s", name); /* For ext transport, command is required. */ if (transport == trans_ext && !command) { @@ -894,7 +894,7 @@ doRemoteOpen (virConnectPtr conn, goto failed; } - DEBUG("Auto-probed URI is %s", uriret.uri); + VIR_DEBUG("Auto-probed URI is %s", uriret.uri); conn->uri = xmlParseURI(uriret.uri); VIR_FREE(uriret.uri); if (!conn->uri) { @@ -913,21 +913,21 @@ doRemoteOpen (virConnectPtr conn, goto failed; } - DEBUG0("Adding Handler for remote events"); + VIR_DEBUG0("Adding Handler for remote events"); /* Set up a callback to listen on the socket data */ if ((priv->watch = virEventAddHandle(priv->sock, VIR_EVENT_HANDLE_READABLE, remoteDomainEventFired, conn, NULL)) < 0) { - DEBUG0("virEventAddHandle failed: No addHandleImpl defined." + VIR_DEBUG0("virEventAddHandle failed: No addHandleImpl defined." " continuing without events."); } else { - DEBUG0("Adding Timeout for remote event queue flushing"); + VIR_DEBUG0("Adding Timeout for remote event queue flushing"); if ( (priv->eventFlushTimer = virEventAddTimeout(-1, remoteDomainEventQueueFlush, conn, NULL)) < 0) { - DEBUG0("virEventAddTimeout failed: No addTimeoutImpl defined. " + VIR_DEBUG0("virEventAddTimeout failed: No addTimeoutImpl defined. " "continuing without events."); virEventRemoveHandle(priv->watch); priv->watch = -1; @@ -1076,7 +1076,7 @@ remoteOpen (virConnectPtr conn, (STREQ(conn->uri->path, "/session") || STRPREFIX(conn->uri->scheme, "test+")) && getuid() > 0) { - DEBUG0("Auto-spawn user daemon instance"); + VIR_DEBUG0("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; if (!autostart || STRNEQ(autostart, "0")) @@ -1090,10 +1090,10 @@ remoteOpen (virConnectPtr conn, * to the UNIX socket anyway. */ if (!conn->uri) { - DEBUG0("Auto-probe remote URI"); + VIR_DEBUG0("Auto-probe remote URI"); #ifndef __sun if (getuid() > 0) { - DEBUG0("Auto-spawn user daemon instance"); + VIR_DEBUG0("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; if (!autostart || STRNEQ(autostart, "0")) @@ -1142,7 +1142,7 @@ check_cert_file(const char *type, const char *file) static void remote_debug_gnutls_log(int level, const char* str) { - DEBUG("%d %s", level, str); + VIR_DEBUG("%d %s", level, str); } static int @@ -1252,7 +1252,7 @@ initialize_gnutls(char *pkipath, int flags) goto error; /* Set the trusted CA cert. */ - DEBUG("loading CA file %s", libvirt_cacert); + VIR_DEBUG("loading CA file %s", libvirt_cacert); err = gnutls_certificate_set_x509_trust_file (x509_cred, libvirt_cacert, GNUTLS_X509_FMT_PEM); @@ -1264,7 +1264,7 @@ initialize_gnutls(char *pkipath, int flags) } /* Set the client certificate and private key. */ - DEBUG("loading client cert and key from files %s and %s", + VIR_DEBUG("loading client cert and key from files %s and %s", libvirt_clientcert, libvirt_clientkey); err = gnutls_certificate_set_x509_key_file (x509_cred, @@ -1390,7 +1390,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, /* Verify certificate. */ if (verify_certificate (conn, priv, session) == -1) { - DEBUG0("failed to verify peer's certificate"); + VIR_DEBUG0("failed to verify peer's certificate"); if (!no_verify) return NULL; } @@ -7240,7 +7240,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, int ret = -1; const char *mechlist; - DEBUG0("Client initialize SASL authentication"); + VIR_DEBUG0("Client initialize SASL authentication"); /* Sets up the SASL library as a whole */ err = sasl_client_init(NULL); if (err != SASL_OK) { @@ -7305,7 +7305,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, } ssf *= 8; /* key size is bytes, sasl wants bits */ - DEBUG("Setting external SSF %d", ssf); + VIR_DEBUG("Setting external SSF %d", ssf); err = sasl_setprop(saslconn, SASL_SSF_EXTERNAL, &ssf); if (err != SASL_OK) { remoteError(VIR_ERR_INTERNAL_ERROR, @@ -7353,7 +7353,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, } restart: /* Start the auth negotiation on the client end first */ - DEBUG("Client start negotiation mechlist '%s'", mechlist); + VIR_DEBUG("Client start negotiation mechlist '%s'", mechlist); err = sasl_client_start(saslconn, mechlist, &interact, @@ -7408,7 +7408,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, sargs.data.data_val = (char*)clientout; sargs.data.data_len = clientoutlen; sargs.mech = (char*)mech; - DEBUG("Server start negotiation with mech %s. Data %d bytes %p", mech, clientoutlen, clientout); + VIR_DEBUG("Server start negotiation with mech %s. Data %d bytes %p", mech, clientoutlen, clientout); /* Now send the initial auth data to the server */ memset (&sret, 0, sizeof sret); @@ -7421,7 +7421,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, /* NB, distinction of NULL vs "" is *critical* in SASL */ serverin = sret.nil ? NULL : sret.data.data_val; serverinlen = sret.data.data_len; - DEBUG("Client step result complete: %d. Data %d bytes %p", + VIR_DEBUG("Client step result complete: %d. Data %d bytes %p", complete, serverinlen, serverin); /* Loop-the-loop... @@ -7468,7 +7468,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, } VIR_FREE(serverin); - DEBUG("Client step result %d. Data %d bytes %p", err, clientoutlen, clientout); + VIR_DEBUG("Client step result %d. Data %d bytes %p", err, clientoutlen, clientout); /* Previous server call showed completion & we're now locally complete too */ if (complete && err == SASL_OK) @@ -7480,7 +7480,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, pargs.nil = clientout ? 0 : 1; pargs.data.data_val = (char*)clientout; pargs.data.data_len = clientoutlen; - DEBUG("Server step with %d bytes %p", clientoutlen, clientout); + VIR_DEBUG("Server step with %d bytes %p", clientoutlen, clientout); memset (&pret, 0, sizeof pret); if (call (conn, priv, in_open, REMOTE_PROC_AUTH_SASL_STEP, @@ -7493,7 +7493,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, serverin = pret.nil ? NULL : pret.data.data_val; serverinlen = pret.data.data_len; - DEBUG("Client step result complete: %d. Data %d bytes %p", + VIR_DEBUG("Client step result complete: %d. Data %d bytes %p", complete, serverinlen, serverin); /* This server call shows complete, and earlier client step was OK */ @@ -7513,7 +7513,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, goto cleanup; } ssf = *(const int *)val; - DEBUG("SASL SSF value %d", ssf); + VIR_DEBUG("SASL SSF value %d", ssf); if (ssf < 56) { /* 56 == DES level, good for Kerberos */ remoteError(VIR_ERR_AUTH_FAILED, _("negotiation SSF %d was not strong enough"), ssf); @@ -7522,7 +7522,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, priv->is_secure = 1; } - DEBUG0("SASL authentication complete"); + VIR_DEBUG0("SASL authentication complete"); priv->saslconn = saslconn; ret = 0; @@ -7548,7 +7548,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, virConnectAuthPtr auth ATTRIBUTE_UNUSED) { remote_auth_polkit_ret ret; - DEBUG0("Client initialize PolicyKit-1 authentication"); + VIR_DEBUG0("Client initialize PolicyKit-1 authentication"); memset (&ret, 0, sizeof ret); if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT, @@ -7557,7 +7557,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, return -1; /* virError already set by call */ } - DEBUG0("PolicyKit-1 authentication complete"); + VIR_DEBUG0("PolicyKit-1 authentication complete"); return 0; } # elif HAVE_POLKIT0 @@ -7577,7 +7577,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, NULL, 0, }; - DEBUG0("Client initialize PolicyKit-0 authentication"); + VIR_DEBUG0("Client initialize PolicyKit-0 authentication"); if (auth && auth->cb) { /* Check if the necessary credential type for PolicyKit is supported */ @@ -7587,7 +7587,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, } if (allowcb) { - DEBUG0("Client run callback for PolicyKit authentication"); + VIR_DEBUG0("Client run callback for PolicyKit authentication"); /* Run the authentication callback */ if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { remoteError(VIR_ERR_AUTH_FAILED, "%s", @@ -7595,10 +7595,10 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, return -1; } } else { - DEBUG0("Client auth callback does not support PolicyKit"); + VIR_DEBUG0("Client auth callback does not support PolicyKit"); } } else { - DEBUG0("No auth callback provided"); + VIR_DEBUG0("No auth callback provided"); } memset (&ret, 0, sizeof ret); @@ -7608,7 +7608,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open, return -1; /* virError already set by call */ } - DEBUG0("PolicyKit-0 authentication complete"); + VIR_DEBUG0("PolicyKit-0 authentication complete"); return 0; } # endif /* HAVE_POLKIT0 */ @@ -8330,7 +8330,7 @@ remoteStreamPacket(virStreamPtr st, const char *data, size_t nbytes) { - DEBUG("st=%p status=%d data=%p nbytes=%zu", st, status, data, nbytes); + VIR_DEBUG("st=%p status=%d data=%p nbytes=%zu", st, status, data, nbytes); struct private_data *priv = st->conn->privateData; struct private_stream_data *privst = st->privateData; XDR xdr; @@ -8475,7 +8475,7 @@ remoteStreamSend(virStreamPtr st, const char *data, size_t nbytes) { - DEBUG("st=%p data=%p nbytes=%zu", st, data, nbytes); + VIR_DEBUG("st=%p data=%p nbytes=%zu", st, data, nbytes); struct private_data *priv = st->conn->privateData; int rv = -1; @@ -8504,7 +8504,7 @@ remoteStreamRecv(virStreamPtr st, char *data, size_t nbytes) { - DEBUG("st=%p data=%p nbytes=%zu", st, data, nbytes); + VIR_DEBUG("st=%p data=%p nbytes=%zu", st, data, nbytes); struct private_data *priv = st->conn->privateData; struct private_stream_data *privst = st->privateData; int rv = -1; @@ -8519,7 +8519,7 @@ remoteStreamRecv(virStreamPtr st, int ret; if (st->flags & VIR_STREAM_NONBLOCK) { - DEBUG0("Non-blocking mode and no data available"); + VIR_DEBUG0("Non-blocking mode and no data available"); rv = -2; goto cleanup; } @@ -8549,7 +8549,7 @@ remoteStreamRecv(virStreamPtr st, goto cleanup; } - DEBUG("After IO %d", privst->incomingOffset); + VIR_DEBUG("After IO %d", privst->incomingOffset); if (privst->incomingOffset) { int want = privst->incomingOffset; if (want > nbytes) @@ -8569,7 +8569,7 @@ remoteStreamRecv(virStreamPtr st, remoteStreamEventTimerUpdate(privst); - DEBUG("Done %d", rv); + VIR_DEBUG("Done %d", rv); cleanup: if (rv == -1) @@ -9818,7 +9818,7 @@ remoteIODecodeMessageLength(struct private_data *priv) { /* Extend our declared buffer length and carry on reading the header + payload */ priv->bufferLength += len; - DEBUG("Got length, now need %d total (%d more)", priv->bufferLength, len); + VIR_DEBUG("Got length, now need %d total (%d more)", priv->bufferLength, len); return 0; } @@ -9977,10 +9977,10 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv, /* An async message has come in while we were waiting for the * response. Process it to pull it off the wire, and try again */ - DEBUG0("Encountered an event while waiting for a response"); + VIR_DEBUG0("Encountered an event while waiting for a response"); if (in_open) { - DEBUG("Ignoring bogus event %d received while in open", hdr->proc); + VIR_DEBUG("Ignoring bogus event %d received while in open", hdr->proc); return -1; } @@ -10014,7 +10014,7 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv, break; default: - DEBUG("Unexpected event proc %d", hdr->proc); + VIR_DEBUG("Unexpected event proc %d", hdr->proc); break; } @@ -10023,7 +10023,7 @@ processCallDispatchMessage(virConnectPtr conn, struct private_data *priv, if (virDomainEventQueuePush(priv->domainEvents, event) < 0) { - DEBUG0("Error adding event to queue"); + VIR_DEBUG0("Error adding event to queue"); virDomainEventFree(event); } virEventUpdateTimeout(priv->eventFlushTimer, 0); @@ -10271,7 +10271,7 @@ remoteIOEventLoop(virConnectPtr conn, if (fds[1].revents) { ssize_t s; - DEBUG0("Woken up from poll by other thread"); + VIR_DEBUG0("Woken up from poll by other thread"); s = saferead(priv->wakeupReadFD, &ignore, sizeof(ignore)); if (s < 0) { virReportSystemError(errno, "%s", @@ -10322,7 +10322,7 @@ remoteIOEventLoop(virConnectPtr conn, * we release our mutex a short while * later... */ - DEBUG("Waking up sleep %d %p %p", tmp->proc_nr, tmp, priv->waitDispatch); + VIR_DEBUG("Waking up sleep %d %p %p", tmp->proc_nr, tmp, priv->waitDispatch); virCondSignal(&tmp->cond); } prev = tmp; @@ -10336,11 +10336,11 @@ remoteIOEventLoop(virConnectPtr conn, * remove us */ priv->waitDispatch = thiscall->next; - DEBUG("Giving up the buck %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); + VIR_DEBUG("Giving up the buck %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); /* See if someone else is still waiting * and if so, then pass the buck ! */ if (priv->waitDispatch) { - DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); + VIR_DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); virCondSignal(&priv->waitDispatch->cond); } return 0; @@ -10357,11 +10357,11 @@ remoteIOEventLoop(virConnectPtr conn, error: priv->waitDispatch = thiscall->next; - DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); + VIR_DEBUG("Giving up the buck due to I/O error %d %p %p", thiscall->proc_nr, thiscall, priv->waitDispatch); /* See if someone else is still waiting * and if so, then pass the buck ! */ if (priv->waitDispatch) { - DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); + VIR_DEBUG("Passing the buck to %d %p", priv->waitDispatch->proc_nr, priv->waitDispatch); virCondSignal(&priv->waitDispatch->cond); } return -1; @@ -10408,7 +10408,7 @@ remoteIO(virConnectPtr conn, { int rv; - DEBUG("Do proc=%d serial=%d length=%d wait=%p", + VIR_DEBUG("Do proc=%d serial=%d length=%d wait=%p", thiscall->proc_nr, thiscall->serial, thiscall->bufferLength, priv->waitDispatch); @@ -10439,7 +10439,7 @@ remoteIO(virConnectPtr conn, return -1; } - DEBUG("Going to sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); + VIR_DEBUG("Going to sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); /* Go to sleep while other thread is working... */ if (virCondWait(&thiscall->cond, &priv->lock) < 0) { if (priv->waitDispatch == thiscall) { @@ -10458,7 +10458,7 @@ remoteIO(virConnectPtr conn, return -1; } - DEBUG("Wokeup from sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); + VIR_DEBUG("Wokeup from sleep %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); /* Two reasons we can be woken up * 1. Other thread has got our reply ready for us * 2. Other thread is all done, and it is our turn to @@ -10482,7 +10482,7 @@ remoteIO(virConnectPtr conn, priv->waitDispatch = thiscall; } - DEBUG("We have the buck %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); + VIR_DEBUG("We have the buck %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); /* * The buck stops here! * @@ -10509,7 +10509,7 @@ remoteIO(virConnectPtr conn, return -1; cleanup: - DEBUG("All done with our call %d %p %p", thiscall->proc_nr, + VIR_DEBUG("All done with our call %d %p %p", thiscall->proc_nr, priv->waitDispatch, thiscall); if (thiscall->mode == REMOTE_MODE_ERROR) { /* Interop for virErrorNumber glitch in 0.8.0, if server is @@ -10641,10 +10641,10 @@ remoteDomainEventFired(int watch, if (priv->waitDispatch) goto done; - DEBUG("Event fired %d %d %d %X", watch, fd, event, event); + VIR_DEBUG("Event fired %d %d %d %X", watch, fd, event, event); if (event & (VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR)) { - DEBUG("%s : VIR_EVENT_HANDLE_HANGUP or " + VIR_DEBUG("%s : VIR_EVENT_HANDLE_HANGUP or " "VIR_EVENT_HANDLE_ERROR encountered", __FUNCTION__); virEventRemoveHandle(watch); priv->watch = -1; @@ -10658,7 +10658,7 @@ remoteDomainEventFired(int watch, } if (remoteIOHandleInput(conn, priv, 0) < 0) - DEBUG0("Something went wrong during async message processing"); + VIR_DEBUG0("Something went wrong during async message processing"); done: remoteDriverUnlock(priv); diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 52353a3..1c1a037 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -615,7 +615,7 @@ virSecurityDACSetProcessLabel(virSecurityManagerPtr mgr, { virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); - DEBUG("Dropping privileges of VM to %d:%d", priv->user, priv->group); + VIR_DEBUG("Dropping privileges of VM to %d:%d", priv->user, priv->group); if (virSetUIDGID(priv->user, priv->group) < 0) return -1; diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index c7ade6b..ac421c3 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -474,7 +474,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, unsigned long long cylinderSize = dev->geometry.heads * dev->geometry.sectors * SECTOR_SIZE; - DEBUG("find free area: allocation %llu, cyl size %llu", allocation, + VIR_DEBUG("find free area: allocation %llu, cyl size %llu", allocation, cylinderSize); int partType = virStorageBackendDiskPartTypeToCreate(pool); @@ -528,7 +528,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, return -1; } - DEBUG("aligned alloc %llu", alignedAllocation); + VIR_DEBUG("aligned alloc %llu", alignedAllocation); *start = dev->freeExtents[smallestExtent].start; if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { @@ -544,7 +544,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, /* counting in byte, we want the last byte of the current sector */ *end -= 1; - DEBUG("final aligned start %llu, end %llu", *start, *end); + VIR_DEBUG("final aligned start %llu, end %llu", *start, *end); return 0; } @@ -658,7 +658,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, devname = basename(devpath); srcname = basename(pool->def->source.devices[0].path); - DEBUG("devname=%s, srcname=%s", devname, srcname); + VIR_DEBUG("devname=%s, srcname=%s", devname, srcname); if (!STRPREFIX(devname, srcname)) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1937da0..b168570 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1164,7 +1164,7 @@ static virDrvOpenStatus testOpen(virConnectPtr conn, if ((privconn->domainEventTimer = virEventAddTimeout(-1, testDomainEventFlush, privconn, NULL)) < 0) - DEBUG0("virEventAddTimeout failed: No addTimeoutImpl defined. " + VIR_DEBUG0("virEventAddTimeout failed: No addTimeoutImpl defined. " "continuing without events."); testDriverUnlock(privconn); } diff --git a/src/util/logging.h b/src/util/logging.h index 574f68d..2e2734e 100644 --- a/src/util/logging.h +++ b/src/util/logging.h @@ -1,7 +1,7 @@ /* * logging.h: internal logging and debugging * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008, 2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,7 +28,7 @@ /* * If configured with --enable-debug=yes then library calls * are printed to stderr for debugging or to an appropriate channel - * defined at runtime of from the libvirt daemon configuration file + * defined at runtime from the libvirt daemon configuration file */ # ifdef ENABLE_DEBUG # define VIR_DEBUG_INT(category, f, l, fmt,...) \ @@ -62,12 +62,6 @@ # define VIR_ERROR0(msg) \ VIR_ERROR_INT("file." __FILE__, __func__, __LINE__, "%s", msg) -/* Legacy compat */ -# define DEBUG(fmt,...) \ - VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, fmt, __VA_ARGS__) -# define DEBUG0(msg) \ - VIR_DEBUG_INT("file." __FILE__, __func__, __LINE__, "%s", msg) - /* * To be made public */ diff --git a/src/util/util.c b/src/util/util.c index 6161be6..ca64bf9 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -846,7 +846,7 @@ virRunWithHook(const char *const*argv, virReportOOMError(); goto error; } - DEBUG0(argv_str); + VIR_DEBUG0(argv_str); if ((execret = __virExec(argv, NULL, NULL, &childpid, -1, &outfd, &errfd, @@ -862,9 +862,9 @@ virRunWithHook(const char *const*argv, } if (outbuf) - DEBUG("Command stdout: %s", outbuf); + VIR_DEBUG("Command stdout: %s", outbuf); if (errbuf) - DEBUG("Command stderr: %s", errbuf); + VIR_DEBUG("Command stderr: %s", errbuf); while ((waitret = waitpid(childpid, &exitstatus, 0) == -1) && errno == EINTR); diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index f647eb9..9526ee4 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -87,7 +87,7 @@ int vboxRegister(void) { /* Init the glue and get the API version. */ if (VBoxCGlueInit(&uVersion) == 0) { - DEBUG("VBoxCGlueInit found API version: %d.%d.%d (%u)", + VIR_DEBUG("VBoxCGlueInit found API version: %d.%d.%d (%u)", uVersion / 1000000, uVersion % 1000000 / 1000, uVersion % 1000, @@ -98,36 +98,36 @@ int vboxRegister(void) { * number 51, thus the version ranges in the if statements below. */ if (uVersion >= 2001052 && uVersion < 2002051) { - DEBUG0("VirtualBox API version: 2.2"); + VIR_DEBUG0("VirtualBox API version: 2.2"); driver = &vbox22Driver; networkDriver = &vbox22NetworkDriver; storageDriver = &vbox22StorageDriver; } else if (uVersion >= 2002051 && uVersion < 3000051) { - DEBUG0("VirtualBox API version: 3.0"); + VIR_DEBUG0("VirtualBox API version: 3.0"); driver = &vbox30Driver; networkDriver = &vbox30NetworkDriver; storageDriver = &vbox30StorageDriver; } else if (uVersion >= 3000051 && uVersion < 3001051) { - DEBUG0("VirtualBox API version: 3.1"); + VIR_DEBUG0("VirtualBox API version: 3.1"); driver = &vbox31Driver; networkDriver = &vbox31NetworkDriver; storageDriver = &vbox31StorageDriver; } else if (uVersion >= 3001051 && uVersion < 3002051) { - DEBUG0("VirtualBox API version: 3.2"); + VIR_DEBUG0("VirtualBox API version: 3.2"); driver = &vbox32Driver; networkDriver = &vbox32NetworkDriver; storageDriver = &vbox32StorageDriver; } else if (uVersion >= 3002051 && uVersion < 4000051) { - DEBUG0("VirtualBox API version: 4.0"); + VIR_DEBUG0("VirtualBox API version: 4.0"); driver = &vbox40Driver; networkDriver = &vbox40NetworkDriver; storageDriver = &vbox40StorageDriver; } else { - DEBUG0("Unsupport VirtualBox API version"); + VIR_DEBUG0("Unsupport VirtualBox API version"); } } else { - DEBUG0("VBoxCGlueInit failed, using dummy driver"); + VIR_DEBUG0("VBoxCGlueInit failed, using dummy driver"); } if (virRegisterDriver(driver) < 0) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index cf3cbc6..1c4e46f 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -143,14 +143,14 @@ if (strUtf16) {\ \ g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(strUtf16, &strUtf8);\ if (strUtf8) {\ - DEBUG("%s: %s", msg, strUtf8);\ + VIR_DEBUG("%s: %s", msg, strUtf8);\ g_pVBoxGlobalData->pFuncs->pfnUtf8Free(strUtf8);\ }\ } #define DEBUGUUID(msg, iid) \ {\ - DEBUG (msg ": {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",\ + VIR_DEBUG (msg ": {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",\ (unsigned)(iid)->m0,\ (unsigned)(iid)->m1,\ (unsigned)(iid)->m2,\ @@ -617,7 +617,7 @@ static char *vboxGenerateMediumName(PRUint32 storageBus, name = virIndexToDiskName(total, prefix); - DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, " + VIR_DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, " "devicePort=%d deviceSlot=%d, maxPortPerInst=%u maxSlotPerPort=%u", NULLSTR(name), total, storageBus, deviceInst, devicePort, deviceSlot, maxPortPerInst, maxSlotPerPort); @@ -677,7 +677,7 @@ static bool vboxGetDeviceDetails(const char *deviceName, *devicePort = (total % (maxPortPerInst * maxSlotPerPort)) / maxSlotPerPort; *deviceSlot = (total % (maxPortPerInst * maxSlotPerPort)) % maxSlotPerPort; - DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, " + VIR_DEBUG("name=%s, total=%d, storageBus=%u, deviceInst=%d, " "devicePort=%d deviceSlot=%d, maxPortPerInst=%u maxSlotPerPort=%u", deviceName, total, storageBus, *deviceInst, *devicePort, *deviceSlot, maxPortPerInst, maxSlotPerPort); @@ -1027,14 +1027,14 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn, #endif /* !(VBOX_API_VERSION == 2002) */ conn->privateData = data; - DEBUG0("in vboxOpen"); + VIR_DEBUG0("in vboxOpen"); return VIR_DRV_OPEN_SUCCESS; } static int vboxClose(virConnectPtr conn) { vboxGlobalData *data = conn->privateData; - DEBUG("%s: in vboxClose",conn->driver->name); + VIR_DEBUG("%s: in vboxClose",conn->driver->name); vboxUninitialize(data); conn->privateData = NULL; @@ -1044,7 +1044,7 @@ static int vboxClose(virConnectPtr conn) { static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { vboxGlobalData *data = conn->privateData; - DEBUG("%s: in vboxGetVersion",conn->driver->name); + VIR_DEBUG("%s: in vboxGetVersion",conn->driver->name); vboxDriverLock(data); *version = data->version; @@ -3560,22 +3560,22 @@ vboxSetBootDeviceOrder(virDomainDefPtr def, vboxGlobalData *data, PRUint32 maxBootPosition = 0; int i = 0; - DEBUG("def->os.type %s", def->os.type); - DEBUG("def->os.arch %s", def->os.arch); - DEBUG("def->os.machine %s", def->os.machine); - DEBUG("def->os.nBootDevs %d", def->os.nBootDevs); - DEBUG("def->os.bootDevs[0] %d", def->os.bootDevs[0]); - DEBUG("def->os.bootDevs[1] %d", def->os.bootDevs[1]); - DEBUG("def->os.bootDevs[2] %d", def->os.bootDevs[2]); - DEBUG("def->os.bootDevs[3] %d", def->os.bootDevs[3]); - DEBUG("def->os.init %s", def->os.init); - DEBUG("def->os.kernel %s", def->os.kernel); - DEBUG("def->os.initrd %s", def->os.initrd); - DEBUG("def->os.cmdline %s", def->os.cmdline); - DEBUG("def->os.root %s", def->os.root); - DEBUG("def->os.loader %s", def->os.loader); - DEBUG("def->os.bootloader %s", def->os.bootloader); - DEBUG("def->os.bootloaderArgs %s", def->os.bootloaderArgs); + VIR_DEBUG("def->os.type %s", def->os.type); + VIR_DEBUG("def->os.arch %s", def->os.arch); + VIR_DEBUG("def->os.machine %s", def->os.machine); + VIR_DEBUG("def->os.nBootDevs %d", def->os.nBootDevs); + VIR_DEBUG("def->os.bootDevs[0] %d", def->os.bootDevs[0]); + VIR_DEBUG("def->os.bootDevs[1] %d", def->os.bootDevs[1]); + VIR_DEBUG("def->os.bootDevs[2] %d", def->os.bootDevs[2]); + VIR_DEBUG("def->os.bootDevs[3] %d", def->os.bootDevs[3]); + VIR_DEBUG("def->os.init %s", def->os.init); + VIR_DEBUG("def->os.kernel %s", def->os.kernel); + VIR_DEBUG("def->os.initrd %s", def->os.initrd); + VIR_DEBUG("def->os.cmdline %s", def->os.cmdline); + VIR_DEBUG("def->os.root %s", def->os.root); + VIR_DEBUG("def->os.loader %s", def->os.loader); + VIR_DEBUG("def->os.bootloader %s", def->os.bootloader); + VIR_DEBUG("def->os.bootloaderArgs %s", def->os.bootloaderArgs); data->vboxObj->vtbl->GetSystemProperties(data->vboxObj, &systemProperties); if (systemProperties) { @@ -3617,17 +3617,17 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) return; for (i = 0; i < def->ndisks; i++) { - DEBUG("disk(%d) type: %d", i, def->disks[i]->type); - DEBUG("disk(%d) device: %d", i, def->disks[i]->device); - DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); - DEBUG("disk(%d) src: %s", i, def->disks[i]->src); - DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); - DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); - DEBUG("disk(%d) driverType: %s", i, def->disks[i]->driverType); - DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); - DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly + VIR_DEBUG("disk(%d) type: %d", i, def->disks[i]->type); + VIR_DEBUG("disk(%d) device: %d", i, def->disks[i]->device); + VIR_DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); + VIR_DEBUG("disk(%d) src: %s", i, def->disks[i]->src); + VIR_DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); + VIR_DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); + VIR_DEBUG("disk(%d) driverType: %s", i, def->disks[i]->driverType); + VIR_DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); + VIR_DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly ? "True" : "False")); - DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared + VIR_DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared ? "True" : "False")); if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { @@ -3734,15 +3734,15 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (def->disks[i]->readonly) { hardDisk->vtbl->SetType(hardDisk, HardDiskType_Immutable); - DEBUG0("setting harddisk to readonly"); + VIR_DEBUG0("setting harddisk to readonly"); } else if (!def->disks[i]->readonly) { hardDisk->vtbl->SetType(hardDisk, HardDiskType_Normal); - DEBUG0("setting harddisk type to normal"); + VIR_DEBUG0("setting harddisk type to normal"); } if (def->disks[i]->bus == VIR_DOMAIN_DISK_BUS_IDE) { if (STREQ(def->disks[i]->dst, "hdc")) { - DEBUG0("Not connecting harddisk to hdc as hdc" + VIR_DEBUG0("Not connecting harddisk to hdc as hdc" " is taken by CD/DVD Drive"); } else { PRInt32 channel = 0; @@ -3896,17 +3896,17 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) } for (i = 0; i < def->ndisks && !error; i++) { - DEBUG("disk(%d) type: %d", i, def->disks[i]->type); - DEBUG("disk(%d) device: %d", i, def->disks[i]->device); - DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); - DEBUG("disk(%d) src: %s", i, def->disks[i]->src); - DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); - DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); - DEBUG("disk(%d) driverType: %s", i, def->disks[i]->driverType); - DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); - DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly + VIR_DEBUG("disk(%d) type: %d", i, def->disks[i]->type); + VIR_DEBUG("disk(%d) device: %d", i, def->disks[i]->device); + VIR_DEBUG("disk(%d) bus: %d", i, def->disks[i]->bus); + VIR_DEBUG("disk(%d) src: %s", i, def->disks[i]->src); + VIR_DEBUG("disk(%d) dst: %s", i, def->disks[i]->dst); + VIR_DEBUG("disk(%d) driverName: %s", i, def->disks[i]->driverName); + VIR_DEBUG("disk(%d) driverType: %s", i, def->disks[i]->driverType); + VIR_DEBUG("disk(%d) cachemode: %d", i, def->disks[i]->cachemode); + VIR_DEBUG("disk(%d) readonly: %s", i, (def->disks[i]->readonly ? "True" : "False")); - DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared + VIR_DEBUG("disk(%d) shared: %s", i, (def->disks[i]->shared ? "True" : "False")); if (def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE && @@ -4017,10 +4017,10 @@ vboxAttachDrives(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (def->disks[i]->readonly) { medium->vtbl->SetType(medium, MediumType_Immutable); - DEBUG0("setting harddisk to immutable"); + VIR_DEBUG0("setting harddisk to immutable"); } else if (!def->disks[i]->readonly) { medium->vtbl->SetType(medium, MediumType_Normal); - DEBUG0("setting harddisk type to normal"); + VIR_DEBUG0("setting harddisk type to normal"); } } @@ -4129,8 +4129,8 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - DEBUG("Number of Network Cards to be connected: %d", def->nnets); - DEBUG("Number of Network Cards available: %d", networkAdapterCount); + VIR_DEBUG("Number of Network Cards to be connected: %d", def->nnets); + VIR_DEBUG("Number of Network Cards available: %d", networkAdapterCount); for (i = 0; (i < def->nnets) && (i < networkAdapterCount); i++) { INetworkAdapter *adapter = NULL; @@ -4149,20 +4149,20 @@ vboxAttachNetwork(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) def->nets[i]->mac[5]); macaddrvbox[VIR_MAC_STRING_BUFLEN - 6] = '\0'; - DEBUG("NIC(%d): Type: %d", i, def->nets[i]->type); - DEBUG("NIC(%d): Model: %s", i, def->nets[i]->model); - DEBUG("NIC(%d): Mac: %s", i, macaddr); - DEBUG("NIC(%d): ifname: %s", i, def->nets[i]->ifname); + VIR_DEBUG("NIC(%d): Type: %d", i, def->nets[i]->type); + VIR_DEBUG("NIC(%d): Model: %s", i, def->nets[i]->model); + VIR_DEBUG("NIC(%d): Mac: %s", i, macaddr); + VIR_DEBUG("NIC(%d): ifname: %s", i, def->nets[i]->ifname); if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.network.name); + VIR_DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.network.name); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_INTERNAL) { - DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.internal.name); + VIR_DEBUG("NIC(%d): name: %s", i, def->nets[i]->data.internal.name); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_USER) { - DEBUG("NIC(%d): NAT.", i); + VIR_DEBUG("NIC(%d): NAT.", i); } else if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - DEBUG("NIC(%d): brname: %s", i, def->nets[i]->data.bridge.brname); - DEBUG("NIC(%d): script: %s", i, def->nets[i]->data.bridge.script); - DEBUG("NIC(%d): ipaddr: %s", i, def->nets[i]->data.bridge.ipaddr); + VIR_DEBUG("NIC(%d): brname: %s", i, def->nets[i]->data.bridge.brname); + VIR_DEBUG("NIC(%d): script: %s", i, def->nets[i]->data.bridge.script); + VIR_DEBUG("NIC(%d): ipaddr: %s", i, def->nets[i]->data.bridge.ipaddr); } machine->vtbl->GetNetworkAdapter(machine, i, &adapter); @@ -4263,13 +4263,13 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - DEBUG("Number of Serial Ports to be connected: %d", def->nserials); - DEBUG("Number of Serial Ports available: %d", serialPortCount); + VIR_DEBUG("Number of Serial Ports to be connected: %d", def->nserials); + VIR_DEBUG("Number of Serial Ports available: %d", serialPortCount); for (i = 0; (i < def->nserials) && (i < serialPortCount); i++) { ISerialPort *serialPort = NULL; - DEBUG("SerialPort(%d): Type: %d", i, def->serials[i]->source.type); - DEBUG("SerialPort(%d): target.port: %d", i, + VIR_DEBUG("SerialPort(%d): Type: %d", i, def->serials[i]->source.type); + VIR_DEBUG("SerialPort(%d): target.port: %d", i, def->serials[i]->target.port); machine->vtbl->GetSerialPort(machine, i, &serialPort); @@ -4296,12 +4296,12 @@ vboxAttachSerial(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (def->serials[i]->target.port == 0) { serialPort->vtbl->SetIRQ(serialPort, 4); serialPort->vtbl->SetIOBase(serialPort, 1016); - DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", i, 4, 1016, def->serials[i]->source.data.file.path); } else if (def->serials[i]->target.port == 1) { serialPort->vtbl->SetIRQ(serialPort, 3); serialPort->vtbl->SetIOBase(serialPort, 760); - DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" serialPort-%d irq: %d, iobase 0x%x, path: %s", i, 3, 760, def->serials[i]->source.data.file.path); } @@ -4342,13 +4342,13 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) systemProperties = NULL; } - DEBUG("Number of Parallel Ports to be connected: %d", def->nparallels); - DEBUG("Number of Parallel Ports available: %d", parallelPortCount); + VIR_DEBUG("Number of Parallel Ports to be connected: %d", def->nparallels); + VIR_DEBUG("Number of Parallel Ports available: %d", parallelPortCount); for (i = 0; (i < def->nparallels) && (i < parallelPortCount); i++) { IParallelPort *parallelPort = NULL; - DEBUG("ParallelPort(%d): Type: %d", i, def->parallels[i]->source.type); - DEBUG("ParallelPort(%d): target.port: %d", i, + VIR_DEBUG("ParallelPort(%d): Type: %d", i, def->parallels[i]->source.type); + VIR_DEBUG("ParallelPort(%d): target.port: %d", i, def->parallels[i]->target.port); machine->vtbl->GetParallelPort(machine, i, &parallelPort); @@ -4370,12 +4370,12 @@ vboxAttachParallel(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (i == 0) { parallelPort->vtbl->SetIRQ(parallelPort, 7); parallelPort->vtbl->SetIOBase(parallelPort, 888); - DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", i, 7, 888, def->parallels[i]->source.data.file.path); } else if (i == 1) { parallelPort->vtbl->SetIRQ(parallelPort, 5); parallelPort->vtbl->SetIOBase(parallelPort, 632); - DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", + VIR_DEBUG(" parallePort-%d irq: %d, iobase 0x%x, path: %s", i, 5, 632, def->parallels[i]->source.data.file.path); } } @@ -4446,20 +4446,20 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) #endif /* VBOX_API_VERSION >= 4000 */ if (VRDxServer) { VRDxServer->vtbl->SetEnabled(VRDxServer, PR_TRUE); - DEBUG0("VRDP Support turned ON."); + VIR_DEBUG0("VRDP Support turned ON."); #if VBOX_API_VERSION < 3001 if (def->graphics[i]->data.rdp.port) { VRDxServer->vtbl->SetPort(VRDxServer, def->graphics[i]->data.rdp.port); - DEBUG("VRDP Port changed to: %d", + VIR_DEBUG("VRDP Port changed to: %d", def->graphics[i]->data.rdp.port); } else if (def->graphics[i]->data.rdp.autoport) { /* Setting the port to 0 will reset its value to * the default one which is 3389 currently */ VRDxServer->vtbl->SetPort(VRDxServer, 0); - DEBUG0("VRDP Port changed to default, which is 3389 currently"); + VIR_DEBUG0("VRDP Port changed to default, which is 3389 currently"); } #elif VBOX_API_VERSION < 4000 /* 3001 <= VBOX_API_VERSION < 4000 */ PRUnichar *portUtf16 = NULL; @@ -4480,13 +4480,13 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) if (def->graphics[i]->data.rdp.replaceUser) { VRDxServer->vtbl->SetReuseSingleConnection(VRDxServer, PR_TRUE); - DEBUG0("VRDP set to reuse single connection"); + VIR_DEBUG0("VRDP set to reuse single connection"); } if (def->graphics[i]->data.rdp.multiUser) { VRDxServer->vtbl->SetAllowMultiConnection(VRDxServer, PR_TRUE); - DEBUG0("VRDP set to allow multiple connection"); + VIR_DEBUG0("VRDP set to allow multiple connection"); } if (def->graphics[i]->data.rdp.listenAddr) { @@ -4506,7 +4506,7 @@ vboxAttachDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) netAddressUtf16); VBOX_UTF16_FREE(netAddressKey); #endif /* VBOX_API_VERSION >= 4000 */ - DEBUG("VRDP listen address is set to: %s", + VIR_DEBUG("VRDP listen address is set to: %s", def->graphics[i]->data.rdp.listenAddr); VBOX_UTF16_FREE(netAddressUtf16); @@ -4639,7 +4639,7 @@ vboxAttachUSB(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { if (def->hostdevs[i]->source.subsys.u.usb.vendor || def->hostdevs[i]->source.subsys.u.usb.product) { - DEBUG("USB Device detected, VendorId:0x%x, ProductId:0x%x", + VIR_DEBUG("USB Device detected, VendorId:0x%x, ProductId:0x%x", def->hostdevs[i]->source.subsys.u.usb.vendor, def->hostdevs[i]->source.subsys.u.usb.product); isUSB = true; @@ -6322,7 +6322,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis, g_pVBoxGlobalData->domainEventDispatching = 1; vboxDriverLock(g_pVBoxGlobalData); - DEBUG("IVirtualBoxCallback: %p, State: %d", pThis, state); + VIR_DEBUG("IVirtualBoxCallback: %p, State: %d", pThis, state); DEBUGPRUnichar("machineId", machineId); if (machineId) { @@ -6389,7 +6389,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnMachineDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); return NS_OK; @@ -6402,7 +6402,7 @@ vboxCallbackOnExtraDataCanChange(IVirtualBoxCallback *pThis, PRUnichar **error ATTRIBUTE_UNUSED, PRBool *allowChange) { - DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false"); + VIR_DEBUG("IVirtualBoxCallback: %p, allowChange: %s", pThis, *allowChange ? "true" : "false"); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("key", key); DEBUGPRUnichar("value", value); @@ -6414,7 +6414,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnExtraDataChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUnichar *key, PRUnichar *value) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("key", key); DEBUGPRUnichar("value", value); @@ -6427,8 +6427,8 @@ static nsresult PR_COM_METHOD vboxCallbackOnMediaRegistered(IVirtualBoxCallback *pThis, PRUnichar *mediaId, PRUint32 mediaType, PRBool registered) { - DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); - DEBUG("mediaType: %d", mediaType); + VIR_DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); + VIR_DEBUG("mediaType: %d", mediaType); DEBUGPRUnichar("mediaId", mediaId); return NS_OK; @@ -6447,7 +6447,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis, g_pVBoxGlobalData->domainEventDispatching = 1; vboxDriverLock(g_pVBoxGlobalData); - DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); + VIR_DEBUG("IVirtualBoxCallback: %p, registered: %s", pThis, registered ? "true" : "false"); DEBUGPRUnichar("machineId", machineId); if (machineId) { @@ -6499,7 +6499,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnSessionStateChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUint32 state) { - DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state); + VIR_DEBUG("IVirtualBoxCallback: %p, state: %d", pThis, state); DEBUGPRUnichar("machineId", machineId); return NS_OK; @@ -6509,7 +6509,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnSnapshotTaken(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUnichar *snapshotId) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("snapshotId", snapshotId); @@ -6520,7 +6520,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnSnapshotDiscarded(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUnichar *snapshotId) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("snapshotId", snapshotId); @@ -6531,7 +6531,7 @@ static nsresult PR_COM_METHOD vboxCallbackOnSnapshotChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUnichar *snapshotId) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("snapshotId", snapshotId); @@ -6543,7 +6543,7 @@ vboxCallbackOnGuestPropertyChange(IVirtualBoxCallback *pThis, PRUnichar *machineId, PRUnichar *name, PRUnichar *value, PRUnichar *flags) { - DEBUG("IVirtualBoxCallback: %p", pThis); + VIR_DEBUG("IVirtualBoxCallback: %p", pThis); DEBUGPRUnichar("machineId", machineId); DEBUGPRUnichar("name", name); DEBUGPRUnichar("value", value); @@ -6559,7 +6559,7 @@ vboxCallbackAddRef(nsISupports *pThis) c = ++g_pVBoxGlobalData->vboxCallBackRefCount; - DEBUG("pThis: %p, vboxCallback AddRef: %d", pThis, c); + VIR_DEBUG("pThis: %p, vboxCallback AddRef: %d", pThis, c); return c; } @@ -6576,7 +6576,7 @@ vboxCallbackRelease(nsISupports *pThis) VIR_FREE(pThis); } - DEBUG("pThis: %p, vboxCallback Release: %d", pThis, c); + VIR_DEBUG("pThis: %p, vboxCallback Release: %d", pThis, c); return c; } @@ -6594,13 +6594,13 @@ vboxCallbackQueryInterface(nsISupports *pThis, const nsID *iid, void **resultp) g_pVBoxGlobalData->vboxCallBackRefCount++; *resultp = that; - DEBUG("pThis: %p, vboxCallback QueryInterface: %d", pThis, g_pVBoxGlobalData->vboxCallBackRefCount); + VIR_DEBUG("pThis: %p, vboxCallback QueryInterface: %d", pThis, g_pVBoxGlobalData->vboxCallBackRefCount); return NS_OK; } - DEBUG("pThis: %p, vboxCallback QueryInterface didn't find a matching interface", pThis); + VIR_DEBUG("pThis: %p, vboxCallback QueryInterface didn't find a matching interface", pThis); DEBUGUUID("The UUID Callback Interface expects", iid); DEBUGUUID("The UUID Callback Interface got", &ivirtualboxCallbackUUID); return NS_NOINTERFACE; @@ -6708,7 +6708,7 @@ static int vboxDomainEventRegister (virConnectPtr conn, ret = virDomainEventCallbackListAdd(conn, data->domainEventCallbacks, callback, opaque, freecb); - DEBUG("virDomainEventCallbackListAdd (ret = %d) ( conn: %p, " + VIR_DEBUG("virDomainEventCallbackListAdd (ret = %d) ( conn: %p, " "data->domainEventCallbacks: %p, callback: %p, opaque: %p, " "freecb: %p )", ret, conn, data->domainEventCallbacks, callback, opaque, freecb); @@ -6809,7 +6809,7 @@ static int vboxDomainEventRegisterAny(virConnectPtr conn, ret = virDomainEventCallbackListAddID(conn, data->domainEventCallbacks, dom, eventID, callback, opaque, freecb); - DEBUG("virDomainEventCallbackListAddID (ret = %d) ( conn: %p, " + VIR_DEBUG("virDomainEventCallbackListAddID (ret = %d) ( conn: %p, " "data->domainEventCallbacks: %p, callback: %p, opaque: %p, " "freecb: %p )", ret, conn, data->domainEventCallbacks, callback, opaque, freecb); @@ -6881,7 +6881,7 @@ static virDrvOpenStatus vboxNetworkOpen(virConnectPtr conn, (data->vboxSession == NULL)) goto cleanup; - DEBUG0("network initialized"); + VIR_DEBUG0("network initialized"); /* conn->networkPrivateData = some network specific data */ return VIR_DRV_OPEN_SUCCESS; @@ -6890,7 +6890,7 @@ cleanup: } static int vboxNetworkClose(virConnectPtr conn) { - DEBUG0("network uninitialized"); + VIR_DEBUG0("network uninitialized"); conn->networkPrivateData = NULL; return 0; } @@ -6924,7 +6924,7 @@ static int vboxNumOfNetworks(virConnectPtr conn) { VBOX_RELEASE(host); - DEBUG("numActive: %d", ret); + VIR_DEBUG("numActive: %d", ret); return ret; } @@ -6955,7 +6955,7 @@ static int vboxListNetworks(virConnectPtr conn, char **const names, int nnames) networkInterface->vtbl->GetName(networkInterface, &nameUtf16); VBOX_UTF16_TO_UTF8(nameUtf16, &nameUtf8); - DEBUG("nnames[%d]: %s", ret, nameUtf8); + VIR_DEBUG("nnames[%d]: %s", ret, nameUtf8); names[ret] = strdup(nameUtf8); if (names[ret] == NULL) { virReportOOMError(); @@ -7006,7 +7006,7 @@ static int vboxNumOfDefinedNetworks(virConnectPtr conn) { VBOX_RELEASE(host); - DEBUG("numActive: %d", ret); + VIR_DEBUG("numActive: %d", ret); return ret; } @@ -7037,7 +7037,7 @@ static int vboxListDefinedNetworks(virConnectPtr conn, char **const names, int n networkInterface->vtbl->GetName(networkInterface, &nameUtf16); VBOX_UTF16_TO_UTF8(nameUtf16, &nameUtf8); - DEBUG("nnames[%d]: %s", ret, nameUtf8); + VIR_DEBUG("nnames[%d]: %s", ret, nameUtf8); names[ret] = strdup(nameUtf8); if (names[ret] == NULL) { virReportOOMError(); @@ -7087,7 +7087,7 @@ vboxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) ret = virGetNetwork(conn, nameUtf8, uuid); - DEBUG("Network Name: %s", nameUtf8); + VIR_DEBUG("Network Name: %s", nameUtf8); DEBUGIID("Network UUID", iid.value); VBOX_UTF8_FREE(nameUtf8); @@ -7124,7 +7124,7 @@ static virNetworkPtr vboxNetworkLookupByName(virConnectPtr conn, const char *nam networkInterface->vtbl->GetId(networkInterface, &iid.value); vboxIIDToUUID(&iid, uuid); ret = virGetNetwork(conn, name, uuid); - DEBUG("Network Name: %s", name); + VIR_DEBUG("Network Name: %s", name); DEBUGIID("Network UUID", iid.value); vboxIIDUnalloc(&iid); @@ -7232,7 +7232,7 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * data->vboxObj->vtbl->CreateDHCPServer(data->vboxObj, networkNameUtf16, &dhcpServer); - DEBUG0("couldn't find dhcp server so creating one"); + VIR_DEBUG0("couldn't find dhcp server so creating one"); } if (dhcpServer) { PRUnichar *ipAddressUtf16 = NULL; @@ -7692,7 +7692,7 @@ static virDrvOpenStatus vboxStorageOpen (virConnectPtr conn, (data->vboxSession == NULL)) goto cleanup; - DEBUG0("vbox storage initialized"); + VIR_DEBUG0("vbox storage initialized"); /* conn->storagePrivateData = some storage specific data */ return VIR_DRV_OPEN_SUCCESS; @@ -7701,7 +7701,7 @@ cleanup: } static int vboxStorageClose (virConnectPtr conn) { - DEBUG0("vbox storage uninitialized"); + VIR_DEBUG0("vbox storage uninitialized"); conn->storagePrivateData = NULL; return 0; } @@ -7807,7 +7807,7 @@ static int vboxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names VBOX_UTF16_FREE(nameUtf16); if (nameUtf8) { - DEBUG("nnames[%d]: %s", numActive, nameUtf8); + VIR_DEBUG("nnames[%d]: %s", numActive, nameUtf8); names[numActive] = strdup(nameUtf8); if (names[numActive] == NULL) { virReportOOMError(); @@ -7874,10 +7874,10 @@ static virStorageVolPtr vboxStorageVolLookupByName(virStoragePoolPtr pool, const ret = virGetStorageVol(pool->conn, pool->name, name, key); - DEBUG("virStorageVolPtr: %p", ret); - DEBUG("Storage Volume Name: %s", name); - DEBUG("Storage Volume key : %s", key); - DEBUG("Storage Volume Pool: %s", pool->name); + VIR_DEBUG("virStorageVolPtr: %p", ret); + VIR_DEBUG("Storage Volume Name: %s", name); + VIR_DEBUG("Storage Volume key : %s", key); + VIR_DEBUG("Storage Volume Pool: %s", pool->name); } vboxIIDUnalloc(&hddIID); @@ -7934,15 +7934,15 @@ static virStorageVolPtr vboxStorageVolLookupByKey(virConnectPtr conn, const char if (hddNameUtf8) { if (vboxStorageNumOfPools(conn) == 1) { ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key); - DEBUG("Storage Volume Pool: %s", "default-pool"); + VIR_DEBUG("Storage Volume Pool: %s", "default-pool"); } else { /* TODO: currently only one default pool and thus * nothing here, change it when pools are supported */ } - DEBUG("Storage Volume Name: %s", key); - DEBUG("Storage Volume key : %s", hddNameUtf8); + VIR_DEBUG("Storage Volume Name: %s", key); + VIR_DEBUG("Storage Volume key : %s", hddNameUtf8); VBOX_UTF8_FREE(hddNameUtf8); VBOX_UTF16_FREE(hddNameUtf16); @@ -8007,9 +8007,9 @@ static virStorageVolPtr vboxStorageVolLookupByPath(virConnectPtr conn, const cha if (vboxStorageNumOfPools(conn) == 1) ret = virGetStorageVol(conn, "default-pool", hddNameUtf8, key); - DEBUG("Storage Volume Pool: %s", "default-pool"); - DEBUG("Storage Volume Name: %s", hddNameUtf8); - DEBUG("Storage Volume key : %s", key); + VIR_DEBUG("Storage Volume Pool: %s", "default-pool"); + VIR_DEBUG("Storage Volume Name: %s", hddNameUtf8); + VIR_DEBUG("Storage Volume key : %s", key); } vboxIIDUnalloc(&hddIID); @@ -8241,12 +8241,12 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, #endif /* VBOX_API_VERSION >= 3001 */ if (NS_SUCCEEDED(rc)) { rc = machine->vtbl->SaveSettings(machine); - DEBUG0("saving machine settings"); + VIR_DEBUG0("saving machine settings"); } if (NS_SUCCEEDED(rc)) { deregister++; - DEBUG("deregistering hdd:%d", deregister); + VIR_DEBUG("deregistering hdd:%d", deregister); } if (controller) @@ -8341,10 +8341,10 @@ static int vboxStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info ret = 0; - DEBUG("Storage Volume Name: %s", vol->name); - DEBUG("Storage Volume Type: %s", info->type == VIR_STORAGE_VOL_BLOCK ? "Block" : "File"); - DEBUG("Storage Volume Capacity: %llu", info->capacity); - DEBUG("Storage Volume Allocation: %llu", info->allocation); + VIR_DEBUG("Storage Volume Name: %s", vol->name); + VIR_DEBUG("Storage Volume Type: %s", info->type == VIR_STORAGE_VOL_BLOCK ? "Block" : "File"); + VIR_DEBUG("Storage Volume Capacity: %llu", info->capacity); + VIR_DEBUG("Storage Volume Allocation: %llu", info->allocation); } VBOX_MEDIUM_RELEASE(hardDisk); @@ -8435,7 +8435,7 @@ static char *vboxStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags A VBOX_UTF16_TO_UTF8(hddFormatUtf16, &hddFormatUtf8); if (hddFormatUtf8) { - DEBUG("Storage Volume Format: %s", hddFormatUtf8); + VIR_DEBUG("Storage Volume Format: %s", hddFormatUtf8); if (STRCASEEQ("vmdk", hddFormatUtf8)) def.target.format = VIR_STORAGE_FILE_VMDK; @@ -8505,9 +8505,9 @@ static char *vboxStorageVolGetPath(virStorageVolPtr vol) { if (!ret) virReportOOMError(); - DEBUG("Storage Volume Name: %s", vol->name); - DEBUG("Storage Volume Path: %s", hddLocationUtf8); - DEBUG("Storage Volume Pool: %s", vol->pool); + VIR_DEBUG("Storage Volume Name: %s", vol->name); + VIR_DEBUG("Storage Volume Path: %s", hddLocationUtf8); + VIR_DEBUG("Storage Volume Pool: %s", vol->pool); VBOX_UTF8_FREE(hddLocationUtf8); } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index b14c8db..f6d281e 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -323,35 +323,35 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) /* Hypervisor is only run with privilege & required to succeed */ if (xenHavePrivilege()) { - DEBUG0("Trying hypervisor sub-driver"); + VIR_DEBUG0("Trying hypervisor sub-driver"); if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { - DEBUG0("Activated hypervisor sub-driver"); + VIR_DEBUG0("Activated hypervisor sub-driver"); priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1; } } /* XenD is required to succeed if privileged */ - DEBUG0("Trying XenD sub-driver"); + VIR_DEBUG0("Trying XenD sub-driver"); if (drivers[XEN_UNIFIED_XEND_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { - DEBUG0("Activated XenD sub-driver"); + VIR_DEBUG0("Activated XenD sub-driver"); priv->opened[XEN_UNIFIED_XEND_OFFSET] = 1; /* XenD is active, so try the xm & xs drivers too, both requird to * succeed if root, optional otherwise */ if (priv->xendConfigVersion <= 2) { - DEBUG0("Trying XM sub-driver"); + VIR_DEBUG0("Trying XM sub-driver"); if (drivers[XEN_UNIFIED_XM_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { - DEBUG0("Activated XM sub-driver"); + VIR_DEBUG0("Activated XM sub-driver"); priv->opened[XEN_UNIFIED_XM_OFFSET] = 1; } } - DEBUG0("Trying XS sub-driver"); + VIR_DEBUG0("Trying XS sub-driver"); if (drivers[XEN_UNIFIED_XS_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { - DEBUG0("Activated XS sub-driver"); + VIR_DEBUG0("Activated XS sub-driver"); priv->opened[XEN_UNIFIED_XS_OFFSET] = 1; } else { if (xenHavePrivilege()) @@ -361,7 +361,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) if (xenHavePrivilege()) { goto fail; /* XenD is mandatory when privileged */ } else { - DEBUG0("Handing off for remote driver"); + VIR_DEBUG0("Handing off for remote driver"); ret = VIR_DRV_OPEN_DECLINED; /* Let remote_driver try instead */ goto clean; } @@ -370,16 +370,16 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) xenNumaInit(conn); if (!(priv->caps = xenHypervisorMakeCapabilities(conn))) { - DEBUG0("Failed to make capabilities"); + VIR_DEBUG0("Failed to make capabilities"); goto fail; } #if WITH_XEN_INOTIFY if (xenHavePrivilege()) { - DEBUG0("Trying Xen inotify sub-driver"); + VIR_DEBUG0("Trying Xen inotify sub-driver"); if (drivers[XEN_UNIFIED_INOTIFY_OFFSET]->open(conn, auth, flags) == VIR_DRV_OPEN_SUCCESS) { - DEBUG0("Activated Xen inotify sub-driver"); + VIR_DEBUG0("Activated Xen inotify sub-driver"); priv->opened[XEN_UNIFIED_INOTIFY_OFFSET] = 1; } } @@ -390,7 +390,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) fail: ret = VIR_DRV_OPEN_ERROR; clean: - DEBUG0("Failed to activate a mandatory sub-driver"); + VIR_DEBUG0("Failed to activate a mandatory sub-driver"); for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++) if (priv->opened[i]) drivers[i]->close(conn); virMutexDestroy(&priv->lock); @@ -2163,7 +2163,7 @@ xenUnifiedAddDomainInfo(xenUnifiedDomainInfoListPtr list, for (n=0; n < list->count; n++) { if (STREQ(list->doms[n]->name, name) && !memcmp(list->doms[n]->uuid, uuid, VIR_UUID_BUFLEN)) { - DEBUG0("WARNING: dom already tracked"); + VIR_DEBUG0("WARNING: dom already tracked"); return -1; } } diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 4a0924f..9cb8e8c 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1989,7 +1989,7 @@ xenHypervisorInit(void) ret = ioctl(fd, cmd, (unsigned long) &hc); if ((ret != -1) && (ret != 0)) { - DEBUG("Using new hypervisor call: %X", ret); + VIR_DEBUG("Using new hypervisor call: %X", ret); hv_version = ret; xen_ioctl_hypercall_cmd = cmd; goto detect_v2; @@ -2005,7 +2005,7 @@ xenHypervisorInit(void) 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", ret); + VIR_DEBUG("Using old hypervisor call: %X", ret); hv_version = ret; xen_ioctl_hypercall_cmd = cmd; hypervisor_version = 0; @@ -2042,13 +2042,13 @@ xenHypervisorInit(void) /* 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"); + VIR_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"); + VIR_DEBUG0("Using hypervisor call v2, sys ver2 dom ver4"); goto done; } } @@ -2058,7 +2058,7 @@ xenHypervisorInit(void) /* 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"); + VIR_DEBUG0("Using hypervisor call v2, sys ver3 dom ver5"); goto done; } } @@ -2068,7 +2068,7 @@ xenHypervisorInit(void) /* 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"); + VIR_DEBUG0("Using hypervisor call v2, sys ver4 dom ver5"); goto done; } } @@ -2078,7 +2078,7 @@ xenHypervisorInit(void) /* 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"); + VIR_DEBUG0("Using hypervisor call v2, sys ver6 dom ver5"); goto done; } } @@ -2087,14 +2087,14 @@ xenHypervisorInit(void) 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"); + VIR_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"); + VIR_DEBUG0("Using hypervisor call v1"); goto done; } @@ -2102,7 +2102,7 @@ xenHypervisorInit(void) * we failed to make the getdomaininfolist hypercall */ - DEBUG0("Failed to find any Xen hypervisor method"); + VIR_DEBUG0("Failed to find any Xen hypervisor method"); hypervisor_version = -1; virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", (unsigned long)IOCTL_PRIVCMD_HYPERCALL); diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 1067769..7d4ba4c 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -97,7 +97,7 @@ xenInotifyXenCacheLookup(virConnectPtr conn, xenXMConfCachePtr entry; if (!(entry = virHashLookup(priv->configCache, filename))) { - DEBUG("No config found for %s", filename); + VIR_DEBUG("No config found for %s", filename); return -1; } @@ -105,7 +105,7 @@ xenInotifyXenCacheLookup(virConnectPtr conn, memcpy(uuid, entry->def->uuid, VIR_UUID_BUFLEN); if (!*name) { - DEBUG0("Error getting dom from def"); + VIR_DEBUG0("Error getting dom from def"); virReportOOMError(); return -1; } @@ -135,7 +135,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, /* call directly into xend here, as driver may not yet be set during open while we are building our initial list of domains */ - DEBUG("Looking for dom with uuid: %s", uuid_str); + VIR_DEBUG("Looking for dom with uuid: %s", uuid_str); /* XXX Should not have to go via a virDomainPtr obj instance */ if(!(dom = xenDaemonLookupByUUID(conn, rawuuid))) { /* If we are here, the domain has gone away. @@ -149,7 +149,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, return -1; } memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); - DEBUG0("Found dom on list"); + VIR_DEBUG0("Found dom on list"); return 0; } } @@ -288,7 +288,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED, virConnectPtr conn = data; xenUnifiedPrivatePtr priv = NULL; - DEBUG0("got inotify event"); + VIR_DEBUG0("got inotify event"); if( conn && conn->privateData ) { priv = conn->privateData; @@ -437,7 +437,7 @@ xenInotifyOpen(virConnectPtr conn, return -1; } - DEBUG("Adding a watch on %s", priv->configDir); + VIR_DEBUG("Adding a watch on %s", priv->configDir); if (inotify_add_watch(priv->inotifyFD, priv->configDir, IN_CREATE | @@ -449,18 +449,18 @@ xenInotifyOpen(virConnectPtr conn, return -1; } - DEBUG0("Building initial config cache"); + VIR_DEBUG0("Building initial config cache"); if (priv->useXenConfigCache && xenXMConfigCacheRefresh (conn) < 0) { - DEBUG("Failed to enable XM config cache %s", conn->err.message); + VIR_DEBUG("Failed to enable XM config cache %s", conn->err.message); return -1; } - DEBUG0("Registering with event loop"); + VIR_DEBUG0("Registering with event loop"); /* Add the handle for monitoring */ if ((priv->inotifyWatch = virEventAddHandle(priv->inotifyFD, VIR_EVENT_HANDLE_READABLE, xenInotifyEvent, conn, NULL)) < 0) { - DEBUG0("Failed to add inotify handle, disabling events"); + VIR_DEBUG0("Failed to add inotify handle, disabling events"); } return 0; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index bc23595..da8269d 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -522,7 +522,7 @@ xend_op_ext(virConnectPtr xend, const char *path, const char *key, va_list ap) } content = virBufferContentAndReset(&buf); - DEBUG("xend op: %s\n", content); + VIR_DEBUG("xend op: %s\n", content); ret = http2unix(xend_post(xend, path, content)); VIR_FREE(content); @@ -4603,7 +4603,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, } } - DEBUG("hostname = %s, port = %s", hostname, port); + VIR_DEBUG("hostname = %s, port = %s", hostname, port); /* Make the call. * NB: xend will fail the operation if any parameters are @@ -4626,7 +4626,7 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, if (ret == 0 && undefined_source) xenDaemonDomainUndefine (domain); - DEBUG0("migration done"); + VIR_DEBUG0("migration done"); return ret; } @@ -5805,7 +5805,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, char *bufout; int hvm = 0, i; - DEBUG0("Formatting domain sexpr"); + VIR_DEBUG0("Formatting domain sexpr"); virBufferAddLit(&buf, "(vm "); virBufferEscapeSexpr(&buf, "(name '%s')", def->name); @@ -6058,7 +6058,7 @@ xenDaemonFormatSxpr(virConnectPtr conn, } bufout = virBufferContentAndReset(&buf); - DEBUG("Formatted sexpr: \n%s", bufout); + VIR_DEBUG("Formatted sexpr: \n%s", bufout); return bufout; error: diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 865805c..242a7de 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -363,13 +363,13 @@ xenXMConfigCacheRemoveFile(virConnectPtr conn, entry = virHashLookup(priv->configCache, filename); if (!entry) { - DEBUG("No config entry for %s", filename); + VIR_DEBUG("No config entry for %s", filename); return 0; } virHashRemoveEntry(priv->nameConfigMap, entry->def->name, NULL); virHashRemoveEntry(priv->configCache, filename, xenXMConfigFree); - DEBUG("Removed %s %s", entry->def->name, filename); + VIR_DEBUG("Removed %s %s", entry->def->name, filename); return 0; } @@ -387,7 +387,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) int newborn = 0; time_t now = time(NULL); - DEBUG("Adding file %s", filename); + VIR_DEBUG("Adding file %s", filename); /* Get modified time */ if ((stat(filename, &st) < 0)) { @@ -400,7 +400,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) /* Ignore zero length files, because inotify fires before any content has actually been created */ if (st.st_size == 0) { - DEBUG("Ignoring zero length file %s", filename); + VIR_DEBUG("Ignoring zero length file %s", filename); return -1; } @@ -436,7 +436,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) entry->refreshedAt = now; if (!(entry->def = xenXMConfigReadFile(conn, entry->filename))) { - DEBUG("Failed to read %s", entry->filename); + VIR_DEBUG("Failed to read %s", entry->filename); if (!newborn) virHashRemoveEntry(priv->configCache, filename, NULL); VIR_FREE(entry); @@ -465,7 +465,7 @@ xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) VIR_FREE(entry); } } - DEBUG("Added config %s %s", entry->def->name, filename); + VIR_DEBUG("Added config %s %s", entry->def->name, filename); return 0; } diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 7fff560..d9aad1f 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -327,7 +327,7 @@ xenStoreOpen(virConnectPtr conn, xenStoreWatchEvent, conn, NULL)) < 0) - DEBUG0("Failed to add event handle, disabling events"); + VIR_DEBUG0("Failed to add event handle, disabling events"); return 0; } @@ -353,12 +353,12 @@ xenStoreClose(virConnectPtr conn) priv = (xenUnifiedPrivatePtr) conn->privateData; if (xenStoreRemoveWatch(conn, "@introduceDomain", "introduceDomain") < 0) { - DEBUG0("Warning, could not remove @introduceDomain watch"); + VIR_DEBUG0("Warning, could not remove @introduceDomain watch"); /* not fatal */ } if (xenStoreRemoveWatch(conn, "@releaseDomain", "releaseDomain") < 0) { - DEBUG0("Warning, could not remove @releaseDomain watch"); + VIR_DEBUG0("Warning, could not remove @releaseDomain watch"); /* not fatal */ } @@ -1196,7 +1196,7 @@ int xenStoreRemoveWatch(virConnectPtr conn, list->watches[i]->path, list->watches[i]->token)) { - DEBUG0("WARNING: Could not remove watch"); + VIR_DEBUG0("WARNING: Could not remove watch"); /* Not fatal, continue */ } @@ -1351,7 +1351,7 @@ retry: VIR_FREE(new_domids); if (missing && retries--) { - DEBUG0("Some domains were missing, trying again"); + VIR_DEBUG0("Some domains were missing, trying again"); usleep(100 * 1000); goto retry; } @@ -1426,7 +1426,7 @@ retry: VIR_FREE(new_domids); if (!removed && retries--) { - DEBUG0("No domains removed, retrying"); + VIR_DEBUG0("No domains removed, retrying"); usleep(100 * 1000); goto retry; } -- 1.7.4

2 2

[libvirt] [PATCH] hash: make virHashFree more free-like
by Eric Blake 21 Feb '11

21 Feb '11

Two-argument free functions are uncommon; match the style elsewhere by caching the callback at creation. * src/util/hash.h (virHashCreate, virHashFree): Move deallocator argument to creation. * cfg.mk (useless_free_options): Add virHashFree. * src/util/hash.c (_virHashTable): Track deallocator. (virHashCreate, virHashFree): Update to new signature. * src/conf/domain_conf.c (virDomainObjListDeinit) (virDomainObjListInit, virDomainDiskDefForeachPath) (virDomainSnapshotObjListDeinit, virDomainSnapshotObjListInit): Update callers. * src/conf/nwfilter_params.c (virNWFilterHashTableFree) (virNWFilterHashTableCreate): Likewise. * src/conf/nwfilter_conf.c (virNWFilterTriggerVMFilterRebuild): Likewise. * src/cpu/cpu_generic.c (genericHashFeatures, genericBaseline): Likewise. * src/xen/xm_internal.c (xenXMOpen, xenXMClose): Likewise. * src/nwfilter/nwfilter_learnipaddr.c (virNWFilterLearnInit) (virNWFilterLearnShutdown): Likewise. * src/qemu/qemu_command.c (qemuDomainPCIAddressSetCreate) (qemuDomainPCIAddressSetFree): Likewise. * src/qemu/qemu_process.c (qemuProcessWaitForMonitor): Likewise. --- Requires that this be applied first: https://www.redhat.com/archives/libvir-list/2011-February/msg00784.html cfg.mk | 1 + src/conf/domain_conf.c | 49 ++++++++++++++++++---------------- src/conf/nwfilter_conf.c | 6 ++-- src/conf/nwfilter_params.c | 5 ++- src/cpu/cpu_generic.c | 10 +++--- src/nwfilter/nwfilter_learnipaddr.c | 9 +++--- src/qemu/qemu_command.c | 16 ++++++----- src/qemu/qemu_process.c | 4 +- src/util/hash.c | 14 +++++---- src/util/hash.h | 9 +++--- src/xen/xm_internal.c | 12 ++++---- 11 files changed, 73 insertions(+), 62 deletions(-) diff --git a/cfg.mk b/cfg.mk index f870723..1bb9cbb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -106,6 +106,7 @@ useless_free_options = \ --name=virDomainSoundDefFree \ --name=virDomainVideoDefFree \ --name=virDomainWatchdogDefFree \ + --name=virHashFree \ --name=virInterfaceDefFree \ --name=virInterfaceIpDefFree \ --name=virInterfaceObjFree \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e7c3409..b97c1f0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -391,26 +391,27 @@ VIR_ENUM_IMPL(virDomainTimerMode, VIR_DOMAIN_TIMER_MODE_LAST, #define VIR_DOMAIN_XML_WRITE_FLAGS VIR_DOMAIN_XML_SECURE #define VIR_DOMAIN_XML_READ_FLAGS VIR_DOMAIN_XML_INACTIVE +static void +virDomainObjListDeallocator(void *payload, const char *name ATTRIBUTE_UNUSED) +{ + virDomainObjPtr obj = payload; + virDomainObjLock(obj); + if (virDomainObjUnref(obj) > 0) + virDomainObjUnlock(obj); +} + int virDomainObjListInit(virDomainObjListPtr doms) { - doms->objs = virHashCreate(50); + doms->objs = virHashCreate(50, virDomainObjListDeallocator); if (!doms->objs) return -1; return 0; } -static void virDomainObjListDeallocator(void *payload, const char *name ATTRIBUTE_UNUSED) -{ - virDomainObjPtr obj = payload; - virDomainObjLock(obj); - if (virDomainObjUnref(obj) > 0) - virDomainObjUnlock(obj); -} - void virDomainObjListDeinit(virDomainObjListPtr doms) { - virHashFree(doms->objs, virDomainObjListDeallocator); + virHashFree(doms->objs); } @@ -8751,25 +8752,27 @@ virDomainSnapshotObjPtr virDomainSnapshotAssignDef(virDomainSnapshotObjListPtr s } /* Snapshot Obj List functions */ +static void +virDomainSnapshotObjListDeallocator(void *payload, + const char *name ATTRIBUTE_UNUSED) +{ + virDomainSnapshotObjPtr obj = payload; + + virDomainSnapshotObjUnref(obj); +} + int virDomainSnapshotObjListInit(virDomainSnapshotObjListPtr snapshots) { - snapshots->objs = virHashCreate(50); + snapshots->objs = virHashCreate(50, virDomainSnapshotObjListDeallocator); if (!snapshots->objs) return -1; return 0; } -static void virDomainSnapshotObjListDeallocator(void *payload, - const char *name ATTRIBUTE_UNUSED) -{ - virDomainSnapshotObjPtr obj = payload; - - virDomainSnapshotObjUnref(obj); -} - -static void virDomainSnapshotObjListDeinit(virDomainSnapshotObjListPtr snapshots) +static void +virDomainSnapshotObjListDeinit(virDomainSnapshotObjListPtr snapshots) { - virHashFree(snapshots->objs, virDomainSnapshotObjListDeallocator); + virHashFree(snapshots->objs); } struct virDomainSnapshotNameData { @@ -9002,7 +9005,7 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, } } - paths = virHashCreate(5); + paths = virHashCreate(5, NULL); do { virStorageFileMetadata meta; @@ -9070,7 +9073,7 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, ret = 0; cleanup: - virHashFree(paths, NULL); + virHashFree(paths); VIR_FREE(nextpath); return ret; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index c6a4d6f..1f250e9 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2,7 +2,7 @@ * nwfilter_conf.c: network filter XML processing * (derived from storage_conf.c) * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * Copyright (C) 2010 IBM Corporation @@ -2297,7 +2297,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) .conn = conn, .err = 0, .step = STEP_APPLY_NEW, - .skipInterfaces = virHashCreate(0), + .skipInterfaces = virHashCreate(0, NULL), }; if (!cb.skipInterfaces) @@ -2328,7 +2328,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn) &cb); } - virHashFree(cb.skipInterfaces, NULL); + virHashFree(cb.skipInterfaces); return err; } diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 23423fa..cd94b30 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -1,6 +1,7 @@ /* * nwfilter_params.c: parsing and data maintenance of filter parameters * + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -102,7 +103,7 @@ virNWFilterHashTableFree(virNWFilterHashTablePtr table) int i; if (!table) return; - virHashFree(table->hashTable, hashDealloc); + virHashFree(table->hashTable); for (i = 0; i < table->nNames; i++) VIR_FREE(table->names[i]); @@ -119,7 +120,7 @@ virNWFilterHashTableCreate(int n) { virReportOOMError(); return NULL; } - ret->hashTable = virHashCreate(n); + ret->hashTable = virHashCreate(n, hashDealloc); if (!ret->hashTable) { VIR_FREE(ret); return NULL; diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c index a39f262..a98b109 100644 --- a/src/cpu/cpu_generic.c +++ b/src/cpu/cpu_generic.c @@ -2,7 +2,7 @@ * cpu_generic.c: CPU manipulation driver for architectures which are not * handled by their own driver * - * Copyright (C) 2009--2010 Red Hat, Inc. + * Copyright (C) 2009-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -39,14 +39,14 @@ genericHashFeatures(virCPUDefPtr cpu) virHashTablePtr hash; unsigned int i; - if ((hash = virHashCreate(cpu->nfeatures)) == NULL) + if ((hash = virHashCreate(cpu->nfeatures, NULL)) == NULL) return NULL; for (i = 0; i < cpu->nfeatures; i++) { if (virHashAddEntry(hash, cpu->features[i].name, cpu->features + i)) { - virHashFree(hash, NULL); + virHashFree(hash); return NULL; } } @@ -105,7 +105,7 @@ genericCompare(virCPUDefPtr host, ret = VIR_CPU_COMPARE_IDENTICAL; cleanup: - virHashFree(hash, NULL); + virHashFree(hash); return ret; } @@ -178,7 +178,7 @@ genericBaseline(virCPUDefPtr *cpus, } } - virHashFree(hash, NULL); + virHashFree(hash); } if (VIR_ALLOC_N(cpu->features, count) < 0) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 02af918..8bd7b50 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -2,6 +2,7 @@ * nwfilter_learnipaddr.c: support for learning IP address used by a VM * on an interface * + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2010 IBM Corp. * Copyright (C) 2010 Stefan Berger * @@ -822,7 +823,7 @@ virNWFilterLearnInit(void) { threadsTerminate = false; - pendingLearnReq = virHashCreate(0); + pendingLearnReq = virHashCreate(0, freeLearnReqEntry); if (!pendingLearnReq) { return 1; } @@ -844,7 +845,7 @@ virNWFilterLearnInit(void) { return 1; } - ifaceLockMap = virHashCreate(0); + ifaceLockMap = virHashCreate(0, freeIfaceLock); if (!ifaceLockMap) { virNWFilterLearnShutdown(); return 1; @@ -879,12 +880,12 @@ virNWFilterLearnShutdown(void) { virNWFilterLearnThreadsTerminate(false); - virHashFree(pendingLearnReq, freeLearnReqEntry); + virHashFree(pendingLearnReq); pendingLearnReq = NULL; virNWFilterHashTableFree(ipAddressMap); ipAddressMap = NULL; - virHashFree(ifaceLockMap, freeIfaceLock); + virHashFree(ifaceLockMap); ifaceLockMap = NULL; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0db2843..a41859c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -745,6 +745,13 @@ cleanup: } +static void +qemuDomainPCIAddressSetFreeEntry(void *payload, + const char *name ATTRIBUTE_UNUSED) +{ + VIR_FREE(payload); +} + qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def) { qemuDomainPCIAddressSetPtr addrs; @@ -752,7 +759,7 @@ qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def) if (VIR_ALLOC(addrs) < 0) goto no_memory; - if (!(addrs->used = virHashCreate(10))) + if (!(addrs->used = virHashCreate(10, qemuDomainPCIAddressSetFreeEntry))) goto error; if (virDomainDeviceInfoIterate(def, qemuCollectPCIAddress, addrs) < 0) @@ -823,11 +830,6 @@ int qemuDomainPCIAddressEnsureAddr(qemuDomainPCIAddressSetPtr addrs, return ret; } -static void qemuDomainPCIAddressSetFreeEntry(void *payload, const char *name ATTRIBUTE_UNUSED) -{ - VIR_FREE(payload); -} - int qemuDomainPCIAddressReleaseAddr(qemuDomainPCIAddressSetPtr addrs, virDomainDeviceInfoPtr dev) @@ -852,7 +854,7 @@ void qemuDomainPCIAddressSetFree(qemuDomainPCIAddressSetPtr addrs) if (!addrs) return; - virHashFree(addrs->used, qemuDomainPCIAddressSetFreeEntry); + virHashFree(addrs->used); VIR_FREE(addrs); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 31e3c60..9c5ea63 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -994,7 +994,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, * reliable if it's available. * Note that the monitor itself can be on a pty, so we still need to try the * log output method. */ - paths = virHashCreate(0); + paths = virHashCreate(0, qemuProcessFreePtyPath); if (paths == NULL) goto cleanup; @@ -1008,7 +1008,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, ret = qemuProcessFindCharDevicePTYsMonitor(vm, paths); cleanup: - virHashFree(paths, qemuProcessFreePtyPath); + virHashFree(paths); if (kill(vm->pid, 0) == -1 && errno == ESRCH) { /* VM is dead, any other error raised in the interim is probably diff --git a/src/util/hash.c b/src/util/hash.c index 9497b60..d7950b9 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -55,6 +55,7 @@ struct _virHashTable { struct _virHashEntry *table; int size; int nbElems; + virHashDeallocator f; }; /* @@ -80,13 +81,14 @@ virHashComputeKey(virHashTablePtr table, const char *name) /** * virHashCreate: * @size: the size of the hash table + * @deallocator: function to call on each entry during virHashFree * * Create a new virHashTablePtr. * * Returns the newly created object, or NULL if an error occured. */ virHashTablePtr -virHashCreate(int size) +virHashCreate(int size, virHashDeallocator deallocator) { virHashTablePtr table = NULL; @@ -100,6 +102,7 @@ virHashCreate(int size) table->size = size; table->nbElems = 0; + table->f = deallocator; if (VIR_ALLOC_N(table->table, size) < 0) { virReportOOMError(); VIR_FREE(table); @@ -203,13 +206,12 @@ virHashGrow(virHashTablePtr table, int size) /** * virHashFree: * @table: the hash table - * @f: the deallocator function for items in the hash * * Free the hash @table and its contents. The userdata is - * deallocated with @f if provided. + * deallocated with function provided at creation time. */ void -virHashFree(virHashTablePtr table, virHashDeallocator f) +virHashFree(virHashTablePtr table) { int i; virHashEntryPtr iter; @@ -228,8 +230,8 @@ virHashFree(virHashTablePtr table, virHashDeallocator f) inside_table = 1; while (iter) { next = iter->next; - if ((f != NULL) && (iter->payload != NULL)) - f(iter->payload, iter->name); + if ((table->f != NULL) && (iter->payload != NULL)) + table->f(iter->payload, iter->name); VIR_FREE(iter->name); iter->payload = NULL; if (!inside_table) diff --git a/src/util/hash.h b/src/util/hash.h index b0ef441..cf08e1a 100644 --- a/src/util/hash.h +++ b/src/util/hash.h @@ -3,7 +3,7 @@ * Description: This module implements the hash table and allocation and * deallocation of domains and connections * - * Copy: Copyright (C) 2005 Red Hat, Inc. + * Copy: Copyright (C) 2005, 2011 Red Hat, Inc. * * Author: Bjorn Reese <bjorn.reese(a)systematic.dk> * Daniel Veillard <veillard(a)redhat.com> @@ -49,13 +49,14 @@ typedef void (*virHashIterator) (void *payload, const char *name, void *data); * Returns 1 if the hash entry is desired, 0 to move * to next entry */ -typedef int (*virHashSearcher) (const void *payload, const char *name, const void *data); +typedef int (*virHashSearcher) (const void *payload, const char *name, + const void *data); /* * Constructor and destructor. */ -virHashTablePtr virHashCreate(int size); -void virHashFree(virHashTablePtr table, virHashDeallocator f); +virHashTablePtr virHashCreate(int size, virHashDeallocator f); +void virHashFree(virHashTablePtr table); int virHashSize(virHashTablePtr table); /* diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 242a7de..bc304f0 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1,7 +1,7 @@ /* * xm_internal.h: helper routines for dealing with inactive domains * - * Copyright (C) 2006-2007, 2009-2010 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -587,12 +587,12 @@ xenXMOpen (virConnectPtr conn, priv->configDir = XM_CONFIG_DIR; - priv->configCache = virHashCreate(50); + priv->configCache = virHashCreate(50, xenXMConfigFree); if (!priv->configCache) return (-1); - priv->nameConfigMap = virHashCreate(50); + priv->nameConfigMap = virHashCreate(50, NULL); if (!priv->nameConfigMap) { - virHashFree(priv->configCache, NULL); + virHashFree(priv->configCache); priv->configCache = NULL; return (-1); } @@ -611,8 +611,8 @@ xenXMOpen (virConnectPtr conn, int xenXMClose(virConnectPtr conn) { xenUnifiedPrivatePtr priv = conn->privateData; - virHashFree(priv->nameConfigMap, NULL); - virHashFree(priv->configCache, xenXMConfigFree); + virHashFree(priv->nameConfigMap); + virHashFree(priv->configCache); return (0); } -- 1.7.4

2 2

Re: [libvirt] [libvirt-php] rewrite checking for libxml2
by Lyre 21 Feb '11

21 Feb '11

> > I don't think you're supposed to inline pkg.m4 within aclocal... I didn't check it carefully. But it was generated by autoreconf -fi, I'm not quite sure what exactly it did.

4 3

[libvirt] [PATCH] build: Fix API docs generation in VPATH build
by Jiri Denemark 21 Feb '11

21 Feb '11

--- docs/Makefile.am | 12 ++++++++---- docs/devhelp/devhelp.xsl | 7 +++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index adf74ee..c4926d4 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -88,7 +88,10 @@ EXTRA_DIST= \ sitemap.html.in \ todo.pl todo.cfg-example -MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) +MAINTAINERCLEANFILES = \ + $(addprefix $(srcdir)/,$(dot_html)) \ + $(addprefix $(srcdir)/,$(apihtml)) \ + $(addprefix $(srcdir)/,$(devhelphtml)) all: web @@ -146,19 +149,20 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in -@if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi + $(XSLTPROC) --nonet -o $(srcdir)/ \ + $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ - $(XMLLINT) --catalogs --nonet --valid --noout html/*.html ; \ + $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ else echo "missing XHTML1 DTD" ; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files -@if [ -x $(XSLTPROC) ] ; then \ - $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ + $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi python_generated_files = \ diff --git a/docs/devhelp/devhelp.xsl b/docs/devhelp/devhelp.xsl index 6600f5f..add5794 100644 --- a/docs/devhelp/devhelp.xsl +++ b/docs/devhelp/devhelp.xsl @@ -13,6 +13,13 @@  <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> + <xsl:template match="/"> + <xsl:document xmlns="http://www.devhelp.net/book" href="libvirt.devhelp" + method="xml" encoding="UTF-8" indent="yes"> + <xsl:apply-templates/> + </xsl:document> + </xsl:template> + <xsl:template match="/api"> <book title="{@name} Reference Manual" link="index.html" author="" name="{@name}"> <xsl:apply-templates select="files"/> -- 1.7.4.1

3 4

[libvirt] RFC: make <mac> element required?
by Michal Prívozník 21 Feb '11

21 Feb '11

Hi, I am about to fix https://bugzilla.redhat.com/show_bug.cgi?id=616721 It seems to me that problem is libvirt inserts a new element <mac address='...'> during parsing interface XML with random mac address which result in error described in BZ. I am not sure wheter to fix it just in virsh or in virDomainDetachDevice() as well. If in virsh, then other application may fail without knowing why. But isn't the second option too aggressive? Michal Privoznik

2 1

[libvirt] hash.c patches
by Christophe Fergeau 21 Feb '11

21 Feb '11

Hi, I recently started looking at libvirt code, and while reading hash.c, I noticed a few buglets and some cleanup that could be done. I was planning to test them carefully before sending them (ie make sure there's a unit test for this code), but since I don't know when I have time for that, and since make check and make syntax-check are passing, I'm just sending them for an initial review :) If you prefer the patches inline/in separate mails, just let me know. Thanks! Christophe

6 28

[libvirt] Vietnamese Translation for libvirt
by Hero Phương 21 Feb '11

21 Feb '11

Dear libvirt-list, I want to send my translation to upstream. But I have waited for being approved in translation site ( https://translate.fedoraproject.org/projects/p/libvirt/access/rq/add/) for a long time. Does anyone here have the responsibility for approving membership for libvirt translation? Please help me! Regards, HeroP

2 2

[libvirt] [PATCH] build: Fix VPATH build
by Jiri Denemark 21 Feb '11

21 Feb '11

Even VPATH make dist succeeds now --- docs/Makefile.am | 8 ++++---- docs/apibuild.py | 23 +++++++++++++---------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 473bbbf..8c96e79 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -92,7 +92,7 @@ MAINTAINERCLEANFILES = $(dot_html) $(apihtml) $(devhelphtml) all: web -api: libvirt-api.xml libvirt-refs.xml +api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml web: $(dot_html) html/index.html devhelp/index.html @@ -146,7 +146,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in -@if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ - $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi + $(XSLTPROC) --nonet $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ > /dev/null ; then \ @@ -159,7 +159,7 @@ $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files -@if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o devhelp/libvirt.devhelp \ - $(top_srcdir)/docs/devhelp/devhelp.xsl libvirt-api.xml ; fi + $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi python_generated_files = \ $(srcdir)/html/libvirt-libvirt.html \ @@ -179,7 +179,7 @@ clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local - rm -rf libvirt-api.xml libvirt-refs.xml todo.html.in + rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in rebuild: api all diff --git a/docs/apibuild.py b/docs/apibuild.py index 62b7557..895a313 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -1614,8 +1614,9 @@ class CParser: class docBuilder: """A documentation builder""" - def __init__(self, name, directories=['.'], includes=[]): + def __init__(self, name, path='.', directories=['.'], includes=[]): self.name = name + self.path = path self.directories = directories self.includes = includes + included_files.keys() self.modules = {} @@ -2062,7 +2063,7 @@ class docBuilder: output.write(" </index>\n") def serialize(self): - filename = "%s-api.xml" % self.name + filename = "%s/%s-api.xml" % (self.path, self.name) print "Saving XML description %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') @@ -2098,7 +2099,7 @@ class docBuilder: output.write("</api>\n") output.close() - filename = "%s-refs.xml" % self.name + filename = "%s/%s-refs.xml" % (self.path, self.name) print "Saving XML Cross References %s" % (filename) output = open(filename, "w") output.write('<?xml version="1.0" encoding="ISO-8859-1"?>\n') @@ -2113,14 +2114,16 @@ def rebuild(): srcdir = os.environ["srcdir"] if glob.glob(srcdir + "/../src/libvirt.c") != [] : print "Rebuilding API description for libvirt" - builder = docBuilder("libvirt", - [srcdir + "/../src", - srcdir + "/../src/util", - srcdir + "/../include/libvirt"], - []) + dirs = [srcdir + "/../src", + srcdir + "/../src/util", + srcdir + "/../include/libvirt"] + if glob.glob(srcdir + "/../include/libvirt/libvirt.h") == [] : + dirs.append("../include/libvirt") + builder = docBuilder("libvirt", srcdir, dirs, []) elif glob.glob("src/libvirt.c") != [] : - print "Rebuilding API description for libvir" - builder = docBuilder("libvirt", ["src", "src/util", "include/libvirt"], + print "Rebuilding API description for libvirt" + builder = docBuilder("libvirt", srcdir, + ["src", "src/util", "include/libvirt"], []) else: print "rebuild() failed, unable to guess the module" -- 1.7.4.1

3 11

[libvirt] libvirt-ask
by stone1927 21 Feb '11

21 Feb '11

windows7 connect to linux/kvm by libvirt that is always failure.sothere, I want to know why? Why use qemu+tcp:// connect to linux/kvm is failure.

4 4

[libvirt] [PATCH 0/6 v3] Add blkio cgroup support
by Gui Jianfeng 21 Feb '11

21 Feb '11

Hi This patchset adds blkio cgroup support for qemu and lxc. [PATCH 1/6] cgroup: Enable cgroup hierarchy for blkio cgroup [PATCH 2/6 v3] cgroup: Implement blkio.weight tuning API. [PATCH 3/6] Update XML Schema for new entries. [PATCH 4/6 v3] qemu: Implement blkio tunable XML configuration and parsing. [PATCH 5/6 v3] LXC: LXC Blkio weight configuration support. [PATCH 6/6] Add documentation for blkiotune elements. Will post a patchset to implement virsh command "blkiotune" to tune blkio cgroup parameter later on. v2 -> v3 Changes: o Remove an unused local variable o Rename virCgroup(Set/Get)Weight to virCgroup(Set/Get)BlkioWeight o Add documentation in docs/formatdomain.html.in o Update XML Schema for new entries. docs/formatdomain.html.in | 10 ++++++++++ docs/schemas/domain.rng | 20 ++++++++++++++++++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 4 ++++ src/libvirt_private.syms | 2 ++ src/lxc/lxc_controller.c | 10 ++++++++++ src/qemu/qemu_cgroup.c | 16 +++++++++++++++- src/qemu/qemu_conf.c | 3 ++- src/util/cgroup.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/util/cgroup.h | 4 ++++ 10 files changed, 120 insertions(+), 3 deletions(-) Thanks Gui

4 29

[libvirt] [libvirt-php] domains: added autostart and is active
by Lyre 21 Feb '11

21 Feb '11

This patch added following functions for domain: * integer libvirt_domain_get_autostart(resource $domain) return 1, 0, and -1 indicates true, false, and error. * bool libvirt_domain_set_autostart(resource $domain, bool $autosatrt) return ture on succeess and false on failure. * integer libvirt_domain_is_active(resource $domain) return 1, 0, and -1 indicates true, false, and error. modified: src/libvirt.c modified: src/php_libvirt.h --- src/libvirt.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/php_libvirt.h | 3 +++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 570511e..748d898 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -63,6 +63,9 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_memory_stats,NULL) PHP_FE(libvirt_domain_block_stats,NULL) PHP_FE(libvirt_domain_interface_stats,NULL) + PHP_FE(libvirt_domain_get_autostart, NULL) + PHP_FE(libvirt_domain_set_autostart, NULL) + PHP_FE(libvirt_domain_is_active, NULL) PHP_FE(libvirt_version,NULL) PHP_FE(libvirt_domain_get_connect, NULL) PHP_FE(libvirt_domain_migrate, NULL) @@ -70,7 +73,7 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_get_job_info, NULL) PHP_FE(libvirt_domain_xml_xpath, NULL) PHP_FE(libvirt_domain_get_block_info, NULL) - PHP_FE(libvirt_domain_get_network_info, NULL) + PHP_FE(libvirt_domain_get_network_info, NULL) PHP_FE(libvirt_list_storagepools,NULL) PHP_FE(libvirt_storagepool_lookup_by_name,NULL) PHP_FE(libvirt_storagepool_list_volumes,NULL) @@ -2200,6 +2203,46 @@ PHP_FUNCTION(libvirt_domain_interface_stats) LONGLONG_ASSOC(return_value, "tx_drop", stats.tx_drop); } +PHP_FUNCTION(libvirt_domain_get_autostart) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + int flags = 0; + + GET_DOMAIN_FROM_ARGS ("r", &zdomain); + + if (virDomainGetAutostart (domain->domain, &flags) != 0) + { + RETURN_LONG (-1); + } + RETURN_LONG ((long)flags); +} + +PHP_FUNCTION(libvirt_domain_set_autostart) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + zend_bool flags = 0; + + GET_DOMAIN_FROM_ARGS ("rb", &zdomain, &flags); + + if (virDomainSetAutostart (domain->domain, flags) != 0) + { + RETURN_FALSE; + } + RETURN_TRUE; +} + +PHP_FUNCTION(libvirt_domain_is_active) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + + GET_DOMAIN_FROM_ARGS ("r", &zdomain); + + RETURN_LONG (virDomainIsActive(domain->domain)); +} + PHP_FUNCTION(libvirt_version) { unsigned long libVer; diff --git a/src/php_libvirt.h b/src/php_libvirt.h index 054df46..213d27f 100644 --- a/src/php_libvirt.h +++ b/src/php_libvirt.h @@ -107,6 +107,9 @@ PHP_FUNCTION(libvirt_domain_memory_peek); PHP_FUNCTION(libvirt_domain_memory_stats); PHP_FUNCTION(libvirt_domain_block_stats); PHP_FUNCTION(libvirt_domain_interface_stats); +PHP_FUNCTION(libvirt_domain_get_autostart); +PHP_FUNCTION(libvirt_domain_set_autostart); +PHP_FUNCTION(libvirt_domain_is_active); PHP_FUNCTION(libvirt_version); PHP_FUNCTION(libvirt_domain_get_connect); PHP_FUNCTION(libvirt_domain_migrate); -- 1.7.1

1 0

[libvirt] [libvirt-php 0/2] Another update for building system
by Lyre 21 Feb '11

21 Feb '11

Hi all: This patch updeted the building system. * Added necessary checkings in configure.ac * Cleared up libvirt-php.spec and src/Makefile.am BTW, I've changed my email to business address. Lyre (2): spec file cleanup Added checkings for tools and libraries aclocal.m4 | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 12 ++++ libvirt-php.spec | 8 +- src/Makefile.am | 30 +++------ 4 files changed, 216 insertions(+), 23 deletions(-)

4 5

[libvirt] [PATCH] 802.1Qbh: Delay IFF_UP'ing interface until migration final stage
by Roopa Prabhu 19 Feb '11

19 Feb '11

From: Roopa Prabhu <roprabhu(a)cisco.com> Current code does an IFF_UP on a 8021Qbh interface immediately after a port profile set. This is ok in most cases except when its the migration prepare stage. During migration we want to postpone IFF_UP'ing the interface on the destination host until the source host has disassociated the interface. This patch moves IFF_UP of the interface to the final stage of migration. The motivation for this change is to postpone any addr registrations on the destination host until the source host has done the addr deregistrations. While at it, for symmetry with associate move ifDown of a 8021Qbh interface to before disassociate Signed-off-by: Roopa Prabhu <roprabhu(a)cisco.com> Signed-off-by: David Wang <dwang2(a)cisco.com> Signed-off-by: Christian Benvenuti <benve(a)cisco.com> --- src/util/macvtap.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 8814400..a71db86 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -1470,8 +1470,6 @@ doPortProfileOp8021Qbh(const char *ifname, NULL, vf, PORT_REQUEST_DISASSOCIATE); - if (!rc) - ifaceUp(ifname); break; case DISASSOCIATE: @@ -1484,7 +1482,6 @@ doPortProfileOp8021Qbh(const char *ifname, NULL, vf, PORT_REQUEST_DISASSOCIATE); - ifaceDown(ifname); break; default: @@ -1550,10 +1547,11 @@ vpAssociatePortProfileId(const char *macvtap_ifname, case VIR_VIRTUALPORT_8021QBH: /* avoid associating twice */ - if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) - break; - rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, - virtPort, vmuuid, ASSOCIATE); + if (vmOp != VIR_VM_OP_MIGRATE_IN_FINISH) + rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, + virtPort, vmuuid, ASSOCIATE); + if (vmOp != VIR_VM_OP_MIGRATE_IN_START && !rc) + ifaceUp(linkdev); break; } @@ -1600,6 +1598,7 @@ vpDisassociatePortProfileId(const char *macvtap_ifname, /* avoid disassociating twice */ if (vmOp == VIR_VM_OP_MIGRATE_IN_FINISH) break; + ifaceDown(linkdev); rc = doPortProfileOp8021Qbh(linkdev, macvtap_macaddr, virtPort, NULL, DISASSOCIATE); break;

2 1