- Devel - libvirt List Archives

[libvirt] logging: how about adding a ProcessName field in logging file?
by zhang bo 13 Mar '15

13 Mar '15

Suppose there are 3 or more clients of libvirt: 1)nova 2)bash virsh commands 3)user customized ELF 4)etc.... The env LIBVIRT_DEBUG and LIBVIRT_LOG_OUTPUTS affects all of these clients, thus, they will all accumulate the logs into *ONE* file set by LIBVIRT_LOG_OUTPUTS. eg: [2015-03-07 00:33:30]: 103674: info : virDomainShutdown:3242 : enter virDomainShutdown domainname=VMName [2015-03-07 00:33:41]: 103674: info : virDomainShutdown:3253 : domain VMName shutted down [2015-03-13 00:53:44]: 5073: info : libvirt version: 1.2.7 [2015-03-13 00:53:44]: 5034: info : libvirt version: 1.2.7 [2015-03-13 00:53:44]: 5073: error : virNetSocketReadWire:1475 : End of file while reading data: Input/output error note: 103674: bash virsh command 5037: nova if we don't know that 103674 is just a virsh command, and suspect that it's nova, time would be wasted to find out who's the criminal. The improved log would be: [2015-03-07 00:33:30]: virsh: 103674: info : virDomainShutdown:3242 : enter virDomainShutdown domainname=VMName [2015-03-07 00:33:41]: virsh: 103674: info : virDomainShutdown:3253 : domain VMName shutted down [2015-03-13 00:53:44]: nova: 5073: info : libvirt version: 1.2.7 [2015-03-13 00:53:44]: myProc1: 5034: info : libvirt version: 1.2.7 [2015-03-13 00:53:44]: nova: error : virNetSocketReadWire:1475 : End of file while reading data: Input/output error So, here's the qeustion: Is it neccssary to add a ProcessName field in the logging file? if so, I'd like to apply a patch for this. thank you in advance.

2 2

[libvirt] Should logging in the library set its default outputs?
by zhang bo 13 Mar '15

13 Mar '15

If the env LIBVIRT_DEBUG and LIBVIRT_LOG_OUTPUTS are not set, the logging in the library would not log into any file. So: Is it necessary to set the default level and outputs in virGlobalInit(), just in case the maintainer forgets to set the ENVs ? Thanks in advance.

1 0

[libvirt] [libvirt-test-API][PATCH V2 0/2] Add connection_getAllDomainStats test case
by jiahu 13 Mar '15

13 Mar '15

The testing case will validate the getAllDomainStats API in class virConnect V2: Added new domainListGetStats API in this case jiahu (2): Add connection_getAllDomainStats test case to linux_domain.conf Add connection_getAllDomainStats test case cases/linux_domain.conf | 14 + repos/virconn/connection_getAllDomainStats.py | 549 ++++++++++++++++++++++++++ 2 files changed, 563 insertions(+) create mode 100644 repos/virconn/connection_getAllDomainStats.py -- 1.8.1.4

2 3

[libvirt] [PATCH] parallels: fix prlsdkCheckUnsupportedParams checks
by Maxim Nestratov 13 Mar '15

13 Mar '15

