- Devel - libvirt List Archives

Re: [libvirt] Close the BlockDriverState when guest eject the media
by Weidong Huang 27 Oct '14

27 Oct '14

On 2014/10/20 19:39, Kevin Wolf wrote: > Am 20.10.2014 um 13:27 hat Weidong Huang geschrieben: >> On 2014/10/20 17:41, Kevin Wolf wrote: >> >>> Am 18.10.2014 um 12:02 hat Weidong Huang geschrieben: >>>> Hi ALL: >>>> >>>> There are two ways to eject the cdrom tray. One is by the eject's qmp commmand(eject_device). >>>> The another one is by the guest(bdrv_eject). They have different results. >>> >>> Yes, they are different things. >>> >>> If a guest opens the tray (using bdrv_eject) and then closes it again, >>> with no user interaction in between, the virtual media must still be in >>> the drive and the guest must be able to access the same image again. >>> Calling bdrv_close() in this case would be a bug. >>> >>> The goal of the monitor command "eject" on the other hand is to remove >>> the medium so that the drive is empty. That a device with a closed tray >>> has to be opened for this is only secondary. >> >> >> Thanks for your reply. >> >> There is a problem. >> >> 1. Qemu receive the "eject" command. >> 2. Runs "eject_request_cb" when an eject request is issued from the monitor, the tray >> is closed, and the medium is locked. But the drive is not closed. >> 3. Guest agree with opening tray and qemu will call bdrv_eject to complete. The drive is >> still not close. >> >> So the result of the monitor command "eject" is not to remove the medium in this situation. > > Now I understand, thanks for explaining. > > But I think libvirt can actually work correctly with what qemu offers > today. qemu returns an error if the medium cannot be removed with the > 'eject' command and it only sends an eject request to the guest. > > With this error, libvirt can know that the DEVICE_TRAY_MOVED event > doesn't mean that the medium has removed, but that it needs to issue > another 'eject' command. > > If this isn't implemented correctly in libvirt today, this needs a > libvirt fix rather than a qemu one. > hi all! How about fix it in libvirt? >>>> eject_device: close the BlockDriverState(bdrv_close(bs)) >>>> bdrv_eject: don't close the BlockDriverState, >>>> >>>> This is ambiguous. So libvirt can't handle some situations. >>>> >>>> libvirt send eject qmp command ---> qemu send eject request to guest ---> >>>> guest respond to qemu ---> qemu emit tray_open event to libvirt ---> >>>> libvirt will not send change qmp command if media source is null. So >>>> the media is not be replace to the null. >>> >>> What is the problem that libvirt has with the guest opening the tray? I >>> don't think libvirt should even care about that case. >> >> >> For example, using libvirt to change media by xml below(media source is null): >> <disk type='file' device='cdrom'> >> <driver name='qemu'/> >> <target dev='hdb' bus='ide'/> >> </disk> >> >> libivrt return ok. But media still is in the guest. >> This is confused. > > Kevin > > . >

4 3

[libvirt] [PATCHv4 0/3] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 26 Oct '14

26 Oct '14

1 3

[libvirt] [PATCH] util: eliminate "use after free" in callers of virNetDevLinkDump
by Laine Stump 26 Oct '14

26 Oct '14

virNetDevLinkDump() gets a message from netlink into "resp", then calls nlmsg_parse() to fill the table "tb" with pointers into resp. It then returns tb to its caller, but not before freeing the buffer at resp. That means that all the callers of virNetDevLinkDump() are examining memory that has already been freed. This can be verified by filling the buffer at resp with garbage prior to freeing it (or, I suppose, just running libvirtd under valgrind) then performing some operation that calls virNetDevLinkDump(). The code has been like this ever since virNetDevLinkDump() was written - the original author didn't notice it, and neither did later additional users of the function. It has only been pure luck (or maybe a lack of heavy load, and/or maybe an allocation algorithm in malloc() that delays re-use of just-freed memory) that has kept this from causing errors, for example when configuring a PCI passthrough or macvtap passthrough network interface. The solution taken in this patch is the simplest - just return resp to the caller along with tb, then have the caller free it after they are finished using the data (pointers) in tb. I alternately could have made a cleaner interface by creating a new struct that put tb and resp together along with a vir*Free() function for it, but this function is only used in a couple places, and I'm not sure there will be additional new uses of virNetDevLinkDump(), so the value of adding a new type, extra APIs, etc. is dubious. --- src/util/virnetdev.c | 26 +++++++++++++++++--------- src/util/virnetdev.h | 2 +- src/util/virnetdevvportprofile.c | 17 ++++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index db5623a..c22a0e6 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1353,23 +1353,25 @@ static struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = { /** * virNetDevLinkDump: * - * @ifname: The name of the interface; only use if ifindex < 0 - * @ifindex: The interface index; may be < 0 if ifname is given - * @nlattr: pointer to a pointer of netlink attributes that will contain - * the results + * @ifname: The name of the interface; only use if ifindex <= 0 + * @ifindex: The interface index; may be <= 0 if ifname is given + * @data: Gets a pointer to the raw data from netlink. + MUST BE FREED BY CALLER! + * @nlattr: Pointer to a pointer of netlink attributes that will contain + * the results * @src_pid: pid used for nl_pid of the local end of the netlink message * (0 == "use getpid()") * @dst_pid: pid of destination nl_pid if the kernel * is not the target of the netlink message but it is to be * sent to another process (0 if sending to the kernel) * - * Get information about an interface given its name or index. + * Get information from netlink about an interface given its name or index. * * Returns 0 on success, -1 on fatal error. */ int virNetDevLinkDump(const char *ifname, int ifindex, - struct nlattr **tb, + void **nlData, struct nlattr **tb, uint32_t src_pid, uint32_t dst_pid) { int rc = -1; @@ -1451,7 +1453,9 @@ virNetDevLinkDump(const char *ifname, int ifindex, rc = 0; cleanup: nlmsg_free(nl_msg); - VIR_FREE(resp); + if (rc < 0) + VIR_FREE(resp); + *nlData = resp; return rc; malformed_resp: @@ -1647,15 +1651,18 @@ virNetDevGetVfConfig(const char *ifname, int vf, virMacAddrPtr mac, int *vlanid) { int rc = -1; + void *nlData = NULL; struct nlattr *tb[IFLA_MAX + 1] = {NULL, }; int ifindex = -1; - rc = virNetDevLinkDump(ifname, ifindex, tb, 0, 0); + rc = virNetDevLinkDump(ifname, ifindex, &nlData, tb, 0, 0); if (rc < 0) - return rc; + goto cleanup; rc = virNetDevParseVfConfig(tb, vf, mac, vlanid); + cleanup: + VIR_FREE(nlData); return rc; } @@ -1798,6 +1805,7 @@ virNetDevRestoreNetConfig(const char *linkdev, int vf, const char *stateDir) int virNetDevLinkDump(const char *ifname ATTRIBUTE_UNUSED, int ifindex ATTRIBUTE_UNUSED, + void **nlData ATTRIBUTE_UNUSED, struct nlattr **tb ATTRIBUTE_UNUSED, uint32_t src_pid ATTRIBUTE_UNUSED, uint32_t dst_pid ATTRIBUTE_UNUSED) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 2a6e67d..5c463ef 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -166,7 +166,7 @@ int virNetDevGetVirtualFunctions(const char *pfname, ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; int virNetDevLinkDump(const char *ifname, int ifindex, - struct nlattr **tb, + void **nlData, struct nlattr **tb, uint32_t src_pid, uint32_t dst_pid) ATTRIBUTE_RETURN_CHECK; diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 75679b0..6ee20d3 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -787,7 +787,8 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int int *parent_ifindex, char *parent_ifname, unsigned int *nth) { - int rc; + int rc = -1; + void *nlData = NULL; struct nlattr *tb[IFLA_MAX + 1] = { NULL, }; bool end = false; size_t i = 0; @@ -798,7 +799,8 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int return -1; while (!end && i <= nthParent) { - rc = virNetDevLinkDump(ifname, ifindex, tb, 0, 0); + VIR_FREE(nlData); + rc = virNetDevLinkDump(ifname, ifindex, &nlData, tb, 0, 0); if (rc < 0) break; @@ -807,7 +809,8 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int IFNAMSIZ)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("buffer for root interface name is too small")); - return -1; + rc = -1; + goto cleanup; } *parent_ifindex = ifindex; } @@ -824,6 +827,8 @@ virNetDevVPortProfileGetNthParent(const char *ifname, int ifindex, unsigned int *nth = i - 1; + cleanup: + VIR_FREE(nlData); return rc; } @@ -845,6 +850,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex, int rc; int src_pid = 0; uint32_t dst_pid = 0; + void *nlData = NULL; struct nlattr *tb[IFLA_MAX + 1] = { NULL, }; int repeats = STATUS_POLL_TIMEOUT_USEC / STATUS_POLL_INTERVL_USEC; uint16_t status = 0; @@ -877,7 +883,8 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex, } while (--repeats >= 0) { - rc = virNetDevLinkDump(NULL, ifindex, tb, src_pid, dst_pid); + VIR_FREE(nlData); + rc = virNetDevLinkDump(NULL, ifindex, &nlData, tb, src_pid, dst_pid); if (rc < 0) goto cleanup; @@ -909,7 +916,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int ifindex, } cleanup: - + VIR_FREE(nlData); return rc; } -- 1.9.3

