There was one attempt a year ago done by me to drop HAL [1] but it was never resolved. There was another time when Dan suggested to drop HAL driver [2] but it was decided to keep it around in case device assignment will be implemented for FreeBSD and the fact that virt-manager uses node device driver [3]. I checked git history and code and it doesn't look like bhyve supports device assignment so from that POV it should not block removing HAL. The argument about virt-manager is not strong as well because libvirt installed from FreeBSD packages doesn't have HAL support so it will not affect these users as well [4]. The only users affected by this change would be the ones compiling libvirt from GIT on FreeBSD. I looked into alternatives and there is libudev-devd package on FreeBSD but unfortunately it doesn't work as it doesn't list any devices when used with libvirt. It provides libudev APIs using devd. I also looked into devd directly and it provides some APIs but there are no APIs for device monitoring and events so that would have to be somehow done by libvirt. Main motivation for dropping HAL support is to replace libdbus with GLib dbus implementation and it cannot be done with HAL driver present in libvirt because HAL APIs heavily depends on symbols provided by libdbus. [1] <https://www.redhat.com/archives/libvir-list/2019-May/msg00203.html> [2] <https://www.redhat.com/archives/libvir-list/2016-April/msg00992.html> [3] <https://www.redhat.com/archives/libvir-list/2016-April/msg00994.html> [4] <https://svnweb.freebsd.org/ports/head/devel/libvirt/Makefile?view=markup> Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- meson.build | 9 +- meson_options.txt | 1 - po/POTFILES.in | 1 - src/node_device/meson.build | 5 - src/node_device/node_device_driver.c | 10 +- src/node_device/node_device_driver.h | 5 - src/node_device/node_device_hal.c | 843 --------------------------- src/node_device/node_device_hal.h | 22 - 8 files changed, 3 insertions(+), 893 deletions(-) delete mode 100644 src/node_device/node_device_hal.c delete mode 100644 src/node_device/node_device_hal.h diff --git a/meson.build b/meson.build index 195d7cd784..3d15b4ee34 100644 --- a/meson.build +++ b/meson.build @@ -1077,12 +1077,6 @@ glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, r gnutls_version = '3.2.0' gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) -hal_version = '0.5.0' -hal_dep = dependency('hal', version: '>=' + hal_version, required: get_option('hal')) -if hal_dep.found() - conf.set('WITH_HAL', 1) -endif - # Check for BSD kvm (kernel memory interface) if host_machine.system() == 'freebsd' kvm_dep = cc.find_library('kvm') @@ -1728,7 +1722,7 @@ if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') and conf.set('WITH_NETWORK', 1) endif -if hal_dep.found() or udev_dep.found() +if udev_dep.found() conf.set('WITH_NODE_DEVICES', 1) endif @@ -2433,7 +2427,6 @@ libs_summary = { 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), 'gnutls': gnutls_dep.found(), - 'hal': hal_dep.found(), 'libiscsi': libiscsi_dep.found(), 'libnl': libnl_dep.found(), 'libpcap': libpcap_dep.found(), diff --git a/meson_options.txt b/meson_options.txt index 7838630c1e..c8886e1430 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -23,7 +23,6 @@ option('firewalld', type: 'feature', value: 'auto', description: 'firewalld supp option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support') -option('hal', type: 'feature', value: 'auto', description: 'hal support') option('libiscsi', type: 'feature', value: 'auto', description: 'libiscsi support') option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support') option('libssh', type: 'feature', value: 'auto', description: 'libssh support') diff --git a/po/POTFILES.in b/po/POTFILES.in index 471af30b89..4ab8832b37 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -130,7 +130,6 @@ @SRCDIR@src/network/bridge_driver_linux.c @SRCDIR@src/network/leaseshelper.c @SRCDIR@src/node_device/node_device_driver.c -@SRCDIR@src/node_device/node_device_hal.c @SRCDIR@src/node_device/node_device_udev.c @SRCDIR@src/nwfilter/nwfilter_dhcpsnoop.c @SRCDIR@src/nwfilter/nwfilter_driver.c diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 5953c6b8ed..c4e4c3906b 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -4,10 +4,6 @@ node_device_driver_sources = [ stateful_driver_source_files += files(node_device_driver_sources) -if conf.has('WITH_HAL') - node_device_driver_sources += 'node_device_hal.c' -endif - if conf.has('WITH_UDEV') node_device_driver_sources += 'node_device_udev.c' endif @@ -22,7 +18,6 @@ if conf.has('WITH_NODE_DEVICES') ], dependencies: [ access_dep, - hal_dep, libnl_dep, pciaccess_dep, src_dep, diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 375c1fff32..f4b140bef4 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -36,7 +36,6 @@ #include "node_device_conf.h" #include "node_device_event.h" #include "node_device_driver.h" -#include "node_device_hal.h" #include "node_device_util.h" #include "virvhba.h" #include "viraccessapicheck.h" @@ -98,14 +97,13 @@ int nodeConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) return 1; } -#if defined (__linux__) && ( defined (WITH_HAL) || defined(WITH_UDEV)) +#if defined (__linux__) && defined(WITH_UDEV) /* NB: It was previously believed that changes in driver name were * relayed to libvirt as "change" events by udev, and the udev event * notification is setup to recognize such events and effectively * recreate the device entry in the cache. However, neither the kernel * nor udev sends such an event, so it is necessary to manually update - * the driver name for a device each time its entry is used, both for - * udev *and* HAL backends. + * the driver name for a device each time its entry is used. */ static int nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) @@ -935,9 +933,5 @@ nodedevRegister(void) { #ifdef WITH_UDEV return udevNodeRegister(); -#else -# ifdef WITH_HAL - return halNodeRegister(); -# endif #endif } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index be5d397828..2113d2b0a5 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -28,11 +28,6 @@ #define LINUX_NEW_DEVICE_WAIT_TIME 60 -#ifdef WITH_HAL -int -halNodeRegister(void); -#endif - #ifdef WITH_UDEV int udevNodeRegister(void); diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c deleted file mode 100644 index 53a49ba2aa..0000000000 --- a/src/node_device/node_device_hal.c +++ /dev/null @@ -1,843 +0,0 @@ -/* - * node_device_hal.c: node device enumeration - HAL-based implementation - * - * Copyright (C) 2011-2015 Red Hat, Inc. - * Copyright (C) 2008 Virtual Iron Software, Inc. - * Copyright (C) 2008 David F. Lively - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <config.h> - -#include <libhal.h> - -#include "node_device_conf.h" -#include "node_device_driver.h" -#include "node_device_hal.h" -#include "virerror.h" -#include "driver.h" -#include "datatypes.h" -#include "viralloc.h" -#include "viruuid.h" -#include "virfile.h" -#include "virpci.h" -#include "virpidfile.h" -#include "virlog.h" -#include "virdbus.h" -#include "virstring.h" -#include "virutil.h" - -#include "configmake.h" - -#define VIR_FROM_THIS VIR_FROM_NODEDEV - -VIR_LOG_INIT("node_device.node_device_hal"); - -/* - * Host device enumeration (HAL implementation) - */ - -#define DRV_STATE_HAL_CTX(ds) ((LibHalContext *)((ds)->privateData)) - - -static const char * -hal_name(const char *udi) -{ - const char *name = strrchr(udi, '/'); - if (name) - return name + 1; - return udi; -} - - -static int -get_str_prop(LibHalContext *ctxt, const char *udi, - const char *prop, char **val_p) -{ - char *val = libhal_device_get_property_string(ctxt, udi, prop, NULL); - - if (val) { - if (*val) { - *val_p = val; - return 0; - } else { - /* Treat empty strings as NULL values */ - VIR_FREE(val); - } - } - - return -1; -} - -static int -get_int_prop(LibHalContext *ctxt, const char *udi, - const char *prop, int *val_p) -{ - DBusError err; - int val; - int rv; - - dbus_error_init(&err); - val = libhal_device_get_property_int(ctxt, udi, prop, &err); - rv = dbus_error_is_set(&err); - dbus_error_free(&err); - if (rv == 0) - *val_p = val; - - return rv; -} - -static int -get_bool_prop(LibHalContext *ctxt, const char *udi, - const char *prop, int *val_p) -{ - DBusError err; - int val; - int rv; - - dbus_error_init(&err); - val = libhal_device_get_property_bool(ctxt, udi, prop, &err); - rv = dbus_error_is_set(&err); - dbus_error_free(&err); - if (rv == 0) - *val_p = val; - - return rv; -} - -static int -get_uint64_prop(LibHalContext *ctxt, const char *udi, - const char *prop, unsigned long long *val_p) -{ - DBusError err; - unsigned long long val; - int rv; - - dbus_error_init(&err); - val = libhal_device_get_property_uint64(ctxt, udi, prop, &err); - rv = dbus_error_is_set(&err); - dbus_error_free(&err); - if (rv == 0) - *val_p = val; - - return rv; -} - -static int -gather_pci_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - char *sysfs_path; - - if (get_str_prop(ctx, udi, "pci.linux.sysfs_path", &sysfs_path) == 0) { - char *p = strrchr(sysfs_path, '/'); - if (p) { - ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.domain)); - ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.bus)); - ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.slot)); - ignore_value(virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function)); - } - - if (virNodeDeviceGetPCIDynamicCaps(sysfs_path, &d->pci_dev) < 0) { - VIR_FREE(sysfs_path); - return -1; - } - VIR_FREE(sysfs_path); - } - - (void)get_int_prop(ctx, udi, "pci.vendor_id", (int *)&d->pci_dev.vendor); - if (get_str_prop(ctx, udi, "pci.vendor", &d->pci_dev.vendor_name) != 0) - (void)get_str_prop(ctx, udi, "info.vendor", &d->pci_dev.vendor_name); - (void)get_int_prop(ctx, udi, "pci.product_id", (int *)&d->pci_dev.product); - if (get_str_prop(ctx, udi, "pci.product", &d->pci_dev.product_name) != 0) - (void)get_str_prop(ctx, udi, "info.product", &d->pci_dev.product_name); - - return 0; -} - - -static int -gather_usb_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - (void)get_int_prop(ctx, udi, "usb.interface.number", - (int *)&d->usb_if.number); - (void)get_int_prop(ctx, udi, "usb.interface.class", - (int *)&d->usb_if.klass); - (void)get_int_prop(ctx, udi, "usb.interface.subclass", - (int *)&d->usb_if.subclass); - (void)get_int_prop(ctx, udi, "usb.interface.protocol", - (int *)&d->usb_if.protocol); - (void)get_str_prop(ctx, udi, "usb.interface.description", - &d->usb_if.description); - return 0; -} - - -static int -gather_usb_device_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - (void)get_int_prop(ctx, udi, "usb_device.bus_number", - (int *)&d->usb_dev.bus); - (void)get_int_prop(ctx, udi, "usb_device.linux.device_number", - (int *)&d->usb_dev.device); - (void)get_int_prop(ctx, udi, "usb_device.vendor_id", - (int *)&d->usb_dev.vendor); - if (get_str_prop(ctx, udi, "usb_device.vendor", - &d->usb_dev.vendor_name) != 0) - (void)get_str_prop(ctx, udi, "info.vendor", &d->usb_dev.vendor_name); - (void)get_int_prop(ctx, udi, "usb_device.product_id", - (int *)&d->usb_dev.product); - if (get_str_prop(ctx, udi, "usb_device.product", - &d->usb_dev.product_name) != 0) - (void)get_str_prop(ctx, udi, "info.product", &d->usb_dev.product_name); - return 0; -} - - -static int -gather_net_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - unsigned long long dummy; - (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname); - (void)get_str_prop(ctx, udi, "net.address", &d->net.address); - if (get_uint64_prop(ctx, udi, "net.80203.mac_address", - &dummy) == 0) - d->net.subtype = VIR_NODE_DEV_CAP_NET_80203; - else if (get_uint64_prop(ctx, udi, "net.80211.mac_address", - &dummy) == 0) - d->net.subtype = VIR_NODE_DEV_CAP_NET_80211; - else - d->net.subtype = VIR_NODE_DEV_CAP_NET_LAST; - - return 0; -} - - -static int -gather_scsi_host_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - (void)get_int_prop(ctx, udi, "scsi_host.host", (int *)&d->scsi_host.host); - - return virNodeDeviceGetSCSIHostCaps(&d->scsi_host); -} - - -static int -gather_scsi_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - (void)get_int_prop(ctx, udi, "scsi.host", (int *)&d->scsi.host); - (void)get_int_prop(ctx, udi, "scsi.bus", (int *)&d->scsi.bus); - (void)get_int_prop(ctx, udi, "scsi.target", (int *)&d->scsi.target); - (void)get_int_prop(ctx, udi, "scsi.lun", (int *)&d->scsi.lun); - (void)get_str_prop(ctx, udi, "scsi.type", &d->scsi.type); - return 0; -} - - -static int -gather_storage_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - int val; - (void)get_str_prop(ctx, udi, "block.device", &d->storage.block); - (void)get_str_prop(ctx, udi, "storage.bus", &d->storage.bus); - (void)get_str_prop(ctx, udi, "storage.drive_type", &d->storage.drive_type); - (void)get_str_prop(ctx, udi, "storage.model", &d->storage.model); - (void)get_str_prop(ctx, udi, "storage.vendor", &d->storage.vendor); - (void)get_str_prop(ctx, udi, "storage.serial", &d->storage.serial); - if (get_bool_prop(ctx, udi, "storage.removable", &val) == 0 && val) { - d->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; - if (get_bool_prop(ctx, udi, "storage.removable.media_available", - &val) == 0 && val) { - d->storage.flags |= - VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; - (void)get_uint64_prop(ctx, udi, "storage.removable.media_size", - &d->storage.removable_media_size); - } - } else { - (void)get_uint64_prop(ctx, udi, "storage.size", &d->storage.size); - } - if (get_bool_prop(ctx, udi, "storage.hotpluggable", &val) == 0 && val) - d->storage.flags |= VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE; - return 0; -} - -static int -gather_scsi_generic_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - (void)get_str_prop(ctx, udi, "scsi_generic.device", &d->sg.path); - return 0; -} - - -static int -gather_system_cap(LibHalContext *ctx, const char *udi, - virNodeDevCapDataPtr d) -{ - char *uuidstr; - - (void)get_str_prop(ctx, udi, "system.product", &d->system.product_name); - (void)get_str_prop(ctx, udi, "system.hardware.vendor", - &d->system.hardware.vendor_name); - (void)get_str_prop(ctx, udi, "system.hardware.version", - &d->system.hardware.version); - (void)get_str_prop(ctx, udi, "system.hardware.serial", - &d->system.hardware.serial); - if (get_str_prop(ctx, udi, "system.hardware.uuid", &uuidstr) == 0) { - ignore_value(virUUIDParse(uuidstr, d->system.hardware.uuid)); - VIR_FREE(uuidstr); - } - (void)get_str_prop(ctx, udi, "system.firmware.vendor", - &d->system.firmware.vendor_name); - (void)get_str_prop(ctx, udi, "system.firmware.version", - &d->system.firmware.version); - (void)get_str_prop(ctx, udi, "system.firmware.release_date", - &d->system.firmware.release_date); - return 0; -} - - -struct _caps_tbl_entry { - const char *cap_name; - virNodeDevCapType type; - int (*gather_fn)(LibHalContext *ctx, - const char *udi, - virNodeDevCapDataPtr data); -}; - -typedef struct _caps_tbl_entry caps_tbl_entry; - -static caps_tbl_entry caps_tbl[] = { - { "system", VIR_NODE_DEV_CAP_SYSTEM, gather_system_cap }, - { "pci", VIR_NODE_DEV_CAP_PCI_DEV, gather_pci_cap }, - { "usb", VIR_NODE_DEV_CAP_USB_INTERFACE, gather_usb_cap }, - { "usb_device", VIR_NODE_DEV_CAP_USB_DEV, gather_usb_device_cap }, - { "net", VIR_NODE_DEV_CAP_NET, gather_net_cap }, - { "scsi_host", VIR_NODE_DEV_CAP_SCSI_HOST, gather_scsi_host_cap }, - { "scsi", VIR_NODE_DEV_CAP_SCSI, gather_scsi_cap }, - { "storage", VIR_NODE_DEV_CAP_STORAGE, gather_storage_cap }, - { "scsi_generic", VIR_NODE_DEV_CAP_SCSI_GENERIC, gather_scsi_generic_cap }, -}; - - -/* qsort/bsearch string comparator */ -static int -cmpstringp(const void *p1, const void *p2) -{ - /* from man 3 qsort */ - return strcmp(* (char * const *) p1, * (char * const *) p2); -} - - -static int -gather_capability(LibHalContext *ctx, const char *udi, - const char *cap_name, - virNodeDevCapsDefPtr *caps_p) -{ - caps_tbl_entry *entry; - - entry = bsearch(&cap_name, caps_tbl, G_N_ELEMENTS(caps_tbl), - sizeof(caps_tbl[0]), cmpstringp); - - if (entry) { - virNodeDevCapsDefPtr caps; - if (VIR_ALLOC(caps) < 0) - return ENOMEM; - caps->data.type = entry->type; - if (entry->gather_fn) { - int rv = (*entry->gather_fn)(ctx, udi, &caps->data); - if (rv != 0) { - virNodeDevCapsDefFree(caps); - return rv; - } - } - caps->next = *caps_p; - *caps_p = caps; - } - - return 0; -} - - -static int -gather_capabilities(LibHalContext *ctx, const char *udi, - virNodeDevCapsDefPtr *caps_p) -{ - char *bus_name = NULL; - virNodeDevCapsDefPtr caps = NULL; - char **hal_cap_names = NULL; - int rv; - size_t i; - - if (STREQ(udi, "/org/freedesktop/Hal/devices/computer")) { - rv = gather_capability(ctx, udi, "system", &caps); - if (rv != 0) - goto failure; - } - - if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0 || - get_str_prop(ctx, udi, "linux.subsystem", &bus_name) == 0) { - rv = gather_capability(ctx, udi, bus_name, &caps); - if (rv != 0) - goto failure; - } - - hal_cap_names = libhal_device_get_property_strlist(ctx, udi, - "info.capabilities", - NULL); - if (hal_cap_names) { - for (i = 0; hal_cap_names[i]; i++) { - if (! (bus_name && STREQ(hal_cap_names[i], bus_name))) { - rv = gather_capability(ctx, udi, hal_cap_names[i], &caps); - if (rv != 0) - goto failure; - } - } - for (i = 0; hal_cap_names[i]; i++) - VIR_FREE(hal_cap_names[i]); - VIR_FREE(hal_cap_names); - } - VIR_FREE(bus_name); - - *caps_p = caps; - return 0; - - failure: - VIR_FREE(bus_name); - if (hal_cap_names) { - for (i = 0; hal_cap_names[i]; i++) - VIR_FREE(hal_cap_names[i]); - VIR_FREE(hal_cap_names); - } - while (caps) { - virNodeDevCapsDefPtr next = caps->next; - virNodeDevCapsDefFree(caps); - caps = next; - } - return rv; -} - -static void -dev_create(const char *udi) -{ - LibHalContext *ctx; - char *parent_key = NULL; - virNodeDeviceObjPtr obj = NULL; - virNodeDeviceDefPtr def = NULL; - virNodeDeviceDefPtr objdef; - const char *name = hal_name(udi); - int rv; - char *devicePath = NULL; - - nodeDeviceLock(); - ctx = DRV_STATE_HAL_CTX(driver); - - if (VIR_ALLOC(def) < 0) - goto failure; - - def->name = g_strdup(name); - - if (get_str_prop(ctx, udi, "info.parent", &parent_key) == 0) { - def->parent = g_strdup(hal_name(parent_key)); - VIR_FREE(parent_key); - } - - rv = gather_capabilities(ctx, udi, &def->caps); - if (rv != 0) goto failure; - - if (def->caps == NULL) - goto cleanup; - - /* Some devices don't have a path in sysfs, so ignore failure */ - (void)get_str_prop(ctx, udi, "linux.sysfs_path", &devicePath); - - if (!(obj = virNodeDeviceObjListAssignDef(driver->devs, def))) { - VIR_FREE(devicePath); - goto failure; - } - objdef = virNodeDeviceObjGetDef(obj); - - objdef->sysfs_path = devicePath; - - virNodeDeviceObjEndAPI(&obj); - - nodeDeviceUnlock(); - return; - - failure: - VIR_DEBUG("FAILED TO ADD dev %s", name); - cleanup: - virNodeDeviceDefFree(def); - nodeDeviceUnlock(); -} - -static void -dev_refresh(const char *udi) -{ - const char *name = hal_name(udi); - virNodeDeviceObjPtr obj; - - if ((obj = virNodeDeviceObjListFindByName(driver->devs, name))) { - /* Simply "rediscover" device -- incrementally handling changes - * to sub-capabilities (like net.80203) is nasty ... so avoid it. - */ - virNodeDeviceObjListRemove(driver->devs, obj); - virObjectUnref(obj); - dev_create(udi); - } else { - VIR_DEBUG("no device named %s", name); - } -} - -static void -device_added(LibHalContext *ctx G_GNUC_UNUSED, - const char *udi) -{ - VIR_DEBUG("%s", hal_name(udi)); - dev_create(udi); -} - - -static void -device_removed(LibHalContext *ctx G_GNUC_UNUSED, - const char *udi) -{ - const char *name = hal_name(udi); - virNodeDeviceObjPtr obj; - - obj = virNodeDeviceObjListFindByName(driver->devs, name); - VIR_DEBUG("%s", name); - if (obj) - virNodeDeviceObjListRemove(driver->devs, obj); - else - VIR_DEBUG("no device named %s", name); - virObjectUnref(obj); -} - - -static void -device_cap_added(LibHalContext *ctx, - const char *udi, const char *cap) -{ - const char *name = hal_name(udi); - virNodeDeviceObjPtr obj; - virNodeDeviceDefPtr def; - - VIR_DEBUG("%s %s", cap, name); - if ((obj = virNodeDeviceObjListFindByName(driver->devs, name))) { - def = virNodeDeviceObjGetDef(obj); - (void)gather_capability(ctx, udi, cap, &def->caps); - virNodeDeviceObjEndAPI(&obj); - } else { - VIR_DEBUG("no device named %s", name); - } -} - - -static void -device_cap_lost(LibHalContext *ctx G_GNUC_UNUSED, - const char *udi, - const char *cap) -{ - const char *name = hal_name(udi); - VIR_DEBUG("%s %s", cap, name); - - dev_refresh(udi); -} - - -static void -device_prop_modified(LibHalContext *ctx G_GNUC_UNUSED, - const char *udi, - const char *key, - dbus_bool_t is_removed G_GNUC_UNUSED, - dbus_bool_t is_added G_GNUC_UNUSED) -{ - const char *name = hal_name(udi); - VIR_DEBUG("%s %s", name, key); - - dev_refresh(udi); -} - - -static int -nodeStateInitialize(bool privileged G_GNUC_UNUSED, - const char *root, - virStateInhibitCallback callback G_GNUC_UNUSED, - void *opaque G_GNUC_UNUSED) -{ - LibHalContext *hal_ctx = NULL; - char **udi = NULL; - int num_devs; - size_t i; - int ret = VIR_DRV_STATE_INIT_ERROR; - DBusConnection *sysbus; - DBusError err; - - if (root != NULL) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Driver does not support embedded mode")); - return -1; - } - - /* Ensure caps_tbl is sorted by capability name */ - qsort(caps_tbl, G_N_ELEMENTS(caps_tbl), sizeof(caps_tbl[0]), - cmpstringp); - - if (VIR_ALLOC(driver) < 0) - return VIR_DRV_STATE_INIT_ERROR; - - driver->lockFD = -1; - if (virMutexInit(&driver->lock) < 0) { - VIR_FREE(driver); - return VIR_DRV_STATE_INIT_ERROR; - } - - if (virCondInit(&driver->initCond) < 0) { - virReportSystemError(errno, "%s", - _("Unable to initialize condition variable")); - virMutexDestroy(&driver->lock); - VIR_FREE(driver); - return VIR_DRV_STATE_INIT_ERROR; - } - - nodeDeviceLock(); - - if (privileged) { - driver->stateDir = g_strdup_printf("%s/libvirt/nodedev", RUNSTATEDIR); - } else { - g_autofree char *rundir = NULL; - - rundir = virGetUserRuntimeDirectory(); - driver->stateDir = g_strdup_printf("%s/nodedev/run", rundir); - } - - if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { - virReportSystemError(errno, _("cannot create state directory '%s'"), - driver->stateDir); - goto failure; - } - - if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) - goto failure; - - if (!(driver->devs = virNodeDeviceObjListNew())) - goto failure; - - dbus_error_init(&err); - if (!(sysbus = virDBusGetSystemBus())) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("DBus not available, disabling HAL driver: %s"), - virGetLastErrorMessage()); - ret = VIR_DRV_STATE_INIT_SKIPPED; - goto failure; - } - - hal_ctx = libhal_ctx_new(); - if (hal_ctx == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libhal_ctx_new returned NULL")); - goto failure; - } - - if (!libhal_ctx_set_dbus_connection(hal_ctx, sysbus)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libhal_ctx_set_dbus_connection failed")); - goto failure; - } - if (!libhal_ctx_init(hal_ctx, &err)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libhal_ctx_init failed, haldaemon is probably " - "not running")); - /* We don't want to show a fatal error here, - otherwise entire libvirtd shuts down when - hald isn't running */ - ret = VIR_DRV_STATE_INIT_SKIPPED; - goto failure; - } - - /* Populate with known devices */ - driver->privateData = hal_ctx; - - /* We need to unlock state now, since setting these callbacks cause - * a dbus RPC call, and while this call is waiting for the reply, - * a signal may already arrive, triggering the callback and thus - * requiring the lock ! - */ - nodeDeviceUnlock(); - - /* Register HAL event callbacks */ - if (!libhal_ctx_set_device_added(hal_ctx, device_added) || - !libhal_ctx_set_device_removed(hal_ctx, device_removed) || - !libhal_ctx_set_device_new_capability(hal_ctx, device_cap_added) || - !libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) || - !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) || - !libhal_device_property_watch_all(hal_ctx, &err)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("setting up HAL callbacks failed")); - goto failure; - } - - udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); - if (udi == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libhal_get_all_devices failed")); - goto failure; - } - for (i = 0; i < num_devs; i++) { - dev_create(udi[i]); - VIR_FREE(udi[i]); - } - VIR_FREE(udi); - - nodeDeviceLock(); - driver->initialized = true; - nodeDeviceUnlock(); - virCondBroadcast(&driver->initCond); - - return VIR_DRV_STATE_INIT_COMPLETE; - - failure: - if (dbus_error_is_set(&err)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s: %s"), err.name, err.message); - dbus_error_free(&err); - } - virNodeDeviceObjListFree(driver->devs); - if (hal_ctx) - (void)libhal_ctx_free(hal_ctx); - nodeDeviceUnlock(); - VIR_FREE(driver); - - return ret; -} - - -static int -nodeStateCleanup(void) -{ - if (driver) { - nodeDeviceLock(); - LibHalContext *hal_ctx = DRV_STATE_HAL_CTX(driver); - virNodeDeviceObjListFree(driver->devs); - (void)libhal_ctx_shutdown(hal_ctx, NULL); - (void)libhal_ctx_free(hal_ctx); - if (driver->lockFD != -1) - virPidFileRelease(driver->stateDir, "driver", driver->lockFD); - - VIR_FREE(driver->stateDir); - nodeDeviceUnlock(); - virCondDestroy(&driver->initCond); - virMutexDestroy(&driver->lock); - VIR_FREE(driver); - return 0; - } - return -1; -} - - -static int -nodeStateReload(void) -{ - DBusError err; - char **udi = NULL; - int num_devs; - size_t i; - LibHalContext *hal_ctx; - - VIR_INFO("Reloading HAL device state"); - nodeDeviceLock(); - VIR_INFO("Removing existing objects"); - virNodeDeviceObjListFree(driver->devs); - nodeDeviceUnlock(); - - hal_ctx = DRV_STATE_HAL_CTX(driver); - VIR_INFO("Creating new objects"); - dbus_error_init(&err); - udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); - if (udi == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("libhal_get_all_devices failed")); - return -1; - } - for (i = 0; i < num_devs; i++) { - dev_create(udi[i]); - VIR_FREE(udi[i]); - } - VIR_FREE(udi); - VIR_INFO("HAL device reload complete"); - - return 0; -} - - -static virNodeDeviceDriver halNodeDeviceDriver = { - .name = "HAL", - .nodeNumOfDevices = nodeNumOfDevices, /* 0.5.0 */ - .nodeListDevices = nodeListDevices, /* 0.5.0 */ - .connectListAllNodeDevices = nodeConnectListAllNodeDevices, /* 0.10.2 */ - .nodeDeviceLookupByName = nodeDeviceLookupByName, /* 0.5.0 */ - .nodeDeviceLookupSCSIHostByWWN = nodeDeviceLookupSCSIHostByWWN, /* 1.0.2 */ - .nodeDeviceGetXMLDesc = nodeDeviceGetXMLDesc, /* 0.5.0 */ - .nodeDeviceGetParent = nodeDeviceGetParent, /* 0.5.0 */ - .nodeDeviceNumOfCaps = nodeDeviceNumOfCaps, /* 0.5.0 */ - .nodeDeviceListCaps = nodeDeviceListCaps, /* 0.5.0 */ - .nodeDeviceCreateXML = nodeDeviceCreateXML, /* 0.6.5 */ - .nodeDeviceDestroy = nodeDeviceDestroy, /* 0.6.5 */ -}; - - -static virHypervisorDriver halHypervisorDriver = { - .name = "nodedev", - .connectOpen = nodeConnectOpen, /* 4.1.0 */ - .connectClose = nodeConnectClose, /* 4.1.0 */ - .connectIsEncrypted = nodeConnectIsEncrypted, /* 4.1.0 */ - .connectIsSecure = nodeConnectIsSecure, /* 4.1.0 */ - .connectIsAlive = nodeConnectIsAlive, /* 4.1.0 */ -}; - - -static virConnectDriver halConnectDriver = { - .localOnly = true, - .uriSchemes = (const char *[]){ "nodedev", NULL }, - .hypervisorDriver = &halHypervisorDriver, - .nodeDeviceDriver = &halNodeDeviceDriver, -}; - - -static virStateDriver halStateDriver = { - .name = "HAL", - .stateInitialize = nodeStateInitialize, /* 0.5.0 */ - .stateCleanup = nodeStateCleanup, /* 0.5.0 */ - .stateReload = nodeStateReload, /* 0.5.0 */ -}; - -int -halNodeRegister(void) -{ - if (virRegisterConnectDriver(&halConnectDriver, false) < 0) - return -1; - if (virSetSharedNodeDeviceDriver(&halNodeDeviceDriver) < 0) - return -1; - return virRegisterStateDriver(&halStateDriver); -} diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h deleted file mode 100644 index 5e9c25ae34..0000000000 --- a/src/node_device/node_device_hal.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * node_device_hal.h: node device enumeration - HAL-based implementation - * - * Copyright (C) 2009 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#pragma once -- 2.26.2

