- Devel - libvirt List Archives

[libvirt] [PATCH] tools: Pass opaque data in vshCompleter and introduce autoCompleteOpaque
by Nishith Shah 07 Sep '16

07 Sep '16

This patch changes the signature of vshCompleters, allowing to pass along some data that we might want to along with the completers; for example, we might want to pass the autocomplete vshControl along with the completer, in case the completer requires a connection to libvirtd. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com> --- tools/vsh.c | 10 +++++++++- tools/vsh.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 3157922..3cc03ec 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -64,6 +64,11 @@ # define SA_SIGINFO 0 #endif +#ifdef WITH_READLINE +/* For autocompletion */ +void *autoCompleteOpaque; +#endif + /* NOTE: It would be much nicer to have these two as part of vshControl * structure, unfortunately readline doesn't support passing opaque data * and only relies on static data accessible from the user-side callback @@ -2808,7 +2813,8 @@ vshReadlineParse(const char *text, int state) res = vshReadlineOptionsGenerator(sanitized_text, state, cmd); } else if (non_bool_opt_exists && data_complete && opt->completer) { if (!completed_list) - completed_list = opt->completer(opt->completer_flags); + completed_list = opt->completer(autoCompleteOpaque, + opt->completer_flags); if (completed_list) { while ((completed_name = completed_list[completed_list_index])) { completed_list_index++; @@ -2858,6 +2864,8 @@ vshReadlineInit(vshControl *ctl) char *histsize_env = NULL; const char *histsize_str = NULL; + /* Opaque data for autocomplete callbacks and connections to libvirtd */ + autoCompleteOpaque = ctl; /* Allow conditional parsing of the ~/.inputrc file. * Work around ancient readline 4.1 (hello Mac OS X), * which declared it as 'char *' instead of 'const char *'. diff --git a/tools/vsh.h b/tools/vsh.h index 7f43055..e53910f 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -123,7 +123,7 @@ typedef struct _vshCmdOpt vshCmdOpt; typedef struct _vshCmdOptDef vshCmdOptDef; typedef struct _vshControl vshControl; -typedef char **(*vshCompleter)(unsigned int flags); +typedef char **(*vshCompleter)(void *opaque, unsigned int flags); /* * vshCmdInfo -- name/value pair for information about command -- 2.1.4

2 1

[libvirt] [PATCH] util: hostcpu: improve CPU freq code for FreeBSD
by Roman Bogorodskiy 07 Sep '16

07 Sep '16

Current implementation uses the dev.cpu.0.freq sysctl that is provided by the cpufreq(4) framework and returns the actual CPU frequency. However, there are environment where it's not available, e.g. when running nested in KVM. In this case fall back to hw.clockrate that reports CPU frequency at the boot time. Resolves (hopefully): https://bugzilla.redhat.com/show_bug.cgi?id=1369964 --- src/util/virhostcpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 0f03ff8..b5a37a8 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -994,9 +994,16 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, *threads = 1; # ifdef __FreeBSD__ + /* dev.cpu.%d.freq reports current active CPU frequency. It is provided by + * the cpufreq(4) framework. However, it might be disabled or no driver + * available. In this case fallback to "hw.clockrate" which reports boot time + * CPU frequency. */ + if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { - virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); - return -1; + if (sysctlbyname("hw.clockrate", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); + return -1; + } } *mhz = cpu_freq; -- 2.7.4

2 2

[libvirt] [PATCH] virsh: Fix *-event error string
by Christophe Fergeau 07 Sep '16

07 Sep '16

When using virsh net-event non-existing-net the error message says that 'either --list or event type is required' This is misleading as 'virsh net-event $valid-event-type' is not going to work either. What is expected is 'virsh net-event --event $valid-event-type' This commit fixes the string in pool-event, nodedev-event, event, and net-event. --- tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a614512..702a8bd8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12694,7 +12694,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) } } else if (!all) { vshError(ctl, "%s", - _("one of --list, --all, or event type is required")); + _("one of --list, --all, or --event type is required")); return false; } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index eec7faf..c6bd132 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1238,7 +1238,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } if ((event = virshNetworkEventIdTypeFromString(eventName)) < 0) { diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 805c0ff..0e695b9 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -903,7 +903,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index d25851e..70b2bdd 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -2057,7 +2057,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } -- 2.7.4