2 2

[libvirt] [PATCH v2] tests: Adding SELINUX_LIBS to fix viridentitytest linker bug.
by Julio Faracco 25 Oct '14

25 Oct '14

In a clean build system (Ubuntu 14.04), the viridentitytest failed to compile. Even if all the SELINUX libraries and depedencies are installed. See the error message below: [...] CC viridentitytest.o CCLD viridentitytest /usr/bin/ld: viridentitytest.o: undefined reference to symbol 'security_disable' //lib/x86_64-linux-gnu/libselinux.so.1: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status make: *** [viridentitytest] Error 1 Simply adding the variable SELINUX_LIBS in viridentitytest rules of Makefile.am to include SELINUX libraries into viridentitytest solved that compilation issue. A conditional was added to consider when libvirt is using or not SELINUX. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- tests/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4c3d4ef..363c902 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -926,11 +926,13 @@ virstoragetest_LDADD = $(LDADDS) \ viridentitytest_SOURCES = \ viridentitytest.c testutils.h testutils.c -viridentitytest_LDADD = $(LDADDS) if WITH_SELINUX +viridentitytest_LDADD = $(LDADDS) $(SELINUX_LIBS) viridentitytest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la -endif WITH_SELINUX +else ! WITH_SELINUX +viridentitytest_LDADD = $(LDADDS) +endif ! WITH_SELINUX viriscsitest_SOURCES = \ viriscsitest.c testutils.h testutils.c -- 1.9.1

2 3

[libvirt] [PATCH] qemu: add capability probing for block-stream
by Shanzhi Yu 24 Oct '14

24 Oct '14

Since block-stream is not supported on qemu-kvm, so libvirt should post more accurate error info when do blockpull with qemu-kvm but not "Command 'block-stream' is not found" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1140981 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 13 +++++-------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 81ada48..5674f4f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -269,6 +269,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "splash-timeout", /* 175 */ "iothread", + "block-stream", ); @@ -1426,6 +1427,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-spice", QEMU_CAPS_SPICE }, { "query-kvm", QEMU_CAPS_KVM }, { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, + { "block-stream", QEMU_CAPS_BLOCK_STREAM }, { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0980c00..6701965 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -216,6 +216,7 @@ typedef enum { QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ QEMU_CAPS_SPLASH_TIMEOUT = 175, /* -boot splash-time */ QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ + QEMU_CAPS_BLOCK_STREAM = 177, /* block-stream */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 73edda3..b38bc91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14980,15 +14980,12 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("block jobs not supported with this QEMU binary")); goto cleanup; - } else if (base) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("partial block pull not supported with this " - "QEMU binary")); - goto cleanup; - } else if (mode == BLOCK_JOB_PULL && bandwidth) { + } + + if (mode == BLOCK_JOB_PULL && + !(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_STREAM))){ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting bandwidth at start of block pull not " - "supported with this QEMU binary")); + _("block pull is not supported with this QEMU binary")); goto cleanup; } -- 1.8.3.1

2 3

[libvirt] [PATCH] vbox: network: make sure driver not be NULL in virRegisterNetworkDriver
by Shanzhi Yu 24 Oct '14

24 Oct '14

libvirtd will report below error if does not make sure driver not be NULL in virRegisterNetworkDriver $ libvirtd 2014-10-24 09:24:36.443+0000: 28876: info : libvirt version: 1.2.10 2014-10-24 09:24:36.443+0000: 28876: error : virRegisterNetworkDriver:549 : driver in virRegisterNetworkDriver must not be NULL 2014-10-24 09:24:36.443+0000: 28876: error : virDriverLoadModule:99 : Failed module registration vboxNetworkRegister Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/vbox/vbox_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 743a488..ff69069 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -152,7 +152,7 @@ int vboxNetworkRegister(void) if (VBoxCGlueInit(&uVersion) == 0) networkDriver = vboxGetNetworkDriver(uVersion); - if (virRegisterNetworkDriver(networkDriver) < 0) + if ((networkDriver != NULL) && (virRegisterNetworkDriver(networkDriver) < 0)) return -1; return 0; } -- 1.9.3

3 4

[libvirt] [PATCHv3] qemu: NUMA/network tuning shouldn't be supported in session mode
by Erik Skultety 24 Oct '14

24 Oct '14