This test calls into src/util/virfirewalld.c where it uses DBus to figure out if firewalld is registered. Without the mock it luckily fails and the test works correctly. To isolate the tests from host environment we should mock the DBus calls. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tests/meson.build | 2 +- tests/networkxml2firewalltest.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 0a204c46e4..f0f3d8c1ef 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -404,7 +404,7 @@ endif if conf.has('WITH_NETWORK') tests += [ { 'name': 'networkxml2conftest', 'link_with': [ network_driver_impl ] }, - { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_impl ] }, + { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_impl ], 'deps': [ dbus_dep ] }, { 'name': 'networkxml2xmltest', 'link_with': [ network_driver_impl ] }, ] endif diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 29e7d8bc38..80e2d6a035 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -26,8 +26,13 @@ #if defined (__linux__) +# if WITH_DBUS +# include <dbus/dbus.h> +# endif + # include "network/bridge_driver_platform.h" # include "virbuffer.h" +# include "virmock.h" # define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW # include "virfirewallpriv.h" @@ -43,6 +48,22 @@ # error "test case not ported to this platform" # endif +# if WITH_DBUS +VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, + DBusMessage *, + DBusConnection *, connection, + DBusMessage *, message, + int, timeout_milliseconds, + DBusError *, error) +{ + VIR_MOCK_REAL_INIT(dbus_connection_send_with_reply_and_block); + + dbus_set_error_const(error, "org.freedesktop.error", "dbus is disabled"); + + return NULL; +} +# endif + static void testCommandDryRun(const char *const*args G_GNUC_UNUSED, const char *const*env G_GNUC_UNUSED, @@ -176,7 +197,11 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } +# if WITH_DBUS +VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdbus")) +# else VIR_TEST_MAIN(mymain) +# endif #else /* ! defined (__linux__) */ -- 2.26.2