2 2

[libvirt] qapi DEVICE_DELETED event issued *before* instance_finalize?!
by Alex Williamson 06 Sep '16

06 Sep '16

Hey, I'm out of my QOM depth, so I'll just beg for help in advance. I noticed in testing vfio-pci hotunplug that the host seems to be trying to reclaim the device before QEMU is actually done with it, there's a very short race where libvirt has seen the DEVICE_DELETED event and tries to unbind the physical device from vfio-pci, the use count is clearly non-zero because the host driver tries to send a device request, but that event channel has already been torn down. Nearly immediately after, QEMU finally releases the device, but we can't do a proper reset due to some issues with device references in the kernel. When I run gdb on QEMU with breakpoints at qapi_event_send_device_deleted() and vfio_instance_finalize(), the QAPI even happens first. Clearly this is horribly wrong, right? I can't unmap my references to the vfio device file until my instance_finalize is called, so I'm always going to have that open when libvirt takes the DEVICE_DELETED event as a cue to return the device to host drivers. The call chains look like this: #0 qapi_event_send_device_deleted (has_device=true, device=0x7f5ca3e36fb0 "hostdev0", path=0x7f5c89e84fe0 "/machine/peripheral/hostdev0", errp=0x7f5ca241f9e8 <error_abort>) at qapi-event.c:412 #1 0x00007f5ca1701608 in device_unparent (obj=0x7f5ca43ffc00) at hw/core/qdev.c:1115 #2 0x00007f5ca18b7891 in object_finalize_child_property (obj=0x7f5ca380f500, name=0x7f5ca3f21da0 "hostdev0", opaque=0x7f5ca43ffc00) at qom/object.c:1362 #3 0x00007f5ca18b56b2 in object_property_del_child (obj=0x7f5ca380f500, child=0x7f5ca43ffc00, errp=0x0) at qom/object.c:422 #4 0x00007f5ca18b5790 in object_unparent (obj=0x7f5ca43ffc00) at qom/object.c:441 #5 0x00007f5ca16c1f31 in acpi_pcihp_eject_slot (s=0x7f5ca4c41268, bsel=0, slots=4) at hw/acpi/pcihp.c:139 #0 vfio_instance_finalize (obj=0x7f5ca43ffc00) at /net/gimli/home/alwillia/Work/qemu.git/hw/vfio/pci.c:2731 #1 0x00007f5ca18b57c0 in object_deinit (obj=0x7f5ca43ffc00, type=0x7f5ca376f490) at qom/object.c:448 #2 0x00007f5ca18b5831 in object_finalize (data=0x7f5ca43ffc00) at qom/object.c:462 #3 0x00007f5ca18b6782 in object_unref (obj=0x7f5ca43ffc00) at qom/object.c:896 #4 0x00007f5ca1550cc0 in memory_region_unref (mr=0x7f5ca43fff00) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:1476 #5 0x00007f5ca1553886 in do_address_space_destroy (as=0x7f5ca43ffe10) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:2272 It appears that DEVICE_DELETED only means the VM is done with the device but libvirt is interpreting it as QEMU is done with the device. Which is correct? Do we need a new event or do we need to fix the ordering of this event? An ordering fix would be more compatible with existing libvirt. Thanks, Alex

5 8

[libvirt] virt-admin commands aliases
by Erik Skultety 06 Sep '16

06 Sep '16

