- Devel - libvirt List Archives

[libvirt] [jenkins-ci PATCH 0/8] lcitool: Support building arbitrary branches
by Andrea Bolognani 04 Sep '18

04 Sep '18

Better (hopefully :) implementation of the feature scrapped from the initial "build support" series. Andrea Bolognani (8): lcitool: Add "-r REVISION" argument for build Don't use "branch" in paths and job names jobs: Hardcode "master" branch guests: Use "git_branch" when building Drop "branch" variable Add "git_urls" dictionary to defaults guests: Use "git_remote" when building guests: Update documentation guests/README.markdown | 8 ++++- guests/lcitool | 36 +++++++++++++------ .../build/jobs/autotools-build-job.yml | 4 +-- .../build/jobs/autotools-check-job.yml | 4 +-- .../build/jobs/autotools-rpm-job.yml | 4 +-- .../build/jobs/autotools-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/defaults.yml | 32 ++++++++++++++++- .../build/jobs/generic-build-job.yml | 4 +-- .../build/jobs/generic-check-job.yml | 4 +-- .../playbooks/build/jobs/generic-rpm-job.yml | 4 +-- .../build/jobs/generic-syntax-check-job.yml | 4 +-- guests/playbooks/build/jobs/go-build-job.yml | 4 +-- guests/playbooks/build/jobs/go-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-build-job.yml | 4 +-- .../build/jobs/perl-modulebuild-check-job.yml | 4 +-- .../build/jobs/perl-modulebuild-rpm-job.yml | 4 +-- guests/playbooks/build/jobs/prepare.yml | 10 +++--- .../build/jobs/python-distutils-build-job.yml | 4 +-- .../build/jobs/python-distutils-check-job.yml | 4 +-- .../build/jobs/python-distutils-rpm-job.yml | 4 +-- guests/playbooks/build/projects/libosinfo.yml | 2 +- .../playbooks/build/projects/libvirt-cim.yml | 2 +- .../playbooks/build/projects/libvirt-dbus.yml | 2 +- .../playbooks/build/projects/libvirt-glib.yml | 2 +- .../build/projects/libvirt-go-xml.yml | 2 +- .../playbooks/build/projects/libvirt-go.yml | 2 +- .../playbooks/build/projects/libvirt-perl.yml | 2 +- .../build/projects/libvirt-python.yml | 2 +- .../build/projects/libvirt-sandbox.yml | 2 +- .../playbooks/build/projects/libvirt-tck.yml | 2 +- guests/playbooks/build/projects/libvirt.yml | 2 +- .../build/projects/osinfo-db-tools.yml | 2 +- guests/playbooks/build/projects/osinfo-db.yml | 2 +- .../playbooks/build/projects/virt-manager.yml | 2 +- .../playbooks/build/projects/virt-viewer.yml | 2 +- jobs/autotools.yaml | 18 +++++----- jobs/defaults.yaml | 32 ++++++++++++++++- jobs/generic.yaml | 18 +++++----- jobs/go.yaml | 10 +++--- jobs/perl-modulebuild.yaml | 14 ++++---- jobs/python-distutils.yaml | 14 ++++---- projects/libosinfo.yaml | 14 ++++---- projects/libvirt-cim.yaml | 6 ++-- projects/libvirt-dbus.yaml | 10 +++--- projects/libvirt-glib.yaml | 14 ++++---- projects/libvirt-go-xml.yaml | 6 ++-- projects/libvirt-go.yaml | 6 ++-- projects/libvirt-perl.yaml | 8 ++--- projects/libvirt-python.yaml | 8 ++--- projects/libvirt-sandbox.yaml | 10 +++--- projects/libvirt-tck.yaml | 8 ++--- projects/libvirt.yaml | 8 ++--- projects/osinfo-db-tools.yaml | 8 ++--- projects/osinfo-db.yaml | 8 ++--- projects/virt-manager.yaml | 10 +++--- projects/virt-viewer.yaml | 14 ++++---- 56 files changed, 253 insertions(+), 171 deletions(-) -- 2.17.1

2 19

[libvirt] Release of libvirt-4.7.0
by Daniel Veillard 03 Sep '18

03 Sep '18