for memory limits since unset ones are no longer zero Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_sdk.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index a775348..4c90a18 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -1791,10 +1791,10 @@ prlsdkCheckUnsupportedParams(PRL_HANDLE sdkdom, virDomainDefPtr def) } if (def->mem.nhugepages || - def->mem.hard_limit || - def->mem.soft_limit || + virMemoryLimitIsSet(def->mem.hard_limit) || + virMemoryLimitIsSet(def->mem.soft_limit) || def->mem.min_guarantee || - def->mem.swap_hard_limit) { + virMemoryLimitIsSet(def->mem.swap_hard_limit)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory parameter is not supported " -- 1.7.1

2 2

[libvirt] [PATCH v5 for-2.3 4/4] migration: Expose 'cancelling' status to user
by zhanghailiang 13 Mar '15

13 Mar '15

'cancelling' status was introduced by commit 51cf4c1a, mainly to avoid a possible start of a new migration process while the previous one still exists. But we didn't expose this status to user, instead we returned the 'active' state. Here, we expose it to the user (such as libvirt), 'cancelling' status only occurs for a short window before the migration aborts, so for users, if they cancel a migration process, it will observe 'cancelling' status occasionally. Testing revealed that with older libvirt (anything 1.2.13 or less) will print an odd error message if the state is seen, but that the migration is still properly cancelled. Newer libvirt will be patched to recognize the new state without the odd error message. Signed-off-by: zhanghailiang <zhang.zhanghailiang(a)huawei.com> Reviewed-by: Eric Blake <eblake(a)redhat.com> Cc: libvir-list(a)redhat.com --- migration/migration.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 035e005..a57928d 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -179,13 +179,11 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_SETUP: info->has_status = true; - info->status = MIGRATION_STATUS_SETUP; info->has_total_time = false; break; case MIGRATION_STATUS_ACTIVE: case MIGRATION_STATUS_CANCELLING: info->has_status = true; - info->status = MIGRATION_STATUS_ACTIVE; info->has_total_time = true; info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) - s->total_time; @@ -221,7 +219,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) get_xbzrle_cache_stats(info); info->has_status = true; - info->status = MIGRATION_STATUS_COMPLETED; info->has_total_time = true; info->total_time = s->total_time; info->has_downtime = true; @@ -243,13 +240,12 @@ MigrationInfo *qmp_query_migrate(Error **errp) break; case MIGRATION_STATUS_FAILED: info->has_status = true; - info->status = MIGRATION_STATUS_FAILED; break; case MIGRATION_STATUS_CANCELLED: info->has_status = true; - info->status = MIGRATION_STATUS_CANCELLED; break; } + info->status = s->state; return info; } -- 1.7.12.4

1 0

[libvirt] [libvirt-test-API][PATCH 0/2] Add coredump_with_format test case
by jiahu 13 Mar '15

13 Mar '15

The coredump_with_format.py uses coreDumpWithFormat() to validate new API virDomainCoreDumpWithFormat of libvirt. jiahu (2): Add coredump_with_format test case Add coredump_with_format test case to linux_domain conf cases/linux_domain.conf | 44 +++++++ repos/domain/coredump_with_format.py | 239 +++++++++++++++++++++++++++++++++++ 2 files changed, 283 insertions(+) create mode 100644 repos/domain/coredump_with_format.py -- 1.8.3.1

2 3

[libvirt] [PATCH] qemu: read backing chain names from qemu
by Eric Blake 12 Mar '15

12 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1199182 documents that after a series of disk snapshots into existing destination images, followed by active commits of the top image, it is possible for qemu 2.2 and earlier to end up tracking a different name for the image than what it would have had when opening the chain afresh. That is, when starting with the chain 'a <- b <- c', the name associated with 'b' is how it was spelled in the metadata of 'c', but when starting with 'a', taking two snapshots into 'a <- b <- c', then committing 'c' back into 'b', the name associated with 'b' is now the name used when taking the first snapshot. Sadly, older qemu doesn't know how to treat different spellings of the same filename as identical files (it uses strcmp() instead of checking for the same inode), which means libvirt's attempt to commit an image using solely the names learned from qcow2 metadata fails with a cryptic: error: internal error: unable to execute QEMU command 'block-commit': Top image file /tmp/images/c/../b/b not found even though the file exists. Trying to teach libvirt the rules on which name qemu will expect is not worth the effort (besides, we'd have to remember it across libvirtd restarts, and track whether a file was opened via metadata or via snapshot creation for a given qemu process); it is easier to just always directly ask qemu what string it expects to see in the first place. * src/qemu/qemu_monitor.h (qemuMonitorDiskNameLookup): New prototype. * src/qemu/qemu_monitor_json.h (qemuMonitorJSONDiskNameLookup): Likewise. * src/qemu/qemu_monitor.c (qemuMonitorDiskNameLookup): New function. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskNameLookup) (qemuMonitorJSONDiskNameLookupOne): Likewise. * src/qemu/qemu_driver.c (qemuDomainBlockCommit) (qemuDomainBlockJobImpl): Use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Adam, since you reported the issue, let me know if you need a scratch binary to test this patch on. Jeff, thanks for the idea on how to solve the problem without touching qemu (of course, it would still be nice to teach qemu to respect inode equivalence rather than relying on streq, and even nicer for libvirt to use node names instead of file names, but those can be later patches without holding up VDSM now). src/qemu/qemu_driver.c | 28 +++++++------- src/qemu/qemu_monitor.c | 20 +++++++++- src/qemu/qemu_monitor.h | 8 +++- src/qemu/qemu_monitor_json.c | 87 +++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor_json.h | 9 ++++- 5 files changed, 134 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 51b30b7..e540001 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15932,9 +15932,6 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, goto endjob; if (baseSource) { - if (qemuGetDriveSourceString(baseSource, NULL, &basePath) < 0) - goto endjob; - if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -15972,8 +15969,12 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorBlockJob(priv->mon, device, basePath, backingPath, - speed, mode, async); + if (baseSource) + basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src, + baseSource); + if (!baseSource || basePath) + ret = qemuMonitorBlockJob(priv->mon, device, basePath, backingPath, + speed, mode, async); if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -1; if (ret < 0) { @@ -16703,12 +16704,6 @@ qemuDomainBlockCommit(virDomainPtr dom, VIR_DISK_CHAIN_READ_WRITE) < 0)) goto endjob; - if (qemuGetDriveSourceString(topSource, NULL, &topPath) < 0) - goto endjob; - - if (qemuGetDriveSourceString(baseSource, NULL, &basePath) < 0) - goto endjob; - if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE && topSource != disk->src) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) { @@ -16739,9 +16734,14 @@ qemuDomainBlockCommit(virDomainPtr dom, disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT; } qemuDomainObjEnterMonitor(driver, vm); - ret = qemuMonitorBlockCommit(priv->mon, device, - topPath, basePath, backingPath, - speed); + basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src, + baseSource); + topPath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src, + topSource); + if (basePath && topPath) + ret = qemuMonitorBlockCommit(priv->mon, device, + topPath, basePath, backingPath, + speed); if (qemuDomainObjExitMonitor(driver, vm) < 0) { ret = -1; goto endjob; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index d869a72..cf7dc5e 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1,7 +1,7 @@ /* * qemu_monitor.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3458,6 +3458,24 @@ qemuMonitorSupportsActiveCommit(qemuMonitorPtr mon) } +/* Determine the name that qemu is using for tracking the backing + * element TARGET within the chain starting at TOP. */ +char * +qemuMonitorDiskNameLookup(qemuMonitorPtr mon, + const char *device, + virStorageSourcePtr top, + virStorageSourcePtr target) +{ + if (!mon->json) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return NULL; + } + + return qemuMonitorJSONDiskNameLookup(mon, device, top, target); +} + + /* Use the block-job-complete monitor command to pivot a block copy * job. */ int diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index b30da34..e67d800 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1,7 +1,7 @@ /* * qemu_monitor.h: interaction with QEMU monitor console * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -734,6 +734,12 @@ int qemuMonitorBlockCommit(qemuMonitorPtr mon, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); bool qemuMonitorSupportsActiveCommit(qemuMonitorPtr mon); +char *qemuMonitorDiskNameLookup(qemuMonitorPtr mon, + const char *device, + virStorageSourcePtr top, + virStorageSourcePtr target) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4); int qemuMonitorArbitraryCommand(qemuMonitorPtr mon, const char *cmd, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c16f3ca..7759365 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1,7 +1,7 @@ /* * qemu_monitor_json.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3883,6 +3883,91 @@ qemuMonitorJSONDrivePivot(qemuMonitorPtr mon, const char *device, } +static char * +qemuMonitorJSONDiskNameLookupOne(virJSONValuePtr image, + virStorageSourcePtr top, + virStorageSourcePtr target) +{ + virJSONValuePtr backing; + char *ret; + + if (!top) + return NULL; + if (top != target) { + backing = virJSONValueObjectGet(image, "backing-image"); + return qemuMonitorJSONDiskNameLookupOne(backing, top->backingStore, + target); + } + ignore_value(VIR_STRDUP(ret, + virJSONValueObjectGetString(image, "filename"))); + return ret; +} + + +char * +qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon, + const char *device, + virStorageSourcePtr top, + virStorageSourcePtr target) +{ + char *ret = NULL; + virJSONValuePtr cmd = NULL; + virJSONValuePtr reply = NULL; + virJSONValuePtr devices; + size_t i; + + cmd = qemuMonitorJSONMakeCommand("query-block", NULL); + if (!cmd) + return NULL; + if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) + goto cleanup; + + devices = virJSONValueObjectGet(reply, "return"); + if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info reply was missing device list")); + goto cleanup; + } + + for (i = 0; i < virJSONValueArraySize(devices); i++) { + virJSONValuePtr dev = virJSONValueArrayGet(devices, i); + virJSONValuePtr inserted; + virJSONValuePtr image; + const char *thisdev; + + if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info device entry was not in expected format")); + goto cleanup; + } + + if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("block info device entry was not in expected format")); + goto cleanup; + } + + if (STRNEQ(thisdev, device) || + !(inserted = virJSONValueObjectGet(dev, "inserted")) || + !(image = virJSONValueObjectGet(inserted, "image"))) { + continue; + } + ret = qemuMonitorJSONDiskNameLookupOne(image, top, target); + break; + } + if (!ret) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to find backing name for device %s"), + device); + + cleanup: + virJSONValueFree(cmd); + virJSONValueFree(reply); + + return ret; +} + + int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, char **reply_str, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 8ceea8a..49392b6 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -1,7 +1,7 @@ /* * qemu_monitor_json.h: interaction with QEMU monitor console * - * Copyright (C) 2006-2009, 2011-2014 Red Hat, Inc. + * Copyright (C) 2006-2009, 2011-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -277,6 +277,13 @@ int qemuMonitorJSONBlockCommit(qemuMonitorPtr mon, unsigned long long bandwidth) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +char *qemuMonitorJSONDiskNameLookup(qemuMonitorPtr mon, + const char *device, + virStorageSourcePtr top, + virStorageSourcePtr target) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) + ATTRIBUTE_NONNULL(4); + int qemuMonitorJSONArbitraryCommand(qemuMonitorPtr mon, const char *cmd_str, char **reply_str, -- 2.1.0

3 5

[libvirt] [PATCH] vmx: add e1000e to supported NIC models.
by Dawid Zamirski 12 Mar '15

12 Mar '15

From: Dawid Zamirski <dzamirski(a)dattobackup.com> This NIC model is supported on hardware version 8 and newer and libvirt ESX driver does support those. --- src/vmx/vmx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index ac2542a..fe6b883 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2536,10 +2536,11 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def) if (STRCASENEQ(virtualDev, "vlance") && STRCASENEQ(virtualDev, "vmxnet") && STRCASENEQ(virtualDev, "vmxnet3") && - STRCASENEQ(virtualDev, "e1000")) { + STRCASENEQ(virtualDev, "e1000") && + STRCASENEQ(virtualDev, "e1000e")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'vmxnet3' or 'e1000' but found '%s'"), virtualDev_name, + "'vmxnet3' or 'e1000e' or 'e1000e' but found '%s'"), virtualDev_name, virtualDev); goto cleanup; } @@ -3592,11 +3593,12 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller, STRCASENEQ(def->model, "vmxnet") && STRCASENEQ(def->model, "vmxnet2") && STRCASENEQ(def->model, "vmxnet3") && - STRCASENEQ(def->model, "e1000")) { + STRCASENEQ(def->model, "e1000") && + STRCASENEQ(def->model, "e1000e")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting domain XML entry 'devices/interface/model' " "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' " - "or 'e1000' but found '%s'"), def->model); + "or 'e1000' or 'e1000e' but found '%s'"), def->model); return -1; } -- 2.1.0