Rewrite to use GLib DBus instead of libdbus will introduce function with large number of arguments that we will have to mock for our tests so we need to extend the number of arguments for our macros. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- tests/virmock.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/virmock.h b/tests/virmock.h index a812cfe08b..dea5feb80f 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -27,8 +27,8 @@ #include "internal.h" -#define VIR_MOCK_COUNT_ARGS(...) VIR_MOCK_ARG21(__VA_ARGS__, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) -#define VIR_MOCK_ARG21(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, ...) _21 +#define VIR_MOCK_COUNT_ARGS(...) VIR_MOCK_ARG27(__VA_ARGS__, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) +#define VIR_MOCK_ARG27(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, ...) _27 #define VIR_MOCK_ARG_PASTE(a, b, ...) a##b(__VA_ARGS__) #define VIR_MOCK_ARGNAME(a, b) b @@ -56,6 +56,12 @@ #define VIR_MOCK_GET_ARG19(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r) #define VIR_MOCK_GET_ARG20(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t) #define VIR_MOCK_GET_ARG21(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t) +#define VIR_MOCK_GET_ARG22(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v) +#define VIR_MOCK_GET_ARG23(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v) +#define VIR_MOCK_GET_ARG24(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v), z(w, x) +#define VIR_MOCK_GET_ARG25(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v), z(w, x) +#define VIR_MOCK_GET_ARG26(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, aa) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v), z(w, x), z(y, aa) +#define VIR_MOCK_GET_ARG27(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, aa, ab) z(a, b), z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t), z(u, v), z(w, x), z(y, aa) #define VIR_MOCK_ARGNAMES_EXPAND(a, b, ...) VIR_MOCK_ARG_PASTE(a, b, __VA_ARGS__) -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virpolkit.c | 115 +++++++++++++++++++++--------------------- tests/meson.build | 11 ++-- tests/virpolkittest.c | 112 +++++++++++++++------------------------- 3 files changed, 104 insertions(+), 134 deletions(-) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 1570d667ee..2ad00fd206 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -28,7 +28,7 @@ #include "virstring.h" #include "virprocess.h" #include "viralloc.h" -#include "virdbus.h" +#include "virgdbus.h" #include "virfile.h" #include "virutil.h" @@ -63,80 +63,81 @@ int virPolkitCheckAuth(const char *actionid, const char **details, bool allowInteraction) { - DBusConnection *sysbus; - DBusMessage *reply = NULL; - char **retdetails = NULL; - size_t nretdetails = 0; - bool is_authorized; - bool is_challenge; + GDBusConnection *sysbus; + GVariantBuilder builder; + GVariant *gprocess = NULL; + GVariant *gdetails = NULL; + g_autoptr(GVariant) message = NULL; + g_autoptr(GVariant) reply = NULL; + g_autoptr(GVariantIter) iter = NULL; + char *retkey; + char *retval; + gboolean is_authorized; + gboolean is_challenge; bool is_dismissed = false; size_t i; - int ret = -1; - if (!(sysbus = virDBusGetSystemBus())) - goto cleanup; + if (!(sysbus = virGDBusGetSystemBus())) + return -1; VIR_INFO("Checking PID %lld running as %d", (long long) pid, uid); - if (virDBusCallMethod(sysbus, - &reply, - NULL, - "org.freedesktop.PolicyKit1", - "/org/freedesktop/PolicyKit1/Authority", - "org.freedesktop.PolicyKit1.Authority", - "CheckAuthorization", - "(sa{sv})sa&{ss}us", - "unix-process", - 3, - "pid", "u", (unsigned int)pid, - "start-time", "t", startTime, - "uid", "i", (int)uid, - actionid, - virStringListLength(details) / 2, - details, - allowInteraction, - "" /* cancellation ID */) < 0) - goto cleanup; + g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}")); + g_variant_builder_add(&builder, "{sv}", "pid", g_variant_new_uint32(pid)); + g_variant_builder_add(&builder, "{sv}", "start-time", g_variant_new_uint64(startTime)); + g_variant_builder_add(&builder, "{sv}", "uid", g_variant_new_int32(uid)); + gprocess = g_variant_builder_end(&builder); - if (virDBusMessageDecode(reply, - "(bba&{ss})", - &is_authorized, - &is_challenge, - &nretdetails, - &retdetails) < 0) - goto cleanup; + g_variant_builder_init(&builder, G_VARIANT_TYPE("a{ss}")); + for (i = 0; i < virStringListLength(details); i += 2) + g_variant_builder_add(&builder, "{ss}", details[i], details[i + 1]); + gdetails = g_variant_builder_end(&builder); - for (i = 0; i < (nretdetails / 2); i++) { - if (STREQ(retdetails[(i * 2)], "polkit.dismissed") && - STREQ(retdetails[(i * 2) + 1], "true")) + message = g_variant_new("((s@a{sv})s@a{ss}us)", + "unix-process", + gprocess, + actionid, + gdetails, + allowInteraction, + "" /* cancellation ID */); + + if (virGDBusCallMethod(sysbus, + &reply, + NULL, + "org.freedesktop.PolicyKit1", + "/org/freedesktop/PolicyKit1/Authority", + "org.freedesktop.PolicyKit1.Authority", + "CheckAuthorization", + message) < 0) + return -1; + + g_variant_get(reply, "((bba{ss}))", &is_authorized, &is_challenge, &iter); + + while (g_variant_iter_loop(iter, "{ss}", &retkey, &retval)) { + if (STREQ(retkey, "polkit.dismissed") && STREQ(retval, "true")) is_dismissed = true; } VIR_DEBUG("is auth %d is challenge %d", is_authorized, is_challenge); - if (is_authorized) { - ret = 0; + if (is_authorized) + return 0; + + if (is_dismissed) { + virReportError(VIR_ERR_AUTH_CANCELLED, "%s", + _("user cancelled authentication process")); + } else if (is_challenge) { + virReportError(VIR_ERR_AUTH_UNAVAILABLE, + _("no polkit agent available to authenticate action '%s'"), + actionid); } else { - ret = -2; - if (is_dismissed) - virReportError(VIR_ERR_AUTH_CANCELLED, "%s", - _("user cancelled authentication process")); - else if (is_challenge) - virReportError(VIR_ERR_AUTH_UNAVAILABLE, - _("no polkit agent available to authenticate " - "action '%s'"), - actionid); - else - virReportError(VIR_ERR_AUTH_FAILED, "%s", - _("access denied by policy")); + virReportError(VIR_ERR_AUTH_FAILED, "%s", + _("access denied by policy")); } - cleanup: - virStringListFreeCount(retdetails, nretdetails); - virDBusMessageUnref(reply); - return ret; + return -2; } diff --git a/tests/meson.build b/tests/meson.build index 0f3e4bfdd7..75bfb3effe 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -365,11 +365,6 @@ if conf.has('WITH_DBUS') { 'name': 'virsystemdtest', 'deps': [ dbus_dep ] }, ] - if conf.has('WITH_POLKIT') - tests += [ - { 'name': 'virpolkittest', 'deps': [ dbus_dep ] }, - ] - endif endif if conf.has('WITH_ESX') @@ -446,6 +441,12 @@ if conf.has('WITH_OPENVZ') ] endif +if conf.has('WITH_POLKIT') + tests += [ + { 'name': 'virpolkittest' }, + ] +endif + if conf.has('WITH_QEMU') tests += [ { 'name': 'qemuagenttest', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib ] }, diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index fe7a3b5b91..011d83a506 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -22,10 +22,8 @@ #if defined(__ELF__) -# include <dbus/dbus.h> - # include "virpolkit.h" -# include "virdbus.h" +# include "virgdbus.h" # include "virlog.h" # include "virmock.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -37,54 +35,43 @@ VIR_LOG_INIT("tests.systemdtest"); # define THE_TIME 11011000001 # define THE_UID 1729 -VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, - DBusMessage *, - DBusConnection *, connection, - DBusMessage *, message, - int, timeout_milliseconds, - DBusError *, error) +VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync, + GVariant *, + GDBusConnection *, connection, + const gchar *, bus_name, + const gchar *, object_path, + const gchar *, interface_name, + const gchar *, method_name, + GVariant *, parameters, + const GVariantType *, reply_type, + GDBusCallFlags, flags, + gint, timeout_msec, + GCancellable *, cancellable, + GError **, error) { - DBusMessage *reply = NULL; - const char *service = dbus_message_get_destination(message); - const char *member = dbus_message_get_member(message); + GVariant *reply = NULL; + g_autoptr(GVariant) params = parameters; - VIR_MOCK_REAL_INIT(dbus_connection_send_with_reply_and_block); + VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync); - if (STREQ(service, "org.freedesktop.PolicyKit1") && - STREQ(member, "CheckAuthorization")) { + if (STREQ(bus_name, "org.freedesktop.PolicyKit1") && + STREQ(method_name, "CheckAuthorization")) { + g_autoptr(GVariantIter) iter = NULL; + GVariantBuilder builder; char *type; - char *pidkey; - unsigned int pidval; - char *timekey; - unsigned long long timeval; - char *uidkey; - int uidval; char *actionid; - char **details; - size_t detailslen; - int allowInteraction; - char *cancellationId; - const char **retdetails = NULL; - size_t retdetailslen = 0; - const char *retdetailscancelled[] = { - "polkit.dismissed", "true", - }; int is_authorized = 1; int is_challenge = 0; - if (virDBusMessageDecode(message, - "(sa{sv})sa&{ss}us", - &type, - 3, - &pidkey, "u", &pidval, - &timekey, "t", &timeval, - &uidkey, "i", &uidval, - &actionid, - &detailslen, - &details, - &allowInteraction, - &cancellationId) < 0) - goto error; + g_variant_get(params, "((&s@a{sv})&sa{ss}@u@s)", + &type, + NULL, + &actionid, + &iter, + NULL, + NULL); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a{ss}")); if (STREQ(actionid, "org.libvirt.test.success")) { is_authorized = 1; @@ -95,17 +82,15 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, } else if (STREQ(actionid, "org.libvirt.test.cancelled")) { is_authorized = 0; is_challenge = 0; - retdetails = retdetailscancelled; - retdetailslen = G_N_ELEMENTS(retdetailscancelled) / 2; + g_variant_builder_add(&builder, "{ss}", "polkit.dismissed", "true"); } else if (STREQ(actionid, "org.libvirt.test.details")) { - size_t i; + char *key; + char *val; is_authorized = 0; is_challenge = 0; - for (i = 0; i < detailslen / 2; i++) { - if (STREQ(details[i * 2], - "org.libvirt.test.person") && - STREQ(details[(i * 2) + 1], - "Fred")) { + + while (g_variant_iter_loop(iter, "{ss}", &key, &val)) { + if (STREQ(key, "org.libvirt.test.person") && STREQ(val, "Fred")) { is_authorized = 1; is_challenge = 0; } @@ -115,30 +100,13 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, is_challenge = 0; } - VIR_FREE(type); - VIR_FREE(pidkey); - VIR_FREE(timekey); - VIR_FREE(uidkey); - VIR_FREE(actionid); - VIR_FREE(cancellationId); - virStringListFreeCount(details, detailslen); - - if (virDBusCreateReply(&reply, - "(bba&{ss})", - is_authorized, - is_challenge, - retdetailslen, - retdetails) < 0) - goto error; + reply = g_variant_new("((bb@a{ss}))", is_authorized, is_challenge, + g_variant_builder_end(&builder)); } else { - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + reply = g_variant_new("()"); } return reply; - - error: - virDBusMessageUnref(reply); - return NULL; } @@ -322,7 +290,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdbus")) +VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virgdbus")) #else /* ! __ELF__ */ int -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/util/virsystemd.c | 371 +++++++++++++++++++++-------------------- tests/meson.build | 2 +- tests/virsystemdtest.c | 173 +++++++------------ 3 files changed, 254 insertions(+), 292 deletions(-) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 0ae896f4a3..32c830c002 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -26,7 +26,7 @@ #include "virsystemd.h" #include "virbuffer.h" -#include "virdbus.h" +#include "virgdbus.h" #include "virstring.h" #include "viralloc.h" #include "virutil.h" @@ -157,13 +157,13 @@ virSystemdHasMachined(void) if (val != -1) return val; - if ((ret = virDBusIsServiceEnabled("org.freedesktop.machine1")) < 0) { + if ((ret = virGDBusIsServiceEnabled("org.freedesktop.machine1")) < 0) { if (ret == -2) g_atomic_int_set(&virSystemdHasMachinedCachedValue, -2); return ret; } - if ((ret = virDBusIsServiceRegistered("org.freedesktop.systemd1")) == -1) + if ((ret = virGDBusIsServiceRegistered("org.freedesktop.systemd1")) == -1) return ret; g_atomic_int_set(&virSystemdHasMachinedCachedValue, ret); return ret; @@ -179,14 +179,14 @@ virSystemdHasLogind(void) if (val != -1) return val; - ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + ret = virGDBusIsServiceEnabled("org.freedesktop.login1"); if (ret < 0) { if (ret == -2) g_atomic_int_set(&virSystemdHasLogindCachedValue, -2); return ret; } - if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) == -1) + if ((ret = virGDBusIsServiceRegistered("org.freedesktop.login1")) == -1) return ret; g_atomic_int_set(&virSystemdHasLogindCachedValue, ret); @@ -197,53 +197,59 @@ virSystemdHasLogind(void) char * virSystemdGetMachineNameByPID(pid_t pid) { - DBusConnection *conn; - DBusMessage *reply = NULL; - char *name = NULL, *object = NULL; + GDBusConnection *conn; + g_autoptr(GVariant) message = NULL; + g_autoptr(GVariant) reply = NULL; + g_autoptr(GVariant) gvar = NULL; + g_autofree char *object = NULL; + char *name = NULL; if (virSystemdHasMachined() < 0) - goto cleanup; + return NULL; - if (!(conn = virDBusGetSystemBus())) - goto cleanup; + if (!(conn = virGDBusGetSystemBus())) + return NULL; - if (virDBusCallMethod(conn, &reply, NULL, - "org.freedesktop.machine1", - "/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - "GetMachineByPID", - "u", pid) < 0) - goto cleanup; + message = g_variant_new("(u)", pid); - if (virDBusMessageDecode(reply, "o", &object) < 0) - goto cleanup; + if (virGDBusCallMethod(conn, + &reply, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "GetMachineByPID", + message) < 0) + return NULL; - virDBusMessageUnref(reply); + g_variant_get(reply, "(o)", &object); + + g_variant_unref(reply); reply = NULL; VIR_DEBUG("Domain with pid %lld has object path '%s'", (long long) pid, object); - if (virDBusCallMethod(conn, &reply, NULL, - "org.freedesktop.machine1", - object, - "org.freedesktop.DBus.Properties", - "Get", - "ss", - "org.freedesktop.machine1.Machine", - "Name") < 0) - goto cleanup; + g_variant_unref(message); + message = g_variant_new("(ss)", + "org.freedesktop.machine1.Machine", "Name"); - if (virDBusMessageDecode(reply, "v", "s", &name) < 0) - goto cleanup; + if (virGDBusCallMethod(conn, + &reply, + NULL, + "org.freedesktop.machine1", + object, + "org.freedesktop.DBus.Properties", + "Get", + message) < 0) + return NULL; + + g_variant_get(reply, "(v)", &gvar); + g_variant_get(gvar, "s", &name); VIR_DEBUG("Domain with pid %lld has machine name '%s'", (long long) pid, name); - cleanup: - VIR_FREE(object); - virDBusMessageUnref(reply); - return name; } @@ -274,26 +280,28 @@ int virSystemdCreateMachine(const char *name, const char *partition, unsigned int maxthreads) { - int ret; - DBusConnection *conn; - char *creatorname = NULL; - char *slicename = NULL; - char *scopename = NULL; + int rc; + GDBusConnection *conn; + GVariant *guuid; + GVariant *gnicindexes; + GVariant *gprops; + GVariant *message; + g_autofree char *creatorname = NULL; + g_autofree char *slicename = NULL; + g_autofree char *scopename = NULL; static int hasCreateWithNetwork = 1; - if ((ret = virSystemdHasMachined()) < 0) - return ret; + if ((rc = virSystemdHasMachined()) < 0) + return rc; - if (!(conn = virDBusGetSystemBus())) + if (!(conn = virGDBusGetSystemBus())) return -1; - ret = -1; - creatorname = g_strdup_printf("libvirt-%s", drivername); if (partition) { if (!(slicename = virSystemdMakeSliceName(partition))) - goto cleanup; + return -1; } else { slicename = g_strdup(""); } @@ -352,122 +360,138 @@ int virSystemdCreateMachine(const char *name, VIR_DEBUG("Attempting to create machine via systemd"); if (g_atomic_int_get(&hasCreateWithNetwork)) { - virError error; - memset(&error, 0, sizeof(error)); + g_autoptr(virError) error = NULL; - if (virDBusCallMethod(conn, - NULL, - &error, - "org.freedesktop.machine1", - "/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - "CreateMachineWithNetwork", - "sayssusa&ia(sv)", - name, - 16, - uuid[0], uuid[1], uuid[2], uuid[3], - uuid[4], uuid[5], uuid[6], uuid[7], - uuid[8], uuid[9], uuid[10], uuid[11], - uuid[12], uuid[13], uuid[14], uuid[15], - creatorname, - iscontainer ? "container" : "vm", - (unsigned int)pidleader, - NULLSTR_EMPTY(rootdir), - nnicindexes, nicindexes, - 3, - "Slice", "s", slicename, - "After", "as", 1, "libvirtd.service", - "Before", "as", 1, "virt-guest-shutdown.target") < 0) - goto cleanup; + if (VIR_ALLOC(error) < 0) + return -1; - if (error.level == VIR_ERR_ERROR) { - if (virDBusErrorIsUnknownMethod(&error)) { + guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"), + uuid, 16, sizeof(unsigned char)); + gnicindexes = g_variant_new_fixed_array(G_VARIANT_TYPE("i"), + nicindexes, nnicindexes, sizeof(int)); + gprops = g_variant_new_parsed("[('Slice', <%s>)," + " ('After', <['libvirtd.service']>)," + " ('Before', <['virt-guest-shutdown.target']>)]", + slicename); + message = g_variant_new("(s@ayssus@ai@a(sv))", + name, + guuid, + creatorname, + iscontainer ? "container" : "vm", + (unsigned int)pidleader, + NULLSTR_EMPTY(rootdir), + gnicindexes, + gprops); + + rc = virGDBusCallMethod(conn, + NULL, + error, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "CreateMachineWithNetwork", + message); + + g_variant_unref(message); + + if (rc < 0) + return -1; + + if (error->level == VIR_ERR_ERROR) { + if (virGDBusErrorIsUnknownMethod(error)) { VIR_INFO("CreateMachineWithNetwork isn't supported, switching " "to legacy CreateMachine method for systemd-machined"); - virResetError(&error); + virResetError(error); g_atomic_int_set(&hasCreateWithNetwork, 0); /* Could re-structure without Using goto, but this * avoids another atomic read which would trigger * another memory barrier */ goto fallback; } - virReportErrorObject(&error); - virResetError(&error); - goto cleanup; + virReportErrorObject(error); + virResetError(error); + return -1; } } else { fallback: - if (virDBusCallMethod(conn, - NULL, - NULL, - "org.freedesktop.machine1", - "/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - "CreateMachine", - "sayssusa(sv)", - name, - 16, - uuid[0], uuid[1], uuid[2], uuid[3], - uuid[4], uuid[5], uuid[6], uuid[7], - uuid[8], uuid[9], uuid[10], uuid[11], - uuid[12], uuid[13], uuid[14], uuid[15], - creatorname, - iscontainer ? "container" : "vm", - (unsigned int)pidleader, - NULLSTR_EMPTY(rootdir), - 3, - "Slice", "s", slicename, - "After", "as", 1, "libvirtd.service", - "Before", "as", 1, "virt-guest-shutdown.target") < 0) - goto cleanup; + guuid = g_variant_new_fixed_array(G_VARIANT_TYPE("y"), + uuid, 16, sizeof(unsigned char)); + gprops = g_variant_new_parsed("[('Slice', <%s>)," + " ('After', <['libvirtd.service']>)," + " ('Before', <['virt-guest-shutdown.target']>)]", + slicename); + message = g_variant_new("(s@ayssus@a(sv))", + name, + guuid, + creatorname, + iscontainer ? "container" : "vm", + (unsigned int)pidleader, + NULLSTR_EMPTY(rootdir), + gprops); + + rc = virGDBusCallMethod(conn, + NULL, + NULL, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "CreateMachine", + message); + + g_variant_unref(message); + + if (rc < 0) + return -1; } if (maxthreads > 0) { if (!(scopename = virSystemdMakeScopeName(name, drivername, false))) - goto cleanup; - - if (virDBusCallMethod(conn, - NULL, - NULL, - "org.freedesktop.systemd1", - "/org/freedesktop/systemd1", - "org.freedesktop.systemd1.Manager", - "SetUnitProperties", - "sba(sv)", - scopename, - true, - 1, - "TasksMax", "t", (uint64_t)maxthreads) < 0) - goto cleanup; + return -1; + + gprops = g_variant_new_parsed("[('TasksMax', <%llu>)]", + (uint64_t)maxthreads); + + message = g_variant_new("(sb@a(sv))", + scopename, + true, + gprops); + + rc = virGDBusCallMethod(conn, + NULL, + NULL, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SetUnitProperties", + message); + + g_variant_unref(message); + + if (rc < 0) + return -1; } - ret = 0; - - cleanup: - VIR_FREE(creatorname); - VIR_FREE(slicename); - VIR_FREE(scopename); - return ret; + return 0; } int virSystemdTerminateMachine(const char *name) { - int ret; - DBusConnection *conn; - virError error; + int rc; + GDBusConnection *conn; + g_autoptr(GVariant) message = NULL; + g_autoptr(virError) error = NULL; if (!name) return 0; - memset(&error, 0, sizeof(error)); + if ((rc = virSystemdHasMachined()) < 0) + return rc; - if ((ret = virSystemdHasMachined()) < 0) - goto cleanup; + if (!(conn = virGDBusGetSystemBus())) + return -1; - ret = -1; - - if (!(conn = virDBusGetSystemBus())) - goto cleanup; + if (VIR_ALLOC(error) < 0) + return -1; /* * The systemd DBus API we're invoking has the @@ -479,31 +503,27 @@ int virSystemdTerminateMachine(const char *name) * in 'ps' listing & similar */ + message = g_variant_new("(s)", name); + VIR_DEBUG("Attempting to terminate machine via systemd"); - if (virDBusCallMethod(conn, - NULL, - &error, - "org.freedesktop.machine1", - "/org/freedesktop/machine1", - "org.freedesktop.machine1.Manager", - "TerminateMachine", - "s", - name) < 0) - goto cleanup; + if (virGDBusCallMethod(conn, + NULL, + error, + "org.freedesktop.machine1", + "/org/freedesktop/machine1", + "org.freedesktop.machine1.Manager", + "TerminateMachine", + message) < 0) + return -1; - if (error.level == VIR_ERR_ERROR && + if (error->level == VIR_ERR_ERROR && STRNEQ_NULLABLE("org.freedesktop.machine1.NoSuchMachine", - error.str1)) { - virReportErrorObject(&error); - goto cleanup; + error->str1)) { + virReportErrorObject(error); + return -1; } - ret = 0; - - cleanup: - virResetError(&error); - - return ret; + return 0; } void @@ -559,41 +579,32 @@ virSystemdNotifyStartup(void) static int virSystemdPMSupportTarget(const char *methodName, bool *result) { - int ret; - DBusConnection *conn; - DBusMessage *message = NULL; + int rc; + GDBusConnection *conn; + g_autoptr(GVariant) reply = NULL; char *response; - if ((ret = virSystemdHasLogind()) < 0) - return ret; + if ((rc = virSystemdHasLogind()) < 0) + return rc; - if (!(conn = virDBusGetSystemBus())) + if (!(conn = virGDBusGetSystemBus())) return -1; - ret = -1; - - if (virDBusCallMethod(conn, - &message, - NULL, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - methodName, - NULL) < 0) - return ret; + if (virGDBusCallMethod(conn, + &reply, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return -1; - if ((ret = virDBusMessageDecode(message, "s", &response)) < 0) - goto cleanup; + g_variant_get(reply, "(&s)", &response); *result = STREQ("yes", response) || STREQ("challenge", response); - ret = 0; - - cleanup: - virDBusMessageUnref(message); - VIR_FREE(response); - - return ret; + return 0; } int virSystemdCanSuspend(bool *result) diff --git a/tests/meson.build b/tests/meson.build index 2c4f044d30..356286839a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -332,6 +332,7 @@ tests += [ { 'name': 'virschematest' }, { 'name': 'virshtest' }, { 'name': 'virstringtest' }, + { 'name': 'virsystemdtest' }, { 'name': 'virtimetest' }, { 'name': 'virtypedparamtest' }, { 'name': 'viruritest' }, @@ -362,7 +363,6 @@ endif if conf.has('WITH_DBUS') tests += [ { 'name': 'virdbustest', 'deps': [ dbus_dep ] }, - { 'name': 'virsystemdtest', 'deps': [ dbus_dep ] }, ] endif diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index e7dcdea8e9..c1411d7c05 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -20,9 +20,8 @@ #include "testutils.h" -#if defined(WITH_DBUS) && defined(__linux__) +#if defined(__linux__) -# include <dbus/dbus.h> # include <fcntl.h> # include <unistd.h> @@ -30,7 +29,7 @@ # include "virsystemdpriv.h" # include "virsystemd.h" -# include "virdbus.h" +# include "virgdbus.h" # include "virlog.h" # include "virmock.h" # include "rpc/virnetsocket.h" @@ -39,125 +38,77 @@ VIR_LOG_INIT("tests.systemdtest"); -VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, - DBusMessage *, - DBusConnection *, connection, - DBusMessage *, message, - int, timeout_milliseconds, - DBusError *, error) +VIR_MOCK_WRAP_RET_ARGS(g_dbus_connection_call_sync, + GVariant *, + GDBusConnection *, connection, + const gchar *, bus_name, + const gchar *, object_path, + const gchar *, interface_name, + const gchar *, method_name, + GVariant *, parameters, + const GVariantType *, reply_type, + GDBusCallFlags, flags, + gint, timeout_msec, + GCancellable *, cancellable, + GError **, error) { - DBusMessage *reply = NULL; - const char *service = dbus_message_get_destination(message); - const char *member = dbus_message_get_member(message); + GVariant *reply = NULL; - VIR_MOCK_REAL_INIT(dbus_connection_send_with_reply_and_block); + if (parameters) + g_variant_unref(parameters); - if (STREQ(service, "org.freedesktop.machine1")) { + VIR_MOCK_REAL_INIT(g_dbus_connection_call_sync); + + if (STREQ(bus_name, "org.freedesktop.machine1")) { if (getenv("FAIL_BAD_SERVICE")) { - dbus_set_error_const(error, - "org.freedesktop.systemd.badthing", - "Something went wrong creating the machine"); + *error = g_dbus_error_new_for_dbus_error( + "org.freedesktop.systemd.badthing", + "Something went wrong creating the machine"); } else { - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); - - if (STREQ(member, "GetMachineByPID")) { - const char *object_path = "/org/freedesktop/machine1/machine/qemu_2ddemo"; - DBusMessageIter iter; - - dbus_message_iter_init_append(reply, &iter); - if (!dbus_message_iter_append_basic(&iter, - DBUS_TYPE_OBJECT_PATH, - &object_path)) - goto error; - } else if (STREQ(member, "Get")) { - const char *name = "qemu-demo"; - DBusMessageIter iter; - DBusMessageIter sub; - - dbus_message_iter_init_append(reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, - "s", &sub); - - if (!dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &name)) - goto error; - dbus_message_iter_close_container(&iter, &sub); + if (STREQ(method_name, "GetMachineByPID")) { + reply = g_variant_new("(o)", + "/org/freedesktop/machine1/machine/qemu_2ddemo"); + } else if (STREQ(method_name, "Get")) { + reply = g_variant_new("(v)", g_variant_new_string("qemu-demo")); + } else { + reply = g_variant_new("()"); } } - } else if (STREQ(service, "org.freedesktop.login1")) { - char *supported = getenv("RESULT_SUPPORT"); - DBusMessageIter iter; - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); - dbus_message_iter_init_append(reply, &iter); + } else if (STREQ(bus_name, "org.freedesktop.login1")) { + reply = g_variant_new("(s)", getenv("RESULT_SUPPORT")); + } else if (STREQ(bus_name, "org.freedesktop.DBus") && + STREQ(method_name, "ListActivatableNames")) { + GVariantBuilder builder; - if (!dbus_message_iter_append_basic(&iter, - DBUS_TYPE_STRING, - &supported)) - goto error; - } else if (STREQ(service, "org.freedesktop.DBus") && - STREQ(member, "ListActivatableNames")) { - const char *svc1 = "org.foo.bar.wizz"; - const char *svc2 = "org.freedesktop.machine1"; - const char *svc3 = "org.freedesktop.login1"; - DBusMessageIter iter; - DBusMessageIter sub; - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); - dbus_message_iter_init_append(reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - "s", &sub); + g_variant_builder_init(&builder, G_VARIANT_TYPE("as")); - if (!dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc1)) - goto error; - if (!getenv("FAIL_NO_SERVICE") && - !dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc2)) - goto error; - if (!getenv("FAIL_NO_SERVICE") && - !dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc3)) - goto error; - dbus_message_iter_close_container(&iter, &sub); - } else if (STREQ(service, "org.freedesktop.DBus") && - STREQ(member, "ListNames")) { - const char *svc1 = "org.foo.bar.wizz"; - const char *svc2 = "org.freedesktop.systemd1"; - const char *svc3 = "org.freedesktop.login1"; - DBusMessageIter iter; - DBusMessageIter sub; - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); - dbus_message_iter_init_append(reply, &iter); - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - "s", &sub); + g_variant_builder_add(&builder, "s", "org.foo.bar.wizz"); - if (!dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc1)) - goto error; - if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && - !dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc2)) - goto error; - if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && - !dbus_message_iter_append_basic(&sub, - DBUS_TYPE_STRING, - &svc3)) - goto error; - dbus_message_iter_close_container(&iter, &sub); + if (!getenv("FAIL_NO_SERVICE")) { + g_variant_builder_add(&builder, "s", "org.freedesktop.machine1"); + g_variant_builder_add(&builder, "s", "org.freedesktop.login1"); + } + + reply = g_variant_new("(@as)", g_variant_builder_end(&builder)); + } else if (STREQ(bus_name, "org.freedesktop.DBus") && + STREQ(method_name, "ListNames")) { + GVariantBuilder builder; + + g_variant_builder_init(&builder, G_VARIANT_TYPE("as")); + + g_variant_builder_add(&builder, "s", "org.foo.bar.wizz"); + + if (!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) { + g_variant_builder_add(&builder, "s", "org.freedesktop.systemd1"); + g_variant_builder_add(&builder, "s", "org.freedesktop.login1"); + } + + reply = g_variant_new("(@as)", g_variant_builder_end(&builder)); } else { - reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + reply = g_variant_new("()"); } return reply; - - error: - virDBusMessageUnref(reply); - return NULL; } @@ -794,12 +745,12 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virdbus")) +VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virgdbus")) -#else /* ! (WITH_DBUS && __linux__) */ +#else /* ! __linux__ */ int main(void) { return EXIT_AM_SKIP; } -#endif /* ! WITH_DBUS */ +#endif /* ! __linux__ */ -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/network/bridge_driver.c | 81 ++++++++++++++++++------------------- src/network/meson.build | 2 - 2 files changed, 39 insertions(+), 44 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 87d7acab06..5d9b9eaa4f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -59,7 +59,7 @@ #include "virnetdevtap.h" #include "virnetdevvportprofile.h" #include "virpci.h" -#include "virdbus.h" +#include "virgdbus.h" #include "virfile.h" #include "virstring.h" #include "viraccessapicheck.h" @@ -638,33 +638,29 @@ networkAutostartConfig(virNetworkObjPtr obj, #ifdef WITH_FIREWALLD -static DBusHandlerResult -firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, - void *user_data) +static void +firewalld_dbus_signal_callback(GDBusConnection *connection G_GNUC_UNUSED, + const char *senderName G_GNUC_UNUSED, + const char *objectPath G_GNUC_UNUSED, + const char *interfaceName, + const char *signalName, + GVariant *parameters, + gpointer user_data) { virNetworkDriverStatePtr driver = user_data; bool reload = false; - if (dbus_message_is_signal(message, - "org.fedoraproject.FirewallD1", "Reloaded")) { + if (STREQ(interfaceName, "org.fedoraproject.FirewallD1") && + STREQ(signalName, "Reloaded")) { reload = true; + } else if (STREQ(interfaceName, "org.freedesktop.DBus") && + STREQ(signalName, "NameOwnerChanged")) { + char *name = NULL; + char *old_owner = NULL; + char *new_owner = NULL; - } else if (dbus_message_is_signal(message, - DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { + g_variant_get(parameters, "(&s&s&s)", &name, &old_owner, &new_owner); - g_autofree char *name = NULL; - g_autofree char *old_owner = NULL; - g_autofree char *new_owner = NULL; - - if (virDBusMessageDecode(message, "sss", &name, &old_owner, &new_owner) < 0) { - VIR_WARN("Failed to decode DBus NameOwnerChanged message"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } - /* - * if new_owner is empty, firewalld is shutting down. If it is - * non-empty, then it is starting - */ if (new_owner && *new_owner) reload = true; } @@ -673,8 +669,6 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, VIR_DEBUG("Reload in bridge_driver because of firewalld."); networkReloadFirewallRules(driver, false, true); } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } #endif @@ -694,7 +688,7 @@ networkStateInitialize(bool privileged, g_autofree char *rundir = NULL; bool autostart = true; #ifdef WITH_FIREWALLD - DBusConnection *sysbus = NULL; + GDBusConnection *sysbus = NULL; #endif if (root != NULL) { @@ -793,27 +787,30 @@ networkStateInitialize(bool privileged, network_driver->networkEventState = virObjectEventStateNew(); #ifdef WITH_FIREWALLD - if (!(sysbus = virDBusGetSystemBus())) { + if (!(sysbus = virGDBusGetSystemBus())) { VIR_WARN("DBus not available, disabling firewalld support " "in bridge_network_driver: %s", virGetLastErrorMessage()); } else { - /* add matches for - * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop - * Reloaded on org.fedoraproject.FirewallD1 for firewalld reload - */ - dbus_bus_add_match(sysbus, - "type='signal'" - ",interface='"DBUS_INTERFACE_DBUS"'" - ",member='NameOwnerChanged'" - ",arg0='org.fedoraproject.FirewallD1'", - NULL); - dbus_bus_add_match(sysbus, - "type='signal'" - ",interface='org.fedoraproject.FirewallD1'" - ",member='Reloaded'", - NULL); - dbus_connection_add_filter(sysbus, firewalld_dbus_filter_bridge, - network_driver, NULL); + g_dbus_connection_signal_subscribe(sysbus, + NULL, + "org.freedesktop.DBus", + "NameOwnerChanged", + NULL, + "org.fedoraproject.FirewallD1", + G_DBUS_SIGNAL_FLAGS_NONE, + firewalld_dbus_signal_callback, + network_driver, + NULL); + g_dbus_connection_signal_subscribe(sysbus, + NULL, + "org.fedoraproject.FirewallD1", + "Reloaded", + NULL, + NULL, + G_DBUS_SIGNAL_FLAGS_NONE, + firewalld_dbus_signal_callback, + network_driver, + NULL); } #endif diff --git a/src/network/meson.build b/src/network/meson.build index ae2848697a..13dd2c26b2 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -18,7 +18,6 @@ if conf.has('WITH_NETWORK') ], dependencies: [ access_dep, - dbus_dep, libnl_dep, src_dep, ], @@ -30,7 +29,6 @@ if conf.has('WITH_NETWORK') virt_modules += { 'name': 'virt_driver_network', 'deps': [ - dbus_dep, libnl_dep, ], 'link_whole': [ -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/remote/remote_daemon.c | 73 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 2ac4f6cd2e..9eb2c2bc0d 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -63,7 +63,7 @@ #include "configmake.h" -#include "virdbus.h" +#include "virgdbus.h" VIR_LOG_INIT("daemon." DAEMON_NAME); @@ -508,9 +508,8 @@ static void daemonInhibitCallback(bool inhibit, void *opaque) } -#ifdef WITH_DBUS -static DBusConnection *sessionBus; -static DBusConnection *systemBus; +static GDBusConnection *sessionBus; +static GDBusConnection *systemBus; static void daemonStopWorker(void *opaque) { @@ -538,41 +537,40 @@ static void daemonStop(virNetDaemonPtr dmn) } -static DBusHandlerResult -handleSessionMessageFunc(DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, - void *opaque) +static GDBusMessage * +handleSessionMessageFunc(GDBusConnection *connection G_GNUC_UNUSED, + GDBusMessage *message, + gboolean incoming G_GNUC_UNUSED, + gpointer opaque) { virNetDaemonPtr dmn = opaque; VIR_DEBUG("dmn=%p", dmn); - if (dbus_message_is_signal(message, - DBUS_INTERFACE_LOCAL, - "Disconnected")) + if (virGDBusMessageIsSignal(message, + "org.freedesktop.DBus.Local", + "Disconnected")) daemonStop(dmn); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + return message; } -static DBusHandlerResult -handleSystemMessageFunc(DBusConnection *connection G_GNUC_UNUSED, - DBusMessage *message, - void *opaque) +static void +handleSystemMessageFunc(GDBusConnection *connection G_GNUC_UNUSED, + const char *senderName G_GNUC_UNUSED, + const char *objectPath G_GNUC_UNUSED, + const char *interfaceName G_GNUC_UNUSED, + const char *signalName G_GNUC_UNUSED, + GVariant *parameters G_GNUC_UNUSED, + gpointer opaque) { virNetDaemonPtr dmn = opaque; VIR_DEBUG("dmn=%p", dmn); - if (dbus_message_is_signal(message, - "org.freedesktop.login1.Manager", - "PrepareForShutdown")) - daemonStop(dmn); - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + daemonStop(dmn); } -#endif static void daemonRunStateInit(void *opaque) @@ -608,25 +606,28 @@ static void daemonRunStateInit(void *opaque) driversInitialized = true; -#ifdef WITH_DBUS /* Tie the non-privileged daemons to the session/shutdown lifecycle */ if (!virNetDaemonIsPrivileged(dmn)) { - sessionBus = virDBusGetSessionBus(); + sessionBus = virGDBusGetSessionBus(); if (sessionBus != NULL) - dbus_connection_add_filter(sessionBus, - handleSessionMessageFunc, dmn, NULL); + g_dbus_connection_add_filter(sessionBus, + handleSessionMessageFunc, dmn, NULL); - systemBus = virDBusGetSystemBus(); - if (systemBus != NULL) { - dbus_connection_add_filter(systemBus, - handleSystemMessageFunc, dmn, NULL); - dbus_bus_add_match(systemBus, - "type='signal',sender='org.freedesktop.login1', interface='org.freedesktop.login1.Manager'", - NULL); - } + systemBus = virGDBusGetSystemBus(); + if (systemBus != NULL) + g_dbus_connection_signal_subscribe(systemBus, + "org.freedesktop.login1", + "org.freedesktop.login1.Manager", + "PrepareForShutdown", + NULL, + NULL, + G_DBUS_SIGNAL_FLAGS_NONE, + handleSystemMessageFunc, + dmn, + NULL); } -#endif + /* Only now accept clients from network */ virNetDaemonUpdateServices(dmn, true); cleanup: -- 2.26.2

Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- libvirt.spec.in | 3 - meson.build | 27 +- meson_options.txt | 1 - po/POTFILES.in | 1 - src/libvirt_private.syms | 17 - src/libvirt_probes.d | 6 - src/meson.build | 1 - src/remote/remote_daemon_dispatch.c | 1 - src/util/meson.build | 2 - src/util/virdbus.c | 1871 --------------------------- src/util/virdbus.h | 76 -- src/util/virdbuspriv.h | 56 - tests/meson.build | 13 - tests/virdbusmock.c | 62 - tests/virdbustest.c | 728 ----------- 15 files changed, 3 insertions(+), 2862 deletions(-) delete mode 100644 src/util/virdbus.c delete mode 100644 src/util/virdbus.h delete mode 100644 src/util/virdbuspriv.h delete mode 100644 tests/virdbusmock.c delete mode 100644 tests/virdbustest.c diff --git a/libvirt.spec.in b/libvirt.spec.in index 62b401bd08..264932e6d5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -374,9 +374,6 @@ BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils -# Communication with the firewall and polkit daemons use DBus -BuildRequires: dbus-devel - # Fedora build root suckage BuildRequires: gawk diff --git a/meson.build b/meson.build index b5b1223227..24535a403c 100644 --- a/meson.build +++ b/meson.build @@ -1019,22 +1019,6 @@ if curl_dep.found() conf.set('WITH_CURL', 1) endif -dbus_version = '1.0.0' -dbus_dep = dependency('dbus-1', version: '>=' + dbus_version, required: get_option('dbus')) -if dbus_dep.found() - conf.set('WITH_DBUS', 1) - - function = 'dbus_watch_get_unix_fd' - if cc.has_function(function, dependencies: dbus_dep) - conf.set('WITH_@0@'.format(function.to_upper()), 1) - endif - - type = 'DBusBasicValue' - if cc.has_type(type, dependencies: dbus_dep, prefix: '#include <dbus/dbus.h>') - conf.set('WITH_@0@'.format(type.to_upper()), 1) - endif -endif - devmapper_version = '1.0.0' devmapper_dep = dependency('devmapper', version: '>=' + devmapper_version, required: false) if not devmapper_dep.found() @@ -1536,10 +1520,8 @@ if bash_completion_dep.found() endif if host_machine.system() != 'freebsd' - if not get_option('firewalld').disabled() and dbus_dep.found() + if not get_option('firewalld').disabled() conf.set('WITH_FIREWALLD', 1) - elif get_option('firewalld').enabled() - error('You must have dbus enabled for firewalld support') endif endif @@ -1553,10 +1535,8 @@ if conf.has('WITH_MACVTAP') and not conf.has('WITH_LIBNL') error('libnl3-devel is required for macvtap support') endif -if (pkcheck_prog.found() or get_option('polkit').enabled()) and dbus_dep.found() +if (pkcheck_prog.found() or get_option('polkit').enabled()) conf.set('WITH_POLKIT', 1) -elif get_option('polkit').enabled() - error('You must install dbus to compile libvirt with polkit-1') endif if udev_dep.found() and not pciaccess_dep.found() @@ -2203,7 +2183,7 @@ endif if not get_option('pm_utils').disabled() use_pm_utils = true - if dbus_dep.found() and init_script == 'systemd' + if init_script == 'systemd' use_pm_utils = false endif @@ -2423,7 +2403,6 @@ libs_summary = { 'blkid': blkid_dep.found(), 'capng': capng_dep.found(), 'curl': curl_dep.found(), - 'dbus': dbus_dep.found(), 'dlopen': dlopen_dep.found(), 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), diff --git a/meson_options.txt b/meson_options.txt index c8886e1430..f92c80553c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,7 +18,6 @@ option('bash_completion_dir', type: 'string', value: '', description: 'directory option('blkid', type: 'feature', value: 'auto', description: 'blkid support') option('capng', type: 'feature', value: 'auto', description: 'cap-ng support') option('curl', type: 'feature', value: 'auto', description: 'curl support') -option('dbus', type: 'feature', value: 'auto', description: 'dbus-1 support') option('firewalld', type: 'feature', value: 'auto', description: 'firewalld support') option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone') option('fuse', type: 'feature', value: 'auto', description: 'fuse support') diff --git a/po/POTFILES.in b/po/POTFILES.in index d87425a64c..54f78e7861 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -243,7 +243,6 @@ @SRCDIR@src/util/virconf.c @SRCDIR@src/util/vircrypto.c @SRCDIR@src/util/virdaemon.c -@SRCDIR@src/util/virdbus.c @SRCDIR@src/util/virdevmapper.c @SRCDIR@src/util/virdnsmasq.c @SRCDIR@src/util/virerror.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fea5a49e55..bdbe3431b8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1948,23 +1948,6 @@ virDaemonSetupLogging; virDaemonUnixSocketPaths; -# util/virdbus.h -virDBusCallMethod; -virDBusCloseSystemBus; -virDBusCreateMethod; -virDBusCreateMethodV; -virDBusCreateReply; -virDBusCreateReplyV; -virDBusErrorIsUnknownMethod; -virDBusGetSessionBus; -virDBusGetSystemBus; -virDBusHasSystemBus; -virDBusMessageDecode; -virDBusMessageEncode; -virDBusMessageUnref; -virDBusSetSharedBus; - - # util/virdevmapper.h virDevMapperGetTargets; virIsDevMapperDevice; diff --git a/src/libvirt_probes.d b/src/libvirt_probes.d index 5e4faa2f5b..6fac10a2bf 100644 --- a/src/libvirt_probes.d +++ b/src/libvirt_probes.d @@ -13,12 +13,6 @@ provider libvirt { probe event_glib_remove_timeout_idle(int timer, void *ff, void *opaque); probe event_glib_dispatch_timeout(int timer, void *cb, void *opaque); - # file: src/util/virdbus.c - # prefix: dbus - probe dbus_method_call(const char *interface, const char *member, const char *object, const char *destination); - probe dbus_method_error(const char *interface, const char *member, const char *object, const char *destination, const char *name, const char *message); - probe dbus_method_reply(const char *interface, const char *member, const char *object, const char *destination); - # file: src/util/virobject.c # prefix: object probe object_new(void *obj, const char *klassname); diff --git a/src/meson.build b/src/meson.build index 897b5ecbca..29c8210ab2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -614,7 +614,6 @@ foreach daemon : virt_daemons dependencies: [ admin_dep, access_dep, - dbus_dep, gnutls_dep, libnl_dep, rpc_dep, diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 53d17a8f4a..c187932a3c 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -35,7 +35,6 @@ #include "virnetserver.h" #include "virfile.h" #include "virtypedparam.h" -#include "virdbus.h" #include "virprocess.h" #include "remote_protocol.h" #include "qemu_protocol.h" diff --git a/src/util/meson.build b/src/util/meson.build index 8a9dcac053..4d63173cbd 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -18,7 +18,6 @@ util_sources = [ 'virconf.c', 'vircrypto.c', 'virdaemon.c', - 'virdbus.c', 'virdevmapper.c', 'virdnsmasq.c', 'virebtables.c', @@ -185,7 +184,6 @@ virt_util_lib = static_library( acl_dep, audit_dep, capng_dep, - dbus_dep, devmapper_dep, gnutls_dep, intl_dep, diff --git a/src/util/virdbus.c b/src/util/virdbus.c deleted file mode 100644 index 459b57abc6..0000000000 --- a/src/util/virdbus.c +++ /dev/null @@ -1,1871 +0,0 @@ -/* - * virdbus.c: helper for using DBus - * - * Copyright (C) 2012-2014 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#include <config.h> - -#define LIBVIRT_VIRDBUSPRIV_H_ALLOW -#include "virdbuspriv.h" -#include "viralloc.h" -#include "virerror.h" -#include "virlog.h" -#include "virthread.h" -#include "virstring.h" -#include "virprobe.h" - -#define VIR_FROM_THIS VIR_FROM_DBUS - -VIR_LOG_INIT("util.dbus"); - -#ifdef WITH_DBUS - -static bool sharedBus = true; -static DBusConnection *systembus; -static DBusConnection *sessionbus; -static virOnceControl systemonce = VIR_ONCE_CONTROL_INITIALIZER; -static virOnceControl sessiononce = VIR_ONCE_CONTROL_INITIALIZER; -static DBusError systemdbuserr; -static DBusError sessiondbuserr; - -static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data); -static void virDBusRemoveWatch(DBusWatch *watch, void *data); -static void virDBusToggleWatch(DBusWatch *watch, void *data); - -void virDBusSetSharedBus(bool shared) -{ - sharedBus = shared; -} - -static DBusConnection *virDBusBusInit(DBusBusType type, DBusError *dbuserr) -{ - DBusConnection *bus; - - /* Allocate and initialize a new HAL context */ - dbus_connection_set_change_sigpipe(FALSE); - dbus_threads_init_default(); - - dbus_error_init(dbuserr); - bus = sharedBus ? - dbus_bus_get(type, dbuserr) : - dbus_bus_get_private(type, dbuserr); - if (!bus) - return NULL; - - dbus_connection_set_exit_on_disconnect(bus, FALSE); - - /* Register dbus watch callbacks */ - if (!dbus_connection_set_watch_functions(bus, - virDBusAddWatch, - virDBusRemoveWatch, - virDBusToggleWatch, - bus, NULL)) { - return NULL; - } - return bus; -} - -static void virDBusSystemBusInit(void) -{ - systembus = virDBusBusInit(DBUS_BUS_SYSTEM, &systemdbuserr); -} - -static DBusConnection * -virDBusGetSystemBusInternal(void) -{ - if (virOnce(&systemonce, virDBusSystemBusInit) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to run one time DBus initializer")); - return NULL; - } - - return systembus; -} - - -DBusConnection * -virDBusGetSystemBus(void) -{ - DBusConnection *bus; - - if (!(bus = virDBusGetSystemBusInternal())) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to get DBus system bus connection: %s"), - systemdbuserr.message ? systemdbuserr.message : "watch setup failed"); - return NULL; - } - - return bus; -} - - -/** - * virDBusHasSystemBus: - * - * Check if dbus system bus is running. This does not - * imply that we have a connection. DBus might be running - * and refusing connections due to its client limit. The - * latter must be treated as a fatal error. - * - * Return false if dbus is not available, true if probably available. - */ -bool -virDBusHasSystemBus(void) -{ - if (virDBusGetSystemBusInternal()) - return true; - - if (systemdbuserr.name && - (STREQ(systemdbuserr.name, "org.freedesktop.DBus.Error.FileNotFound") || - STREQ(systemdbuserr.name, "org.freedesktop.DBus.Error.NoServer"))) { - VIR_DEBUG("System DBus not available: %s", NULLSTR(systemdbuserr.message)); - return false; - } - return true; -} - - -void virDBusCloseSystemBus(void) -{ - if (systembus && !sharedBus) { - dbus_connection_close(systembus); - dbus_connection_unref(systembus); - systembus = NULL; - } -} - -static void virDBusSessionBusInit(void) -{ - sessionbus = virDBusBusInit(DBUS_BUS_SESSION, &sessiondbuserr); -} - -DBusConnection *virDBusGetSessionBus(void) -{ - if (virOnce(&sessiononce, virDBusSessionBusInit) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to run one time DBus initializer")); - return NULL; - } - - if (!sessionbus) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to get DBus session bus connection: %s"), - sessiondbuserr.message ? sessiondbuserr.message : "watch setup failed"); - return NULL; - } - - return sessionbus; -} - -struct virDBusWatch -{ - int watch; - DBusConnection *bus; -}; - -static void virDBusWatchCallback(int fdatch G_GNUC_UNUSED, - int fd G_GNUC_UNUSED, - int events, void *opaque) -{ - DBusWatch *watch = opaque; - struct virDBusWatch *info; - int dbus_flags = 0; - - info = dbus_watch_get_data(watch); - - if (events & VIR_EVENT_HANDLE_READABLE) - dbus_flags |= DBUS_WATCH_READABLE; - if (events & VIR_EVENT_HANDLE_WRITABLE) - dbus_flags |= DBUS_WATCH_WRITABLE; - if (events & VIR_EVENT_HANDLE_ERROR) - dbus_flags |= DBUS_WATCH_ERROR; - if (events & VIR_EVENT_HANDLE_HANGUP) - dbus_flags |= DBUS_WATCH_HANGUP; - - if (dbus_watch_handle(watch, dbus_flags) == FALSE) - VIR_DEBUG("dbus_watch_handle() returned FALSE"); - - dbus_connection_ref(info->bus); - while (dbus_connection_dispatch(info->bus) == DBUS_DISPATCH_DATA_REMAINS) - /* keep dispatching while data remains */; - dbus_connection_unref(info->bus); -} - - -static int virDBusTranslateWatchFlags(int dbus_flags) -{ - unsigned int flags = 0; - if (dbus_flags & DBUS_WATCH_READABLE) - flags |= VIR_EVENT_HANDLE_READABLE; - if (dbus_flags & DBUS_WATCH_WRITABLE) - flags |= VIR_EVENT_HANDLE_WRITABLE; - if (dbus_flags & DBUS_WATCH_ERROR) - flags |= VIR_EVENT_HANDLE_ERROR; - if (dbus_flags & DBUS_WATCH_HANGUP) - flags |= VIR_EVENT_HANDLE_HANGUP; - return flags; -} - - -static void virDBusWatchFree(void *data) -{ - struct virDBusWatch *info = data; - VIR_FREE(info); -} - -static dbus_bool_t virDBusAddWatch(DBusWatch *watch, - void *data) -{ - int flags = 0; - int fd; - struct virDBusWatch *info; - - if (VIR_ALLOC(info) < 0) - return FALSE; - - if (dbus_watch_get_enabled(watch)) - flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); - -# if WITH_DBUS_WATCH_GET_UNIX_FD - fd = dbus_watch_get_unix_fd(watch); -# else - fd = dbus_watch_get_fd(watch); -# endif - dbus_watch_set_data(watch, info, virDBusWatchFree); - info->bus = (DBusConnection *)data; - info->watch = virEventAddHandle(fd, flags, - virDBusWatchCallback, - watch, NULL); - if (info->watch < 0) { - dbus_watch_set_data(watch, NULL, NULL); - return FALSE; - } - - return TRUE; -} - - -static void virDBusRemoveWatch(DBusWatch *watch, - void *data G_GNUC_UNUSED) -{ - struct virDBusWatch *info; - - info = dbus_watch_get_data(watch); - - (void)virEventRemoveHandle(info->watch); -} - - -static void virDBusToggleWatch(DBusWatch *watch, - void *data G_GNUC_UNUSED) -{ - int flags = 0; - struct virDBusWatch *info; - - if (dbus_watch_get_enabled(watch)) - flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); - - info = dbus_watch_get_data(watch); - - (void)virEventUpdateHandle(info->watch, flags); -} - -# define VIR_DBUS_TYPE_STACK_MAX_DEPTH 32 - -static const char virDBusBasicTypes[] = { - DBUS_TYPE_BYTE, - DBUS_TYPE_BOOLEAN, - DBUS_TYPE_INT16, - DBUS_TYPE_UINT16, - DBUS_TYPE_INT32, - DBUS_TYPE_UINT32, - DBUS_TYPE_INT64, - DBUS_TYPE_UINT64, - DBUS_TYPE_DOUBLE, - DBUS_TYPE_STRING, - DBUS_TYPE_OBJECT_PATH, - DBUS_TYPE_SIGNATURE, -}; - -static bool virDBusIsBasicType(char c) -{ - return !!memchr(virDBusBasicTypes, c, G_N_ELEMENTS(virDBusBasicTypes)); -} - -/* - * All code related to virDBusMessageIterEncode and - * virDBusMessageIterDecode is derived from systemd - * bus_message_append_ap()/message_read_ap() in - * bus-message.c under the terms of the LGPLv2+ - */ -static int -virDBusSignatureLengthInternal(const char *s, - bool allowDict, - unsigned arrayDepth, - unsigned structDepth, - size_t *skiplen, - size_t *siglen) -{ - if (virDBusIsBasicType(*s) || *s == DBUS_TYPE_VARIANT) { - *skiplen = *siglen = 1; - return 0; - } - - if (*s == DBUS_TYPE_ARRAY) { - size_t skiplencont; - size_t siglencont; - bool arrayref = false; - - if (arrayDepth >= VIR_DBUS_TYPE_STACK_MAX_DEPTH) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Signature '%s' too deeply nested"), - s); - return -1; - } - - if (*(s + 1) == '&') { - arrayref = true; - s++; - } - - if (virDBusSignatureLengthInternal(s + 1, - true, - arrayDepth + 1, - structDepth, - &skiplencont, - &siglencont) < 0) - return -1; - - *skiplen = skiplencont + 1; - *siglen = siglencont + 1; - if (arrayref) - (*skiplen)++; - return 0; - } - - if (*s == DBUS_STRUCT_BEGIN_CHAR) { - const char *p = s + 1; - - if (structDepth >= VIR_DBUS_TYPE_STACK_MAX_DEPTH) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Signature '%s' too deeply nested"), - s); - return -1; - } - - *skiplen = *siglen = 2; - - while (*p != DBUS_STRUCT_END_CHAR) { - size_t skiplencont; - size_t siglencont; - - if (virDBusSignatureLengthInternal(p, - false, - arrayDepth, - structDepth + 1, - &skiplencont, - &siglencont) < 0) - return -1; - - p += skiplencont; - *skiplen += skiplencont; - *siglen += siglencont; - } - - return 0; - } - - if (*s == DBUS_DICT_ENTRY_BEGIN_CHAR && allowDict) { - const char *p = s + 1; - unsigned n = 0; - if (structDepth >= VIR_DBUS_TYPE_STACK_MAX_DEPTH) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Signature '%s' too deeply nested"), - s); - return -1; - } - - *skiplen = *siglen = 2; - - while (*p != DBUS_DICT_ENTRY_END_CHAR) { - size_t skiplencont; - size_t siglencont; - - if (n == 0 && !virDBusIsBasicType(*p)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Dict entry in signature '%s' must be a basic type"), - s); - return -1; - } - - if (virDBusSignatureLengthInternal(p, - false, - arrayDepth, - structDepth + 1, - &skiplencont, - &siglencont) < 0) - return -1; - - p += skiplencont; - *skiplen += skiplencont; - *siglen += siglencont; - n++; - } - - if (n != 2) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Dict entry in signature '%s' is wrong size"), - s); - return -1; - } - - return 0; - } - - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected signature '%s'"), s); - return -1; -} - - -static int virDBusSignatureLength(const char *s, size_t *skiplen, size_t *siglen) -{ - return virDBusSignatureLengthInternal(s, true, 0, 0, skiplen, siglen); -} - - -static char *virDBusCopyContainerSignature(const char *sig, - size_t *skiplen, - size_t *siglen) -{ - size_t i, j; - char *contsig; - bool isGroup; - - isGroup = (sig[0] == DBUS_STRUCT_BEGIN_CHAR || - sig[0] == DBUS_DICT_ENTRY_BEGIN_CHAR); - - if (virDBusSignatureLength(isGroup ? sig : sig + 1, skiplen, siglen) < 0) - return NULL; - - if (VIR_ALLOC_N(contsig, *siglen + 1) < 0) - return NULL; - - for (i = 0, j = 0; i < *skiplen && j < *siglen; i++) { - if (sig[i + 1] == '&') - continue; - contsig[j] = sig[i + 1]; - j++; - } - contsig[*siglen] = '\0'; - VIR_DEBUG("Extracted '%s' from '%s'", contsig, sig); - return contsig; -} - - -/* Ideally, we'd just call ourselves recursively on every - * complex type. However, the state of a va_list that is - * passed to a function is undefined after that function - * returns. This means we need to decode the va_list linearly - * in a single stackframe. We hence implement our own - * home-grown stack in an array. */ - -typedef struct _virDBusTypeStack virDBusTypeStack; -struct _virDBusTypeStack { - const char *types; - size_t nstruct; - size_t narray; - DBusMessageIter *iter; -}; - -static int virDBusTypeStackPush(virDBusTypeStack **stack, - size_t *nstack, - DBusMessageIter *iter, - const char *types, - size_t nstruct, - size_t narray) -{ - if (*nstack >= VIR_DBUS_TYPE_STACK_MAX_DEPTH) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DBus type too deeply nested")); - return -1; - } - - if (VIR_EXPAND_N(*stack, *nstack, 1) < 0) - return -1; - - (*stack)[(*nstack) - 1].iter = iter; - (*stack)[(*nstack) - 1].types = types; - (*stack)[(*nstack) - 1].nstruct = nstruct; - (*stack)[(*nstack) - 1].narray = narray; - VIR_DEBUG("Pushed types='%s' nstruct=%zu narray=%zd", - types, nstruct, (ssize_t)narray); - return 0; -} - - -static int virDBusTypeStackPop(virDBusTypeStack **stack, - size_t *nstack, - DBusMessageIter **iter, - const char **types, - size_t *nstruct, - size_t *narray) -{ - if (*nstack == 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("DBus type stack is empty")); - return -1; - } - - *iter = (*stack)[(*nstack) - 1].iter; - *types = (*stack)[(*nstack) - 1].types; - *nstruct = (*stack)[(*nstack) - 1].nstruct; - *narray = (*stack)[(*nstack) - 1].narray; - VIR_DEBUG("Popped types='%s' nstruct=%zu narray=%zd", - *types, *nstruct, (ssize_t)*narray); - VIR_SHRINK_N(*stack, *nstack, 1); - - return 0; -} - - -static void virDBusTypeStackFree(virDBusTypeStack **stack, - size_t *nstack) -{ - size_t i; - - if (!*stack) - return; - - /* The iter in the first level of the stack is the - * root iter which must not be freed - */ - for (i = 1; i < *nstack; i++) - VIR_FREE((*stack)[i].iter); - VIR_FREE(*stack); -} - - -static bool -virDBusIsAllowedRefType(const char *sig) -{ - if (*sig == '{') { - if (strlen(sig) != 4) - return false; - if (!virDBusIsBasicType(sig[1]) || - !virDBusIsBasicType(sig[2]) || - sig[1] != sig[2]) - return false; - if (sig[3] != '}') - return false; - } else { - if (strlen(sig) != 1) - return false; - if (!virDBusIsBasicType(sig[0])) - return false; - } - return true; -} - - -# define SET_NEXT_VAL(dbustype, vargtype, arrtype, sigtype, fmt) \ - do { \ - dbustype x; \ - if (arrayref) { \ - arrtype valarray = arrayptr; \ - x = (dbustype)*valarray; \ - valarray++; \ - arrayptr = valarray; \ - } else { \ - x = (dbustype)va_arg(args, vargtype); \ - } \ - if (!dbus_message_iter_append_basic(iter, sigtype, &x)) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Cannot append basic type %s"), #vargtype);\ - goto cleanup; \ - } \ - VIR_DEBUG("Appended basic type '" #dbustype "' varg '" #vargtype\ - "' sig '%c' val '" fmt "'", sigtype, (vargtype)x); \ - } while (0) - - -static int -virDBusMessageIterEncode(DBusMessageIter *rootiter, - const char *types, - va_list args) -{ - int ret = -1; - size_t narray; - size_t nstruct; - bool arrayref = false; - void *arrayptr = NULL; - virDBusTypeStack *stack = NULL; - size_t nstack = 0; - size_t siglen; - size_t skiplen; - char *contsig = NULL; - const char *vsig; - DBusMessageIter *newiter = NULL; - DBusMessageIter *iter = rootiter; - - VIR_DEBUG("rootiter=%p types=%s", rootiter, types); - - if (!types) - return 0; - - narray = (size_t)-1; - nstruct = strlen(types); - - for (;;) { - const char *t; - - VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu types='%s'", - nstack, (ssize_t)narray, nstruct, types); - if (narray == 0 || - (narray == (size_t)-1 && - nstruct == 0)) { - DBusMessageIter *thisiter = iter; - if (*types != '}') { - VIR_DEBUG("Reset array ref"); - arrayref = false; - arrayptr = NULL; - } - VIR_DEBUG("Popping iter=%p", iter); - if (nstack == 0) - break; - if (virDBusTypeStackPop(&stack, &nstack, &iter, - &types, &nstruct, &narray) < 0) - goto cleanup; - VIR_DEBUG("Popped iter=%p", iter); - - if (!dbus_message_iter_close_container(iter, thisiter)) { - if (thisiter != rootiter) - VIR_FREE(thisiter); - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot close container iterator")); - goto cleanup; - } - if (thisiter != rootiter) - VIR_FREE(thisiter); - continue; - } - - t = types; - if (narray != (size_t)-1) { - narray--; - } else { - types++; - nstruct--; - } - - switch (*t) { - case DBUS_TYPE_BYTE: - SET_NEXT_VAL(unsigned char, int, unsigned char *, *t, "%d"); - break; - - case DBUS_TYPE_BOOLEAN: - SET_NEXT_VAL(dbus_bool_t, int, bool *, *t, "%d"); - break; - - case DBUS_TYPE_INT16: - SET_NEXT_VAL(dbus_int16_t, int, short *, *t, "%d"); - break; - - case DBUS_TYPE_UINT16: - SET_NEXT_VAL(dbus_uint16_t, unsigned int, unsigned short *, - *t, "%d"); - break; - - case DBUS_TYPE_INT32: - SET_NEXT_VAL(dbus_int32_t, int, int *, *t, "%d"); - break; - - case DBUS_TYPE_UINT32: - SET_NEXT_VAL(dbus_uint32_t, unsigned int, unsigned int *, - *t, "%u"); - break; - - case DBUS_TYPE_INT64: - SET_NEXT_VAL(dbus_int64_t, long long, long long *, *t, "%lld"); - break; - - case DBUS_TYPE_UINT64: - SET_NEXT_VAL(dbus_uint64_t, unsigned long long, - unsigned long long *, *t, "%llu"); - break; - - case DBUS_TYPE_DOUBLE: - SET_NEXT_VAL(double, double, double *, *t, "%lf"); - break; - - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - case DBUS_TYPE_SIGNATURE: - SET_NEXT_VAL(char *, char *, char **, *t, "%s"); - break; - - case DBUS_TYPE_ARRAY: - arrayptr = NULL; - if (t[1] == '&') { - VIR_DEBUG("Got array ref"); - t++; - types++; - nstruct--; - arrayref = true; - } else { - VIR_DEBUG("Got array non-ref"); - arrayref = false; - } - - if (!(contsig = virDBusCopyContainerSignature(t, &skiplen, &siglen))) - goto cleanup; - - if (arrayref && !virDBusIsAllowedRefType(contsig)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Got array ref but '%s' is not a single basic type " - "or dict with matching key+value type"), - contsig); - goto cleanup; - } - - if (narray == (size_t)-1) { - types += skiplen; - nstruct -= skiplen; - } - - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - VIR_DEBUG("Contsig '%s' skip='%zu' len='%zu'", contsig, skiplen, siglen); - if (!dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, - contsig, newiter)) - goto cleanup; - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); - goto cleanup; - } - VIR_FREE(contsig); - iter = g_steal_pointer(&newiter); - types = t + 1; - nstruct = skiplen; - narray = (size_t)va_arg(args, int); - if (arrayref) - arrayptr = va_arg(args, void *); - break; - - case DBUS_TYPE_VARIANT: - vsig = va_arg(args, const char *); - if (!vsig) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing variant type signature")); - goto cleanup; - } - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, - vsig, newiter)) - goto cleanup; - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); - goto cleanup; - } - iter = g_steal_pointer(&newiter); - types = vsig; - nstruct = strlen(types); - narray = (size_t)-1; - break; - - case DBUS_STRUCT_BEGIN_CHAR: - case DBUS_DICT_ENTRY_BEGIN_CHAR: - if (!(contsig = virDBusCopyContainerSignature(t, &skiplen, &siglen))) - goto cleanup; - - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - VIR_DEBUG("Contsig '%s' skip='%zu' len='%zu'", contsig, skiplen, siglen); - if (!dbus_message_iter_open_container(iter, - *t == DBUS_STRUCT_BEGIN_CHAR ? - DBUS_TYPE_STRUCT : DBUS_TYPE_DICT_ENTRY, - NULL, newiter)) - goto cleanup; - if (narray == (size_t)-1) { - types += skiplen - 1; - nstruct -= skiplen - 1; - } - - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) { - VIR_FREE(newiter); - goto cleanup; - } - VIR_FREE(contsig); - iter = g_steal_pointer(&newiter); - types = t + 1; - nstruct = skiplen - 2; - narray = (size_t)-1; - - break; - - default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown type '%x' in signature '%s'"), - (int)*t, types); - goto cleanup; - } - } - - ret = 0; - - cleanup: - while (nstack > 0) { - DBusMessageIter *thisiter = iter; - VIR_DEBUG("Popping iter=%p", iter); - ignore_value(virDBusTypeStackPop(&stack, &nstack, &iter, - &types, &nstruct, &narray)); - VIR_DEBUG("Popped iter=%p", iter); - - if (thisiter != rootiter) - VIR_FREE(thisiter); - } - - virDBusTypeStackFree(&stack, &nstack); - VIR_FREE(contsig); - VIR_FREE(newiter); - return ret; -} -# undef SET_NEXT_VAL - - -# define GET_NEXT_VAL(dbustype, member, vargtype, fmt) \ - do { \ - DBusBasicValue v; \ - dbustype *x = (dbustype *)&v.member; \ - vargtype *y; \ - if (arrayref) { \ - vargtype **xptrptr = arrayptr; \ - VIR_DEBUG("Use arrayref"); \ - if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) \ - goto cleanup; \ - y = (*xptrptr + (*narrayptr - 1)); \ - VIR_DEBUG("Expanded to %zu", *narrayptr); \ - } else { \ - y = va_arg(args, vargtype *); \ - } \ - dbus_message_iter_get_basic(iter, x); \ - *y = *x; \ - VIR_DEBUG("Read basic type '" #dbustype "' varg '" #vargtype \ - "' val '" fmt "'", (vargtype)*y); \ - } while (0) - - -static int -virDBusMessageIterDecode(DBusMessageIter *rootiter, - const char *types, - va_list args) -{ - int ret = -1; - size_t narray; - size_t nstruct; - bool arrayref = false; - void *arrayptr = NULL; - size_t *narrayptr = 0; - virDBusTypeStack *stack = NULL; - size_t nstack = 0; - size_t skiplen; - size_t siglen; - char *contsig = NULL; - const char *vsig; - DBusMessageIter *newiter = NULL; - DBusMessageIter *iter = rootiter; - - VIR_DEBUG("rootiter=%p types=%s", rootiter, types); - - if (!types) - return 0; - - narray = (size_t)-1; - nstruct = strlen(types); - - for (;;) { - const char *t; - bool advanceiter = true; - - VIR_DEBUG("Loop nstack=%zu narray=%zd nstruct=%zu type='%s'", - nstack, (ssize_t)narray, nstruct, types); - if (narray == 0 || - (narray == (size_t)-1 && - nstruct == 0)) { - DBusMessageIter *thisiter = iter; - VIR_DEBUG("Popping iter=%p", iter); - if (nstack == 0) - break; - if (virDBusTypeStackPop(&stack, &nstack, &iter, - &types, &nstruct, &narray) < 0) - goto cleanup; - VIR_DEBUG("Popped iter=%p types=%s", iter, types); - if (strchr(types, '}') == NULL) { - arrayref = false; - arrayptr = NULL; - VIR_DEBUG("Clear array ref flag"); - } - if (thisiter != rootiter) - VIR_FREE(thisiter); - if (arrayref) { - if (!dbus_message_iter_has_next(iter)) - narray = 0; - else - narray = 1; - VIR_DEBUG("Pop set narray=%zd", (ssize_t)narray); - } - if (!(narray == 0 || - (narray == (size_t)-1 && - nstruct == 0)) && - !dbus_message_iter_next(iter)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Not enough fields in message for signature")); - goto cleanup; - } - continue; - } - - t = types; - if (narray != (size_t)-1) { - if (!arrayref) - narray--; - } else { - types++; - nstruct--; - } - - switch (*t) { - case DBUS_TYPE_BYTE: - GET_NEXT_VAL(unsigned char, byt, unsigned char, "%d"); - break; - - case DBUS_TYPE_BOOLEAN: - GET_NEXT_VAL(dbus_bool_t, bool_val, bool, "%d"); - break; - - case DBUS_TYPE_INT16: - GET_NEXT_VAL(dbus_int16_t, i16, short, "%d"); - break; - - case DBUS_TYPE_UINT16: - GET_NEXT_VAL(dbus_uint16_t, u16, unsigned short, "%d"); - break; - - case DBUS_TYPE_INT32: - GET_NEXT_VAL(dbus_uint32_t, i32, int, "%d"); - break; - - case DBUS_TYPE_UINT32: - GET_NEXT_VAL(dbus_uint32_t, u32, unsigned int, "%u"); - break; - - case DBUS_TYPE_INT64: - GET_NEXT_VAL(dbus_uint64_t, i64, long long, "%lld"); - break; - - case DBUS_TYPE_UINT64: - GET_NEXT_VAL(dbus_uint64_t, u64, unsigned long long, "%llu"); - break; - - case DBUS_TYPE_DOUBLE: - GET_NEXT_VAL(double, dbl, double, "%lf"); - break; - - case DBUS_TYPE_STRING: - case DBUS_TYPE_OBJECT_PATH: - case DBUS_TYPE_SIGNATURE: - do { - char **x; - char *s; - if (arrayref) { - char ***xptrptr = arrayptr; - if (VIR_EXPAND_N(*xptrptr, *narrayptr, 1) < 0) - goto cleanup; - x = (char **)(*xptrptr + (*narrayptr - 1)); - VIR_DEBUG("Expanded to %zu", *narrayptr); - } else { - x = (char **)va_arg(args, char **); - } - dbus_message_iter_get_basic(iter, &s); - *x = g_strdup(s); - VIR_DEBUG("Read basic type 'char *' varg 'char **'" - "' val '%s'", *x); - } while (0); - break; - - case DBUS_TYPE_ARRAY: - arrayptr = NULL; - if (t[1] == '&') { - VIR_DEBUG("Got array ref"); - t++; - types++; - nstruct--; - arrayref = true; - } else { - VIR_DEBUG("Got array non-ref"); - arrayref = false; - } - - advanceiter = false; - if (!(contsig = virDBusCopyContainerSignature(t, &skiplen, &siglen))) - goto cleanup; - - if (arrayref && !virDBusIsAllowedRefType(contsig)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Got array ref but '%s' is not a single basic type / dict"), - contsig); - goto cleanup; - } - - if (narray == (size_t)-1) { - types += skiplen; - nstruct -= skiplen; - } - - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - VIR_DEBUG("Array contsig='%s' skip=%'zu' len='%zu' types='%s'", - contsig, skiplen, siglen, types); - dbus_message_iter_recurse(iter, newiter); - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) - goto cleanup; - VIR_FREE(contsig); - iter = g_steal_pointer(&newiter); - types = t + 1; - nstruct = skiplen; - if (arrayref) { - narrayptr = va_arg(args, size_t *); - arrayptr = va_arg(args, void *); - *narrayptr = 0; - *(char **)arrayptr = NULL; - } else { - narray = va_arg(args, int); - } - break; - - case DBUS_TYPE_VARIANT: - advanceiter = false; - vsig = va_arg(args, const char *); - if (!vsig) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Missing variant type signature")); - goto cleanup; - } - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - dbus_message_iter_recurse(iter, newiter); - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) { - VIR_DEBUG("Push failed"); - goto cleanup; - } - iter = g_steal_pointer(&newiter); - types = vsig; - nstruct = strlen(types); - narray = (size_t)-1; - break; - - case DBUS_STRUCT_BEGIN_CHAR: - case DBUS_DICT_ENTRY_BEGIN_CHAR: - advanceiter = false; - if (!(contsig = virDBusCopyContainerSignature(t, &skiplen, &siglen))) - goto cleanup; - - if (VIR_ALLOC(newiter) < 0) - goto cleanup; - VIR_DEBUG("Dict/struct contsig='%s' skip='%zu' len='%zu' types='%s'", - contsig, skiplen, siglen, types); - dbus_message_iter_recurse(iter, newiter); - if (narray == (size_t)-1) { - types += skiplen - 1; - nstruct -= skiplen - 1; - } - - if (virDBusTypeStackPush(&stack, &nstack, - iter, types, - nstruct, narray) < 0) - goto cleanup; - VIR_FREE(contsig); - iter = g_steal_pointer(&newiter); - types = t + 1; - nstruct = skiplen - 2; - narray = (size_t)-1; - - break; - - default: - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown type '%c' in signature '%s'"), - *t, types); - goto cleanup; - } - - VIR_DEBUG("After nstack=%zu narray=%zd nstruct=%zu types='%s'", - nstack, (ssize_t)narray, nstruct, types); - - if (arrayref) { - if (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_INVALID) { - narray = 0; - } else { - if (advanceiter) - dbus_message_iter_next(iter); - if (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_INVALID) { - narray = 0; - } else { - narray = 1; - } - } - VIR_DEBUG("Set narray=%zd", (ssize_t)narray); - } else { - if (advanceiter && - !(narray == 0 || - (narray == (size_t)-1 && - nstruct == 0)) && - !dbus_message_iter_next(iter)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Not enough fields in message for signature")); - goto cleanup; - } - } - } - - if (dbus_message_iter_has_next(iter)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Too many fields in message for signature")); - goto cleanup; - } - - ret = 0; - - cleanup: - virDBusTypeStackFree(&stack, &nstack); - VIR_FREE(contsig); - VIR_FREE(newiter); - return ret; -} -# undef GET_NEXT_VAL - -int -virDBusMessageEncodeArgs(DBusMessage* msg, - const char *types, - va_list args) -{ - DBusMessageIter iter; - - memset(&iter, 0, sizeof(iter)); - - dbus_message_iter_init_append(msg, &iter); - - return virDBusMessageIterEncode(&iter, types, args); -} - - -int virDBusMessageDecodeArgs(DBusMessage* msg, - const char *types, - va_list args) -{ - DBusMessageIter iter; - - if (!dbus_message_iter_init(msg, &iter)) { - if (*types != '\0') { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No args present for signature %s"), - types); - } else { - return 0; - } - return -1; - } - - return virDBusMessageIterDecode(&iter, types, args); -} - - -int virDBusMessageEncode(DBusMessage* msg, - const char *types, - ...) -{ - int ret; - va_list args; - va_start(args, types); - ret = virDBusMessageEncodeArgs(msg, types, args); - va_end(args); - return ret; -} - - -/** - * virDBusMessageDecode: - * @msg: the reply to decode - * @types: type signature for following return values - * @...: pointers in which to store return values - * - * The @types type signature is the same format as - * that used for the virDBusCallMethod. The difference - * is that each variadic parameter must be a pointer to - * be filled with the values. eg instead of passing an - * 'int', pass an 'int *'. - * - */ -int -virDBusMessageDecode(DBusMessage* msg, - const char *types, - ...) -{ - int ret; - va_list args; - va_start(args, types); - ret = virDBusMessageDecodeArgs(msg, types, args); - va_end(args); - return ret; -} - -# define VIR_DBUS_METHOD_CALL_TIMEOUT_MILLIS 30 * 1000 - -/** - * virDBusCreateMethodV: - * @call: pointer to be filled with a method call message - * @destination: bus identifier of the target service - * @path: object path of the target service - * @iface: the interface of the object - * @member: the name of the method in the interface - * @types: type signature for following method arguments - * @args: method arguments - * - * This creates a DBus method call message and saves a - * pointer to it in @call. The @destination, @path, @iface - * and @member parameters identify the object method to - * be invoked. The optional @replyout parameter will be - * filled with any reply to the method call. The method - * can be later invoked using virDBusCall. - * - * The @types parameter is a DBus signature describing - * the method call parameters which will be provided - * as variadic args. Each character in @types must - * correspond to one of the following DBus codes for - * basic types: - * - * 'y' - 8-bit byte, promoted to an 'int' - * 'b' - bool value, promoted to an 'int' - * 'n' - 16-bit signed integer, promoted to an 'int' - * 'q' - 16-bit unsigned integer, promoted to an 'int' - * 'i' - 32-bit signed integer, passed as an 'int' - * 'u' - 32-bit unsigned integer, passed as an 'int' - * 'x' - 64-bit signed integer, passed as a 'long long' - * 't' - 64-bit unsigned integer, passed as an 'unsigned long long' - * 'd' - 8-byte floating point, passed as a 'double' - * 's' - NUL-terminated string, in UTF-8 - * 'o' - NUL-terminated string, representing a valid object path - * 'g' - NUL-terminated string, representing a valid type signature - * - * or use one of the compound types - * - * 'a' - array of values - * 'v' - a variadic type. - * '(' - start of a struct - * ')' - end of a struct - * '{' - start of a dictionary entry (pair of types) - * '}' - start of a dictionary entry (pair of types) - * - * At this time, there is no support for Unix fd's ('h'), which only - * newer DBus supports. - * - * Passing values in variadic args for basic types is - * simple, the value is just passed directly using the - * corresponding C type listed against the type code - * above. Note how any integer value smaller than an - * 'int' is promoted to an 'int' by the C rules for - * variadic args. - * - * Passing values in variadic args for compound types - * requires a little further explanation. - * - * - Variant: the first arg is a string containing - * the type signature for the values to be stored - * inside the variant. This is then followed by - * the values corresponding to the type signature - * in the normal manner. - * - * - Array: when 'a' appears in a type signature, it - * must be followed by a single type describing the - * array element type. For example 'as' is an array - * of strings. 'a(is)' is an array of structs, each - * struct containing an int and a string. - * - * The first variadic arg for an array, is an 'int' - * specifying the number of elements in the array. - * This is then followed by additional variadic args, - * one for each element of the array. - * - * - Array reference: when 'a' appears in a type signature, - * followed by '&', this signifies an array passed by - * reference. - * - * Array references may only be used when the - * element values are basic types, or a dict - * entry where both keys and values are using - * the same basic type. - * - * The first variadic arg for an array, is an 'int' - * specifying the number of elements in the array. - * When the element is a basic type, the second - * variadic arg is a pointer to an array containing - * the element values. When the element is a dict - * entry, the second variadic arg is a pointer to - * an array containing the dict keys, and the - * third variadic arg is a pointer to an array - * containing the dict values. - * - * - Struct: when a '(' appears in a type signature, - * it must be followed by one or more types describing - * the elements in the array, terminated by a ')'. - * - * - Dict entry: when a '{' appears in a type signature it - * must be followed by exactly two types, one describing - * the type of the hash key, the other describing the - * type of the hash entry. The hash key type must be - * a basic type, not a compound type. - * - * Example signatures, with their corresponding variadic - * args: - * - * - "biiss" - some basic types - * - * (true, 7, 42, "hello", "world") - * - * - "as" - an array with a basic type element - * - * (3, "one", "two", "three") - * - * - "a(is)" - an array with a struct element - * - * (3, 1, "one", 2, "two", 3, "three") - * - * - "svs" - some basic types with a variant as an int - * - * ("hello", "i", 3, "world") - * - * - "svs" - some basic types with a variant as an array of ints - * - * ("hello", "ai", 4, 1, 2, 3, 4, "world") - * - * - "a{ss}" - a hash table (aka array + dict entry) - * - * (3, "title", "Mr", "forename", "Joe", "surname", "Bloggs") - * - * - "a{sv}" - a hash table (aka array + dict entry) - * - * (3, "email", "s", "joe@blogs.com", "age", "i", 35, - * "address", "as", 3, "Some house", "Some road", "some city") - */ -int virDBusCreateMethodV(DBusMessage **call, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, - va_list args) -{ - if (!(*call = dbus_message_new_method_call(destination, - path, - iface, - member))) { - virReportOOMError(); - return -1; - } - - if (virDBusMessageEncodeArgs(*call, types, args) < 0) { - virDBusMessageUnref(*call); - *call = NULL; - return -1; - } - - return 0; -} - - -/** - * virDBusCreateMethod: - * @call: pointer to be filled with a method call message - * @destination: bus identifier of the target service - * @path: object path of the target service - * @iface: the interface of the object - * @member: the name of the method in the interface - * @types: type signature for following method arguments - * @...: method arguments - * - * See virDBusCreateMethodV for a description of the - * behaviour of this method. - */ -int virDBusCreateMethod(DBusMessage **call, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, ...) -{ - va_list args; - int ret; - - va_start(args, types); - ret = virDBusCreateMethodV(call, destination, path, - iface, member, types, args); - va_end(args); - - return ret; -} - - -/** - * virDBusCreateReplyV: - * @reply: pointer to be filled with a method reply message - * @types: type signature for following method arguments - * @args: method arguments - * - * This creates a DBus method reply message and saves a - * pointer to it in @reply. - * - * The @types parameter is a DBus signature describing - * the method call parameters which will be provided - * as variadic args. See virDBusCreateMethodV for a - * description of this parameter. - */ -int virDBusCreateReplyV(DBusMessage **reply, - const char *types, - va_list args) -{ - if (!(*reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN))) { - virReportOOMError(); - return -1; - } - - if (virDBusMessageEncodeArgs(*reply, types, args) < 0) { - virDBusMessageUnref(*reply); - *reply = NULL; - return -1; - } - - return 0; -} - - -/** - * virDBusCreateReply: - * @reply: pointer to be filled with a method reply message - * @types: type signature for following method arguments - * @...: method arguments - * - * See virDBusCreateReplyV for a description of the - * behaviour of this method. - */ -int virDBusCreateReply(DBusMessage **reply, - const char *types, ...) -{ - va_list args; - int ret; - - va_start(args, types); - ret = virDBusCreateReplyV(reply, types, args); - va_end(args); - - return ret; -} - - -/** - * virDBusCall: - * @conn: a DBus connection - * @call: pointer to a message to send - * @replyout: pointer to receive reply message, or NULL - * @error: pointer to receive error message - * - * This invokes a method encoded in @call on a remote - * service on the DBus bus @conn. The optional @replyout - * parameter will be filled with any reply to the method - * call. The virDBusMethodReply method can be used to - * decode the return values. - * - * If @error is NULL then a libvirt error will be raised - * when a DBus error is received and the return value will - * be -1. If @error is non-NULL then any DBus error will - * be saved into that object and the return value will - * be 0. - * - * Returns 0 on success, or -1 upon error - */ -static int -virDBusCall(DBusConnection *conn, - DBusMessage *call, - DBusMessage **replyout, - virErrorPtr error) - -{ - DBusMessage *reply = NULL; - DBusError localerror; - int ret = -1; - const char *iface, *member, *path, *dest; - - dbus_error_init(&localerror); - if (error) - memset(error, 0, sizeof(*error)); - - iface = dbus_message_get_interface(call); - member = dbus_message_get_member(call); - path = dbus_message_get_path(call); - dest = dbus_message_get_destination(call); - - PROBE(DBUS_METHOD_CALL, - "'%s.%s' on '%s' at '%s'", - iface, member, path, dest); - - if (!(reply = dbus_connection_send_with_reply_and_block(conn, - call, - VIR_DBUS_METHOD_CALL_TIMEOUT_MILLIS, - &localerror))) { - PROBE(DBUS_METHOD_ERROR, - "'%s.%s' on '%s' at '%s' error %s: %s", - iface, member, path, dest, - localerror.name, - localerror.message); - if (error) { - error->level = VIR_ERR_ERROR; - error->code = VIR_ERR_DBUS_SERVICE; - error->domain = VIR_FROM_DBUS; - error->message = g_strdup(localerror.message); - error->str1 = g_strdup(localerror.name); - ret = 0; - } else { - virReportError(VIR_ERR_DBUS_SERVICE, _("%s: %s"), member, - localerror.message ? : _("unknown error")); - } - goto cleanup; - } - - PROBE(DBUS_METHOD_REPLY, - "'%s.%s' on '%s' at '%s'", - iface, member, path, dest); - - ret = 0; - - cleanup: - if (ret < 0 && error) - virResetError(error); - dbus_error_free(&localerror); - if (reply) { - if (ret == 0 && replyout) - *replyout = reply; - else - virDBusMessageUnref(reply); - } - return ret; -} - - -/** - * virDBusCallMethod: - * @conn: a DBus connection - * @replyout: pointer to receive reply message, or NULL - * @destination: bus identifier of the target service - * @path: object path of the target service - * @iface: the interface of the object - * @member: the name of the method in the interface - * @types: type signature for following method arguments - * @...: method arguments - * - * This invokes a method on a remote service on the - * DBus bus @conn. The @destination, @path, @iface - * and @member parameters identify the object method to - * be invoked. The optional @replyout parameter will be - * filled with any reply to the method call. The - * virDBusMethodReply method can be used to decode the - * return values. - * - * The @types parameter is a DBus signature describing - * the method call parameters which will be provided - * as variadic args. See virDBusCreateMethodV for a - * description of this parameter. - * - * - * If @error is NULL then a libvirt error will be raised - * when a DBus error is received and the return value will - * be -1. If @error is non-NULL then any DBus error will - * be saved into that object and the return value will - * be 0. If an error occurs while encoding method args - * the return value will always be -1 regardless of whether - * @error is set. - * - * Returns 0 on success, or -1 upon error - */ -int virDBusCallMethod(DBusConnection *conn, - DBusMessage **replyout, - virErrorPtr error, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, ...) -{ - DBusMessage *call = NULL; - int ret = -1; - va_list args; - - va_start(args, types); - ret = virDBusCreateMethodV(&call, destination, path, - iface, member, types, args); - va_end(args); - if (ret < 0) - goto cleanup; - - ret = virDBusCall(conn, call, replyout, error); - - cleanup: - virDBusMessageUnref(call); - return ret; -} - - -static int virDBusIsServiceInList(const char *listMethod, const char *name) -{ - DBusConnection *conn; - DBusMessage *reply = NULL; - DBusMessageIter iter, sub; - int ret = -1; - - if (!virDBusHasSystemBus()) - return -2; - - if (!(conn = virDBusGetSystemBus())) - return -1; - - if (virDBusCallMethod(conn, - &reply, - NULL, - "org.freedesktop.DBus", - "/org/freedesktop/DBus", - "org.freedesktop.DBus", - listMethod, - NULL) < 0) - return ret; - - if (!dbus_message_iter_init(reply, &iter) || - dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Reply message incorrect")); - goto cleanup; - } - - ret = -2; - dbus_message_iter_recurse(&iter, &sub); - while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING) { - const char *service = NULL; - - dbus_message_iter_get_basic(&sub, &service); - dbus_message_iter_next(&sub); - - if (STREQ(service, name)) { - ret = 0; - break; - } - } - - cleanup: - virDBusMessageUnref(reply); - return ret; -} - -/** - * virDBusIsServiceEnabled: - * @name: service name - * - * Returns 0 if service is available, -1 on fatal error, or -2 if service is not available - */ -int virDBusIsServiceEnabled(const char *name) -{ - int ret = virDBusIsServiceInList("ListActivatableNames", name); - - VIR_DEBUG("Service %s is %s", name, ret ? "unavailable" : "available"); - - return ret; -} - -/** - * virDBusIsServiceRegistered - * @name: service name - * - * Returns 0 if service is registered, -1 on fatal error, or -2 if service is not registered - */ -int virDBusIsServiceRegistered(const char *name) -{ - int ret = virDBusIsServiceInList("ListNames", name); - - VIR_DEBUG("Service %s is %s", name, ret ? "not registered" : "registered"); - - return ret; -} - -void virDBusMessageUnref(DBusMessage *msg) -{ - if (msg) - dbus_message_unref(msg); -} - -#else /* ! WITH_DBUS */ -void virDBusSetSharedBus(bool shared G_GNUC_UNUSED) -{ - /* nothing */ -} - -DBusConnection *virDBusGetSystemBus(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return NULL; -} - - -bool -virDBusHasSystemBus(void) -{ - VIR_DEBUG("DBus support not compiled into this binary"); - return false; -} - -void virDBusCloseSystemBus(void) -{ - /* nothing */ -} - -DBusConnection *virDBusGetSessionBus(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return NULL; -} - -int virDBusCreateMethod(DBusMessage **call G_GNUC_UNUSED, - const char *destination G_GNUC_UNUSED, - const char *path G_GNUC_UNUSED, - const char *iface G_GNUC_UNUSED, - const char *member G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, ...) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusCreateMethodV(DBusMessage **call G_GNUC_UNUSED, - const char *destination G_GNUC_UNUSED, - const char *path G_GNUC_UNUSED, - const char *iface G_GNUC_UNUSED, - const char *member G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, - va_list args G_GNUC_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusCreateReplyV(DBusMessage **reply G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, - va_list args G_GNUC_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusCreateReply(DBusMessage **reply G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, ...) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusCallMethod(DBusConnection *conn G_GNUC_UNUSED, - DBusMessage **reply G_GNUC_UNUSED, - virErrorPtr error G_GNUC_UNUSED, - const char *destination G_GNUC_UNUSED, - const char *path G_GNUC_UNUSED, - const char *iface G_GNUC_UNUSED, - const char *member G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, ...) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - - -int virDBusMessageEncode(DBusMessage* msg G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, - ...) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusMessageDecode(DBusMessage* msg G_GNUC_UNUSED, - const char *types G_GNUC_UNUSED, - ...) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("DBus support not compiled into this binary")); - return -1; -} - -int virDBusIsServiceEnabled(const char *name G_GNUC_UNUSED) -{ - VIR_DEBUG("DBus support not compiled into this binary"); - return -2; -} - -int virDBusIsServiceRegistered(const char *name G_GNUC_UNUSED) -{ - VIR_DEBUG("DBus support not compiled into this binary"); - return -2; -} - -void virDBusMessageUnref(DBusMessage *msg G_GNUC_UNUSED) -{ - /* nothing */ -} -#endif /* ! WITH_DBUS */ - -bool virDBusErrorIsUnknownMethod(virErrorPtr err) -{ - return err->domain == VIR_FROM_DBUS && - err->code == VIR_ERR_DBUS_SERVICE && - err->level == VIR_ERR_ERROR && - STREQ_NULLABLE("org.freedesktop.DBus.Error.UnknownMethod", - err->str1); -} diff --git a/src/util/virdbus.h b/src/util/virdbus.h deleted file mode 100644 index 083c074d59..0000000000 --- a/src/util/virdbus.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * virdbus.h: helper for using DBus - * - * Copyright (C) 2012-2013 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#pragma once - -#ifdef WITH_DBUS -# undef interface /* Work around namespace pollution in mingw's rpc.h */ -# include <dbus/dbus.h> -#else -# define DBusConnection void -# define DBusMessage void -#endif -#include "internal.h" - -#include <stdarg.h> - -void virDBusSetSharedBus(bool shared); - -DBusConnection *virDBusGetSystemBus(void); -bool virDBusHasSystemBus(void); -void virDBusCloseSystemBus(void); -DBusConnection *virDBusGetSessionBus(void); - -int virDBusCreateMethod(DBusMessage **call, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, ...); -int virDBusCreateMethodV(DBusMessage **call, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, - va_list args); -int virDBusCreateReply(DBusMessage **reply, - const char *types, ...); -int virDBusCreateReplyV(DBusMessage **reply, - const char *types, - va_list args); - -int virDBusCallMethod(DBusConnection *conn, - DBusMessage **reply, - virErrorPtr error, - const char *destination, - const char *path, - const char *iface, - const char *member, - const char *types, ...); -int virDBusMessageDecode(DBusMessage *msg, - const char *types, ...); -void virDBusMessageUnref(DBusMessage *msg); - -int virDBusIsServiceEnabled(const char *name); -int virDBusIsServiceRegistered(const char *name); - -bool virDBusErrorIsUnknownMethod(virErrorPtr err); diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h deleted file mode 100644 index 5b4fe217f9..0000000000 --- a/src/util/virdbuspriv.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * virdbuspriv.h: internal APIs for testing DBus code - * - * Copyright (C) 2012-2014 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - * - */ - -#ifndef LIBVIRT_VIRDBUSPRIV_H_ALLOW -# error "virdbuspriv.h may only be included by virdbus.c or test suites" -#endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */ - -#pragma once - -#include "virdbus.h" - -#if defined(WITH_DBUS) && !WITH_DBUSBASICVALUE -/* Copied (and simplified) from dbus 1.6.12, for use with older dbus headers */ -typedef union -{ - dbus_int16_t i16; /**< as int16 */ - dbus_uint16_t u16; /**< as int16 */ - dbus_int32_t i32; /**< as int32 */ - dbus_uint32_t u32; /**< as int32 */ - dbus_bool_t bool_val; /**< as boolean */ - dbus_int64_t i64; /**< as int64 */ - dbus_uint64_t u64; /**< as int64 */ - double dbl; /**< as double */ - unsigned char byt; /**< as byte */ -} DBusBasicValue; -#endif - -int virDBusMessageEncodeArgs(DBusMessage* msg, - const char *types, - va_list args); - -int virDBusMessageDecodeArgs(DBusMessage* msg, - const char *types, - va_list args); - -int virDBusMessageEncode(DBusMessage* msg, - const char *types, - ...); diff --git a/tests/meson.build b/tests/meson.build index 356286839a..f4fbb25e66 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -86,12 +86,6 @@ if conf.has('WITH_BHYVE') ] endif -if conf.has('WITH_DBUS') - mock_libs += [ - { 'name': 'virdbusmock', 'deps': [ dbus_dep ] }, - ] -endif - if conf.has('WITH_LIBXL') mock_libs += [ { 'name': 'xlmock', 'sources': [ 'libxlmock.c' ], 'deps': [ libxl_dep ] }, @@ -360,13 +354,6 @@ if conf.has('WITH_BHYVE') ] endif -if conf.has('WITH_DBUS') - tests += [ - { 'name': 'virdbustest', 'deps': [ dbus_dep ] }, - ] - -endif - if conf.has('WITH_ESX') tests += [ { 'name': 'esxutilstest', 'include': [ esx_inc_dir ] }, diff --git a/tests/virdbusmock.c b/tests/virdbusmock.c deleted file mode 100644 index 0673f7292a..0000000000 --- a/tests/virdbusmock.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * virdbusmock.c: mocking of dbus message send/reply - * - * Copyright (C) 2013-2014 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <config.h> - -#if defined(WITH_DBUS) && !defined(WIN32) -# include "virmock.h" -# include <dbus/dbus.h> - -VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_change_sigpipe, - dbus_bool_t, will_modify_sigpipe) - - -VIR_MOCK_STUB_RET_ARGS(dbus_bus_get, - DBusConnection *, (DBusConnection *)0x1, - DBusBusType, type, - DBusError *, error) - -VIR_MOCK_STUB_VOID_ARGS(dbus_connection_set_exit_on_disconnect, - DBusConnection *, connection, - dbus_bool_t, exit_on_disconnect) - -VIR_MOCK_STUB_RET_ARGS(dbus_connection_set_watch_functions, - dbus_bool_t, 1, - DBusConnection *, connection, - DBusAddWatchFunction, add_function, - DBusRemoveWatchFunction, remove_function, - DBusWatchToggledFunction, toggled_function, - void *, data, - DBusFreeFunction, free_data_function) - -VIR_MOCK_STUB_RET_ARGS(dbus_message_set_reply_serial, - dbus_bool_t, 1, - DBusMessage *, message, - dbus_uint32_t, serial) - - -VIR_MOCK_LINK_RET_ARGS(dbus_connection_send_with_reply_and_block, - DBusMessage *, - DBusConnection *, connection, - DBusMessage *, message, - int, timeout_milliseconds, - DBusError *, error) - -#endif /* WITH_DBUS && !WIN32 */ diff --git a/tests/virdbustest.c b/tests/virdbustest.c deleted file mode 100644 index f9c2fb9587..0000000000 --- a/tests/virdbustest.c +++ /dev/null @@ -1,728 +0,0 @@ -/* - * Copyright (C) 2013, 2014 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 - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * <http://www.gnu.org/licenses/>. - */ - -#include <config.h> - -#define LIBVIRT_VIRDBUSPRIV_H_ALLOW -#include "virdbuspriv.h" -#include "virlog.h" -#include "testutils.h" - -VIR_LOG_INIT("tests.dbustest"); - -#define VERIFY(typname, valorig, valnew, fmt) \ - do { \ - VIR_DEBUG("Compare " typname " '" fmt "' to '" \ - fmt "'", valorig, valnew); \ - if (valorig != valnew) { \ - fprintf(stderr, "Failed to round-trip " typname " '" \ - fmt "' to '" fmt "'\n", valorig, valnew); \ - goto cleanup; \ - } \ - } while (0) - -#define VERIFY_STR(typname, valorig, valnew, fmt) \ - do { \ - VIR_DEBUG("Compare " typname " '" fmt "' to '" \ - fmt "'", valorig, valnew); \ - if (STRNEQ(valorig, valnew)) { \ - fprintf(stderr, "Failed to round-trip " typname " '" \ - fmt "' to '" fmt "'\n", valorig, valnew); \ - goto cleanup; \ - } \ - } while (0) - -static int testMessageSimple(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - unsigned char in_byte = 200, out_byte = 0; - bool in_bool = true, out_bool = false; - short in_int16 = 0xfefe, out_int16 = 0; - unsigned short in_uint16 = 32000, out_uint16 = 0; - int in_int32 = 100000000, out_int32 = 0; - unsigned int in_uint32 = 200000000, out_uint32 = 0; - long long in_int64 = 1000000000000LL, out_int64 = 0; - unsigned long long in_uint64 = 2000000000000LL, out_uint64 = 0; - double in_double = 3.14159265359, out_double = 0; - const char *in_string = "Hello World"; - char *out_string = NULL; - const char *in_objectpath = "/org/libvirt/test"; - char *out_objectpath = NULL; - const char *in_signature = "ybnqiuxtdsog"; - char *out_signature = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "ybnqiuxtdsog", - in_byte, in_bool, - in_int16, in_uint16, - in_int32, in_uint32, - in_int64, in_uint64, - in_double, in_string, - in_objectpath, in_signature) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "ybnqiuxtdsog", - &out_byte, &out_bool, - &out_int16, &out_uint16, - &out_int32, &out_uint32, - &out_int64, &out_uint64, - &out_double, &out_string, - &out_objectpath, &out_signature) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - VERIFY("byte", in_byte, out_byte, "%d"); - VERIFY("bool", in_bool, out_bool, "%d"); - VERIFY("int16", in_int16, out_int16, "%d"); - VERIFY("uint16", in_int16, out_int16, "%d"); - VERIFY("int32", in_int32, out_int32, "%d"); - VERIFY("uint32", in_int32, out_int32, "%d"); - VERIFY("int64", in_int64, out_int64, "%lld"); - VERIFY("uint64", in_int64, out_int64, "%lld"); - VERIFY("double", in_double, out_double, "%lf"); - VERIFY_STR("string", in_string, out_string, "%s"); - VERIFY_STR("objectpath", in_objectpath, out_objectpath, "%s"); - VERIFY_STR("signature", in_signature, out_signature, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_string); - VIR_FREE(out_signature); - VIR_FREE(out_objectpath); - virDBusMessageUnref(msg); - return ret; -} - - -static int testMessageVariant(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_str1 = "Hello"; - int in_int32 = 100000000, out_int32 = 0; - const char *in_str2 = "World"; - char *out_str1 = NULL, *out_str2 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "svs", - in_str1, - "i", in_int32, - in_str2) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "svs", - &out_str1, - "i", &out_int32, - &out_str2) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - VERIFY_STR("str1", in_str1, out_str1, "%s"); - VERIFY("int32", in_int32, out_int32, "%d"); - VERIFY_STR("str2", in_str2, out_str2, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_str1); - VIR_FREE(out_str2); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageArray(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_str1 = "Hello"; - int in_int32a = 1000000000, out_int32a = 0; - int in_int32b = 2000000000, out_int32b = 0; - int in_int32c = -2000000000, out_int32c = 0; - bool in_bool[] = { true, false, true }, out_bool[] = { false, true, false}; - const char *in_str2 = "World"; - char *out_str1 = NULL, *out_str2 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "saiabs", - in_str1, - 3, in_int32a, in_int32b, in_int32c, - 3, in_bool[0], in_bool[1], in_bool[2], - in_str2) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "saiabs", - &out_str1, - 3, &out_int32a, &out_int32b, &out_int32c, - 3, &out_bool[0], &out_bool[1], &out_bool[2], - &out_str2) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - VERIFY_STR("str1", in_str1, out_str1, "%s"); - VERIFY("int32a", in_int32a, out_int32a, "%d"); - VERIFY("int32b", in_int32b, out_int32b, "%d"); - VERIFY("int32c", in_int32c, out_int32c, "%d"); - VERIFY("bool[0]", in_bool[0], out_bool[0], "%d"); - VERIFY("bool[1]", in_bool[1], out_bool[1], "%d"); - VERIFY("bool[2]", in_bool[2], out_bool[2], "%d"); - VERIFY_STR("str2", in_str2, out_str2, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_str1); - VIR_FREE(out_str2); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageEmptyArrayRef(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_strv1[] = {}; - size_t out_nstrv1; - char **out_strv1 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "a&s", - 0, in_strv1) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "a&s", - &out_nstrv1, &out_strv1) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - if (out_nstrv1 != 0) { - fprintf(stderr, "Expected 0 string, but got %zu\n", - out_nstrv1); - goto cleanup; - } - - ret = 0; - - cleanup: - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageSingleArrayRef(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_strv1[] = { - "Fishfood", - }; - char **out_strv1 = NULL; - size_t out_nstrv1 = 0; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "a&s", - 1, in_strv1) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "a&s", - &out_nstrv1, &out_strv1) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - if (out_nstrv1 != 1) { - fprintf(stderr, "Expected 1 string, but got %zu\n", - out_nstrv1); - goto cleanup; - } - VERIFY_STR("strv1[0]", in_strv1[0], out_strv1[0], "%s"); - - ret = 0; - - cleanup: - if (out_strv1) - VIR_FREE(out_strv1[0]); - VIR_FREE(out_strv1); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageArrayRef(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_str1 = "Hello"; - int in_int32[] = { - 100000000, 2000000000, -2000000000 - }; - bool in_bool[] = { true, false, true }; - const char *in_strv1[] = { - "Fishfood", - }; - const char *in_strv2[] = { - "Hello", "World", - }; - int *out_int32 = NULL; - size_t out_nint32 = 0; - bool *out_bool = NULL; - size_t out_nbool = 0; - char **out_strv1 = NULL; - char **out_strv2 = NULL; - size_t out_nstrv1 = 0; - size_t out_nstrv2 = 0; - const char *in_str2 = "World"; - char *out_str1 = NULL, *out_str2 = NULL; - size_t i; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "sa&sa&ia&ba&ss", - in_str1, - 1, in_strv1, - 3, in_int32, - 3, in_bool, - 2, in_strv2, - in_str2) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "sa&sa&ia&ba&ss", - &out_str1, - &out_nstrv1, &out_strv1, - &out_nint32, &out_int32, - &out_nbool, &out_bool, - &out_nstrv2, &out_strv2, - &out_str2) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - VERIFY_STR("str1", in_str1, out_str1, "%s"); - if (out_nstrv1 != 1) { - fprintf(stderr, "Expected 1 string, but got %zu\n", - out_nstrv1); - goto cleanup; - } - VERIFY_STR("strv1[0]", in_strv1[0], out_strv1[0], "%s"); - - if (out_nint32 != 3) { - fprintf(stderr, "Expected 3 integers, but got %zu\n", - out_nint32); - goto cleanup; - } - VERIFY("int32a", in_int32[0], out_int32[0], "%d"); - VERIFY("int32b", in_int32[1], out_int32[1], "%d"); - VERIFY("int32c", in_int32[2], out_int32[2], "%d"); - - if (out_nbool != 3) { - fprintf(stderr, "Expected 3 bools, but got %zu\n", - out_nbool); - goto cleanup; - } - VERIFY("bool[0]", in_bool[0], out_bool[0], "%d"); - VERIFY("bool[1]", in_bool[1], out_bool[1], "%d"); - VERIFY("bool[2]", in_bool[2], out_bool[2], "%d"); - - if (out_nstrv2 != 2) { - fprintf(stderr, "Expected 2 strings, but got %zu\n", - out_nstrv2); - goto cleanup; - } - VERIFY_STR("strv2[0]", in_strv2[0], out_strv2[0], "%s"); - VERIFY_STR("strv2[1]", in_strv2[1], out_strv2[1], "%s"); - - VERIFY_STR("str2", in_str2, out_str2, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_int32); - VIR_FREE(out_bool); - VIR_FREE(out_str1); - VIR_FREE(out_str2); - for (i = 0; i < out_nstrv1; i++) - VIR_FREE(out_strv1[i]); - VIR_FREE(out_strv1); - for (i = 0; i < out_nstrv2; i++) - VIR_FREE(out_strv2[i]); - VIR_FREE(out_strv2); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageStruct(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - unsigned char in_byte = 200, out_byte = 0; - bool in_bool = true, out_bool = false; - short in_int16 = 12000, out_int16 = 0; - unsigned short in_uint16 = 32000, out_uint16 = 0; - int in_int32 = 100000000, out_int32 = 0; - unsigned int in_uint32 = 200000000, out_uint32 = 0; - long long in_int64 = -1000000000000LL, out_int64 = 0; - unsigned long long in_uint64 = 2000000000000LL, out_uint64 = 0; - double in_double = 3.14159265359, out_double = 0; - const char *in_string = "Hello World"; - char *out_string = NULL; - const char *in_objectpath = "/org/libvirt/test"; - char *out_objectpath = NULL; - const char *in_signature = "ybnqiuxtdsog"; - char *out_signature = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "ybn(qiuxtds)og", - in_byte, in_bool, - in_int16, in_uint16, - in_int32, in_uint32, - in_int64, in_uint64, - in_double, in_string, - in_objectpath, in_signature) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "ybn(qiuxtds)og", - &out_byte, &out_bool, - &out_int16, &out_uint16, - &out_int32, &out_uint32, - &out_int64, &out_uint64, - &out_double, &out_string, - &out_objectpath, &out_signature) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - VERIFY("byte", in_byte, out_byte, "%d"); - VERIFY("bool", in_bool, out_bool, "%d"); - VERIFY("int16", in_int16, out_int16, "%d"); - VERIFY("uint16", in_int16, out_int16, "%d"); - VERIFY("int32", in_int32, out_int32, "%d"); - VERIFY("uint32", in_int32, out_int32, "%d"); - VERIFY("int64", in_int64, out_int64, "%lld"); - VERIFY("uint64", in_int64, out_int64, "%lld"); - VERIFY("double", in_double, out_double, "%lf"); - VERIFY_STR("string", in_string, out_string, "%s"); - VERIFY_STR("objectpath", in_objectpath, out_objectpath, "%s"); - VERIFY_STR("signature", in_signature, out_signature, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_string); - VIR_FREE(out_signature); - VIR_FREE(out_objectpath); - virDBusMessageUnref(msg); - return ret; -} - - -static int testMessageDict(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_str1 = "Hello"; - int in_int32a = 100000000, out_int32a = 0; - const char *in_key1 = "turnover"; - int in_int32b = 200000000, out_int32b = 0; - const char *in_key2 = "revenue"; - int in_int32c = 300000000, out_int32c = 0; - const char *in_key3 = "debt"; - const char *in_str2 = "World"; - char *out_str1 = NULL, *out_str2 = NULL; - char *out_key1 = NULL, *out_key2 = NULL, *out_key3 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "(sa{si}s)", - in_str1, - 3, - in_key1, in_int32a, - in_key2, in_int32b, - in_key3, in_int32c, - in_str2) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "(sa{si}s)", - &out_str1, - 3, - &out_key1, &out_int32a, - &out_key2, &out_int32b, - &out_key3, &out_int32c, - &out_str2) < 0) { - VIR_DEBUG("Failed to decode arguments"); - goto cleanup; - } - - - VERIFY_STR("str1", in_str1, out_str1, "%s"); - VERIFY("int32a", in_int32a, out_int32a, "%d"); - VERIFY("int32b", in_int32b, out_int32b, "%d"); - VERIFY("int32c", in_int32c, out_int32c, "%d"); - VERIFY_STR("key1", in_key1, out_key1, "%s"); - VERIFY_STR("key1", in_key2, out_key2, "%s"); - VERIFY_STR("key1", in_key3, out_key3, "%s"); - VERIFY_STR("str2", in_str2, out_str2, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_str1); - VIR_FREE(out_str2); - VIR_FREE(out_key1); - VIR_FREE(out_key2); - VIR_FREE(out_key3); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageDictRef(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_str1 = "Hello"; - const char *in_strv1[] = { - "Fruit1", "Apple", - "Fruit2", "Orange", - "Fruit3", "Kiwi", - }; - const char *in_str2 = "World"; - char *out_str1 = NULL; - size_t out_nint32 = 0; - char **out_strv1 = NULL; - char *out_str2 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "(sa&{ss}s)", - in_str1, - 3, in_strv1, - in_str2) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "(sa&{ss}s)", - &out_str1, - &out_nint32, - &out_strv1, - &out_str2) < 0) { - VIR_DEBUG("Failed to decode arguments: '%s'", virGetLastErrorMessage()); - goto cleanup; - } - - - VERIFY_STR("str1", in_str1, out_str1, "%s"); - VERIFY_STR("strv1[0]", in_strv1[0], out_strv1[0], "%s"); - VERIFY_STR("strv1[1]", in_strv1[1], out_strv1[1], "%s"); - VERIFY_STR("strv1[2]", in_strv1[2], out_strv1[2], "%s"); - VERIFY_STR("strv1[3]", in_strv1[3], out_strv1[3], "%s"); - VERIFY_STR("strv1[4]", in_strv1[4], out_strv1[4], "%s"); - VERIFY_STR("strv1[5]", in_strv1[5], out_strv1[5], "%s"); - VERIFY_STR("str2", in_str2, out_str2, "%s"); - - ret = 0; - - cleanup: - VIR_FREE(out_str1); - VIR_FREE(out_str2); - if (out_strv1) { - VIR_FREE(out_strv1[0]); - VIR_FREE(out_strv1[1]); - VIR_FREE(out_strv1[2]); - VIR_FREE(out_strv1[3]); - VIR_FREE(out_strv1[4]); - VIR_FREE(out_strv1[5]); - } - VIR_FREE(out_strv1); - virDBusMessageUnref(msg); - return ret; -} - -static int testMessageEmptyDictRef(const void *args G_GNUC_UNUSED) -{ - DBusMessage *msg = NULL; - int ret = -1; - const char *in_strv1[] = {}; - size_t out_nint32 = 0; - char **out_strv1 = NULL; - - if (!(msg = dbus_message_new_method_call("org.libvirt.test", - "/org/libvirt/test", - "org.libvirt.test.astrochicken", - "cluck"))) { - VIR_DEBUG("Failed to allocate method call"); - goto cleanup; - } - - if (virDBusMessageEncode(msg, - "a&{ss}", - 0, in_strv1) < 0) { - VIR_DEBUG("Failed to encode arguments"); - goto cleanup; - } - - if (virDBusMessageDecode(msg, - "a&{ss}", - &out_nint32, - &out_strv1) < 0) { - VIR_DEBUG("Failed to decode arguments: '%s'", virGetLastErrorMessage()); - goto cleanup; - } - - if (out_nint32 != 0) { - fprintf(stderr, "Unexpected dict entries\n"); - goto cleanup; - } - - ret = 0; - - cleanup: - virDBusMessageUnref(msg); - return ret; -} - -static int -mymain(void) -{ - int ret = 0; - - if (virTestRun("Test message simple ", testMessageSimple, NULL) < 0) - ret = -1; - if (virTestRun("Test message variant ", testMessageVariant, NULL) < 0) - ret = -1; - if (virTestRun("Test message array ", testMessageArray, NULL) < 0) - ret = -1; - if (virTestRun("Test message array empty ref ", testMessageEmptyArrayRef, NULL) < 0) - ret = -1; - if (virTestRun("Test message array single ref ", testMessageSingleArrayRef, NULL) < 0) - ret = -1; - if (virTestRun("Test message array ref ", testMessageArrayRef, NULL) < 0) - ret = -1; - if (virTestRun("Test message struct ", testMessageStruct, NULL) < 0) - ret = -1; - if (virTestRun("Test message dict ", testMessageDict, NULL) < 0) - ret = -1; - if (virTestRun("Test message dict empty ref ", testMessageEmptyDictRef, NULL) < 0) - ret = -1; - if (virTestRun("Test message dict ref ", testMessageDictRef, NULL) < 0) - ret = -1; - return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -} - -VIR_TEST_MAIN(mymain) -- 2.26.2