Tuning NUMA or network interface parameters require root privileges to manage cgroups, thus an attempt to set some of these parameters in session mode on a running domain should be invalid followed by an error. As an example might be memory tuning which raises an error in such case. Following behavior in session mode will be present after applying this patch: Tuning | SET | GET | ----------|---------------|--------| NUMA | shut off only | always | Memory | never | never | Interface | never | always | Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1126762 --- src/qemu/qemu_command.c | 13 ++++++++++++- src/qemu/qemu_driver.c | 35 +++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eb72451..4c335dc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7671,7 +7671,7 @@ qemuBuildCommandLine(virConnectPtr conn, emulator = def->emulator; if (!cfg->privileged) { - /* If we have no cgroups than we can have no tunings that + /* If we have no cgroups then we can have no tunings that * require them */ if (def->mem.hard_limit || def->mem.soft_limit || @@ -7694,6 +7694,17 @@ qemuBuildCommandLine(virConnectPtr conn, _("CPU tuning is not available in session mode")); goto error; } + + virDomainNetDefPtr *nets = def->nets; + virNetDevBandwidthPtr bandwidth = NULL; + size_t nnets = def->nnets; + for (i = 0; i < nnets; i++) { + if ((bandwidth = virDomainNetGetActualBandwidth(nets[i])) != NULL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto error; + } + } } for (i = 0; i < def->ngraphics; ++i) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6606154..c64d272 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8974,6 +8974,13 @@ qemuDomainSetNumaParameters(virDomainPtr dom, &persistentDef) < 0) goto cleanup; + if (!cfg->privileged && + flags & VIR_DOMAIN_AFFECT_LIVE) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto cleanup; + } + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -9058,6 +9065,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; + virQEMUDriverConfigPtr cfg = NULL; char *nodeset = NULL; int ret = -1; virCapsPtr caps = NULL; @@ -9076,6 +9084,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, return -1; priv = vm->privateData; + cfg = virQEMUDriverGetConfig(driver); if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -9093,14 +9102,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, goto cleanup; } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_MEMORY)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cgroup memory controller is not mounted")); - goto cleanup; - } - } - for (i = 0; i < QEMU_NB_NUMA_PARAM && i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; @@ -9123,9 +9124,16 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (!nodeset) goto cleanup; } else { - if (virCgroupGetCpusetMems(priv->cgroup, &nodeset) < 0) - goto cleanup; + if (!virCgroupHasController(priv->cgroup, + VIR_CGROUP_CONTROLLER_MEMORY) || + virCgroupGetCpusetMems(priv->cgroup, &nodeset) < 0) { + nodeset = virDomainNumatuneFormatNodeset(vm->def->numatune, + NULL, -1); + if (!nodeset) + goto cleanup; + } } + if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) goto cleanup; @@ -9150,6 +9158,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (vm) virObjectUnlock(vm); virObjectUnref(caps); + virObjectUnref(cfg); return ret; } @@ -10120,6 +10129,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, if (virDomainSetInterfaceParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; -- 1.9.3

3 3

[libvirt] [PATCH 00/12] Split up the libvirt.h.in file
by Daniel P. Berrange 24 Oct '14

24 Oct '14

Similar to the previous series, this splits up the libvirt.h.in header file to many pieces. This is backwards compatible as applications will continue to use the main <libvirt/libvirt.h> header and are forbidden from including the individual pieces (to allow us to change them again if we want to in the future). Daniel P. Berrange (12): Move virDomainSnapshot related APIs out of libvirt.h.in Move virNetwork related APIs out of libvirt.h.in Move virInterface related APIs out of libvirt.h.in Move virNWFilter related APIs out of libvirt.h.in Move virNodeDevice related APIs out of libvirt.h.in Move virSecret related APIs out of libvirt.h.in Move virStream related APIs out of libvirt.h.in Move virStoragePool/Vol related APIs out of libvirt.h.in Move virEvent related APIs out of libvirt.h.in Move virDomain related APIs out of libvirt.h.in Move virConnect related APIs out of libvirt.h.in Fix preprocessor indentation in libvirt.h.in cfg.mk | 4 +- docs/apibuild.py | 11 + include/libvirt/Makefile.am | 11 + include/libvirt/libvirt-domain-snapshot.h | 212 ++ include/libvirt/libvirt-domain.h | 3496 +++++++++++++++++ include/libvirt/libvirt-event.h | 190 + include/libvirt/libvirt-host.h | 892 +++++ include/libvirt/libvirt-interface.h | 110 + include/libvirt/libvirt-network.h | 337 ++ include/libvirt/libvirt-nodedev.h | 125 + include/libvirt/libvirt-nwfilter.h | 95 + include/libvirt/libvirt-secret.h | 113 + include/libvirt/libvirt-storage.h | 359 ++ include/libvirt/libvirt-stream.h | 152 + include/libvirt/libvirt.h.in | 5837 +---------------------------- 15 files changed, 6160 insertions(+), 5784 deletions(-) create mode 100644 include/libvirt/libvirt-domain-snapshot.h create mode 100644 include/libvirt/libvirt-domain.h create mode 100644 include/libvirt/libvirt-event.h create mode 100644 include/libvirt/libvirt-host.h create mode 100644 include/libvirt/libvirt-interface.h create mode 100644 include/libvirt/libvirt-network.h create mode 100644 include/libvirt/libvirt-nodedev.h create mode 100644 include/libvirt/libvirt-nwfilter.h create mode 100644 include/libvirt/libvirt-secret.h create mode 100644 include/libvirt/libvirt-storage.h create mode 100644 include/libvirt/libvirt-stream.h -- 2.1.0

2 25

[libvirt] [RFC] Add support for NIC offload discovery
by Chapman, James P 24 Oct '14

24 Oct '14

Currently libvirt provides lots of useful information on the HW capabilities of the host and its attached devices. I'm interested in extending the HW capability discovery of libvirt, to a point where it is capable of discovering the HW offload capabilities of host PCI devices. Take a NIC for example, this feature would enable libvirt discover the supported NIC offload features, csum, tso, etc. So where might a feature like this be used. Consider an Openstack deployment, a VM may have a workload that depends on specific NIC HW offload capabilities in order to stay within certain throughput, CPU utilisation or latency thresholds. For this scenario, it's important that the VM is placed on a host with PCI devices that provide the required NIC HW offload capabilities. If libvirt could provide this functionality, this information could be used during the VM scheduling phase when all nodes are evaluated for their suitability. >From what I understand, libvirt currently uses ioctl's to get the NIC state, MTU, etc. Could the ethtool ioctl framework be used to discover the HW offload features provided by the hosts network controllers. E.g. * ETHTOOL_GRXCSUM * ETHTOOL_GTXCSUM * ETHTOOL_GTSO * ETHTOOL_GFLAGS So I'm looking for your opinions on this feature proposal, does it make sense, is it already being worked on. Thanks James

2 1

[libvirt] [PATCH] Show also short-ids when calling --list-{os, platform}
by Fabiano Fidêncio 24 Oct '14

24 Oct '14