Hi there, after my presentation at KVM Forum, it was pointed out from the audience that we might think about doing something about the naming of the virt-admin's comands, since there is some sort of inconsistency: srv- vs. client- vs. dmn- (not merged yet). When I sent patches to upstream I already knew that the naming was not optimal, but I didn't come up with anything better so I hoped that the reviewer might think of something better which unfortunately did not happen. Anyway, there are multiple options how this can be approached but I'm not 100% satisfied with neither of them: 1) rename the commands completely Although clean, obviously this is the non-preferred option because this would break any backwards compatibility however, I think there is a fair chance that people haven't actually started using it yet (although that might change between 7.3 and 7.4). 2) create aliases for non-abbreviated forms of the commands That way, srv- would become server- and dmn- would become daemon-. However, by doing this we'll end up with 6 almost identical entries in the commands structure which might be error-prone once we decide to add/create&add a flag to the command primitive, since the flag would have to be added both to the alias and to the original (unlikely, but possible that someone might forget about that) 3) abbreviate client- to something like clnt- Identical to the above except for the amount of duplicate entries which would be reduced to 2 4) leave it as is if such a consensus is reached and accepted I guess this does no need any additional comments. Thanks for any ideas. Erik

4 6

[libvirt] [PATCH] qemu: Don't warn about missing device in DEVICE_DELETED event
by Jiri Denemark 06 Sep '16

06 Sep '16

Debug priority is good enough for this. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3d0a120..8384314 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -941,7 +941,7 @@ qemuMonitorJSONHandleDeviceDeleted(qemuMonitorPtr mon, virJSONValuePtr data) const char *device; if (!(device = virJSONValueObjectGetString(data, "device"))) { - VIR_WARN("missing device in device deleted event"); + VIR_DEBUG("missing device in device deleted event"); return; } -- 2.10.0

2 1

[libvirt] [PATCH 0/2] util: storage: Fixes for the JSON pseudo protocol parser
by Peter Krempa 06 Sep '16

06 Sep '16

Gluster protocol type was not set properly and the RBD protocol was missing. Peter Krempa (2): util: storage: Properly set protocol type when parsing gluster json string util: storage: Add json pseudo protocol support for legacy RBD strings src/util/virstoragefile.c | 26 ++++++++++++++++++++++++++ tests/virstoragetest.c | 10 ++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.9.2

2 3

[libvirt] [PATCH] docs: Add libvirt-go Go bindings to binding page
by Roman Mohr 06 Sep '16

06 Sep '16

Signed-off-by: Roman Mohr <rmohr(a)redhat.com> --- docs/bindings.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 95cfe25..7fe26df 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -14,6 +14,10 @@ C#: Arnaud Champion develops <a href="csharp.html">C# bindings</a>. </li> + <li> + Go: Kyle Kelley et al. are developing + <a href="https://github.com/rgbkrk/libvirt-go">Go bindings</a>. + </li> <li> Java: Daniel Veillard develops <a href="java.html">Java bindings</a>. -- 2.5.5

2 1

[libvirt] [PATCH 0/2] Improve handling of QEMU core dumping
by Daniel P. Berrange 06 Sep '16

06 Sep '16

Daniel P. Berrange (2): qemu: add a max_core setting to qemu.conf for core dump size qemu: allow turning off QEMU guest RAM dump globally src/libvirt_private.syms | 2 ++ src/qemu/libvirtd_qemu.aug | 5 +++++ src/qemu/qemu.conf | 31 +++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 18 ++++++++++++------ src/qemu/qemu_conf.c | 20 ++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_process.c | 1 + src/qemu/test_libvirtd_qemu.aug.in | 2 ++ src/util/vircommand.c | 14 ++++++++++++++ src/util/vircommand.h | 1 + src/util/virprocess.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 1 + tests/qemuxml2argvtest.c | 4 ++++ 13 files changed, 131 insertions(+), 6 deletions(-) -- 2.7.4

3 6

[libvirt] [PATCH] Prefix major/minor with gnu_dev_
by Michal Privoznik 06 Sep '16

06 Sep '16