2 1

[libvirt] [PATCH] vbox: use user cache dir when screenshotting.
by Dawid Zamirski 12 Mar '15

12 Mar '15

For VBOX it's most likely that the connection is vbox:///session and it runs with local non-root account. This caused permission denied when LOCALSTATEDIR was used to create temp file. This patch makes use of the virGetUserCacheDirectory to address this problem for non-root users. --- src/vbox/vbox_common.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 55d3624..a548252 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7254,8 +7254,10 @@ vboxDomainScreenshot(virDomainPtr dom, IMachine *machine = NULL; nsresult rc; char *tmp; + char *cacheDir; int tmp_fd = -1; unsigned int max_screen; + uid_t uid = geteuid(); char *ret = NULL; if (!data->vboxObj) @@ -7288,8 +7290,18 @@ vboxDomainScreenshot(virDomainPtr dom, return NULL; } - if (virAsprintf(&tmp, "%s/cache/libvirt/vbox.screendump.XXXXXX", LOCALSTATEDIR) < 0) { + if (uid != 0) + cacheDir = virGetUserCacheDirectory(); + else { + if (virAsprintf(&cacheDir, "%s/cache/libvirt", LOCALSTATEDIR) < 0) { + VBOX_RELEASE(machine); + return NULL; + } + } + + if (cacheDir && virAsprintf(&tmp, "%s/vbox.screendump.XXXXXX", cacheDir) < 0) { VBOX_RELEASE(machine); + VIR_FREE(cacheDir); return NULL; } @@ -7368,6 +7380,7 @@ vboxDomainScreenshot(virDomainPtr dom, VIR_FORCE_CLOSE(tmp_fd); unlink(tmp); VIR_FREE(tmp); + VIR_FREE(cacheDir); VBOX_RELEASE(machine); vboxIIDUnalloc(&iid); return ret; -- 2.1.0