I didn't do this this week-end, that gave time to Andrea to update the release notes :-) it's now tagged in git and signed tarball and rpms are pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed a release 4.7.0 for the python bindings but they are virtually equivalent to 4.6.0 ones, you can find them at ftp://libvirt.org/libvirt/python/ This seems a reasonably large release, many commits, not that many people were in vacations last month ! The resulting is a balanced release with new features, improvements, and obviously the usual amount of bug fixes ! New features: - storage: add storage pool iscsi-direct Introduce a new storage pool backend that uses libiscsi instead of iscsiadm. It support basic pool operations: checkPool and refreshPool. - Add support for MBA (Memory Bandwidth Allocation technology) Domain vCPU threads can now have allocated some parts of host memory bandwidth by using the memorytune element in cputune. - qemu: Add support for RISC-V guests riscv32 and riscv64 guest architectures are now supported. Improvements: - qemu: Add ccw support for vhost-vsock Support the vhost-vsock-ccw device on S390. - qemu: Make default machine type independent of QEMU We can't control whether or not QEMU will change its default machine type in the future, or whether downstream distributions will decide to compile out some machine types, so our only option to provide a predictable behavior is taking care of the default ourselves; management applications and users are encouraged to explicitly pick a machine type when creating new guests. - apparmor: Various improvements Rules have been added to deal with a number of scenarios that didn't work correctly. Bug fixes: - esx: Truncate CPU model name Some CPU model names are too long to be stored into the corresponding property, and should be explicitly truncated to avoid unexpected behavior in users of the virNodeGetInfo() API such as virsh nodeinfo. - utils: Remove arbitrary limit on socket_id/core_id Both values were assumed to be smaller than 4096, but in fact they are entirely hardware-dependent and there have been reports of machines presenting much bigger values, preventing libvirt from working correctly; all such limits have now been removed. Thanks everybody for your help with this release be it with code, bug reports, patch reviews, documentation, ... Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [jenkins-ci PATCH 1/2] guests: enable {media, tree}uris tests for libosinfo
by Fabiano Fidêncio 03 Sep '18

03 Sep '18

Both media and tree uris tests are only run when LIBOSINFO_NETWORK_TESTS is set. Let's have those enabled in order to early catch URL changes in osinfo-db. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/playbooks/build/projects/libosinfo.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guests/playbooks/build/projects/libosinfo.yml b/guests/playbooks/build/projects/libosinfo.yml index c29053b..3c941d2 100644 --- a/guests/playbooks/build/projects/libosinfo.yml +++ b/guests/playbooks/build/projects/libosinfo.yml @@ -9,6 +9,11 @@ - include: '{{ playbook_base }}/jobs/autotools-build-job.yml' - include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' - include: '{{ playbook_base }}/jobs/autotools-check-job.yml' + vars: + local_env: | + # export LIBOSINFO_NETWORK_TESTS in order to run both + # mediauris and treeuris tests + export LIBOSINFO_NETWORK_TESTS=1 - include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' vars: machines: '{{ rpm_machines }}' -- 2.17.1

2 3

[libvirt] [PATCH 0/6] conf: Move a bunch of stuff to device_conf
by Andrea Bolognani 03 Sep '18

03 Sep '18

These are the times where I wish we were using a language with support for proper classes and modules like, I dunno, PHP or something. Andrea Bolognani (6): conf: Move virDomainDeviceAddressType to device_conf conf: Move virDomainDeviceAddressIsValid() to device_conf conf: Change return type of *AddressIsValid() to bool conf: Move virDomainPCIAddressAsString() to device_conf conf: Rename virDomainPCIAddressAsString() conf: Move *AddressParseXML() to device_conf src/conf/device_conf.c | 348 ++++++++++++++++++++++++++++++++- src/conf/device_conf.h | 31 ++- src/conf/domain_addr.c | 20 +- src/conf/domain_addr.h | 3 - src/conf/domain_conf.c | 320 ------------------------------ src/conf/domain_conf.h | 3 - src/libvirt_private.syms | 13 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +- 9 files changed, 386 insertions(+), 360 deletions(-) -- 2.17.1

3 14

[libvirt] [PATCH] qemu: Don't overwrite stats in qemuDomainBlocksStatsGather
by Peter Krempa 03 Sep '18

03 Sep '18