As the short-id can be used to set the os/platform in the example program, let's expose them to the user. --- examples/virt-designer.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/virt-designer.c b/examples/virt-designer.c index 7628449..12faf04 100644 --- a/examples/virt-designer.c +++ b/examples/virt-designer.c @@ -107,8 +107,8 @@ print_oses(const gchar *option_name, if (!db && !load_osinfo()) goto cleanup; - printf(" Operating System ID\n" - "-----------------------\n"); + printf(" Operating System ID (short ID)\n" + "--------------------------------\n"); list = osinfo_db_get_os_list(db); if (!list) @@ -119,6 +119,8 @@ print_oses(const gchar *option_name, OsinfoOs *os = OSINFO_OS(os_iter->data); const char *id = osinfo_entity_get_param_value(OSINFO_ENTITY(os), OSINFO_ENTITY_PROP_ID); + const char *short_id = osinfo_entity_get_param_value(OSINFO_ENTITY(os), + OSINFO_PRODUCT_PROP_SHORT_ID); printf("%s\n", id); } @@ -148,8 +150,8 @@ print_platforms(const gchar *option_name, if (!db && !load_osinfo()) goto cleanup; - printf(" Platform ID\n" - "---------------\n"); + printf(" Platform ID (short ID)\n" + "------------------------\n"); list = osinfo_db_get_platform_list(db); if (!list) @@ -160,6 +162,8 @@ print_platforms(const gchar *option_name, OsinfoPlatform *platform = OSINFO_PLATFORM(platform_iter->data); const char *id = osinfo_entity_get_param_value(OSINFO_ENTITY(platform), OSINFO_ENTITY_PROP_ID); + const char *short_id = osinfo_entity_get_param_value(OSINFO_ENTITY(platform), + OSINFO_PRODUCT_PROP_SHORT_ID); printf("%s\n", id); } @@ -577,9 +581,9 @@ main(int argc, char *argv[]) {"connect", 'c', 0, G_OPTION_ARG_STRING, &connect_uri, "libvirt connection URI used for querying capabilities", "URI"}, {"list-os", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, print_oses, - "list IDs of known OSes", NULL}, + "list IDs and short IDs of known OSes", NULL}, {"list-platform", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, print_platforms, - "list IDs of known hypervisors", NULL}, + "list IDs and short IDs of known hypervisors", NULL}, {"os", 'o', 0, G_OPTION_ARG_STRING, &os_str, "set domain OS", "OS"}, {"platform", 'p', 0, G_OPTION_ARG_STRING, &platform_str, -- 2.1.0

4 4

[libvirt] [PATCH 00/12] Split up large driver files
by Daniel P. Berrange 23 Oct '14

23 Oct '14

This patch series splits up the src/driver.h and src/libvirt.c files into a number of smaller pieces. The driver.h file gets split based on the the driver type, while libvirt.c gets split slightly different based on the object type. The reason for the difference is that the hypervisor driver is rather large, so its useful to split the domain, domain snapshot and connect/node APIs into separate files. There will be much more to follow this series. Just posting this start now since it will be painful to rebase.... Daniel P. Berrange (12): Rename virDriver to virHypervisorDriver Split driver.h into multiple parts Move virDomainSnapshot related APIs out of libvirt.c Move virNetwork related APIs out of libvirt.c Move virInterface related APIs out of libvirt.c Move virNWFilter related APIs out of libvirt.c Move virNodeDevice related APIs out of libvirt.c Move virSecret related APIs out of libvirt.c Move virStream related APIs out of libvirt.c Move virStorage{Pool,Vol} related APIs out of libvirt.c Move virDomain related APIs out of libvirt.c Move virConnect/virNode related APIs out of libvirt.c cfg.mk | 4 +- docs/apibuild.py | 11 + docs/hvsupport.pl | 2 +- po/POTFILES.in | 8 + src/Makefile.am | 20 + src/bhyve/bhyve_driver.c | 4 +- src/datatypes.h | 3 +- src/driver-hypervisor.h | 1396 +++ src/driver-interface.h | 131 + src/driver-network.h | 166 + src/driver-nodedev.h | 112 + src/driver-nwfilter.h | 94 + src/driver-secret.h | 114 + src/driver-state.h | 58 + src/driver-storage.h | 265 + src/driver-stream.h | 72 + src/driver.h | 2172 +--- src/esx/esx_driver.c | 4 +- src/hyperv/hyperv_driver.c | 4 +- src/libvirt-domain-snapshot.c | 1222 +++ src/libvirt-domain.c | 11112 ++++++++++++++++++++ src/libvirt-host.c | 1515 +++ src/libvirt-interface.c | 835 ++ src/libvirt-network.c | 1251 +++ src/libvirt-nodedev.c | 756 ++ src/libvirt-nwfilter.c | 515 + src/libvirt-secret.c | 695 ++ src/libvirt-storage.c | 2118 ++++ src/libvirt-stream.c | 704 ++ src/libvirt.c | 20537 +------------------------------------ src/libvirt_internal.h | 6 + src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/openvz/openvz_driver.c | 4 +- src/parallels/parallels_driver.c | 4 +- src/phyp/phyp_driver.c | 4 +- src/qemu/qemu_driver.c | 4 +- src/remote/remote_driver.c | 7 +- src/test/test_driver.c | 4 +- src/uml/uml_driver.c | 4 +- src/vbox/vbox_common.c | 4 +- src/vbox/vbox_driver.c | 14 +- src/vbox/vbox_get_driver.h | 2 +- src/vbox/vbox_tmpl.c | 4 +- src/vbox/vbox_uniformed_api.h | 2 +- src/vmware/vmware_driver.c | 4 +- src/xen/xen_driver.c | 4 +- src/xenapi/xenapi_driver.c | 4 +- 49 files changed, 23289 insertions(+), 22696 deletions(-) create mode 100644 src/driver-hypervisor.h create mode 100644 src/driver-interface.h create mode 100644 src/driver-network.h create mode 100644 src/driver-nodedev.h create mode 100644 src/driver-nwfilter.h create mode 100644 src/driver-secret.h create mode 100644 src/driver-state.h create mode 100644 src/driver-storage.h create mode 100644 src/driver-stream.h create mode 100644 src/libvirt-domain-snapshot.c create mode 100644 src/libvirt-domain.c create mode 100644 src/libvirt-host.c create mode 100644 src/libvirt-interface.c create mode 100644 src/libvirt-network.c create mode 100644 src/libvirt-nodedev.c create mode 100644 src/libvirt-nwfilter.c create mode 100644 src/libvirt-secret.c create mode 100644 src/libvirt-storage.c create mode 100644 src/libvirt-stream.c -- 2.1.0

2 28

[libvirt] [PATCH] Fix indentation of sysinfo data
by Daniel P. Berrange 23 Oct '14

23 Oct '14