2 1

[libvirt] [PATCH v2] virnetdev: fix build with old kernel
by Pavel Hrdina 12 Mar '15

12 Mar '15

Commit c9027d8f added a detection of NIC HW features, but some of them are not available in old kernel. Very old kernels lack enum ethtool_flags and even if this enum is present, not all values are available for all kernels. To be sure that we have everything in kernel that we need, we must check for existence of most of that flags, because only few of them were defined at first. Also to successfully build libvirt with older kernel we need to include <linux/types.h> before <linux/ethtool.h> to have __u32 and friends defined. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- configure.ac | 5 +++++ src/util/virnetdev.c | 43 +++++++++++++++++++++++++++---------------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index e071813..2fedd1a 100644 --- a/configure.ac +++ b/configure.ac @@ -383,6 +383,11 @@ AC_CHECK_TYPE([struct ifreq], #include <net/if.h> ]]) +AC_CHECK_DECLS([ETH_FLAG_TXVLAN, ETH_FLAG_NTUPLE, ETH_FLAG_RXHASH, ETH_FLAG_LRO, + ETHTOOL_GGSO, ETHTOOL_GGRO, ETHTOOL_GFLAGS], + [], [], [[#include <linux/ethtool.h> + ]]) + dnl Our only use of libtasn1.h is in the testsuite, and can be skipped dnl if the header is not present. Assume -ltasn1 is present if the dnl header could be found. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 971db43..093c99c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -48,6 +48,7 @@ #endif #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) +# include <linux/types.h> # include <linux/ethtool.h> #endif @@ -2800,9 +2801,7 @@ int virNetDevGetFeatures(const char *ifname, virBitmapPtr *out) { - int ret = -1; size_t i = -1; - size_t j = -1; struct ethtool_value cmd = { 0 }; struct elem{ @@ -2815,20 +2814,16 @@ virNetDevGetFeatures(const char *ifname, {ETHTOOL_GTXCSUM, VIR_NET_DEV_FEAT_GTXCSUM}, {ETHTOOL_GSG, VIR_NET_DEV_FEAT_GSG}, {ETHTOOL_GTSO, VIR_NET_DEV_FEAT_GTSO}, +# if HAVE_DECL_ETHTOOL_GGSO {ETHTOOL_GGSO, VIR_NET_DEV_FEAT_GGSO}, +# endif +# if HAVE_DECL_ETHTOOL_GGRO {ETHTOOL_GGRO, VIR_NET_DEV_FEAT_GGRO}, - }; - /* ethtool masks */ - struct elem flags[] = { - {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO}, - {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN}, - {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN}, - {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE}, - {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH}, +# endif }; if (!(*out = virBitmapNew(VIR_NET_DEV_FEAT_LAST))) - goto cleanup; + return -1; for (i = 0; i < ARRAY_CARDINALITY(cmds); i++) { cmd.cmd = cmds[i].cmd; @@ -2836,6 +2831,25 @@ virNetDevGetFeatures(const char *ifname, ignore_value(virBitmapSetBit(*out, cmds[i].feat)); } +# if HAVE_DECL_ETHTOOL_GFLAGS + size_t j = -1; + /* ethtool masks */ + struct elem flags[] = { +# if HAVE_DECL_ETH_FLAG_LRO + {ETH_FLAG_LRO, VIR_NET_DEV_FEAT_LRO}, +# endif +# if HAVE_DECL_ETH_FLAG_TXVLAN + {ETH_FLAG_RXVLAN, VIR_NET_DEV_FEAT_RXVLAN}, + {ETH_FLAG_TXVLAN, VIR_NET_DEV_FEAT_TXVLAN}, +# endif +# if HAVE_DECL_ETH_FLAG_NTUBLE + {ETH_FLAG_NTUPLE, VIR_NET_DEV_FEAT_NTUPLE}, +# endif +# if HAVE_DECL_ETH_FLAG_RXHASH + {ETH_FLAG_RXHASH, VIR_NET_DEV_FEAT_RXHASH}, +# endif + }; + cmd.cmd = ETHTOOL_GFLAGS; if (virNetDevFeatureAvailable(ifname, &cmd)) { for (j = 0; j < ARRAY_CARDINALITY(flags); j++) { @@ -2843,12 +2857,9 @@ virNetDevGetFeatures(const char *ifname, ignore_value(virBitmapSetBit(*out, flags[j].feat)); } } +# endif - ret = 0; - cleanup: - - return ret; - + return 0; } #else int -- 2.0.5

2 2