The size/capacity stats gathered in qemuDomainBlocksStatsGather when using -blockdev would be overwritten by assigning/copying the transfered data statistics at the end. Fix it by moving the assignment prior to fetching the capacity data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0f7c71675..07ea5473b6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11114,6 +11114,8 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, goto cleanup; } + **retstats = *stats; + if (blockdev) { /* capacity are reported only per node-name so we need to transfer them */ qemuBlockStatsPtr capstats; @@ -11127,8 +11129,6 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver, (*retstats)->write_threshold = capstats->write_threshold; } } - - **retstats = *stats; } else { for (i = 0; i < vm->def->ndisks; i++) { disk = vm->def->disks[i]; -- 2.16.2

2 1

[libvirt] [PATCH] news: Update for 4.7.0 release
by Andrea Bolognani 03 Sep '18

03 Sep '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 2b6d08dc02..3233796f32 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -71,8 +71,51 @@ Support the vhost-vsock-ccw device on S390. </description> </change> + <change> + <summary> + qemu: Make default machine type independent of QEMU + </summary> + <description> + We can't control whether or not QEMU will change its default + machine type in the future, or whether downstream distributions + will decide to compile out some machine types, so our only option + to provide a predictable behavior is taking care of the default + ourselves; management applications and users are encouraged to + explicitly pick a machine type when creating new guests. + </description> + </change> + <change> + <summary> + apparmor: Various improvements + </summary> + <description> + Rules have been added to deal with a number of scenarios that + didn't work correctly. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + esx: Truncate CPU model name + </summary> + <description> + Some CPU model names are too long to be stored into the + corresponding property, and should be explicitly truncated to + avoid unexpected behavior. + </description> + </change> + <change> + <summary> + utils: Remove arbitrary limit on socket_id/core_id + </summary> + <description> + Both values were assumed to be smaller than 4096, but in fact + they are entirely hardware-dependent and there have been reports + of machines presenting much bigger values, preventing libvirt from + working correctly; all such limits have now been removed. + </description> + </change> </section> </release> <release version="v4.6.0" date="2018-08-06"> -- 2.17.1

2 1

[libvirt] Terminal input “udevadm trigger” command,then produce “nl_recv returned with error:No buffer space available”
by xiajidong＠cmss.chinamobile.com 02 Sep '18

02 Sep '18

Dear libvirt experts， I have add some patch as follow.this two patch add buffer size to avoid to produce “nl_recv returned with error:No buffer space available” 1. libvirt-nodedev-Increase-the-netlink-socket-buffer-size-to-t.patch 2. libvirt-util-increase-libnl-buffer-size.patch but as I set some configuration in /etc/libvirt/libvitd.conf as follows # Logging level: 4 errors, 3 warnings, 2 information, 1 debug log_level =2 # Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: log_outputs="2:syslog:libvirtd" when I input “udevadm trigger” command [root@localhost ~]# vi /etc/libvirt/libvirtd.conf [root@localhost ~]# systemctl restart libvirtd [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# then will produce “nl_recv returned with error:No buffer space available” [root@localhost ~]# tail -f /var/log/messages | grep buffer Sep 2 22:44:00 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:33 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:45 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available So my question is: When input “udevadm trigger” in terminal, if setting log_level and log_outputs="2:syslog:libvirtd",how to avoid to produce “error virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available” log information? I am looking forward to your reply. _____ Best Regards, Jidong Xia China Mobile (Suzhou) Software Technology Company.cloud computing product department Tel: (+86) 18896726087 E-Mail：xiajidong(a)cmss.chinamobile.com <mailto:xiajidong@cmss.chinamobile.com>

1 0

[libvirt] Virsh reference is out of date, should it be updated from the man page?
by Povilas Kanapickas 02 Sep '18

02 Sep '18

Hi! The online virsh command reference at [1] seems to be very out of date according to [2]. There's much more recent documentation at tools/virsh.pod in the main libvirt repository. I believe it would be great to update the web docs as they are much more accessible and convenient to use (especially the one-command-per-page version). What would be the best way to approach that? I suppose we could look into automatically converting the current manpages into docbook and using that to update the website? What do you think? Regards, Povilas [1] - https://libvirt.org/virshcmdref.html [2] - https://libvirt.org/git/?p=libvirt-virshcmdref.git;a=summary

1 0

[libvirt] [PATCHv2 0/3] network: new network forward mode 'vlan'
by Shi Lei 01 Sep '18

01 Sep '18

Hi, everyone! This patch supports VLan by '8021q' kernel module other than by OVS. The way of '8021q' is simpler and more robust. Mode 'vlan' is like mode 'route' except these major differences: - mode 'vlan' inserts a vlan-device between the specified host's interface and the internal bridge. The vlan-device is based on '8021q' kernel module. - mode 'vlan' has no routed iptables rules but has other common iptables rules It can simplify the work of management apps whose developers want to implement VLan but don't want to introduce OVS into their project. Thank John for his comments in v1. v1 here: https://www.redhat.com/archives/libvir-list/2018-July/msg00331.html since v1: - Change docs/formatnetwork.html.in - Change docs/schemas/network.rng - Add tests/networkxml2* - Other code fixes Besides, I have post two patches followed by John's suggestions. - Replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_* https://www.redhat.com/archives/libvir-list/2018-July/msg01537.html This has been accepted. - Introduce timeout mode for virKModLoad to solve the potential problem of the 'strange delay' when loading '8021q' module https://www.redhat.com/archives/libvir-list/2018-August/msg00605.html This has been rejected and I don't know wether I should continue to solve this problem. Now I just check the INIT process code of '8021q' module and I think this module should not cause delay now. The loading time of '8021q' by virKModLoad on my PC is about 30 milliseconds. Shi Lei (3): add functions: load 8021q module, create/destroy vlan-dev support new forward mode 'vlan' for virtual network tests and docs for new forward mode 'vlan' configure.ac | 6 + docs/formatnetwork.html.in | 27 ++- docs/schemas/network.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/network_conf.c | 24 ++- src/conf/network_conf.h | 1 + src/conf/virnetworkobj.c | 1 + src/esx/esx_network_driver.c | 1 + src/libvirt_private.syms | 4 + src/network/bridge_driver.c | 55 +++++- src/qemu/qemu_process.c | 1 + src/util/virnetdev.c | 203 +++++++++++++++++++++ src/util/virnetdev.h | 18 ++ tests/networkxml2confdata/vlan-network.conf | 16 ++ tests/networkxml2confdata/vlan-network.xml | 13 ++ tests/networkxml2conftest.c | 1 + .../vlan-network-multi-vlan-tag.xml | 11 ++ .../vlan-network-no-forward-dev.xml | 10 + tests/networkxml2xmlin/vlan-network-with-dhcp.xml | 15 ++ tests/networkxml2xmlin/vlan-network.xml | 10 + tests/networkxml2xmlout/vlan-network-with-dhcp.xml | 17 ++ tests/networkxml2xmlout/vlan-network.xml | 12 ++ tests/networkxml2xmltest.c | 5 + 23 files changed, 448 insertions(+), 5 deletions(-) create mode 100644 tests/networkxml2confdata/vlan-network.conf create mode 100644 tests/networkxml2confdata/vlan-network.xml create mode 100644 tests/networkxml2xmlin/vlan-network-multi-vlan-tag.xml create mode 100644 tests/networkxml2xmlin/vlan-network-no-forward-dev.xml create mode 100644 tests/networkxml2xmlin/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlin/vlan-network.xml create mode 100644 tests/networkxml2xmlout/vlan-network-with-dhcp.xml create mode 100644 tests/networkxml2xmlout/vlan-network.xml -- 2.7.4

3 5

[libvirt] [PATCH] Add virNetlinkNewLink for simplifying virNetDev*Create
by Shi Lei 01 Sep '18

01 Sep '18

This patch adds virNetlinkNewLink for simplifying virNetDevMacVLanCreate and virNetDevBridgeCreate. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++-------------------- src/util/virnetdevmacvlan.c | 137 ++++++++++++++------------------------------ src/util/virnetlink.c | 104 +++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 8 +++ 5 files changed, 164 insertions(+), 159 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 47ea35f..23931ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2439,6 +2439,7 @@ virNetlinkEventServiceStop; virNetlinkEventServiceStopAll; virNetlinkGetErrorCode; virNetlinkGetNeighbor; +virNetlinkNewLink; virNetlinkShutdown; virNetlinkStartup; diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index bc377b5..1f5b37e 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -417,77 +417,22 @@ virNetDevBridgeCreate(const char *brname) { /* use a netlink RTM_NEWLINK message to create the bridge */ const char *type = "bridge"; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; - unsigned int recvbuflen; - struct nlattr *linkinfo; - VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + int error = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); - return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_IFNAME, strlen(brname)+1, brname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - return -1; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - if (err->error < 0) { + if (virNetlinkNewLink(NULL, brname, NULL, type, NULL, NULL, &error) < 0) { # if defined(HAVE_STRUCT_IFREQ) && defined(SIOCBRADDBR) - if (err->error == -EOPNOTSUPP) { - /* fallback to ioctl if netlink doesn't support creating - * bridges - */ - return virNetDevBridgeCreateWithIoctl(brname); - } -# endif - - virReportSystemError(-err->error, - _("error creating bridge interface %s"), - brname); - return -1; + if (error == -EOPNOTSUPP) { + /* fallback to ioctl if netlink doesn't support creating bridges */ + return virNetDevBridgeCreateWithIoctl(brname); } - break; +# endif + virReportSystemError(-error, _("error creating bridge interface %s"), + brname); - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } return 0; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - return -1; - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 2035b1f..1629add 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -283,6 +283,37 @@ virNetDevMacVLanReleaseName(const char *name) } +static int +virNetDevMacVLanCreateCallback(struct nl_msg *nl_msg, const void *opaque) +{ + const uint32_t *mode = (const uint32_t *) opaque; + if (!nl_msg || !opaque) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("nl_msg %p or opaque %p is NULL"), + nl_msg, opaque); + return -1; + } + + if (*mode > 0) { + struct nlattr *info_data; + if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(*mode), mode) < 0) + goto buffer_too_small; + + nla_nest_end(nl_msg, info_data); + } + + return 0; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + /** * virNetDevMacVLanCreate: * @@ -307,113 +338,29 @@ virNetDevMacVLanCreate(const char *ifname, uint32_t macvlan_mode, int *retry) { - int rc = -1; - struct nlmsgerr *err; - struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; int ifindex; - unsigned int recvbuflen; - struct nl_msg *nl_msg; - struct nlattr *linkinfo, *info_data; - char macstr[VIR_MAC_STRING_BUFLEN]; - VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; - - if (virNetDevGetIndex(srcdev, &ifindex) < 0) - return -1; - + int error = 0; *retry = 0; - nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, - NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); - if (!nl_msg) { - virReportOOMError(); + if (virNetDevGetIndex(srcdev, &ifindex) < 0) return -1; - } - - if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) - goto buffer_too_small; - - if (nla_put_u32(nl_msg, IFLA_LINK, ifindex) < 0) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, macaddress) < 0) - goto buffer_too_small; - - if (ifname && - nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) - goto buffer_too_small; - if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) - goto buffer_too_small; - - if (macvlan_mode > 0) { - if (!(info_data = nla_nest_start(nl_msg, IFLA_INFO_DATA))) - goto buffer_too_small; - - if (nla_put(nl_msg, IFLA_MACVLAN_MODE, sizeof(macvlan_mode), - &macvlan_mode) < 0) - goto buffer_too_small; - - nla_nest_end(nl_msg, info_data); - } - - nla_nest_end(nl_msg, linkinfo); - - if (virNetlinkCommand(nl_msg, &resp, &recvbuflen, 0, 0, - NETLINK_ROUTE, 0) < 0) { - goto cleanup; - } - - if (recvbuflen < NLMSG_LENGTH(0) || resp == NULL) - goto malformed_resp; - - switch (resp->nlmsg_type) { - case NLMSG_ERROR: - err = (struct nlmsgerr *)NLMSG_DATA(resp); - if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) - goto malformed_resp; - - switch (err->error) { - - case 0: - break; - - case -EEXIST: + if (virNetlinkNewLink(&ifindex, ifname, macaddress, type, + virNetDevMacVLanCreateCallback, &macvlan_mode, + &error) < 0) { + char macstr[VIR_MAC_STRING_BUFLEN]; + if (error == -EEXIST) *retry = 1; - goto cleanup; - - default: - virReportSystemError(-err->error, + else + virReportSystemError(-error, _("error creating %s interface %s@%s (%s)"), type, ifname, srcdev, virMacAddrFormat(macaddress, macstr)); - goto cleanup; - } - break; - - case NLMSG_DONE: - break; - default: - goto malformed_resp; + return -1; } - rc = 0; - cleanup: - nlmsg_free(nl_msg); - return rc; - - malformed_resp: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("malformed netlink response message")); - goto cleanup; - - buffer_too_small: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("allocated netlink buffer is too small")); - goto cleanup; + return 0; } /** diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 8f06446..817e347 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -489,6 +489,110 @@ virNetlinkDumpLink(const char *ifname, int ifindex, /** + * virNetlinkNewLink: + * + * @ifindex: The index for the 'link' device + * @ifname: The name of the link + * @mac: The MAC address of the device + * @type: The type of device, i.e., "bridge", "macvtap", "macvlan" + * @cb: The callback for filling in IFLA_INFO_DATA for this type + * @opaque: opaque for the callback + * @error: for retrieving error code + * + * Create a network "link" (aka interface aka device) with the given + * args. This works for many different types of network devices, + * including macvtap and bridges. + * + * Returns 0 on success, -1 on fatal error. + */ +int +virNetlinkNewLink(const int *ifindex, + const char *ifname, + const virMacAddr *mac, + const char *type, + virNetlinkNewLinkCallback cb, + const void *opaque, + int *error) +{ + struct nlmsgerr *err; + struct nlattr *linkinfo; + unsigned int buflen; + struct ifinfomsg ifinfo = { .ifi_family = AF_UNSPEC }; + VIR_AUTOPTR(virNetlinkMsg) nl_msg = NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; + + *error = 0; + + nl_msg = nlmsg_alloc_simple(RTM_NEWLINK, + NLM_F_REQUEST | NLM_F_CREATE | NLM_F_EXCL); + if (!nl_msg) { + virReportOOMError(); + return -1; + } + + if (nlmsg_append(nl_msg, &ifinfo, sizeof(ifinfo), NLMSG_ALIGNTO) < 0) + goto buffer_too_small; + + if (ifindex && nla_put_u32(nl_msg, IFLA_LINK, *ifindex) < 0) + goto buffer_too_small; + + if (mac && nla_put(nl_msg, IFLA_ADDRESS, VIR_MAC_BUFLEN, mac) < 0) + goto buffer_too_small; + + if (ifname && nla_put(nl_msg, IFLA_IFNAME, strlen(ifname)+1, ifname) < 0) + goto buffer_too_small; + + if (!(linkinfo = nla_nest_start(nl_msg, IFLA_LINKINFO))) + goto buffer_too_small; + + if (nla_put(nl_msg, IFLA_INFO_KIND, strlen(type), type) < 0) + goto buffer_too_small; + + if (cb && cb(nl_msg, opaque) < 0) + return -1; + + nla_nest_end(nl_msg, linkinfo); + + if (virNetlinkCommand(nl_msg, &resp, &buflen, 0, 0, NETLINK_ROUTE, 0) < 0) + return -1; + + if (buflen < NLMSG_LENGTH(0) || resp == NULL) + goto malformed_resp; + + switch (resp->nlmsg_type) { + case NLMSG_ERROR: + err = (struct nlmsgerr *)NLMSG_DATA(resp); + if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err))) + goto malformed_resp; + + if (err->error < 0) { + *error = err->error; + return -1; + } + break; + + case NLMSG_DONE: + break; + + default: + goto malformed_resp; + } + + return 0; + + malformed_resp: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed netlink response message")); + return -1; + + buffer_too_small: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("allocated netlink buffer is too small")); + return -1; +} + + +/** * virNetlinkDelLink: * * @ifname: Name of the link diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 1e1e616..195c7bb 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -65,6 +65,14 @@ int virNetlinkDumpCommand(struct nl_msg *nl_msg, unsigned int protocol, unsigned int groups, void *opaque); +typedef int (*virNetlinkNewLinkCallback)(struct nl_msg *nl_msg, + const void *opaque); + +int virNetlinkNewLink(const int *ifindex, const char *ifname, + const virMacAddr *macaddress, const char *type, + virNetlinkNewLinkCallback cb, const void *opaque, + int *error); + typedef int (*virNetlinkDelLinkFallback)(const char *ifname); int virNetlinkDelLink(const char *ifname, virNetlinkDelLinkFallback fallback); -- 2.7.4

2 4