In the latest glibc, major() and minor() functions are marked as deprecated (glibc commit dbab6577): CC util/libvirt_util_la-vircgroup.lo util/vircgroup.c: In function 'virCgroupGetBlockDevString': util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated: In the GNU C Library, `major' is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use `major', include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro `major', you should #undef it after including <sys/types.h>. [-Werror=deprecated-declarations] if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) ^~ In file included from /usr/include/features.h:397:0, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:28, from ../gnulib/lib/stdio.h:43, from util/vircgroup.c:26: /usr/include/sys/sysmacros.h:87:1: note: declared here __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL) ^ Applications are supposed to use gnu_dev_major() or gnu_dev_minor() respectively. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_audit.c | 4 ++-- src/lxc/lxc_controller.c | 10 +++++----- src/lxc/lxc_driver.c | 26 +++++++++++++------------- src/util/vircgroup.c | 10 +++++----- src/util/virutil.c | 6 +++--- tests/vircgroupmock.c | 16 ++++++++-------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac..d0bfa58 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -52,8 +52,8 @@ virDomainAuditGetRdev(const char *path) if (stat(path, &sb) == 0 && (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { - int maj = major(sb.st_rdev); - int min = minor(sb.st_rdev); + int maj = gnu_dev_major(sb.st_rdev); + int min = gnu_dev_minor(sb.st_rdev); ignore_value(virAsprintfQuiet(&ret, "%02X:%02X", maj, min)); } return ret; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 825b4d4..3bf7eb2 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1520,7 +1520,7 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) LXC_STATE_DIR, ctrl->def->name, devs[i].path) < 0) goto cleanup; - dev_t dev = makedev(devs[i].maj, devs[i].min); + dev_t dev = gnu_dev_makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || chmod(path, devs[i].mode)) { virReportSystemError(errno, @@ -1592,7 +1592,7 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, } VIR_DEBUG("Creating dev %s (%d,%d)", - dstfile, major(sb.st_rdev), minor(sb.st_rdev)); + dstfile, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dstfile, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1672,7 +1672,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, mode = 0700 | S_IFBLK; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1751,7 +1751,7 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, mode = 0700 | S_IFCHR; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1911,7 +1911,7 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d) from %s", - dst, major(sb.st_rdev), minor(sb.st_rdev), tmpsrc); + dst, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev), tmpsrc); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da98b38..3fe79fd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3714,7 +3714,7 @@ lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d)", - data->file, major(data->dev), minor(data->dev)); + data->file, gnu_dev_major(data->dev), gnu_dev_minor(data->dev)); if (mknod(data->file, data->mode, data->dev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -3895,8 +3895,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) goto cleanup; @@ -3915,8 +3915,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, file) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) VIR_WARN("cannot deny device %s for domain %s", src, vm->def->name); @@ -4152,8 +4152,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4165,8 +4165,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, def->source.caps.u.storage.block) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); @@ -4221,8 +4221,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4237,8 +4237,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, def->source.caps.u.misc.chardev) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f2477d5..f4f6a01 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -765,7 +765,7 @@ virCgroupGetBlockDevString(const char *path) /* Automatically append space after the string since all callers * use it anyway */ - if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) + if (virAsprintf(&ret, "%d:%d ", gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)) < 0) return NULL; return ret; @@ -2941,8 +2941,8 @@ virCgroupAllowDevicePath(virCgroupPtr group, return virCgroupAllowDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } @@ -3032,8 +3032,8 @@ virCgroupDenyDevicePath(virCgroupPtr group, return virCgroupDenyDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..b0770bc 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1616,7 +1616,7 @@ virIsDevMapperDevice(const char *dev_name) if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && - dm_is_dm_major(major(buf.st_rdev))) + dm_is_dm_major(gnu_dev_major(buf.st_rdev))) return true; return false; @@ -1664,9 +1664,9 @@ virGetDeviceID(const char *path, int *maj, int *min) return -EINVAL; if (maj) - *maj = major(sb.st_rdev); + *maj = gnu_dev_major(sb.st_rdev); if (min) - *min = minor(sb.st_rdev); + *min = gnu_dev_minor(sb.st_rdev); return 0; } diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index ce6fd46..8f69047 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -562,11 +562,11 @@ int __lxstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___lxstat(ver, path, sb); @@ -593,11 +593,11 @@ int lstat(const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real_lstat(path, sb); @@ -624,11 +624,11 @@ int __xstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___xstat(ver, path, sb); @@ -661,11 +661,11 @@ int stat(const char *path, struct stat *sb) } } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { if (!(newpath = strdup(path))) -- 2.8.4

3 2