The <sysinfo> data block was indented by 2 spaces too many. This was missed because we never had any test validating the XML formatting. --- src/conf/domain_conf.c | 13 +------------ tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml | 16 ++++++++++------ tests/qemuxml2xmltest.c | 1 + 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 73c199e..39befb0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17668,17 +17668,6 @@ virDomainNVRAMDefFormat(virBufferPtr buf, return 0; } -static int -virDomainSysinfoDefFormat(virBufferPtr buf, - virSysinfoDefPtr def) -{ - int ret; - virBufferAdjustIndent(buf, 2); - ret = virSysinfoFormat(buf, def); - virBufferAdjustIndent(buf, -2); - return ret; -} - static int virDomainWatchdogDefFormat(virBufferPtr buf, @@ -18890,7 +18879,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, virDomainResourceDefFormat(buf, def->resource); if (def->sysinfo) - virDomainSysinfoDefFormat(buf, def->sysinfo); + virSysinfoFormat(buf, def->sysinfo); if (def->os.bootloader) { virBufferEscapeString(buf, "<bootloader>%s</bootloader>\n", diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml index 7b2f33a..88f953f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios-date.xml @@ -4,20 +4,24 @@ <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>1048576</currentMemory> <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <smbios mode="sysinfo"/> - </os> - <sysinfo type="smbios"> + <sysinfo type='smbios'> <bios> - <entry name="date">999/999/123</entry> + <entry name='date'>11/21/1923</entry> </bios> </sysinfo> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + <smbios mode='sysinfo'/> + </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 978e5f1..4c2b928 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -405,6 +405,7 @@ mymain(void) DO_TEST("tap-vhost"); DO_TEST("shmem"); + DO_TEST("smbios-date"); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 2.1.0

2 1

[libvirt] [PATCH] qemu: command: Allow UEFI for non-x86
by Cole Robinson 22 Oct '14

22 Oct '14

It's supported on aarch64 and armv7l as well, so just drop the restriction entirely since it doesn't add much. --- src/qemu/qemu_command.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8cb0865..2872e47 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7672,14 +7672,6 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_LOADER_TYPE_PFLASH: - /* UEFI is supported only for x86_64 currently */ - if (def->os.arch != VIR_ARCH_X86_64) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("pflash is not supported for %s guest architecture"), - virArchToString(def->os.arch)); - goto cleanup; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this QEMU binary doesn't support -drive")); -- 2.1.0

3 2

[libvirt] [PATCH 0/3] Fix handling of data returned by XML hooks
by Peter Krempa 22 Oct '14

22 Oct '14

Peter Krempa (3): util: string: Add helper to check whether string is empty qemu: restore: Fix restoring of VM when the restore hook returns empty XML qemu: migration: Make check for empty hook XML robust src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 2 +- src/util/virstring.c | 16 ++++++++++++++++ src/util/virstring.h | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH] doc: HACKING: Regenerate after recent change
by Peter Krempa 22 Oct '14

22 Oct '14

--- Pushed as trivial. HACKING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HACKING b/HACKING index f8546cb..8f42e51 100644 --- a/HACKING +++ b/HACKING @@ -16,7 +16,7 @@ listen to feedback. (2) Official upstream repository is kept in git ("git://libvirt.org/libvirt.git") and is browsable along with other libvirt-related repositories (e.g. -libvirt-python) online <http://libvirt.org>. +libvirt-python) online <http://libvirt.org/git/>. (3) Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of: -- 2.1.0

1 0

[libvirt] [PATCH] docs: fix an improper git browsable address
by Chen Hanxiao 22 Oct '14

22 Oct '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/hacking.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 4ab0179..b1553a5 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -14,7 +14,7 @@ <li>Official upstream repository is kept in git (<code>git://libvirt.org/libvirt.git</code>) and is browsable along with other libvirt-related repositories - (e.g. libvirt-python) <a href="http://libvirt.org">online</a>.</li> + (e.g. libvirt-python) <a href="http://libvirt.org/git/">online</a>.</li> <li><p>Post patches in unified diff format, with git rename detection enabled. You need a one-time setup of:</p> -- 1.9.3

3 2

[libvirt] [libvirt-python PATCH 1/1] virDomainBlockCopy: initialize flags to 0
by Pavel Hrdina 22 Oct '14

22 Oct '14

An optional argument if not passed isn't modified by the PyArg_ParseTuple function. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Sigh :/, pushed as trivial libvirt-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index a461eda..a53b46f 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8171,7 +8171,7 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) char *destxml = NULL; virTypedParameterPtr params = NULL; int nparams = 0; - unsigned int flags; + unsigned int flags = 0; int c_retval; if (!PyArg_ParseTuple(args, (char *) "Ozz|OI:virDomainBlockCopy", -- 2.0.4

2 1

[libvirt] Libvirt clock/time settings doubt.
by Julio Faracco 22 Oct '14

22 Oct '14

Hi everyone! What is the method/function responsible to setup time settings in libvirt? Considering the example of libvirt documentation. <clock offset='localtime'> <timer name='rtc' tickpolicy='catchup' track='guest'> <catchup threshold='123' slew='120' limit='10000'/> </timer> <timer name='pit' tickpolicy='delay'/> </clock> ... I know where this XML will be parsed. But I don't know where libvirt will pass clock/time settings to QEMU. Can somebody explain to me or send me a documentation about it? I passed two weeks trying to discover the sequence of function calls. Thanks guys! *--* *Julio Cesar Faracco*

2 1

[libvirt] [PATCH] Add support for /run/initctl
by Rick Harris 22 Oct '14

22 Oct '14

Newer versions of Debian use `/run/initctl` instead of `/dev/initctl`. This patch updates the code to search for the FIFO from a list of well-known locations. In the FreeBSD case, as before, we fall-back to the `/etc/.initctl` stub. --- src/util/virinitctl.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index a6fda3b..c4b48d4 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -46,12 +46,6 @@ * Copyright (C) 1995-2004 Miquel van Smoorenburg */ -# if defined(__FreeBSD_kernel__) -# define VIR_INITCTL_FIFO "/etc/.initctl" -# else -# define VIR_INITCTL_FIFO "/dev/initctl" -# endif - # define VIR_INITCTL_MAGIC 0x03091969 # define VIR_INITCTL_CMD_START 0 # define VIR_INITCTL_CMD_RUNLVL 1 @@ -124,6 +118,13 @@ virInitctlSetRunLevel(virInitctlRunLevel level) struct virInitctlRequest req; int fd = -1; int ret = -1; + const char *initctl_fifo = NULL; + size_t i = 0; + const char *initctl_fifos[] = { + "/run/initctl", + "/dev/initctl", + "/etc/.initctl", + }; memset(&req, 0, sizeof(req)); @@ -133,22 +134,31 @@ virInitctlSetRunLevel(virInitctlRunLevel level) /* Yes it is an 'int' field, but wants a numeric character. Go figure */ req.runlevel = '0' + level; - if ((fd = open(VIR_INITCTL_FIFO, - O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { - if (errno == ENOENT) { - ret = 0; + for (i = 0; i < ARRAY_CARDINALITY(initctl_fifos); i++) { + initctl_fifo = initctl_fifos[i]; + + if ((fd = open(initctl_fifo, + O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) >= 0) + break; + + if (errno != ENOENT) { + virReportSystemError(errno, + _("Cannot open init control %s"), + initctl_fifo); goto cleanup; } - virReportSystemError(errno, - _("Cannot open init control %s"), - VIR_INITCTL_FIFO); + } + + /* Ensure we found a valid initctl fifo */ + if (fd < 0) { + ret = 0; goto cleanup; } if (safewrite(fd, &req, sizeof(req)) != sizeof(req)) { virReportSystemError(errno, _("Failed to send request to init control %s"), - VIR_INITCTL_FIFO); + initctl_fifo); goto cleanup; } -- 1.9.1

2 2

[libvirt] libvirt build failure on armhf (Re: [Xen-devel] [libvirt bisection] complete build-armhf-libvirt)
by Ian Campbell 22 Oct '14

22 Oct '14

Hi, On Fri, 2014-10-17 at 00:42 +0100, xen.org wrote: > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > Bug introduced: 24c160376275b7d31f71fbde83af8183cbf744a7 > Bug not present: 69f7b67d55316ab7b28fb904b346943497b856a1 The Xen automated build tests have discovered a built error on armhf. I don't think it is Xen specific. Our bisector has fingered the changeset below. I've had a skim of the git log from there to master and of the outstanding patches on libvir list and I don't see anything which is obviously a related fix, so I hope this is still useful/relevant. An instance of the failure can be seen at http://www.chiark.greenend.org.uk/~xensrcts/logs/30765/build-armhf-libvirt/… The logs say: util/virsocketaddr.c: In function 'virSocketAddrIsNumericLocalhost': util/virsocketaddr.c:904:17: error: cast increases required alignment of target type [-Werror=cast-align] util/virsocketaddr.c:909:17: error: cast increases required alignment of target type [-Werror=cast-align] Ian. > commit 24c160376275b7d31f71fbde83af8183cbf744a7 > Author: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> > Date: Tue Oct 7 12:07:31 2014 +0800 > > conf: add check if migration_host is a localhost address > > Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> > > Signed-off-by: Ján Tomko <jtomko(a)redhat.com> > > > For bisection revision-tuple graph see: > http://www.chiark.greenend.org.uk/~xensrcts/results/bisect.libvirt.build-ar… > Revision IDs in each graph node refer, respectively, to the Trees above. > > ---------------------------------------- > Searching for failure / basis pass: > 30765 fail [host=marilith-n4] / 30748 ok. > Failure / basis pass flights: 30765 / 30748 > Tree: gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… > Tree: libvirt git://libvirt.org/libvirt.git > Tree: qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git > Tree: xen git://xenbits.xen.org/xen.git > Latest b155b0649814b20e635a2db305696710fa1037ce e9a1c4384c4f83a8e0d5d98c80369ecfd5b3f2e0 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > Basis pass b155b0649814b20e635a2db305696710fa1037ce 4d1852c48541a29e3c47caf0f2b801dfcb6579db c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 7d96cc5c4b2670a4220a50746fa17a0e8a4da1c2 > Generating revisions with ./adhoc-revtuple-generator git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=… git://libvirt.org/libvirt.git#4d1852c48541a29e3c47caf0f2b801dfcb6579db-e9a1… git://xenbits.xen.org/staging/qemu-upstream-unstable.git#c9d8f8b755e8960edf… git://xenbits.xen.org/xen.git#7d96cc5c4b2670a4220a50746fa17a0e8a4da1c2-4d57… > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/xen > + git remote set-url origin git://drall.uk.xensource.com:9419/git://xenbits.xen.org/xen.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > + exec > + sh -xe > + cd /export/home/osstest/repos/xen > + git remote set-url origin git://drall.uk.xensource.com:9419/git://xenbits.xen.org/xen.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > Loaded 3959 nodes in revision graph > Searching for test results: > 30748 pass b155b0649814b20e635a2db305696710fa1037ce 4d1852c48541a29e3c47caf0f2b801dfcb6579db c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 7d96cc5c4b2670a4220a50746fa17a0e8a4da1c2 > 30765 fail b155b0649814b20e635a2db305696710fa1037ce e9a1c4384c4f83a8e0d5d98c80369ecfd5b3f2e0 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30776 pass b155b0649814b20e635a2db305696710fa1037ce 4d1852c48541a29e3c47caf0f2b801dfcb6579db c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 7d96cc5c4b2670a4220a50746fa17a0e8a4da1c2 > 30777 fail b155b0649814b20e635a2db305696710fa1037ce e9a1c4384c4f83a8e0d5d98c80369ecfd5b3f2e0 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30779 fail b155b0649814b20e635a2db305696710fa1037ce 3d6c07f7f804be936df800eed749d01873da5a45 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30780 fail b155b0649814b20e635a2db305696710fa1037ce 24c160376275b7d31f71fbde83af8183cbf744a7 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30781 pass b155b0649814b20e635a2db305696710fa1037ce 4d1852c48541a29e3c47caf0f2b801dfcb6579db c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30783 pass b155b0649814b20e635a2db305696710fa1037ce 6c31911a964f42f83d7f6b7c86ad40c17c71fcea c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30784 pass b155b0649814b20e635a2db305696710fa1037ce 69f7b67d55316ab7b28fb904b346943497b856a1 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30785 fail b155b0649814b20e635a2db305696710fa1037ce 24c160376275b7d31f71fbde83af8183cbf744a7 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30786 pass b155b0649814b20e635a2db305696710fa1037ce 69f7b67d55316ab7b28fb904b346943497b856a1 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30787 fail b155b0649814b20e635a2db305696710fa1037ce 24c160376275b7d31f71fbde83af8183cbf744a7 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30789 pass b155b0649814b20e635a2db305696710fa1037ce 69f7b67d55316ab7b28fb904b346943497b856a1 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > 30790 fail b155b0649814b20e635a2db305696710fa1037ce 24c160376275b7d31f71fbde83af8183cbf744a7 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > Searching for interesting versions > Result found: flight 30748 (pass), for basis pass > Result found: flight 30765 (fail), for basis failure > Repro found: flight 30776 (pass), for basis pass > Repro found: flight 30777 (fail), for basis failure > 0 revisions at b155b0649814b20e635a2db305696710fa1037ce 69f7b67d55316ab7b28fb904b346943497b856a1 c9d8f8b755e8960edf7725e05f3e6ac743a5e12e 4d57153b52a36183d58e8de6ba613929f906386a > No revisions left to test, checking graph state. > Result found: flight 30784 (pass), for last pass > Result found: flight 30785 (fail), for first failure > Repro found: flight 30786 (pass), for last pass > Repro found: flight 30787 (fail), for first failure > Repro found: flight 30789 (pass), for last pass > Repro found: flight 30790 (fail), for first failure > > *** Found and reproduced problem changeset *** > > Bug is in tree: libvirt git://libvirt.org/libvirt.git > Bug introduced: 24c160376275b7d31f71fbde83af8183cbf744a7 > Bug not present: 69f7b67d55316ab7b28fb904b346943497b856a1 > > + exec > + sh -xe > + cd /export/home/osstest/repos/libvirt > + git remote set-url origin git://drall.uk.xensource.com:9419/git://libvirt.org/libvirt.git > + git fetch -p origin +refs/heads/*:refs/remotes/origin/* > > commit 24c160376275b7d31f71fbde83af8183cbf744a7 > Author: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> > Date: Tue Oct 7 12:07:31 2014 +0800 > > conf: add check if migration_host is a localhost address > > Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> > > Signed-off-by: Ján Tomko <jtomko(a)redhat.com> > > Revision graph left in /home/xc_osstest/results/bisect.libvirt.build-armhf-libvirt.libvirt-build.{dot,ps,png,html}. > ---------------------------------------- > 30790: tolerable ALL FAIL > > flight 30790 libvirt real-bisect [real] > http://www.chiark.greenend.org.uk/~xensrcts/logs/30790/ > > Failures :-/ but no regressions. > > Tests which did not succeed, > including tests which could not be run: > build-armhf-libvirt 5 libvirt-build fail baseline untested > > > jobs: > build-armhf-libvirt fail > > > ------------------------------------------------------------ > sg-report-flight on osstest.cam.xci-test.com > logs: /home/xc_osstest/logs > images: /home/xc_osstest/images > > Logs, config files, etc. are available at > http://www.chiark.greenend.org.uk/~xensrcts/logs > > Test harness code can be found at > http://xenbits.xensource.com/gitweb?p=osstest.git;a=summary > > > _______________________________________________ > Xen-devel mailing list > Xen-devel(a)lists.xen.org > http://lists.xen.org/xen-devel

3 2

[libvirt] [PATCH 0/5] parallels: continue rewriting code to use sdk
by Dmitry Guryanov 22 Oct '14

22 Oct '14

This patch series replaces a series of functions, which retieve different domains info and modifies domains state with new ones, which use parallels sdk instead of executing prlctl command. These functions don't use cached domains list _parallelsConn.domains, so when we rewrite all code, we will be able to remove it. Alexander Burluka (1): parallels: obtain domain info with SDK Dmitry Guryanov (4): parallels: list domains with parallels SDK parallels: implement lookup functions with SDK parallels: move IS_CT macro to parallels_utils.h parallels: change domains state with SDK src/parallels/parallels_driver.c | 178 +----- src/parallels/parallels_sdk.c | 1189 ++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 14 + src/parallels/parallels_utils.h | 3 + 4 files changed, 1230 insertions(+), 154 deletions(-) -- 1.9.3

2 7

[libvirt] [python PATCH] Fix flags cannot get right value for blockCopy function
by Luyao Huang 22 Oct '14

22 Oct '14

When use blockCopy, flags cannot get a right value, because PyArg_ParseTuple want to get 6 parameters and blockCopy only pass 5.Flags will get a unpredictable value, this will make this function cannot be used.And error just like: unsupported flags (0x7f6c) in function qemuDomainBlockCopy Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index c887b71..4999ac3 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8175,8 +8175,7 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) int c_retval; if (!PyArg_ParseTuple(args, (char *) "Ozz|Oi:virDomainBlockCopy", - &pyobj_dom, &disk, &destxml, &pyobj_dict, &params, - &flags)) + &pyobj_dom, &disk, &destxml, &pyobj_dict, &flags)) return VIR_PY_INT_FAIL; if (PyDict_Check(pyobj_dict)) { -- 1.8.3.1

2 1

[libvirt] [PATCH v2] Fix cast errors with clang
by Roman Bogorodskiy 22 Oct '14

22 Oct '14

Build with clang fails with: CC util/libvirt_util_la-virsocketaddr.lo util/virsocketaddr.c:904:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet4 = (struct sockaddr_in*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ util/virsocketaddr.c:909:17: error: cast from 'struct sockaddr *' to 'struct sockaddr_in6 *' increases required alignment from 1 to 4 [-Werror,-Wcast-align] inet6 = (struct sockaddr_in6*) res->ai_addr; ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. Fix that by replacing virSocketAddrParseInternal() call with virSocketAddrParse() in the virSocketAddrIsNumericLocalhost() function. virSocketAddrParse stores an address in virSocketAddr. virSocketAddr uses a union to store an address, so it doesn't need casting. --- src/util/virsocketaddr.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 5f54e68..da0a9f1 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -890,28 +890,20 @@ virSocketAddrNumericFamily(const char *address) bool virSocketAddrIsNumericLocalhost(const char *addr) { - struct addrinfo *res; + virSocketAddr res; struct in_addr tmp = { .s_addr = htonl(INADDR_LOOPBACK) }; - struct sockaddr_in *inet4; - struct sockaddr_in6 *inet6; bool ret = false; - if (virSocketAddrParseInternal(&res, addr, AF_UNSPEC, false) < 0) + if (virSocketAddrParse(&res, addr, AF_UNSPEC) < 0) return ret; - switch (res->ai_addr->sa_family) { + switch (res.data.stor.ss_family) { case AF_INET: - inet4 = (struct sockaddr_in*) res->ai_addr; - ret = memcmp(&inet4->sin_addr.s_addr, &tmp.s_addr, - sizeof(inet4->sin_addr.s_addr)) == 0; - break; + return memcmp(&res.data.inet4.sin_addr.s_addr, &tmp.s_addr, + sizeof(res.data.inet4.sin_addr.s_addr)) == 0; case AF_INET6: - inet6 = (struct sockaddr_in6*) res->ai_addr; - ret = IN6_IS_ADDR_LOOPBACK(&(inet6->sin6_addr)); - break; + return IN6_IS_ADDR_LOOPBACK(&res.data.inet6.sin6_addr); } - freeaddrinfo(res); return ret; - } -- 2.0.2

2 2

[libvirt] [python PATCH 0/3] Fix multiple python binding issues
by Peter Krempa 22 Oct '14

22 Oct '14

Luyao Huang (1): Fix parsing of 'flags' argument for bulk stats functions Peter Krempa (2): Fix function name when parsing arguments in libvirt_virNodeAllocPages Fix rest of unsigned integer handling generator.py | 2 +- libvirt-lxc-override.c | 2 +- libvirt-override.c | 132 ++++++++++++++++++++++++------------------------ libvirt-qemu-override.c | 4 +- 4 files changed, 70 insertions(+), 70 deletions(-) -- 2.1.0

2 7

[libvirt] [PATCH v4] network: Add bandwidth support to ethernet interfaces
by Anirban Chakraborty 21 Oct '14

21 Oct '14

v4: Changed function virNetDevSupportBandwidth to use switch statement. Fixed syntax issues Fold the two patches into one as the second patch was a one liner v3: Addressed issues pointed out in V2 Split into two patches v2: Addressed comments raised in review of V1. Consolidate calls to virNetDevBandwidthSet. Clear bandwidth settings when the interface is detached or domain destroyed. v1: Ethernet interfaces in libvirt currently do not support bandwidth setting. For example, following xml file for an interface will not apply these settings to corresponding qdiscs. <interface type="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <model type="virtio"/> <script path=""/> <target dev="tap361d182a-e4"/> <bandwidth> <inbound average="984" peak="1024" burst="64"/> <outbound average="2000" peak="2048" burst="128"/> </bandwidth> </interface> Signed-off-by: Anirban Chakraborty <abchak(a)juniper.net> --- src/conf/domain_conf.h | 21 +++++++++++++++++++++ src/lxc/lxc_driver.c | 3 +++ src/lxc/lxc_process.c | 18 +++++++++--------- src/qemu/qemu_command.c | 25 +++++++++++++++++++------ src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 12 ++++++++++++ src/qemu/qemu_process.c | 3 +++ src/util/virnetdevmacvlan.c | 10 ---------- src/util/virnetdevmacvlan.h | 1 - 10 files changed, 72 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index afa3da6..59fdfb2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2848,4 +2848,25 @@ int virDomainObjSetMetadata(virDomainObjPtr vm, bool virDomainDefNeedsPlacementAdvice(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); +static inline bool virNetDevSupportBandwidth(virDomainNetType type) +{ + switch (type) { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: + return true; + case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VHOSTUSER: + case VIR_DOMAIN_NET_TYPE_SERVER: + case VIR_DOMAIN_NET_TYPE_CLIENT: + case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_LAST: + break; + } + return false; +} + #endif /* __DOMAIN_CONF_H */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b3e506f..a6f1f8a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,6 +72,7 @@ #include "viraccessapicheck.h" #include "viraccessapichecklxc.h" #include "virhostdev.h" +#include "qemu/qemu_command.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -4634,6 +4635,8 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, detach = vm->def->nets[detachidx]; + qemuDomainClearNetBandwidth(vm); + switch (virDomainNetGetActualType(detach)) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed30c37..3192011 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -274,11 +274,6 @@ char *virLXCProcessSetupInterfaceBridged(virConnectPtr conn, if (virNetDevSetOnline(parentVeth, true) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, vm->uuid, net) < 0) goto cleanup; @@ -300,6 +295,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virNetDevBandwidthPtr bw; virNetDevVPortProfilePtr prof; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); + const char *linkdev = virDomainNetGetActualDirectDev(net); /* XXX how todo bandwidth controls ? * Since the 'net-ifname' is about to be moved to a different @@ -329,14 +325,13 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, if (virNetDevMacVLanCreateWithVPortProfile( net->ifname, &net->mac, - virDomainNetGetActualDirectDev(net), + linkdev, virDomainNetGetActualDirectMode(net), false, def->uuid, - virDomainNetGetActualVirtPortProfile(net), + prof, &res_ifname, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, - cfg->stateDir, - virDomainNetGetActualBandwidth(net), 0) < 0) + cfg->stateDir, 0) < 0) goto cleanup; ret = res_ifname; @@ -450,6 +445,11 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, goto cleanup; } + /* set network bandwidth */ + if (virNetDevBandwidthSet(def->nets[i]->ifname, + virDomainNetGetActualBandwidth(def->nets[i]), false) < 0) + goto cleanup; + (*veths)[(*nveths)-1] = veth; /* Make sure all net definitions will have a name in the container */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8cb0865..3645ace 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -191,7 +191,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virDomainNetGetActualVirtPortProfile(net), &res_ifname, vmop, cfg->stateDir, - virDomainNetGetActualBandwidth(net), macvlan_create_flags); if (rc >= 0) { virDomainAuditNetDevice(def, net, res_ifname, true); @@ -371,11 +370,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, &net->mac) < 0) goto cleanup; - if (virNetDevBandwidthSet(net->ifname, - virDomainNetGetActualBandwidth(net), - false) < 0) - goto cleanup; - if (net->filter && virDomainConfNWFilterInstantiate(conn, def->uuid, net) < 0) { goto cleanup; @@ -7427,6 +7421,13 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), + false) < 0) + goto cleanup; + if ((actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || actualType == VIR_DOMAIN_NET_TYPE_ETHERNET || @@ -12452,3 +12453,15 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, virStringFreeList(progenv); return def; } + +void qemuDomainClearNetBandwidth(virDomainObjPtr vm) +{ + size_t i; + virDomainNetType type; + + for (i = 0; i < vm->def->nnets; i++) { + type = virDomainNetGetActualType(vm->def->nets[i]); + if (virNetDevSupportBandwidth(type)) + virNetDevBandwidthClear(vm->def->nets[i]->ifname); + } +} diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index aa40c9e..7963a91 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -277,4 +277,6 @@ int qemuCheckDiskConfig(virDomainDiskDefPtr disk); bool qemuCheckFips(void); + +void qemuDomainClearNetBandwidth(virDomainObjPtr vm); #endif /* __QEMU_COMMAND_H__*/ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7c9b1ab..8ad644a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2196,6 +2196,9 @@ qemuDomainDestroyFlags(virDomainPtr dom, if (virDomainDestroyFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + /* Clear network bandwidth */ + qemuDomainClearNetBandwidth(vm); + qemuDomainSetFakeReboot(driver, vm, false); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1e504ec..f627e69 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -50,6 +50,7 @@ #include "virstring.h" #include "virtime.h" #include "storage/storage_driver.h" +#include "domain_conf.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -948,6 +949,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } + /* Set Bandwidth */ + if (virNetDevSupportBandwidth(actualType) && + virNetDevBandwidthSet(net->ifname, + virDomainNetGetActualBandwidth(net), false) < 0) + goto cleanup; + for (i = 0; i < tapfdSize; i++) { if (virSecurityManagerSetTapFDLabel(driver->securityManager, vm->def, tapfd[i]) < 0) @@ -3516,6 +3523,11 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, } } + if (virNetDevSupportBandwidth(virDomainNetGetActualType(detach)) && + virNetDevBandwidthClear(detach->ifname) < 0) + VIR_WARN("cannot clear bandwidth setting for device : %s", + detach->ifname); + qemuDomainMarkDeviceForRemoval(vm, &detach->info); qemuDomainObjEnterMonitor(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 95548aa..4d95ec4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4825,6 +4825,9 @@ void qemuProcessStop(virQEMUDriverPtr driver, virStrerror(errno, ebuf, sizeof(ebuf))); } + /* Clear network bandwidth */ + qemuDomainClearNetBandwidth(vm); + virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index c83341c..956a96b 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -811,7 +811,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, char **res_ifname, virNetDevVPortProfileOp vmOp, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? @@ -925,14 +924,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, rc = 0; } - if (virNetDevBandwidthSet(cr_ifname, bandwidth, false) < 0) { - if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) - VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ - else - rc = -1; - goto disassociate_exit; - } - if (vmOp == VIR_NETDEV_VPORT_PROFILE_OP_CREATE || vmOp == VIR_NETDEV_VPORT_PROFILE_OP_RESTORE) { /* Only directly register upon a create or restore (restarting @@ -1076,7 +1067,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, - virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 41aa4e2..f08d32b 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -68,7 +68,6 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, char **res_ifname, virNetDevVPortProfileOp vmop, char *stateDir, - virNetDevBandwidthPtr bandwidth, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; -- 1.9.1

1 2