- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] Fixup SCSI node devices
by Bjoern Walk 22 Mar '16

22 Mar '16

SCSI targets seem to be missing proper treatment and it was actually not possible to import a SCSI target nodedev device definition because of some typo. In order to extend the test case to catch this, I found that the XML schema was missing as well. Bjoern Walk (2): conf: node_device: fix up SCSI target tests: nodedevxml2xml: add test for SCSI target docs/schemas/nodedev.rng | 11 +++++++++++ src/conf/node_device_conf.c | 2 +- tests/nodedevschemadata/scsi_target0_0_0.xml | 7 +++++++ tests/nodedevxml2xmltest.c | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/nodedevschemadata/scsi_target0_0_0.xml -- 2.6.5

2 3

[libvirt] [PATCH V2 0/4] Extend <hap> to a tristate
by Jim Fehlig 21 Mar '16

21 Mar '16

An expanded V2 of https://www.redhat.com/archives/libvir-list/2016-February/msg00140.html In V2, the <hap> feature is extended with a state='on|off' attribute to allow differentiating the 'on' and 'off' states with not set (or hypervisor default). Obviously post 1.3.2 material. See individual patches for details. Jim Fehlig (4): conf: add 'state' attribute to <hap> feature xenconfig: change 'hap' setting to align with Xen behavior Xen drivers: show hap enabled by default in capabilities libxl: support enabling and disabling <hap> feature docs/formatdomain.html.in | 6 ++- docs/schemas/domaincommon.rng | 6 ++- src/conf/domain_conf.c | 4 +- src/libxl/libxl_conf.c | 20 ++++++-- src/xen/xen_hypervisor.c | 2 +- src/xenconfig/xen_common.c | 14 ++--- .../test-disk-positional-parms-full.cfg | 1 - .../test-disk-positional-parms-partial.cfg | 1 - ...est-fullvirt-direct-kernel-boot-bogus-extra.cfg | 1 - .../test-fullvirt-direct-kernel-boot-extra.cfg | 1 - .../test-fullvirt-direct-kernel-boot.cfg | 1 - tests/xlconfigdata/test-fullvirt-multiusb.cfg | 1 - tests/xlconfigdata/test-fullvirt-nohap.cfg | 26 ++++++++++ tests/xlconfigdata/test-fullvirt-nohap.xml | 59 ++++++++++++++++++++++ tests/xlconfigdata/test-new-disk.cfg | 1 - tests/xlconfigdata/test-rbd-multihost-noauth.cfg | 1 - tests/xlconfigdata/test-spice-features.cfg | 1 - tests/xlconfigdata/test-spice.cfg | 1 - tests/xlconfigdata/test-vif-rate.cfg | 1 - tests/xlconfigtest.c | 1 + tests/xmconfigdata/test-escape-paths.cfg | 1 - .../xmconfigdata/test-fullvirt-default-feature.cfg | 1 - tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 1 - tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 1 - tests/xmconfigdata/test-fullvirt-localtime.cfg | 1 - tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 1 - tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 1 - tests/xmconfigdata/test-fullvirt-nohap.cfg | 28 ++++++++++ tests/xmconfigdata/test-fullvirt-nohap.xml | 51 +++++++++++++++++++ tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 1 - .../test-fullvirt-serial-dev-2-ports.cfg | 1 - .../test-fullvirt-serial-dev-2nd-port.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-file.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-null.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 1 - .../test-fullvirt-serial-tcp-telnet.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 1 - tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 1 - tests/xmconfigdata/test-fullvirt-sound.cfg | 1 - tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 1 - tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 1 - tests/xmconfigdata/test-fullvirt-utc.cfg | 1 - tests/xmconfigdata/test-no-source-cdrom.cfg | 1 - tests/xmconfigdata/test-pci-devs.cfg | 1 - tests/xmconfigtest.c | 1 + 48 files changed, 202 insertions(+), 52 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-nohap.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nohap.xml create mode 100755 tests/xmconfigdata/test-fullvirt-nohap.cfg create mode 100644 tests/xmconfigdata/test-fullvirt-nohap.xml -- 2.1.4

3 13

[libvirt] [PATCH v3 00/14] Implement post-copy migration
by Jiri Denemark 21 Mar '16

21 Mar '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. We are pretty sure the interface QEMU provides is OK, but we'd like to wait until seamless SPICE migration is fixed for post-copy before removing the experimental prefix. This should hopefully happen in time for QEMU 2.6.0. This series applies on top of "Fix and enhance statistics of a completed job" series I sent yesterday. Both series on top of current master can be fetched from the "post-copy-migration" branch of my staging repository at https://gitlab.com/jirkade/libvirt Version 3: - VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY_FAILED will only be emitted on the destination host - discard completed stats of an incoming post-copy migration Version 2: - VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag dropped - --postcopy-after-precopy implemented entirely in virsh Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (8): Add event and state details for post-copy qemu: Handle postcopy-active migration state virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode qemu: Add flags to qemuMigrationWaitForCompletion examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 11 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 141 ++++++++++++++++- src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 291 +++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 6 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 233 ++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 157 +++++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 880 insertions(+), 161 deletions(-) -- 2.7.2

2 20

[libvirt] [PATCH] conf: node_device: fix wrong XML element reference
by Bjoern Walk 21 Mar '16

21 Mar '16

When reading in a XML definition for a SCSI target device, the name property of struct scsi_target refers to the @target element. Let's fix this obvious typo. Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/conf/node_device_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 611045c..f74b34d 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -822,7 +822,7 @@ virNodeDevCapSCSITargetParseXML(xmlXPathContextPtr ctxt, orignode = ctxt->node; ctxt->node = node; - data->scsi_target.name = virXPathString("string(./name[1])", ctxt); + data->scsi_target.name = virXPathString("string(./target[1])", ctxt); if (!data->scsi_target.name) { virReportError(VIR_ERR_INTERNAL_ERROR, _("no target name supplied for '%s'"), -- 2.6.5

2 1

[libvirt] [libvirt-sandbox PATCH] tests: add file extension for host mounts
by Guido Günther 21 Mar '16

21 Mar '16

otherwise we fail in gvir_sandbox_util_guess_image_format with "Cannot identify file extension in '/tmp/home' --- libvirt-sandbox/tests/test-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/tests/test-config.c b/libvirt-sandbox/tests/test-config.c index ac10bab..71a65c8 100644 --- a/libvirt-sandbox/tests/test-config.c +++ b/libvirt-sandbox/tests/test-config.c @@ -53,7 +53,7 @@ int main(int argc, char **argv) int ret = EXIT_FAILURE; const gchar *mounts[] = { "host-bind:/var/run/hell=/tmp/home", - "host-image:/etc=/tmp/home", + "host-image:/etc=/tmp/home/img.qcow2", "host-image:/etc=/tmp/home,format=qcow2", "host-bind:/tmp=", NULL -- 2.7.0

2 1

[libvirt] [PATCH 0/2] Some libvirt_nss cleanups
by Martin Kletzander 21 Mar '16

21 Mar '16

*** SOME PSEUDO-RANDOM BLURB *** Martin Kletzander (2): util: Add virSocketAddrSetIPv[46]AddrNetOrder and use it nss: Make aligning look nicer src/libvirt_private.syms | 2 ++ src/nwfilter/nwfilter_dhcpsnoop.c | 4 +-- src/util/virsocketaddr.c | 45 +++++++++++++++++++++++++++++----- src/util/virsocketaddr.h | 2 ++ tests/nsstest.c | 7 +++--- tools/nss/libvirt_nss.c | 51 +++++++++++++++++++++++++-------------- 6 files changed, 81 insertions(+), 30 deletions(-) -- 2.7.3

2 4

[libvirt] Storage Backend Error Handling Consistency
by Richard Laager 21 Mar '16

21 Mar '16

These two blocks exist in different storage backends' createVol implementations: if (vol->target.format != VIR_STORAGE_FILE_RAW) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("only RAW volumes are supported by this storage pool")); return -VIR_ERR_NO_SUPPORT; } if (vol->target.encryption != NULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("storage pool does not support encrypted " "volumes")); return -1; } My hunch is that the second example (VIR_ERR_CONFIG_UNSUPPORTED and returning -1) is correct in both of these cases. Related... Which backends should be restricted to only raw? That code is from storage_backend_rbd.c, which seems to be the only one restricted in that way. But does it make sense to allow !raw on LVM (or ZFS), for example? Whatever the correct answer, I'm looking to submit one or more patches. -- Richard

2 9

[libvirt] Libvirt bite sized tasks
by Michal Privoznik 21 Mar '16

21 Mar '16

Dear lists, I've just started new wiki page which aim is to summarize small and trivial tasks, that starting contributors can take, investigate and implement. The aim is to give them something easy to start with while not scaring them out about complexity of our code. The page can be found here: http://wiki.libvirt.org/page/BiteSizedTasks The name is copied from qemu wiki: http://wiki.qemu.org/BiteSizedTasks Please, feel free to extend the list. I plan to use it in the future when interviewing GSoC candidates. Michal

3 4

[libvirt] [PATCH] nss: don't try to build nss plugin when disabled
by Roman Bogorodskiy 20 Mar '16

20 Mar '16

Even if nss is disabled, the build system tries to build some targets like libnss_libvirt_impl.la and nsstest. Hide those under the "if WITH_NSS" block like the rest of NSS plugin bits. --- tests/Makefile.am | 8 ++++++-- tools/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d80b317..7d6b8a8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -158,7 +158,7 @@ EXTRA_DIST = \ xml2sexprdata \ xml2vmxdata -test_helpers = commandhelper ssh test_conf nsslinktest +test_helpers = commandhelper ssh test_conf test_programs = virshtest sockettest \ nodeinfotest virbuftest \ commandtest seclabeltest \ @@ -191,7 +191,6 @@ test_programs = virshtest sockettest \ vircaps2xmltest \ virnetdevtest \ virtypedparamtest \ - nsstest \ $(NULL) if WITH_REMOTE @@ -330,6 +329,11 @@ if WITH_LINUX test_programs += virscsitest endif WITH_LINUX +if WITH_NSS +test_helpers += nsslinktest +test_programs += nsstest +endif + test_programs += storagevolxml2xmltest storagepoolxml2xmltest test_programs += nodedevxml2xmltest diff --git a/tools/Makefile.am b/tools/Makefile.am index 3218d2f..4320040 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -424,6 +424,7 @@ LIBVIRT_NSS_SOURCES = \ nss/libvirt_nss.c \ nss/libvirt_nss.h +if WITH_NSS noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la nss_libnss_libvirt_impl_la_SOURCES = \ $(LIBVIRT_NSS_SOURCES) @@ -440,7 +441,6 @@ nss_libnss_libvirt_impl_la_LIBADD = \ ../gnulib/lib/libgnu.la \ ../src/libvirt-nss.la -if WITH_NSS nss_libnss_libvirt_la_SOURCES = nss_libnss_libvirt_la_LDFLAGS = \ $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \ -- 2.7.2

2 2

[libvirt] [PATCH] bhyve: caps: Log error message when CPU init fails
by Cole Robinson 20 Mar '16

20 Mar '16

virBhyveCapsInitCPU will raise a libvirt error; even though we treat it as non-fatal we should log the actual message. --- src/bhyve/bhyve_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index d2970a2..93faaed 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -97,7 +97,7 @@ virBhyveCapsBuild(void) goto error; if (virBhyveCapsInitCPU(caps, virArchFromHost()) < 0) - VIR_WARN("Failed to get host CPU"); + VIR_WARN("Failed to get host CPU: %s", virGetLastErrorMessage()); return caps; -- 2.5.0

2 2

[libvirt] [PATCH] bhyve: process: Log error message when kill fails
by Cole Robinson 20 Mar '16

20 Mar '16

virProcessKillPainfully will raise a libvirt error, so log it. We can drop the manual pid logging since ProcessKill always reports the pid in its error message. --- src/bhyve/bhyve_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 14588a9..f2ec712 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -283,9 +283,8 @@ virBhyveProcessStop(bhyveConnPtr driver, /* First, try to kill 'bhyve' process */ if (virProcessKillPainfully(vm->pid, true) != 0) - VIR_WARN("Failed to gracefully stop bhyve VM '%s' (pid: %d)", - vm->def->name, - (int)vm->pid); + VIR_WARN("Failed to gracefully stop bhyve VM '%s': %s", + vm->def->name, virGetLastErrorMessage()); /* Cleanup network interfaces */ bhyveNetCleanup(vm); -- 2.5.0

2 2

[libvirt] Doubt on libvirtmod.so library functions
by Renju M 19 Mar '16

19 Mar '16

Hello, I am doing a project on virtual machine migration and I am using virt-manager for the vm maintenance. When I looked at the libvirt.py code I understood that, once it calls migrate() function inside libvirt.py, it then calls, libvirtmod.virDomainMigrate(self._o, dconn__o, flags, dname, uri, bandwidth). How can I check the definition of this function? Also, which is the function that gets called at the destination to receive the migrated data from the source and is there a way to see the definition of this function as well? And if I want to change the timeout period for the migration process, should I change it in migrateSetMaxDowntime() function? Thankfully, -- *Renju* *M* NIT-C

1 0

[libvirt] autocreate tap device for VIR_DOMAIN_NET_TYPE_ETHERNET
by Vasiliy Tolstov 19 Mar '16

19 Mar '16

If a user specify ehernet device create it via libvirt and run script if it provided. After this commit user does not need to run external script to create tap device or add root to qemu process. Also now libvirt can manage ip address and routes for this device. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- docs/schemas/interface.rng | 6 ++ include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 14 +++- src/conf/domain_conf.h | 1 + src/conf/network_conf.c | 26 ++++++- src/conf/network_conf.h | 1 + src/libvirt.c | 8 +- src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_command.c | 38 +++++----- src/qemu/qemu_hotplug.c | 36 +++++++-- src/qemu/qemu_interface.c | 158 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_interface.h | 5 ++ src/qemu/qemu_process.c | 6 ++ src/util/virnetdev.c | 43 +++++++---- src/util/virnetdev.h | 1 + 16 files changed, 306 insertions(+), 42 deletions(-) diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index 052703ce84aa..b81c38b9d07c 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -332,6 +332,9 @@ <optional> <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> </optional> + <optional> + <attribute name="peer"><ref name="ipv4Addr"/></attribute> + </optional> </element> </zeroOrMore> <optional> @@ -361,6 +364,9 @@ <optional> <attribute name="prefix"><ref name="ipv6Prefix"/></attribute> </optional> + <optional> + <attribute name="peer"><ref name="ipv6Addr"/></attribute> + </optional> </element> </zeroOrMore> <optional> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4ac29cd78816..d2cd45eba253 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3926,6 +3926,7 @@ typedef virDomainIPAddress *virDomainIPAddressPtr; struct _virDomainInterfaceIPAddress { int type; /* virIPAddrType */ char *addr; /* IP address */ + char *peer; /* IP peer */ unsigned int prefix; /* IP address prefix */ }; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7d68096f0e55..fa62cda7a290 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5725,7 +5725,7 @@ virDomainNetIpParseXML(xmlNodePtr node) unsigned int prefixValue = 0; char *familyStr = NULL; int family = AF_UNSPEC; - char *address = NULL; + char *address = NULL, *peer = NULL; if (!(prefixStr = virXMLPropString(node, "prefix")) || (virStrToLong_ui(prefixStr, NULL, 10, &prefixValue) < 0)) { @@ -5739,6 +5739,9 @@ virDomainNetIpParseXML(xmlNodePtr node) goto cleanup; } + if ((peer = virXMLPropString(node, "peer")) == NULL) + VIR_DEBUG("Peer is empty"); + familyStr = virXMLPropString(node, "family"); if (familyStr && STREQ(familyStr, "ipv4")) family = AF_INET; @@ -5756,6 +5759,14 @@ virDomainNetIpParseXML(xmlNodePtr node) address); goto cleanup; } + + if ((peer != NULL) && (virSocketAddrParse(&ip->peer, peer, family) < 0)) { + virReportError(VIR_ERR_INVALID_ARG, + _("Failed to parse IP address: '%s'"), + peer); + goto cleanup; + } + ip->prefix = prefixValue; ret = ip; @@ -5765,6 +5776,7 @@ virDomainNetIpParseXML(xmlNodePtr node) VIR_FREE(prefixStr); VIR_FREE(familyStr); VIR_FREE(address); + VIR_FREE(peer); VIR_FREE(ip); return ret; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 85c4f554a2e2..0feff47ac99e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -513,6 +513,7 @@ typedef struct _virDomainNetIpDef virDomainNetIpDef; typedef virDomainNetIpDef *virDomainNetIpDefPtr; struct _virDomainNetIpDef { virSocketAddr address; /* ipv4 or ipv6 address */ + virSocketAddr peer; /* ipv4 or ipv6 address of peer */ unsigned int prefix; /* number of 1 bits in the net mask */ }; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4fb2e2a75b9d..baee3ad609f2 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1456,7 +1456,7 @@ virNetworkIPDefParseXML(const char *networkName, */ xmlNodePtr cur, save; - char *address = NULL, *netmask = NULL; + char *address = NULL, *netmask = NULL, *peer = NULL; unsigned long prefix = 0; int prefixRc; int result = -1; @@ -1502,6 +1502,14 @@ virNetworkIPDefParseXML(const char *networkName, else def->prefix = prefix; + peer = virXPathString("string(./@peer)", ctxt); + if (peer && (virSocketAddrParse(&def->peer, peer, AF_UNSPEC) < 0)) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid peer '%s' in network '%s'"), + netmask, networkName); + goto cleanup; + } + /* validate address, etc. for each family */ if ((def->family == NULL) || (STREQ(def->family, "ipv4"))) { if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || @@ -1531,6 +1539,14 @@ virNetworkIPDefParseXML(const char *networkName, prefix, networkName); goto cleanup; } + if (peer) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->peer, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Family 'ipv4' specified for non-IPv4 address '%s' in network '%s'"), + peer, networkName); + goto cleanup; + } + } } else if (STREQ(def->family, "ipv6")) { if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1550,6 +1566,14 @@ virNetworkIPDefParseXML(const char *networkName, prefix, networkName); goto cleanup; } + if (peer) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->peer, AF_INET6)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Family 'ipv6' specified for non-IPv6 address '%s' in network '%s'"), + peer, networkName); + goto cleanup; + } + } } else { virReportError(VIR_ERR_XML_ERROR, _("Unrecognized family '%s' in network '%s'"), diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index b72257b970a8..9b8e807fda3c 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -152,6 +152,7 @@ struct _virNetworkIpDef { */ unsigned int prefix; /* ipv6 - only prefix allowed */ virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ + virSocketAddr peer; /* ipv4 or ipv6 peer address */ size_t nranges; /* Zero or more dhcp ranges */ virSocketAddrRangePtr ranges; diff --git a/src/libvirt.c b/src/libvirt.c index dd58e9c23d14..a0458e7004d9 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -274,6 +274,7 @@ winsock_init(void) #ifdef WITH_GNUTLS_GCRYPT +# if GCRYPT_VERSION_NUMBER < 0x010600 static int virTLSMutexInit(void **priv) { @@ -318,8 +319,9 @@ virTLSMutexUnlock(void **priv) virMutexUnlock(lock); return 0; } +#endif - +# if GCRYPT_VERSION_NUMBER < 0x010600 static struct gcry_thread_cbs virTLSThreadImpl = { /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */ # ifdef GCRY_THREAD_OPTION_VERSION @@ -335,7 +337,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #endif /* WITH_GNUTLS_GCRYPT */ - +#endif static bool virGlobalError; static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; @@ -361,6 +363,7 @@ virGlobalInit(void) #endif #ifdef WITH_GNUTLS_GCRYPT + # if GCRYPT_VERSION_NUMBER < 0x010600 /* * This sequence of API calls it copied exactly from * gnutls 2.12.23 source lib/gcrypt/init.c, with @@ -374,6 +377,7 @@ virGlobalInit(void) gcry_control(GCRYCTL_DISABLE_SECMEM, NULL, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0); } + # endif #endif virLogSetFromEnv(); diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 348bbfbc01fc..a909b660b3ae 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -520,7 +520,7 @@ static int lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef, VIR_DEBUG("Adding IP address '%s/%u' to '%s'", ipStr, ip->prefix, newname); - if (virNetDevSetIPAddress(newname, &ip->address, prefix) < 0) { + if (virNetDevSetIPAddress(newname, &ip->address, NULL, prefix) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Failed to set IP address '%s' on %s"), ipStr, newname); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a09a7e474fc5..b3dbea13b58f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1970,7 +1970,7 @@ networkAddAddrToBridge(virNetworkObjPtr network, } if (virNetDevSetIPAddress(network->def->bridge, - &ipdef->address, prefix) < 0) + &ipdef->address, NULL, prefix) < 0) return -1; return 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3e7f1fe3ddf1..30eeab79a608 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3220,6 +3220,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAsprintf(&buf, "tap%c", type_sep); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ @@ -3237,20 +3238,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, is_tap = true; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; - case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", type_sep, @@ -7783,7 +7770,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_DIRECT)) { + actualType == VIR_DOMAIN_NET_TYPE_DIRECT || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7793,7 +7781,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* and only TAP devices support nwfilter rules */ if (net->filter && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filterref is not supported for " "network interfaces of type %s"), @@ -7803,7 +7792,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (net->backend.tap && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Custom tap device path is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7841,6 +7831,20 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, if (qemuInterfaceDirectConnect(def, driver, net, tapfd, tapfdSize, vmop) < 0) goto cleanup; + } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + tapfdSize = net->driver.virtio.queues; + if (!tapfdSize) + tapfdSize = 1; + + if (VIR_ALLOC_N(tapfd, tapfdSize) < 0 || + VIR_ALLOC_N(tapfdName, tapfdSize) < 0) + goto cleanup; + + memset(tapfd, -1, tapfdSize * sizeof(tapfd[0])); + + if (qemuInterfaceEthernetConnect(def, driver, net, + tapfd, tapfdSize) < 0) + goto cleanup; } /* For types whose implementations use a netdev on the host, add diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b580283d6273..4c224be25632 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -896,7 +896,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_DIRECT)) { + actualType == VIR_DOMAIN_NET_TYPE_DIRECT || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -906,7 +907,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* and only TAP devices support nwfilter rules */ if (net->filter && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filterref is not supported for " "network interfaces of type %s"), @@ -951,10 +953,19 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, vhostfd, &vhostfdSize) < 0) goto cleanup; } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) + tapfdSize = vhostfdSize = net->driver.virtio.queues; + if (!tapfdSize) + tapfdSize = vhostfdSize = 1; + if (VIR_ALLOC_N(tapfd, tapfdSize) < 0) goto cleanup; - *vhostfd = -1; + memset(tapfd, -1, sizeof(*tapfd) * tapfdSize); + if (VIR_ALLOC_N(vhostfd, vhostfdSize) < 0) + goto cleanup; + memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize); + if (qemuInterfaceEthernetConnect(vm->def, driver, net, + tapfd, tapfdSize) < 0) + goto cleanup; + iface_connected = true; if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; @@ -2205,6 +2216,21 @@ int qemuDomainChangeNetLinkState(virQEMUDriverPtr driver, if (ret < 0) goto cleanup; + if (virDomainNetGetActualType(dev) == VIR_DOMAIN_NET_TYPE_ETHERNET) { + switch (linkstate) { + case VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP: + case VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT: + if ((ret = virNetDevSetOnline(dev->ifname, true)) < 0) + goto cleanup; + break; + + case VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DOWN: + if ((ret = virNetDevSetOnline(dev->ifname, false)) < 0) + goto cleanup; + break; + } + } + /* modify the device configuration */ dev->linkstate = linkstate; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 08af13358113..bab0ff5b2006 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -387,6 +387,164 @@ qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + * + * This function executes script for new tap device created by libvirt. + * Returns 0 in case of success or -1 on failure + */ +static int +qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; +} + +/* qemuInterfaceEthernetConnect: + * @def: the definition of the VM + * @driver: qemu driver data + * @net: pointer to the VM's interface description + * @tapfd: array of file descriptor return value for the new device + * @tapfdsize: number of file descriptors in @tapfd + * + * Called *only* called if actualType is VIR_DOMAIN_NET_TYPE_ETHERNET + * (i.e. if the connection is made with a tap device) + */ +int +qemuInterfaceEthernetConnect(virDomainDefPtr def, + virQEMUDriverPtr driver, + virDomainNetDefPtr net, + int *tapfd, + size_t tapfdSize) +{ + virMacAddr tapmac; + size_t j; + int ret = -1; + unsigned int tap_create_flags = VIR_NETDEV_TAP_CREATE_IFUP; + bool template_ifname = false; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + const char *tunpath = "/dev/net/tun"; + + if (net->backend.tap) { + tunpath = net->backend.tap; + if (!(virQEMUDriverIsPrivileged(driver))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("cannot use custom tap device in session mode")); + goto cleanup; + } + } + + if (!net->ifname || + STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || + strchr(net->ifname, '%')) { + VIR_FREE(net->ifname); + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) + goto cleanup; + /* avoid exposing vnet%d in getXMLDesc or error outputs */ + template_ifname = true; + } + + if (net->model && STREQ(net->model, "virtio")) + tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; + + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, tapfdSize, + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + + virDomainAuditNetDevice(def, net, tunpath, true); + virMacAddrSet(&tapmac, &net->mac); + tapmac.addr[0] = 0xFE; + + if (virNetDevSetMAC(net->ifname, &tapmac) < 0) + goto cleanup; + + for (j = 0; j < net->nips; j++) { + virDomainNetIpDefPtr ip = net->ips[j]; + unsigned int prefix = (ip->prefix > 0) ? ip->prefix : + VIR_SOCKET_ADDR_DEFAULT_PREFIX; + char *ipStr = virSocketAddrFormat(&ip->address); + + VIR_DEBUG("Adding IP address '%s/%u' to '%s'", + ipStr, ip->prefix, net->ifname); + + if (virNetDevSetIPAddress(net->ifname, &ip->address, &ip->peer, prefix) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Failed to set IP address '%s' on %s"), + ipStr, net->ifname); + VIR_FREE(ipStr); + goto cleanup; + } + VIR_FREE(ipStr); + } + + if (net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP || + net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT) { + if (virNetDevSetOnline(net->ifname, true) < 0) + goto cleanup; + + /* Set the routes */ + for (j = 0; j < net->nroutes; j++) { + virNetworkRouteDefPtr route = net->routes[j]; + + if (virNetDevAddRoute(net->ifname, + virNetworkRouteDefGetAddress(route), + virNetworkRouteDefGetPrefix(route), + virNetworkRouteDefGetGateway(route), + virNetworkRouteDefGetMetric(route)) < 0) { + goto cleanup; + } + } + } + + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) + goto cleanup; + } + + if (cfg->macFilter && + ebtablesAddForwardAllowIn(driver->ebtables, + net->ifname, + &net->mac) < 0) + goto cleanup; + + if (net->filter && + virDomainConfNWFilterInstantiate(def->uuid, net) < 0) { + goto cleanup; + } + + ret = 0; + + cleanup: + if (ret < 0) { + size_t i; + for (i = 0; i < tapfdSize && tapfd[i] >= 0; i++) + VIR_FORCE_CLOSE(tapfd[i]); + if (template_ifname) + VIR_FREE(net->ifname); + } + virObjectUnref(cfg); + + return ret; +} + + /* qemuInterfaceBridgeConnect: * @def: the definition of the VM * @driver: qemu driver data diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index bf4dedf84ac9..66ead2aef81c 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -40,6 +40,11 @@ int qemuInterfaceDirectConnect(virDomainDefPtr def, int *tapfd, size_t tapfdSize, virNetDevVPortProfileOp vmop); +int qemuInterfaceEthernetConnect(virDomainDefPtr def, + virQEMUDriverPtr driver, + virDomainNetDefPtr net, + int *tapfd, + size_t tapfdSize); int qemuInterfaceBridgeConnect(virDomainDefPtr def, virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 14e4629e66f9..ef82581b130c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5699,6 +5699,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainNetGetActualVirtPortProfile(net), cfg->stateDir)); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (net->ifname) { + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + } + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index aed50f546263..d171f34e6058 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1039,21 +1039,28 @@ virNetDevCreateNetlinkAddressMessage(int messageType, const char *ifname, virSocketAddr *addr, unsigned int prefix, - virSocketAddr *broadcast) + virSocketAddr *broadcast, + virSocketAddr *peer) { struct nl_msg *nlmsg = NULL; struct ifaddrmsg ifa; unsigned int ifindex; void *addrData = NULL; + void *peerData = NULL; void *broadcastData = NULL; size_t addrDataLen; if (virNetDevGetIPAddressBinary(addr, &addrData, &addrDataLen) < 0) return NULL; - if (broadcast && virNetDevGetIPAddressBinary(broadcast, &broadcastData, - &addrDataLen) < 0) - return NULL; + if (peer && VIR_SOCKET_ADDR_VALID(peer)) { + if (virNetDevGetIPAddressBinary(peer, &peerData, &addrDataLen) < 0) + return NULL; + } else if (broadcast) { + if (virNetDevGetIPAddressBinary(broadcast, &broadcastData, + &addrDataLen) < 0) + return NULL; + } /* Get the interface index */ if ((ifindex = if_nametoindex(ifname)) == 0) @@ -1078,12 +1085,15 @@ virNetDevCreateNetlinkAddressMessage(int messageType, if (nla_put(nlmsg, IFA_LOCAL, addrDataLen, addrData) < 0) goto buffer_too_small; - if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, addrData) < 0) - goto buffer_too_small; + if (peerData) { + if (nla_put(nlmsg, IFA_ADDRESS, addrDataLen, peerData) < 0) + goto buffer_too_small; + } - if (broadcastData && - nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) - goto buffer_too_small; + if (broadcastData) { + if (nla_put(nlmsg, IFA_BROADCAST, addrDataLen, broadcastData) < 0) + goto buffer_too_small; + } return nlmsg; @@ -1098,6 +1108,7 @@ virNetDevCreateNetlinkAddressMessage(int messageType, * virNetDevSetIPAddress: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) + * @peer: The IP address of peer (IPv4 or IPv6) * @prefix: number of 1 bits in the netmask * * Add an IP address to an interface. This function *does not* remove @@ -1108,6 +1119,7 @@ virNetDevCreateNetlinkAddressMessage(int messageType, */ int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virSocketAddr *broadcast = NULL; @@ -1116,9 +1128,8 @@ int virNetDevSetIPAddress(const char *ifname, struct nlmsghdr *resp = NULL; unsigned int recvbuflen; - /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET) { + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && !VIR_SOCKET_ADDR_VALID(peer)) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) return -1; @@ -1129,7 +1140,7 @@ int virNetDevSetIPAddress(const char *ifname, if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_NEWADDR, ifname, addr, prefix, - broadcast))) + broadcast, peer))) goto cleanup; if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, @@ -1288,7 +1299,7 @@ int virNetDevClearIPAddress(const char *ifname, if (!(nlmsg = virNetDevCreateNetlinkAddressMessage(RTM_DELADDR, ifname, addr, prefix, - NULL))) + NULL, NULL))) goto cleanup; if (virNetlinkCommand(nlmsg, &resp, &recvbuflen, 0, 0, @@ -1423,10 +1434,11 @@ virNetDevWaitDadFinish(virSocketAddrPtr *addrs, size_t count) int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) { virCommandPtr cmd = NULL; - char *addrstr = NULL, *bcaststr = NULL; + char *addrstr = NULL, *bcaststr = NULL, *peerstr = NULL; virSocketAddr broadcast; int ret = -1; @@ -1453,6 +1465,8 @@ int virNetDevSetIPAddress(const char *ifname, cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (peerstr) + virCommandAddArgList(cmd, "peer", peerstr, NULL); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); @@ -1465,6 +1479,7 @@ int virNetDevSetIPAddress(const char *ifname, cleanup: VIR_FREE(addrstr); VIR_FREE(bcaststr); + VIR_FREE(peerstr); virCommandFree(cmd); return ret; } diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index e7719d58a410..240fff774d30 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -90,6 +90,7 @@ int virNetDevGetOnline(const char *ifname, int virNetDevSetIPAddress(const char *ifname, virSocketAddr *addr, + virSocketAddr *peer, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int virNetDevAddRoute(const char *ifname, -- 2.7.3

2 5

[libvirt] [PATCH] domain: Remove controller/net address whitelists
by Cole Robinson 19 Mar '16

19 Mar '16

Judging by how the whitelist has skewed quite far from the original error message, I think it's better to just drop these. If someone wants to revive this check I suggest implementing it on a per-HV driver basis with PostParse callbacks. --- src/conf/domain_conf.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d376a2c..ec14577 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7969,17 +7969,6 @@ virDomainControllerDefParseXML(xmlNodePtr node, break; } - if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Controllers must use the 'pci' address type")); - goto error; - } - cleanup: ctxt->node = saved; VIR_FREE(typeStr); @@ -8670,19 +8659,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, goto error; } - /* XXX what about ISA/USB based NIC models - once we support - * them we should make sure address type is correct */ - if (def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && - def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Network interfaces must use 'pci' address type")); - goto error; - } - switch (def->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: if (network == NULL) { -- 2.5.0

2 3

[libvirt] [libvirt-sandbox PATCH] Silence PyGIWarnings
by Guido Günther 19 Mar '16

19 Mar '16

This fixes /usr/bin/virt-sandbox-service:22: PyGIWarning: LibvirtGObject was imported without specifying a version first. Use gi.require_version('LibvirtGObject', '1.0') before import to ensure that the right version gets loaded. from gi.repository import LibvirtGObject /usr/bin/virt-sandbox-service:23: PyGIWarning: LibvirtSandbox was imported without specifying a version first. Use gi.require_version('LibvirtSandbox', '1.0') before import to ensure that the right version gets loaded. from gi.repository import LibvirtSandbox --- bin/virt-sandbox-service | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index a4a2154..45f4517 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -19,7 +19,10 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +import gi +gi.require_version('LibvirtGObject', '1.0') from gi.repository import LibvirtGObject +gi.require_version('LibvirtSandbox', '1.0') from gi.repository import LibvirtSandbox from gi.repository import GLib import gi -- 2.7.0

2 2

[libvirt] [PATCH 00/24] hostdev: Cleanups and fixes
by Andrea Bolognani 19 Mar '16

19 Mar '16

Part of an ongoing quest to fix: libvirt management of VFIO devices can lead to host crashes https://bugzilla.redhat.com/show_bug.cgi?id=1272300 Previous episode: [PATCH v2 0/9] PCI hostdev refactoring https://www.redhat.com/archives/libvir-list/2016-January/msg01066.html The plan: Once this is in, rebase the series mentioned above on top of it; hopefully it will be smaller and easier to review. Once *that* is in, rebase / rewrite the actual bug fix - probably the latter, because the code has changed a lot since I posted it In this episode: 01-06 Cleanups in the test cases; mostly unrelated, but commit 24 depends on them 07-17 More cleanups and (I believe) farily uncontroversial changes, aimed at making the actual changes either smaller or more obvious 18-19 Change in variable names that make the intended semantics clearer, which should in turn make the follow-up changes easier to review Up until here there should be basically no change in behavior 20 Bug fix 21 Improvement to error reporting 22 The whole point of this series, and also the commit where it's more likely that I might have gotten something wrong :) I haven't been able to figure out a way to split it into smaller chunks, sorry 23 Another bug fix 24 Test the changes made by the rest of the series Cheers. Andrea Bolognani (24): tests: hostdev: Remove magic numbers tests: hostdev: Use better variable names tests: hostdev: Declare count inside CHECK_LIST_COUNT() tests: hostdev: Use size_t for count variables tests: hostdev: Add more checks on list size tests: hostdev: Group test cases hostdev: Make comments easier to change later hostdev: Remove false comment hostdev: Fix indentation hostdev: Remove explicit NULL checks hostdev: Remove redundant check hostdev: virHostdevIsPCINetDevice() should return a bool hostdev: Change argument order for virHostdevReattachPCIDevice() hostdev: Look up devices using IDs when possible hostdev: Remove virHostdevGetActivePCIHostDeviceList() hostdev: Rename hostdev_mgr -> mgr hostdev: Rename usesVfio -> usesVFIO hostdev: Use consistent variable names hostdev: Add more comments hostdev: Save netdev configuration of actual device hostdev: Stop early if unmanaged devices have not been detached hostdev: Streamline device ownership tracking hostdev: Use actual device when reattaching tests: hostdev: Add more tests src/util/virhostdev.c | 660 +++++++++++++++++++++++++------------------------ tests/virhostdevtest.c | 320 ++++++++++++++++++------ 2 files changed, 576 insertions(+), 404 deletions(-) -- 2.5.0

3 74

[libvirt] [PATCH v5 0/9] NSS module for libvirt
by Michal Privoznik 19 Mar '16

19 Mar '16

v5 of: https://www.redhat.com/archives/libvir-list/2016-February/msg00693.html diff to v4: - Dropped the virjson const correctness patch - Worked in Martin's review (small nits here and there) - Dropped libxml2 dependency Patches 1, 4, and 5 have been ACKed already, but I'm sending them for completeness. Michal Privoznik (9): Export virLease* functions for leases file handling virLeaseReadCustomLeaseFile: Allow server_duid to be NULL virsocketaddr: Introduce virSocketAddrSetIPv6Addr Initial support for NSS plugin skeleton libvirt.spec.in: Introduce libvirt-nss package nss: Implement _nss_libvirt_gethostbyname3_r Implement _nss_libvirt_gethostbyname4_r nss: Introduce a test tests: Introduce nsslinktest cfg.mk | 2 +- config-post.h | 24 +++ configure.ac | 2 + libvirt.spec.in | 21 ++ m4/virt-nss.m4 | 51 +++++ po/POTFILES.in | 1 + src/Makefile.am | 58 ++++++ src/libvirt_private.syms | 7 + src/network/leaseshelper.c | 270 +------------------------- src/util/virfile.c | 3 +- src/util/virfile.h | 10 +- src/util/virlease.c | 305 +++++++++++++++++++++++++++++ src/util/virlease.h | 44 +++++ src/util/virsocketaddr.c | 15 ++ src/util/virsocketaddr.h | 1 + tests/Makefile.am | 31 ++- tests/nssdata/virbr0.status | 20 ++ tests/nssdata/virbr1.status | 20 ++ tests/nsslinktest.c | 39 ++++ tests/nssmock.c | 140 ++++++++++++++ tests/nsstest.c | 208 ++++++++++++++++++++ tools/Makefile.am | 43 +++++ tools/nss/libvirt_nss.c | 458 ++++++++++++++++++++++++++++++++++++++++++++ tools/nss/libvirt_nss.h | 52 +++++ tools/nss/libvirt_nss.syms | 12 ++ 25 files changed, 1562 insertions(+), 275 deletions(-) create mode 100644 m4/virt-nss.m4 create mode 100644 src/util/virlease.c create mode 100644 src/util/virlease.h create mode 100644 tests/nssdata/virbr0.status create mode 100644 tests/nssdata/virbr1.status create mode 100644 tests/nsslinktest.c create mode 100644 tests/nssmock.c create mode 100644 tests/nsstest.c create mode 100644 tools/nss/libvirt_nss.c create mode 100644 tools/nss/libvirt_nss.h create mode 100644 tools/nss/libvirt_nss.syms -- 2.4.10

3 18

[libvirt] [PATCH 0/2] small test additions
by Jim Fehlig 18 Mar '16

18 Mar '16

Inspired by Jan's comment from another review https://www.redhat.com/archives/libvir-list/2016-March/msg00570.html Jim Fehlig (2): tests: add xlconfigdata to domainschematests tests: add schema test for default cache mode tests/domainschemadata/default-cache-mode.xml | 26 ++++++++++++++++++++++++++ tests/domainschematest | 1 + 2 files changed, 27 insertions(+) create mode 100644 tests/domainschemadata/default-cache-mode.xml -- 2.1.4

2 5

[libvirt] guys is the header file broken??
by Dravid Kumar 18 Mar '16

18 Mar '16

cause i get this error me.cpp: In function ‘int main(int, char**)’: me.cpp:23:45: error: ‘virConnectCreateXML’ was not declared in this scope dom = virConnectCreateXML(conn, xmlconfig, 0); ^ me.cpp:27:5: error: return-statement with no value, in function returning ‘int’ [-fpermissive] return; ^ me.cpp:30:57: error: ‘virDomainName’ was not declared in this scope fprintf(stderr, "Guest %s has booted", virDomainName(dom)); for the attached cpp file

2 1

[libvirt] CfP 11th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '16)
by VHPC 16 18 Mar '16

18 Mar '16

==================================================================== CALL FOR PAPERS 11th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '16) held in conjunction with the International Supercomputing Conference - High Performance, June 19-23, 2016, Frankfurt, Germany. ==================================================================== Date: June 23, 2016 Workshop URL: http://vhpc.org Paper Submission Deadline: April 25, 2016 Call for Papers Virtualization technologies constitute a key enabling factor for flexible resource management in modern data centers, and particularly in cloud environments. Cloud providers need to manage complex infrastructures in a seamless fashion to support the highly dynamic and heterogeneous workloads and hosted applications customers deploy. Similarly, HPC environments have been increasingly adopting techniques that enable flexible management of vast computing and networking resources, close to marginal provisioning cost, which is unprecedented in the history of scientific and commercial computing. Various virtualization technologies contribute to the overall picture in different ways: machine virtualization, with its capability to enable consolidation of multiple underutilized servers with heterogeneous software and operating systems (OSes), and its capability to live-migrate a fully operating virtual machine (VM) with a very short downtime, enables novel and dynamic ways to manage physical servers; OS-level virtualization (i.e., containerization), with its capability to isolate multiple user-space environments and to allow for their coexistence within the same OS kernel, promises to provide many of the advantages of machine virtualization with high levels of responsiveness and performance; I/O Virtualization allows physical NICs/HBAs to take traffic from multiple VMs or containers; network virtualization, with its capability to create logical network overlays that are independent of the underlying physical topology and IP addressing, provides the fundamental ground on top of which evolved network services can be realized with an unprecedented level of dynamicity and flexibility; the increasingly adopted paradigm of Software-Defined Networking (SDN) promises to extend this flexibility to the control and data planes of network paths. Topics of Interest The VHPC program committee solicits original, high-quality submissions related to virtualization across the entire software stack with a special focus on the intersection of HPC and the cloud. Topics include, but are not limited to: - Virtualization in supercomputing environments, HPC clusters, cloud HPC and grids - OS-level virtualization including container runtimes (Docker, rkt et al.) - Lightweight compute node operating systems/VMMs - Optimizations of virtual machine monitor platforms, hypervisors - QoS and SLA in hypervisors and network virtualization - Cloud based network and system management for SDN and NFV - Management, deployment and monitoring of virtualized environments - Virtual per job / on-demand clusters and cloud bursting - Performance measurement, modelling and monitoring of virtualized/cloud workloads - Programming models for virtualized environments - Virtualization in data intensive computing and Big Data processing - Cloud reliability, fault-tolerance, high-availability and security - Heterogeneous virtualized environments, virtualized accelerators, GPUs and co-processors - Optimized communication libraries/protocols in the cloud and for HPC in the cloud - Topology management and optimization for distributed virtualized applications - Adaptation of emerging HPC technologies (high performance networks, RDMA, etc..) - I/O and storage virtualization, virtualization aware file systems - Job scheduling/control/policy in virtualized environments - Checkpointing and migration of VM-based large compute jobs - Cloud frameworks and APIs - Energy-efficient / power-aware virtualization The Workshop on Virtualization in High-Performance Cloud Computing (VHPC) aims to bring together researchers and industrial practitioners facing the challenges posed by virtualization in order to foster discussion, collaboration, mutual exchange of knowledge and experience, enabling research to ultimately provide novel solutions for virtualized computing systems of tomorrow. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections, plus lightning talks that are limited to 5 minutes. Presentations may be accompanied by interactive demonstrations. Important Dates April 25, 2016 - Paper submission deadline May 30, 2016 Acceptance notification June 23, 2016 - Workshop Day July 25, 2016 - Camera-ready version due Chair Michael Alexander (chair), TU Wien, Austria Anastassios Nanos (co-chair), NTUA, Greece Balazs Gerofi (co-chair), RIKEN Advanced Institute for Computational Science, Japan Program committee Stergios Anastasiadis, University of Ioannina, Greece Costas Bekas, IBM Research, Switzerland Jakob Blomer, CERN Ron Brightwell, Sandia National Laboratories, USA Roberto Canonico, University of Napoli Federico II, Italy Julian Chesterfield, OnApp, UK Stephen Crago, USC ISI, USA Christoffer Dall, Columbia University, USA Patrick Dreher, MIT, USA Robert Futrick, Cycle Computing, USA Robert Gardner, University of Chicago, USA William Gardner, University of Guelph, Canada Wolfgang Gentzsch, UberCloud, USA Kyle Hale, Northwestern University, USA Marcus Hardt, Karlsruhe Institute of Technology, Germany Krishna Kant, Templte University, USA Romeo Kinzler, IBM, Switzerland Brian Kocoloski, University of Pittsburgh, USA Kornilios Kourtis, IBM Research, Switzerland Nectarios Koziris, National Technical University of Athens, Greece John Lange, University of Pittsburgh, USA Nikos Parlavantzas, IRISA, France Kevin Pendretti, Sandia National Laboratories, USA Che-Rung Roger Lee, National Tsing Hua University, Taiwan Giuseppe Lettieri, University of Pisa, Italy Qing Liu, Oak Ridge National Laboratory, USA Paul Mundt, Adaptant, Germany Amer Qouneh, University of Florida, USA Carlos Reaño, Technical University of Valencia, Spain Seetharami Seelam, IBM Research, USA Josh Simons, VMWare, USA Borja Sotomayor, University of Chicago, USA Dieter Suess, TU Wien, Austria Craig Stewart, Indiana University, USA Anata Tiwari, San Diego Supercomputer Center, USA Kurt Tutschku, Blekinge Institute of Technology, Sweden Amit Vadudevan, Carnegie Mellon University, USA Yasuhiro Watashiba, Osaka University, Japan Nicholas Wright, Lawrence Berkeley National Laboratory, USA Chao-Tung Yang, Tunghai University, Taiwan Gianluigi Zanetti, CRS4, Italy Paper Submission-Publication Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. The format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract, Paper Submission Link: https://edas.info/newPaper.php?c=21801 Lightning Talks Lightning Talks are non-paper track, synoptical in nature and are strictly limited to 5 minutes. They can be used to gain early feedback on ongoing research, for demonstrations, to present research results, early research ideas, perspectives and positions of interest to the community. Submit abstract via the main submission link. General Information The workshop is one day in length and will be held in conjunction with the International Supercomputing Conference - High Performance (ISC) 2016, June 19-23, Frankfurt, Germany.

1 0

[libvirt] netlink message help
by Vasiliy Tolstov 18 Mar '16

18 Mar '16

I'm try to implement adding addresses to ehternet devices via libvirt and i need to add address with peer (like point to point) in iproute : ip a add xx.xx.xx.xx peer yy.yy.yy.yy dev tapNNN In netlink as i see i need to add in payload IFA_LOCAL address , after that IFA_ADDRESS, but this is not works =(. Can somebody helps me? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 1

[libvirt] [libvirt-perl][PATCH] Add VIR_MIGRATE_PARAM_DISKS_PORT constant
by Michal Privoznik 18 Mar '16

18 Mar '16

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + Virt.xs | 13 +++++++++++-- lib/Sys/Virt/Domain.pm | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index 8f2cba6..9ca0a76 100644 --- a/Changes +++ b/Changes @@ -9,6 +9,7 @@ Revision history for perl module Sys::Virt - Add VIR_DOMAIN_EVENT_ID_JOB_COMPLETED constant and callback - Add VIR_ERR_NO_SERVER constant - Add VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT constant + - Add VIR_MIGRATE_PARAM_DISKS_PORT constant 1.3.2 2016-03-01 diff --git a/Virt.xs b/Virt.xs index 2148eaf..358a396 100644 --- a/Virt.xs +++ b/Virt.xs @@ -4479,7 +4479,7 @@ _migrate(dom, destcon, newparams, flags=0) virTypedParameter *params; int nparams; CODE: - nparams = 6; + nparams = 7; Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, @@ -4506,6 +4506,10 @@ _migrate(dom, destcon, newparams, flags=0) VIR_TYPED_PARAM_FIELD_LENGTH); params[5].type = VIR_TYPED_PARAM_STRING; + strncpy(params[6].field, VIR_MIGRATE_PARAM_DISKS_PORT, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[6].type = VIR_TYPED_PARAM_INT; + nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, @@ -4534,7 +4538,7 @@ _migrate_to_uri(dom, desturi, newparams, flags=0) virTypedParameter *params; int nparams; PPCODE: - nparams = 6; + nparams = 7; Newx(params, nparams, virTypedParameter); strncpy(params[0].field, VIR_MIGRATE_PARAM_URI, @@ -4561,6 +4565,10 @@ _migrate_to_uri(dom, desturi, newparams, flags=0) VIR_TYPED_PARAM_FIELD_LENGTH); params[5].type = VIR_TYPED_PARAM_STRING; + strncpy(params[6].field, VIR_MIGRATE_PARAM_DISKS_PORT, + VIR_TYPED_PARAM_FIELD_LENGTH); + params[6].type = VIR_TYPED_PARAM_INT; + nparams = vir_typed_param_from_hv(newparams, params, nparams); vir_typed_param_add_string_list_from_hv(newparams, &params, &nparams, @@ -7586,6 +7594,7 @@ BOOT: REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_URI, MIGRATE_PARAM_URI); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_LISTEN_ADDRESS, MIGRATE_PARAM_LISTEN_ADDRESS); REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_MIGRATE_DISKS, MIGRATE_PARAM_MIGRATE_DISKS); + REGISTER_CONSTANT_STR(VIR_MIGRATE_PARAM_DISKS_PORT, MIGRATE_PARAM_DISK_PORT); REGISTER_CONSTANT(VIR_DOMAIN_XML_SECURE, XML_SECURE); REGISTER_CONSTANT(VIR_DOMAIN_XML_INACTIVE, XML_INACTIVE); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index 3e9e7ba..45b8ed1 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -981,6 +981,12 @@ or ::). This default may be a security risk if guests, or other untrusted users have the ability to connect to the virtualization host, thus use of an explicit restricted listen address is recommended. +=item C<Sys::Virt::Domain::MIGRATE_PARAM_DISK_PORT> + +Port that destination server should use for incoming disks migration. Type is +VIR_TYPED_PARAM_INT. If set to 0 or omitted, libvirt will choose a suitable +default. At the moment this is only supported by the QEMU driver. + =back =item C<Sys::Virt::Domain::MIGRATE_PARAM_MIGRATE_DISKS> -- 2.4.10

2 1

[libvirt] [PATCH v2] qemu: Move last error save/restore to qemuBuildNetCommandLine
by John Ferlan 18 Mar '16

18 Mar '16

Commit 'ef2ab8fd' moved just the virDomainConfNWFilterTeardown and left the logic to save/restore the current error essentially doing nothing in the error path for qemuBuildCommandLine. So move it to where it was meant to be. Although the original code would reset the filter on command creation errors after building the network command portion and commit 'ef2ab8fd' altered that logic, the teardown is called during qemuProcessStop from virDomainConfVMNWFilterTeardown and that code has the save/restore last error logic, so just allow that code to handle the teardown rather than running it twice. The qemuProcessStop would be called in the failure path of qemuBuildCommandLine. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: http://www.redhat.com/archives/libvir-list/2016-March/msg00566.html Changes - just move the save/restore error logic from mainline to the BuildNetCommandLine function where it's used. src/qemu/qemu_command.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b18e425..954f802 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8077,8 +8077,13 @@ qemuBuildNetCommandLine(virCommandPtr cmd, return 0; error: + /* free up any resources in the network driver + * but don't overwrite the original error */ + originalError = virSaveLastError(); for (i = 0; last_good_net != -1 && i <= last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); + virSetError(originalError); + virFreeError(originalError); return -1; } @@ -9407,11 +9412,6 @@ qemuBuildCommandLine(virConnectPtr conn, error: virObjectUnref(cfg); - /* free up any resources in the network driver - * but don't overwrite the original error */ - originalError = virSaveLastError(); - virSetError(originalError); - virFreeError(originalError); virCommandFree(cmd); return NULL; } -- 2.5.0

2 3

[libvirt] [PATCH] tests: Set PATH in each test
by Michal Privoznik 18 Mar '16

18 Mar '16

Currently we spawn couple of binaries in our test suite. Moreover, we provide some spoofed versions of system binaries hoping that those will be executed instead of the system ones. For instance, for testing SSH socket we have written our own ssh binary for producing predictable results. We certainly don't want to execute the system ssh binary. However, in order to prefer our binaries over system ones, we need to set PATH environment variable. But this is done only at the Makefile level. So if anybody runs a test by hand that expects our spoofed binary, the test ends up executing real system binaries. This is not good. In fact, it's terribly wrong. The fix lies in a small trick - putting our build directory at the beginning of the PATH environment variable in each test. Hopefully, since every test has this VIRT_TEST_MAIN* wrapper, we can fix this at a single place. Moreover, while this removes setting PATH for our tests written in bash, it's safe as we are not calling anything ours that would require PATH change there. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 3 --- tests/testutils.c | 21 ++++++++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 90981dc..74f7f5a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -462,8 +462,6 @@ TESTS = $(test_programs) \ # intermediate shell variable, but must do all the expansion in make lv_abs_top_builddir=$(shell cd '$(top_builddir)' && pwd) -path_add = $(subst :,$(PATH_SEPARATOR),\ - $(subst !,$(lv_abs_top_builddir)/,!daemon:!tools:!tests)) VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT = \ @@ -472,7 +470,6 @@ TESTS_ENVIRONMENT = \ abs_builddir=$(abs_builddir) \ abs_srcdir=$(abs_srcdir) \ CONFIG_HEADER="$(lv_abs_top_builddir)/config.h" \ - PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ SHELL="$(SHELL)" \ LIBVIRT_DRIVER_DIR="$(lv_abs_top_builddir)/src/.libs" \ LIBVIRT_AUTOSTART=0 \ diff --git a/tests/testutils.c b/tests/testutils.c index 88c4d4b..9211b94 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -806,6 +806,24 @@ virTestGetRegenerate(void) return testRegenerate; } +static int +virTestSetEnvPath(void) +{ + int ret = -1; + const char *path = getenv("PATH"); + char *new_path = NULL; + + if (strstr(path, abs_builddir) != path && + (virAsprintf(&new_path, "%s:%s", abs_builddir, path) < 0 || + setenv("PATH", new_path, 1) < 0)) + goto cleanup; + + ret = 0; + cleanup: + VIR_FREE(new_path); + return ret; +} + int virtTestMain(int argc, char **argv, int (*func)(void)) @@ -818,7 +836,8 @@ int virtTestMain(int argc, virFileActivateDirOverride(argv[0]); - if (!virFileExists(abs_srcdir)) + if (virTestSetEnvPath() < 0 || + !virFileExists(abs_srcdir)) return EXIT_AM_HARDFAIL; progname = last_component(argv[0]); -- 2.4.10

2 2

[libvirt] [PATCH v3 0/2] nodedev: Expose PCI header type information
by Martin Kletzander 18 Mar '16

18 Mar '16

v3: changed 'header' to 'capability', only reported for non-endpoints v2: Removed <multifunction/> reporting. https://www.redhat.com/archives/libvir-list/2016-March/msg00774.html v1: https://www.redhat.com/archives/libvir-list/2016-March/msg00645.html Martin Kletzander (2): nodedev: Indent PCI express for future fix nodedev: Expose PCI header type docs/schemas/nodedev.rng | 11 +++++++ src/conf/node_device_conf.c | 20 ++++++++++++ src/conf/node_device_conf.h | 1 + src/libvirt_private.syms | 3 ++ src/node_device/node_device_udev.c | 37 ++++++++++++---------- src/util/virpci.c | 33 +++++++++++++++++++ src/util/virpci.h | 12 +++++++ .../pci_0000_00_02_0_header_type.xml | 15 +++++++++ .../pci_0000_00_1c_0_header_type.xml | 20 ++++++++++++ tests/nodedevxml2xmltest.c | 2 ++ 10 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml -- 2.7.3

3 7

[libvirt] [PATCH] network: differentiate macvtap/bridge from host-bridge based networks
by Laine Stump 18 Mar '16

18 Mar '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1316465 An attempt to simplify the code for the VIR_NETWORK_FORWARD_BRIDGE case of networkUpdateState in commit b61db335 (first in release 1.2.14) resulted in networks based on macvtap bridge mode being erroneously marked as inactive any time libvirtd was restarted. The problem is that the original code had differentiated between a network using tap devices to connect to an existing host-bridge device (forward mode of VIR_NETWORK_FORWARD_BRIDGE and a non-NULL def->bridge), and one using macvtap bridge mode to connect to any ethernet device (still forward mode VIR_NETWORK_FORWARD_BRIDGE, but null def->bridge), but the changed code assumed that all networks with VIR_NETWORK_FORWARD_BRIDGE were tap + host-bridge networks, so a null def->bridge was interpreted as "inactive". This patch restores the original code in networkUpdateState, as well as fixing two other pre-existing similar problems - the cases for VIR_NETWORK_FORWARD_BRIDGE in both networkStartNetwork and networkShutdownNetwork have always made the same mistake - treating macvtap-bridge-mode networks as tap+host-bridge. --- src/network/bridge_driver.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 01c2ed6..b164334 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -406,7 +406,8 @@ networkUpdateState(virNetworkObjPtr obj, break; case VIR_NETWORK_FORWARD_BRIDGE: - if (!(obj->def->bridge && virNetDevExists(obj->def->bridge) == 1)) { + if (obj->def->bridge) { + if (virNetDevExists(obj->def->bridge) != 1) obj->active = 0; break; } @@ -2490,10 +2491,15 @@ networkStartNetwork(virNetworkDriverStatePtr driver, break; case VIR_NETWORK_FORWARD_BRIDGE: - if (networkStartNetworkBridge(network) < 0) - goto cleanup; - break; - + if (network->def->bridge) { + if (networkStartNetworkBridge(network) < 0) + goto cleanup; + break; + } + /* intentionally fall through to the macvtap/direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + * (since that is macvtap bridge mode). + */ case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_PASSTHROUGH: @@ -2562,9 +2568,14 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, break; case VIR_NETWORK_FORWARD_BRIDGE: - ret = networkShutdownNetworkBridge(network); - break; - + if (network->def->bridge) { + ret = networkShutdownNetworkBridge(network); + break; + } + /* intentionally fall through to the macvtap/direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + * (since that is macvtap bridge mode). + */ case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: case VIR_NETWORK_FORWARD_PASSTHROUGH: @@ -4691,8 +4702,8 @@ networkGetNetworkAddress(const char *netname, char **netaddr) if ((dev_name = netdef->bridge)) break; /* - * fall through if netdef->bridge wasn't set, since this is - * also a direct-mode interface. + * fall through if netdef->bridge wasn't set, since that is + * macvtap bridge mode network. */ case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: -- 2.5.0

2 1

[libvirt] [PATCH v2 0/2] qemu: Support for QXL heads
by Martin Kletzander 18 Mar '16

18 Mar '16

v2: don't change heads when migrating v1: https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Martin Kletzander (2): qemu: Check for qxl's max_outputs parameter qemu: Add support to QXL's max_outputs parameter src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 8 ++++ src/qemu/qemu_migration.c | 50 ++++++++++++++++++++-- .../qemuxml2argv-video-qxl-heads.args | 28 ++++++++++++ .../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ .../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 9 files changed, 192 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml -- 2.7.3

1 2

[libvirt] [PATCH] Use vir*Error instead of VIR_ERROR in qemuStateInitialize
by Jovanka Gulicoska 18 Mar '16

18 Mar '16

--- src/qemu/qemu_driver.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0d6596..d39058a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -639,7 +639,6 @@ qemuStateInitialize(bool privileged, { char *driverConf = NULL; virConnectPtr conn = NULL; - char ebuf[1024]; virQEMUDriverConfigPtr cfg; uid_t run_uid = -1; gid_t run_gid = -1; @@ -683,44 +682,43 @@ qemuStateInitialize(bool privileged, VIR_FREE(driverConf); if (virFileMakePath(cfg->stateDir) < 0) { - VIR_ERROR(_("Failed to create state dir '%s': %s"), - cfg->stateDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create state dir %s"), + cfg->stateDir); goto error; } if (virFileMakePath(cfg->libDir) < 0) { - VIR_ERROR(_("Failed to create lib dir '%s': %s"), - cfg->libDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create lib dir %s"), + cfg->libDir); goto error; } if (virFileMakePath(cfg->cacheDir) < 0) { - VIR_ERROR(_("Failed to create cache dir '%s': %s"), - cfg->cacheDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create cache dir %s"), + cfg->cacheDir); goto error; } if (virFileMakePath(cfg->saveDir) < 0) { - VIR_ERROR(_("Failed to create save dir '%s': %s"), - cfg->saveDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create save dir %s"), + cfg->saveDir); goto error; } if (virFileMakePath(cfg->snapshotDir) < 0) { - VIR_ERROR(_("Failed to create save dir '%s': %s"), - cfg->snapshotDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create save dir %s"), + cfg->snapshotDir); goto error; } if (virFileMakePath(cfg->autoDumpPath) < 0) { - VIR_ERROR(_("Failed to create dump dir '%s': %s"), - cfg->autoDumpPath, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create dump dir %s"), + cfg->autoDumpPath); goto error; } if (virFileMakePath(cfg->channelTargetDir) < 0) { - VIR_ERROR(_("Failed to create channel target dir '%s': %s"), - cfg->channelTargetDir, - virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create channel target dir %s"), + cfg->channelTargetDir); goto error; } if (virFileMakePath(cfg->nvramDir) < 0) { - VIR_ERROR(_("Failed to create nvram dir '%s': %s"), - cfg->nvramDir, virStrerror(errno, ebuf, sizeof(ebuf))); + virReportSystemError(errno, _("Failed to create nvram dir %s"), + cfg->nvramDir); goto error; } -- 2.5.0

2 1

[libvirt] [PATCH] use virGetLastErrorMessage instead of virGetLastError to check for NULL in qemu
by Jovanka Gulicoska 18 Mar '16

18 Mar '16

--- src/qemu/qemu_capabilities.c | 18 ++++++++---------- src/qemu/qemu_driver.c | 12 +++++------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b223837..af35f89 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3089,10 +3089,9 @@ virQEMUCapsInitCached(virQEMUCapsPtr qemuCaps, const char *cacheDir) if (virQEMUCapsLoadCache(qemuCaps, capsfile, &qemuctime, &selfctime, &selfvers) < 0) { - virErrorPtr err = virGetLastError(); + const char *err = virGetLastErrorMessage(); VIR_WARN("Failed to load cached caps from '%s' for '%s': %s", - capsfile, qemuCaps->binary, err ? NULLSTR(err->message) : - _("unknown error")); + capsfile, qemuCaps->binary, err); virResetLastError(); ret = 0; virQEMUCapsReset(qemuCaps); @@ -3320,9 +3319,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, /* @mon is supposed to be locked by callee */ if (qemuMonitorSetCapabilities(mon) < 0) { - virErrorPtr err = virGetLastError(); + const char *err = virGetLastErrorMessage(); VIR_DEBUG("Failed to set monitor capabilities %s", - err ? err->message : "<unknown problem>"); + err); ret = 0; goto cleanup; } @@ -3330,9 +3329,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (qemuMonitorGetVersion(mon, &major, &minor, &micro, &package) < 0) { - virErrorPtr err = virGetLastError(); + const char *err = virGetLastErrorMessage(); VIR_DEBUG("Failed to query monitor version %s", - err ? err->message : "<unknown problem>"); + err); ret = 0; goto cleanup; } @@ -3561,15 +3560,14 @@ virQEMUCapsLogProbeFailure(const char *binary) { .key = "LIBVIRT_QEMU_BINARY", .s = binary, .iv = 0 }, { .key = NULL }, }; - virErrorPtr err = virGetLastError(); + const char *err = virGetLastErrorMessage(); virLogMessage(&virLogSelf, VIR_LOG_WARN, __FILE__, __LINE__, __func__, meta, _("Failed to probe capabilities for %s: %s"), - binary, err && err->message ? err->message : - _("unknown failure")); + binary, err); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 29c3bc8..85e5441 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -277,7 +277,7 @@ qemuAutostartDomain(virDomainObjPtr vm, void *opaque) { struct qemuAutostartData *data = opaque; - virErrorPtr err; + const char *err; int flags = 0; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(data->driver); int ret = -1; @@ -291,19 +291,17 @@ qemuAutostartDomain(virDomainObjPtr vm, if (vm->autostart && !virDomainObjIsActive(vm)) { if (qemuProcessBeginJob(data->driver, vm) < 0) { - err = virGetLastError(); + err = virGetLastErrorMessage(); VIR_ERROR(_("Failed to start job on VM '%s': %s"), - vm->def->name, - err ? err->message : _("unknown error")); + vm->def->name, err); goto cleanup; } if (qemuDomainObjStart(data->conn, data->driver, vm, flags, QEMU_ASYNC_JOB_START) < 0) { - err = virGetLastError(); + err = virGetLastErrorMessage(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), - vm->def->name, - err ? err->message : _("unknown error")); + vm->def->name, err); } qemuProcessEndJob(data->driver, vm); -- 2.5.0

2 1

[libvirt] [PATCH] Don't warn about nonexisting connection drivers
by Jovanka Gulicoska 18 Mar '16

18 Mar '16

--- src/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver.c b/src/driver.c index 2985538..1514a3b 100644 --- a/src/driver.c +++ b/src/driver.c @@ -62,7 +62,7 @@ virDriverLoadModule(const char *name) return NULL; if (access(modfile, R_OK) < 0) { - VIR_WARN("Module %s not accessible", modfile); + VIR_INFO("Module %s not accessible", modfile); goto cleanup; } -- 2.5.0

2 1

[libvirt] [PATCH v3 0/2] persistent live migration with specified XML
by Dmitry Andreev 18 Mar '16

18 Mar '16

v3: - use shorter name for param and rename args - move qemuMigrationCookieAddPersistent out from qemuMigrationBakeCookie - rebase to master v2: reimplemented with new migration param Libvirt doesn't allow to specify destination persistent domain configuration. VIR_MIGRATE_PARAM_DEST_XML migration param is used for active configuration and persistent configuration is taken from source domain. The problem is mentioned in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=835300 This patch-set introduces new migration param VIR_MIGRATE_PARAM_PERSIST_XML and implements its support in qemu driver. Dmitry Andreev (2): qemuMigrationCookieAddPersistent: move it out and change argument type qemu: migration: new migration param for persistent destination XML include/libvirt/libvirt-domain.h | 15 ++++++++++ src/qemu/qemu_driver.c | 12 +++++--- src/qemu/qemu_migration.c | 64 ++++++++++++++++++++++++---------------- src/qemu/qemu_migration.h | 2 ++ 4 files changed, 63 insertions(+), 30 deletions(-) -- 1.8.3.1

1 3

[libvirt] [PATCH v2 0/2] nodedev: Expose PCI header type information
by Martin Kletzander 18 Mar '16

18 Mar '16

v2: Removed <multifunction/> reporting. v1: https://www.redhat.com/archives/libvir-list/2016-March/msg00645.html Martin Kletzander (2): nodedev: Indent PCI express for future fix nodedev: Expose PCI header type docs/schemas/nodedev.rng | 12 +++++++ src/conf/node_device_conf.c | 24 ++++++++++++++ src/conf/node_device_conf.h | 1 + src/libvirt_private.syms | 3 ++ src/node_device/node_device_udev.c | 37 ++++++++++++---------- src/util/virpci.c | 33 +++++++++++++++++++ src/util/virpci.h | 12 +++++++ .../pci_0000_00_02_0_header_type.xml | 16 ++++++++++ .../pci_0000_00_1c_0_header_type.xml | 20 ++++++++++++ tests/nodedevxml2xmltest.c | 2 ++ 10 files changed, 144 insertions(+), 16 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml -- 2.7.3

2 5

[libvirt] [PATCH v4 0/2] migration: add option to set target ndb server port
by Nikolay Shirokovskiy 17 Mar '16

17 Mar '16

Current libvirt + qemu pair lacks secure migrations in case of VMs with non-shared disks. The only option to migrate securely natively is to use tunneled mode and some kind of secure destination URI. But tunelled mode does not support non-shared disks. The other way to make migration secure is to organize a tunnel by external means. This is possible in case of shared disks migration thru use of proper combination of destination URI, migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration param. But again this is not possible in case of non shared disks migration as we have no option to control target nbd server port. But fixing this much more simplier that supporting non-shared disks in tunneled mode. So this patch series adds option to set target ndb port. Finally all qemu migration connections will be secured AFAIK but even in this case this patch could be convinient if one wants all migration traffic be put in a single connection. difference from v3: =================== Revert code of starting nbd server back to v2. Nikolay Shirokovskiy (2): migration: add target peer disks port qemu: implement setting target disks migration port include/libvirt/libvirt-domain.h | 10 +++++ src/qemu/qemu_driver.c | 25 +++++++---- src/qemu/qemu_migration.c | 92 +++++++++++++++++++++++++++++----------- src/qemu/qemu_migration.h | 3 ++ tools/virsh-domain.c | 12 ++++++ tools/virsh.pod | 5 ++- 6 files changed, 113 insertions(+), 34 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH] conf: Format disk pool part_separator attribute for running pool
by John Ferlan 17 Mar '16

17 Mar '16

Commit id '4f846170' added printing of a new field 'part_separator'; however, neglected to do so when there was an "freeExtent" defined for the device (as there would be when the disk pool was started). This patch adjusts the logic to appropriately format the device path and if there the part_separator attribute. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Discovered during the validation of : https://bugzilla.redhat.com/show_bug.cgi?id=1265694 src/conf/storage_conf.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index bfba521..497c65f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1055,9 +1055,15 @@ virStoragePoolSourceFormat(virBufferPtr buf, if ((options->flags & VIR_STORAGE_POOL_SOURCE_DEVICE) && src->ndevice) { for (i = 0; i < src->ndevice; i++) { + virBufferEscapeString(buf, "<device path='%s'", + src->devices[i].path); + if (src->devices[i].part_separator != + VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(buf, " part_separator='%s'", + virTristateBoolTypeToString(src->devices[i].part_separator)); + } if (src->devices[i].nfreeExtent) { - virBufferEscapeString(buf, "<device path='%s'>\n", - src->devices[i].path); + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); for (j = 0; j < src->devices[i].nfreeExtent; j++) { virBufferAsprintf(buf, "<freeExtent start='%llu' end='%llu'/>\n", @@ -1067,13 +1073,6 @@ virStoragePoolSourceFormat(virBufferPtr buf, virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</device>\n"); } else { - virBufferEscapeString(buf, "<device path='%s'", - src->devices[i].path); - if (src->devices[i].part_separator != - VIR_TRISTATE_SWITCH_ABSENT) { - virBufferAsprintf(buf, " part_separator='%s'", - virTristateBoolTypeToString(src->devices[i].part_separator)); - } virBufferAddLit(buf, "/>\n"); } } -- 2.5.0

2 1

[libvirt] [PATCH] docs: fix libvirt version for vram64 in formatdomain.html.in
by Pavel Hrdina 17 Mar '16

17 Mar '16

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 41f2488..423dcdc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5200,7 +5200,7 @@ qemu-kvm -net nic,model=? /dev/null two as <code>vram</code>. There is also optional attribute <code>vgamem</code> (since 1.2.11) to set the size of VGA framebuffer for fallback mode of QXL device. - Attribute <code>vram64</code> (since 1.3.2) + Attribute <code>vram64</code> (since 1.3.3) extends secondary bar and makes it addressable as 64bit memory. </dd> -- 2.7.3

1 0

[libvirt] [PATCH] vz: code refactoring
by Mikhail Feoktistov 17 Mar '16

17 Mar '16

In prlsdkAddNet() Attach/DetachNet() functions privconn should be the first argument --- src/vz/vz_driver.c | 4 ++-- src/vz/vz_sdk.c | 16 ++++++++-------- src/vz/vz_sdk.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index b02e59f..604e7a8 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1088,7 +1088,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } break; case VIR_DOMAIN_DEVICE_NET: - ret = prlsdkAttachNet(privdom, privconn, dev->data.net) + ret = prlsdkAttachNet(privconn, privdom, dev->data.net) if (ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("network attach failed")); @@ -1165,7 +1165,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } break; case VIR_DOMAIN_DEVICE_NET: - ret = prlsdkDetachNet(privdom, privconn, dev->data.net) + ret = prlsdkDetachNet(privconn, privdom, dev->data.net) if (ret) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("network detach failed")); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 1473866..c0fb4fb 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2608,8 +2608,8 @@ static const char * prlsdkFormatMac(virMacAddrPtr mac, char *macstr) return macstr; } -static int prlsdkAddNet(PRL_HANDLE sdkdom, - vzConnPtr privconn, +static int prlsdkAddNet(vzConnPtr privconn, + PRL_HANDLE sdkdom, virDomainNetDefPtr net, bool isCt) { @@ -2865,8 +2865,8 @@ prlsdkCleanupBridgedNet(vzConnPtr privconn, virDomainNetDefPtr net) PrlHandle_Free(vnet); } -int prlsdkAttachNet(virDomainObjPtr dom, - vzConnPtr privconn, +int prlsdkAttachNet(vzConnPtr privconn, + virDomainObjPtr dom, virDomainNetDefPtr net) { int ret = -1; @@ -2883,7 +2883,7 @@ int prlsdkAttachNet(virDomainObjPtr dom, if (PRL_FAILED(waitJob(job))) return ret; - ret = prlsdkAddNet(privdom->sdkdom, privconn, net, IS_CT(dom->def)); + ret = prlsdkAddNet(privconn, privdom->sdkdom, net, IS_CT(dom->def)); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); if (PRL_FAILED(waitJob(job))) @@ -2930,8 +2930,8 @@ prlsdkFindNetByMAC(PRL_HANDLE sdkdom, virMacAddrPtr mac) return adapter; } -int prlsdkDetachNet(virDomainObjPtr dom, - vzConnPtr privconn, +int prlsdkDetachNet(vzConnPtr privconn, + virDomainObjPtr dom, virDomainNetDefPtr net) { int ret = -1; @@ -3372,7 +3372,7 @@ prlsdkDoApplyConfig(virConnectPtr conn, } for (i = 0; i < def->nnets; i++) { - if (prlsdkAddNet(sdkdom, conn->privateData, def->nets[i], IS_CT(def)) < 0) + if (prlsdkAddNet(conn->privateData, sdkdom, def->nets[i], IS_CT(def)) < 0) goto error; } diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index 8a38797..2f11d4f 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -69,9 +69,9 @@ prlsdkDetachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk); int prlsdkGetBlockStats(virDomainObjPtr dom, virDomainDiskDefPtr disk, virDomainBlockStatsPtr stats); int -prlsdkAttachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net); +prlsdkAttachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net); int -prlsdkDetachNet(virDomainObjPtr dom, vzConnPtr privconn, virDomainNetDefPtr net); +prlsdkDetachNet(vzConnPtr privconn, virDomainObjPtr dom, virDomainNetDefPtr net); int prlsdkGetNetStats(virDomainObjPtr dom, const char *path, virDomainInterfaceStatsPtr stats); int -- 1.8.3.1

2 1

[libvirt] [PATCH v2] migration: add option to set target ndb server port
by Nikolay Shirokovskiy 17 Mar '16

17 Mar '16

Current libvirt + qemu pair lacks secure migrations in case of VMs with non-shared disks. The only option to migrate securely natively is to use tunneled mode and some kind of secure destination URI. But tunelled mode does not support non-shared disks. The other way to make migration secure is to organize a tunnel by external means. This is possible in case of shared disks migration thru use of proper combination of destination URI, migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration param. But again this is not possible in case of non shared disks migration as we have no option to control target nbd server port. But fixing this much more simplier that supporting non-shared disks in tunneled mode. So this patch adds option to set target ndb port. Finally all qemu migration connections will be secured AFAIK but even in this case this patch could be convinient if one wants all migration traffic be put in a single connection. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- Difference from v1: 1. fix indentation 2. fix uninitialized variable case in qemuDomainMigratePerform3Params 3. remove check that nbd port that passed from target back to source on preparation step in cookie is requested one. First the check was malformed. Second we don't need it anyway. In case target does not support setting nbd port we get error ealier when checking variable parameters list. After this check is removed we don't need to pass port parameter here and there on perform step except for the tunnel case when we convert all parameters back to parameter list. include/libvirt/libvirt-domain.h | 10 +++++ src/qemu/qemu_driver.c | 25 ++++++++---- src/qemu/qemu_migration.c | 85 ++++++++++++++++++++++++++++------------ src/qemu/qemu_migration.h | 3 ++ tools/virsh-domain.c | 12 ++++++ tools/virsh.pod | 5 ++- 6 files changed, 106 insertions(+), 34 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 65f1618..aa380f5 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -757,6 +757,16 @@ typedef enum { */ # define VIR_MIGRATE_PARAM_MIGRATE_DISKS "migrate_disks" +/** + * VIR_MIGRATE_PARAM_NBD_PORT: + * + * virDomainMigrate* params field: port that destination nbd server should use + * for incoming disks migration. Type is VIR_TYPED_PARAM_INT. If set to 0 or + * omitted, libvirt will choose a suitable default. At the moment this is only + * supported by the QEMU driver. + */ +# define VIR_MIGRATE_PARAM_NBD_PORT "nbd_port" + /* Domain migration. */ virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn, unsigned long flags, const char *dname, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2bbc724..6230087 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12005,7 +12005,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12058,7 +12058,7 @@ qemuDomainMigratePerform(virDomainPtr dom, * Consume any cookie we were able to decode though */ ret = qemuMigrationPerform(driver, dom->conn, vm, - NULL, dconnuri, uri, NULL, NULL, 0, NULL, + NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ flags, dname, resource, false); @@ -12231,7 +12231,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - &def, origname, NULL, 0, NULL, flags); + &def, origname, NULL, 0, NULL, 0, flags); cleanup: VIR_FREE(origname); @@ -12257,6 +12257,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, const char *dname = NULL; const char *uri_in = NULL; const char *listenAddress = cfg->migrationAddress; + int nbdPort = 0; int nmigrate_disks; const char **migrate_disks = NULL; char *origname = NULL; @@ -12277,7 +12278,10 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, &uri_in) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12308,7 +12312,8 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, cookieout, cookieoutlen, uri_in, uri_out, &def, origname, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, + nbdPort, flags); cleanup: VIR_FREE(migrate_disks); @@ -12442,7 +12447,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, } return qemuMigrationPerform(driver, dom->conn, vm, xmlin, - dconnuri, uri, NULL, NULL, 0, NULL, + dconnuri, uri, NULL, NULL, 0, NULL, 0, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, true); @@ -12469,6 +12474,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, int nmigrate_disks; const char **migrate_disks = NULL; unsigned long long bandwidth = 0; + int nbdPort = 0; int ret = -1; virCheckFlags(QEMU_MIGRATION_FLAGS, -1); @@ -12492,7 +12498,10 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, &graphicsuri) < 0 || virTypedParamsGetString(params, nparams, VIR_MIGRATE_PARAM_LISTEN_ADDRESS, - &listenAddress) < 0) + &listenAddress) < 0 || + virTypedParamsGetInt(params, nparams, + VIR_MIGRATE_PARAM_NBD_PORT, + &nbdPort) < 0) goto cleanup; nmigrate_disks = virTypedParamsGetStringList(params, nparams, @@ -12512,7 +12521,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, ret = qemuMigrationPerform(driver, dom->conn, vm, dom_xml, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, true); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f2c7b61..4cadf34 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1709,7 +1709,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, virDomainObjPtr vm, const char *listenAddr, size_t nmigrate_disks, - const char **migrate_disks) + const char **migrate_disks, + int nbdPort) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1717,6 +1718,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, char *diskAlias = NULL; size_t i; + if (nbdPort < 0 || nbdPort > USHRT_MAX) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nbd port must be in range 0-65535")); + return -1; + } + for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -1733,10 +1740,15 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto cleanup; - if (!port && - ((virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) || - (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { - goto exit_monitor; + if (port == 0) { + if (nbdPort) + port = nbdPort; + else + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto exit_monitor; + + if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0) + goto exit_monitor; } if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, true) < 0) @@ -1750,7 +1762,8 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); - if (ret < 0) + // second clause means port is autoselected + if (ret < 0 && nbdPort == 0) virPortAllocatorRelease(driver->migrationPorts, port); return ret; @@ -3312,6 +3325,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { virDomainObjPtr vm = NULL; @@ -3513,7 +3527,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) { if (qemuMigrationStartNBDServer(driver, vm, incoming->address, - nmigrate_disks, migrate_disks) < 0) { + nmigrate_disks, migrate_disks, + nbdPort) < 0) { goto stopjob; } cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; @@ -3565,6 +3580,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (autoPort) priv->migrationPort = port; + // in this case port is autoselected and we don't need to manage it anymore + // after cookie is baked + if (nbdPort != 0) + priv->nbdPort = 0; ret = 0; cleanup: @@ -3576,7 +3595,10 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* priv is set right after vm is added to the list of domains * and there is no 'goto cleanup;' in the middle of those */ VIR_FREE(priv->origname); - virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); + // release if port is auto selected which is not the case if + // it is given in parameters + if (nbdPort == 0) + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; qemuDomainRemoveInactive(driver, vm); } @@ -3633,7 +3655,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, flags); + st, NULL, 0, false, NULL, 0, NULL, 0, flags); return ret; } @@ -3675,6 +3697,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags) { unsigned short port = 0; @@ -3688,11 +3711,11 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " "def=%p, origname=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); *uri_out = NULL; @@ -3797,7 +3820,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, cookieout, cookieoutlen, def, origname, NULL, uri ? uri->scheme : "tcp", port, autoPort, listenAddress, - nmigrate_disks, migrate_disks, flags); + nmigrate_disks, migrate_disks, nbdPort, flags); cleanup: virURIFree(uri); VIR_FREE(hostname); @@ -4867,6 +4890,7 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long long bandwidth, bool useParams, unsigned long flags) @@ -4890,11 +4914,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, dconn=%p, dconnuri=%s, vm=%p, xmlin=%s, " "dname=%s, uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, bandwidth=%llu, " - "useParams=%d, flags=%lx", + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " + "bandwidth=%llu, useParams=%d, flags=%lx", driver, sconn, dconn, NULLSTR(dconnuri), vm, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), NULLSTR(graphicsuri), - NULLSTR(listenAddress), nmigrate_disks, migrate_disks, + NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, bandwidth, useParams, flags); /* Unlike the virDomainMigrateVersion3 counterpart, we don't need @@ -4944,6 +4968,11 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, VIR_MIGRATE_PARAM_MIGRATE_DISKS, migrate_disks[i]) < 0) goto cleanup; + if (nbdPort && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, + nbdPort) < 0) + goto cleanup; } if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) @@ -5210,6 +5239,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags, const char *dname, unsigned long resource, @@ -5225,10 +5255,12 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, uri=%s, " "graphicsuri=%s, listenAddress=%s, nmigrate_disks=%zu, " - "migrate_disks=%p, flags=%lx, dname=%s, resource=%lu", + "migrate_disks=%p, nbdPort=%d, flags=%lx, dname=%s, " + "resource=%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, flags, NULLSTR(dname), resource); + nmigrate_disks, migrate_disks, nbdPort, flags, NULLSTR(dname), + resource); if (flags & VIR_MIGRATE_TUNNELLED && uri) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -5323,8 +5355,8 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, if (*v3proto) { ret = doPeer2PeerMigrate3(driver, sconn, dconn, dconnuri, vm, xmlin, dname, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, resource, - useParams, flags); + nmigrate_disks, migrate_disks, nbdPort, + resource, useParams, flags); } else { ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, dconnuri, flags, dname, resource); @@ -5361,6 +5393,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5396,7 +5429,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { ret = doPeer2PeerMigrate(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, flags, dname, resource, &v3proto); } else { qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); @@ -5529,6 +5562,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, @@ -5540,13 +5574,14 @@ qemuMigrationPerform(virQEMUDriverPtr driver, { VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, graphicsuri=%s, listenAddress=%s, " - "nmigrate_disks=%zu, migrate_disks=%p, " + "nmigrate_disks=%zu, migrate_disks=%p, nbdPort=%d, " "cookiein=%s, cookieinlen=%d, cookieout=%p, cookieoutlen=%p, " "flags=%lx, dname=%s, resource=%lu, v3proto=%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), - nmigrate_disks, migrate_disks, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, NULLSTR(dname), resource, v3proto); + nmigrate_disks, migrate_disks, nbdPort, + NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, + flags, NULLSTR(dname), resource, v3proto); if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (cookieinlen) { @@ -5557,7 +5592,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, return qemuMigrationPerformJob(driver, conn, vm, xmlin, dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); @@ -5578,7 +5613,7 @@ qemuMigrationPerform(virQEMUDriverPtr driver, } else { return qemuMigrationPerformJob(driver, conn, vm, xmlin, NULL, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, + nmigrate_disks, migrate_disks, nbdPort, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, resource, v3proto); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 2445e13..2796361 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -51,6 +51,7 @@ VIR_MIGRATE_PARAM_BANDWIDTH, VIR_TYPED_PARAM_ULLONG, \ VIR_MIGRATE_PARAM_GRAPHICS_URI, VIR_TYPED_PARAM_STRING, \ VIR_MIGRATE_PARAM_LISTEN_ADDRESS, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_NBD_PORT, VIR_TYPED_PARAM_INT, \ VIR_MIGRATE_PARAM_MIGRATE_DISKS, VIR_TYPED_PARAM_STRING | \ VIR_TYPED_PARAM_MULTIPLE, \ NULL @@ -134,6 +135,7 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, @@ -146,6 +148,7 @@ int qemuMigrationPerform(virQEMUDriverPtr driver, const char *listenAddress, size_t nmigrate_disks, const char **migrate_disks, + int nbdPort, const char *cookiein, int cookieinlen, char **cookieout, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index bf65a60..e648a3a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9653,6 +9653,10 @@ static const vshCmdOptDef opts_migrate[] = { .type = VSH_OT_STRING, .help = N_("comma separated list of disks to be migrated") }, + {.name = "nbd-port", + .type = VSH_OT_INT, + .help = N_("port to use by target nbd server") + }, {.name = NULL} }; @@ -9663,6 +9667,7 @@ doMigrate(void *opaque) virDomainPtr dom = NULL; const char *desturi = NULL; const char *opt = NULL; + int optInt = 0; unsigned int flags = 0; virshCtrlData *data = opaque; vshControl *ctl = data->ctl; @@ -9705,6 +9710,13 @@ doMigrate(void *opaque) VIR_MIGRATE_PARAM_LISTEN_ADDRESS, opt) < 0) goto save_error; + if (vshCommandOptInt(ctl, cmd, "nbd-port", &optInt) < 0) + goto out; + if (optInt && + virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_NBD_PORT, optInt) < 0) + goto save_error; + if (vshCommandOptStringReq(ctl, cmd, "dname", &opt) < 0) goto out; if (opt && diff --git a/tools/virsh.pod b/tools/virsh.pod index 435c649..66418b2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1532,7 +1532,7 @@ to the I<uri> namespace is displayed instead of being modified. [I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -[I<--migrate-disks> B<disk-list>] +[I<--migrate-disks> B<disk-list>] [I<--nbd-port> B<port>] Migrate domain to another host. Add I<--live> for live migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> @@ -1659,6 +1659,9 @@ addresses are accepted as well as hostnames (the resolving is done on destination). Some hypervisors do not support this feature and will return an error if this parameter is used. +Optional I<nbd-port> sets the port that hypervisor on destination side should +bind to for incoming nbd traffic. Currently it is supported only by qemu. + =item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to -- 1.8.3.1

2 5

[libvirt] [PATCH v3 0/2] migration: add option to set target ndb server port
by Nikolay Shirokovskiy 17 Mar '16

17 Mar '16

Current libvirt + qemu pair lacks secure migrations in case of VMs with non-shared disks. The only option to migrate securely natively is to use tunneled mode and some kind of secure destination URI. But tunelled mode does not support non-shared disks. The other way to make migration secure is to organize a tunnel by external means. This is possible in case of shared disks migration thru use of proper combination of destination URI, migration URI and VIR_MIGRATE_PARAM_LISTEN_ADDRESS migration param. But again this is not possible in case of non shared disks migration as we have no option to control target nbd server port. But fixing this much more simplier that supporting non-shared disks in tunneled mode. So this patch series adds option to set target ndb port. Finally all qemu migration connections will be secured AFAIK but even in this case this patch could be convinient if one wants all migration traffic be put in a single connection. difference from v2: =================== 1. patch is splitted into API and implementation parts 2. code that starts nbd server is reorganized 3. add check for setting disks port for tunneled case 4. misc small changes according to Jiri comments Nikolay Shirokovskiy (2): migration: add target peer disks port qemu: implement setting target disks migration port include/libvirt/libvirt-domain.h | 10 ++++ src/qemu/qemu_driver.c | 25 ++++++--- src/qemu/qemu_migration.c | 108 +++++++++++++++++++++++++++++---------- src/qemu/qemu_migration.h | 3 ++ tools/virsh-domain.c | 12 +++++ tools/virsh.pod | 5 +- 6 files changed, 127 insertions(+), 36 deletions(-) -- 1.8.3.1

1 2

[libvirt] [PATCH v2 0/2] persistent live migration with specified XML
by Dmitry Andreev 17 Mar '16

17 Mar '16

v2: reimplemented with new migration param Libvirt doesn't allow to specify destination persistent domain configuration. VIR_MIGRATE_PARAM_DEST_XML migration param is used for active configuration and persistent configuration is taken from source domain. The problem is mentioned in this bug: https://bugzilla.redhat.com/show_bug.cgi?id=835300 This patch-set introduces new migration param VIR_MIGRATE_PARAM_DEST_PERSIST_XML and implements its support in qemu driver. Dmitry Andreev (2): qemuMigrationCookieAddPersistent: change argument type qemu: migration: new migration param for persistent destination XML include/libvirt/libvirt-domain.h | 15 ++++++++++ src/qemu/qemu_driver.c | 10 +++++-- src/qemu/qemu_migration.c | 62 ++++++++++++++++++++++++++-------------- src/qemu/qemu_migration.h | 2 ++ 4 files changed, 65 insertions(+), 24 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] nodedev: Expose PCI header type information
by Martin Kletzander 17 Mar '16

17 Mar '16

I can squash those two patches together if it's desirable. Martin Kletzander (2): nodedev: Indent PCI express for future fix nodedev: Expose PCI header type docs/schemas/nodedev.rng | 17 ++++++++++ src/conf/node_device_conf.c | 37 ++++++++++++++++++++ src/conf/node_device_conf.h | 2 ++ src/libvirt_private.syms | 3 ++ src/node_device/node_device_udev.c | 39 +++++++++++++--------- src/util/virpci.c | 38 +++++++++++++++++++++ src/util/virpci.h | 12 +++++++ .../pci_0000_00_02_0_header_type.xml | 16 +++++++++ .../pci_0000_00_1c_0_header_type.xml | 22 ++++++++++++ tests/nodedevxml2xmltest.c | 2 ++ 10 files changed, 172 insertions(+), 16 deletions(-) create mode 100644 tests/nodedevschemadata/pci_0000_00_02_0_header_type.xml create mode 100644 tests/nodedevschemadata/pci_0000_00_1c_0_header_type.xml -- 2.7.3

2 6

[libvirt] [PATCH 0/5] virlog: Refactor parsing log outputs
by Erik Skultety 17 Mar '16

17 Mar '16

Erik Skultety (5): virlog: Change virLogDestination to virLogDestinationType virlog: Introduce Type{To,From}String for virLogDestination virlog: Refactor virLogParseOutputs tests: Slightly tweak virlogtest tests: Add a new test for logging outputs parser po/POTFILES.in | 1 + src/util/virlog.c | 197 +++++++++++++++++++++++++++-------------------------- src/util/virlog.h | 10 ++- tests/virlogtest.c | 76 +++++++++++++++++---- 4 files changed, 168 insertions(+), 116 deletions(-) -- 2.4.3

3 12

[libvirt] [libvirt-perl][PATCH] Add VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT constant
by Michal Privoznik 17 Mar '16

17 Mar '16

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + Virt.xs | 1 + lib/Sys/Virt/Domain.pm | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/Changes b/Changes index aa71a1e..8f2cba6 100644 --- a/Changes +++ b/Changes @@ -8,6 +8,7 @@ Revision history for perl module Sys::Virt constants - Add VIR_DOMAIN_EVENT_ID_JOB_COMPLETED constant and callback - Add VIR_ERR_NO_SERVER constant + - Add VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT constant 1.3.2 2016-03-01 diff --git a/Virt.xs b/Virt.xs index 9cb80fa..2148eaf 100644 --- a/Virt.xs +++ b/Virt.xs @@ -7645,6 +7645,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_EVENT_DEFINED_ADDED, EVENT_DEFINED_ADDED); REGISTER_CONSTANT(VIR_DOMAIN_EVENT_DEFINED_UPDATED, EVENT_DEFINED_UPDATED); REGISTER_CONSTANT(VIR_DOMAIN_EVENT_DEFINED_RENAMED, EVENT_DEFINED_RENAMED); + REGISTER_CONSTANT(VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT, EVENT_DEFINED_FROM_SNAPSHOT); REGISTER_CONSTANT(VIR_DOMAIN_EVENT_UNDEFINED_REMOVED, EVENT_UNDEFINED_REMOVED); REGISTER_CONSTANT(VIR_DOMAIN_EVENT_UNDEFINED_RENAMED, EVENT_UNDEFINED_RENAMED); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index d0d79b9..3e9e7ba 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -2616,6 +2616,10 @@ The defined configuration is an update to an existing configuration The defined configuration is a rename of an existing configuration +=item Sys::Virt::Domain::EVENT_DEFINED_FROM_SNAPSHOT + +The defined configuration was restored from a snapshot + =back =item Sys::Virt::Domain::EVENT_RESUMED -- 2.4.10

2 1

[libvirt] [Issue]: Regarding client socket getting closed from the server once the lxc container is started
by rammohan madhusudan 17 Mar '16

17 Mar '16

Hi Folks, Using libvirt python bindings we are creating an lxc container.Here is the problem that we see sometimes (say 20 % of the time) when we create a new container. 1.container gets created, and also starts.However the we are not able to enter the namepace of the container.It throws an error initPid not available.We see that the using netstat command , socket connection is closed. 2.To get around this problem we have to stop and start the container again.We see that socket under (/var/run/libvirt/*) connection is established and we are able to enter the namespace. Enabled the libvirtd debug logs to debug this issue. For *success* case we see that for new client connection gets created and is able to handle async incoming events, *2016-03-12 08:18:55.748+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54005460 classname=virLXCMonitor* *2016-03-12 08:18:55.748+0000: 1247: debug : virNetSocketNew:159 : localAddr=0x7fed7cd1d170 remoteAddr=0x7fed7cd1d200 fd=28 errfd=-1 pid=0* *2016-03-12 08:18:55.749+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54009040 classname=virNetSocket* *2016-03-12 08:18:55.749+0000: 1247: info : virNetSocketNew:209 : RPC_SOCKET_NEW: sock=0x7fed54009040 fd=28 errfd=-1 pid=0 localAddr=127.0.0.1;0, remoteAddr=127.0.0.1;0* *2016-03-12 08:18:55.749+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54009d10 classname=virNetClient* *2016-03-12 08:18:55.749+0000: 1247: info : virNetClientNew:327 : RPC_CLIENT_NEW: client=0x7fed54009d10 sock=0x7fed54009040* *2016-03-12 08:18:55.749+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54009d10* *2016-03-12 08:18:55.749+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54009040* *2016-03-12 08:18:55.750+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed540009a0 classname=virNetClientProgram* *2016-03-12 08:18:55.750+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed540009a0* *2016-03-12 08:18:55.750+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54005460* *2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c168eb0* *2016-03-12 08:18:55.750+0000: 1247: debug : virLXCProcessCleanInterfaces:475 : Cleared net names: eth0 * *2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c168eb0* *2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c169600* *2016-03-12 08:18:55.755+0000: 1244: debug : virNetClientIncomingEvent:1808 : client=0x7fed54009d10 wantclose=0* *2016-03-12 08:18:55.755+0000: 1244: debug : virNetClientIncomingEvent:1816 : Event fired 0x7fed54009040 1* *2016-03-12 08:18:55.755+0000: 1244: debug : virNetMessageDecodeLength:151 : Got length, now need 36 total (32 more)* *2016-03-12 08:18:55.756+0000: 1244: info : virNetClientCallDispatch:1116 : RPC_CLIENT_MSG_RX: client=0x7fed54009d10 len=36 prog=305402420 vers=1 proc=2 type=2 status=0 serial=1* *2016-03-12 08:18:55.756+0000: 1244: debug : virKeepAliveCheckMessage:377 : ka=(nil), client=0x7fed81fc5ed4, msg=0x7fed54009d78* *2016-03-12 08:18:55.756+0000: 1244: debug : virNetClientProgramDispatch:220 : prog=305402420 ver=1 type=2 status=0 serial=1 proc=2* *2016-03-12 08:18:55.756+0000: 1244: debug : virLXCMonitorHandleEventInit:109 : Event init 1420 * For *failure* case ,we see that the client socket connection is initiated and gets closed immediately after receiving an incoming event.In this case, I don’t see an object for virNetClientProgram being created. Incoming event comes in and since the its unable to find client->prog it bails out and closes the connection. Snaphost of the code, static int virNetClientCallDispatchMessage(virNetClientPtr client) { size_t i; virNetClientProgramPtr prog = NULL; for (i = 0; i < client->nprograms; i++) { if (virNetClientProgramMatches(client->programs[i], &client->msg)) { prog = client->programs[i]; break; } } if (!prog) { * VIR_DEBUG("No program found for event with prog=%d vers=%d",* * client->msg.header.prog, client->msg.header.vers);* return -1; } *2016-03-12 08:19:15.935+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed5c168eb0* *2016-03-12 08:19:15.935+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd7bc0* *2016-03-12 08:19:15.935+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8120 classname=virLXCMonitor* *2016-03-12 08:19:15.935+0000: 1246: debug : virNetSocketNew:159 : localAddr=0x7fed7d51e170 remoteAddr=0x7fed7d51e200 fd=31 errfd=-1 pid=0* *2016-03-12 08:19:15.936+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8660 classname=virNetSocket* *2016-03-12 08:19:15.936+0000: 1246: info : virNetSocketNew:209 : RPC_SOCKET_NEW: sock=0x7fed82bd8660 fd=31 errfd=-1 pid=0 localAddr=127.0.0.1;0, remoteAddr=127.0.0.1;0* *2016-03-12 08:19:15.936+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8ca0 classname=virNetClient* *2016-03-12 08:19:15.936+0000: 1246: info : virNetClientNew:327 : RPC_CLIENT_NEW: client=0x7fed82bd8ca0 sock=0x7fed82bd8660* *2016-03-12 08:19:15.936+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd8ca0* *2016-03-12 08:19:15.936+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd8660* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientIncomingEvent:1808 : client=0x7fed82bd8ca0 wantclose=0* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientIncomingEvent:1816 : Event fired 0x7fed82bd8660 1* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetMessageDecodeLength:151 : Got length, now need 36 total (32 more)* *2016-03-12 08:19:15.942+0000: 1244: info : virNetClientCallDispatch:1116 : RPC_CLIENT_MSG_RX: client=0x7fed82bd8ca0 len=36 prog=305402420 vers=1 proc=2 type=2 status=0 serial=1* *2016-03-12 08:19:15.942+0000: 1244: debug : virKeepAliveCheckMessage:377 : ka=(nil), client=0x7fed81fc5ed4, msg=0x7fed82bd8d08* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientCallDispatchMessage:1008 : No program found for event with prog=305402420 vers=1* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetMessageClear:57 : msg=0x7fed82bd8d08 nfds=0* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientMarkClose:632 : client=0x7fed82bd8ca0, reason=0* *2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientCloseLocked:648 : client=0x7fed82bd8ca0, sock=0x7fed82bd8660, reason=0* Here is the snapshot of code , virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, const char *socketdir, virLXCMonitorCallbacksPtr cb) { virLXCMonitorPtr mon; char *sockpath = NULL; if (virLXCMonitorInitialize() < 0) return NULL; if (!(mon = virObjectLockableNew(virLXCMonitorClass))) return NULL; if (virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name) < 0) goto error; if (!(mon->client = virNetClientNewUNIX(sockpath, false, NULL))) goto error; * if (virNetClientRegisterAsyncIO(mon->client) < 0)* * goto error;* * if (!(mon->program = virNetClientProgramNew(VIR_LXC_MONITOR_PROGRAM,* * VIR_LXC_MONITOR_PROGRAM_VERSION,* * virLXCMonitorEvents,* * ARRAY_CARDINALITY(virLXCMonitorEvents),* * mon)))* * goto error;* * if (virNetClientAddProgram(mon->client,* * mon->program) < 0)* * goto error;* * mon->vm = vm;* * memcpy(&mon->cb, cb, sizeof(mon->cb));* virObjectRef(mon); virNetClientSetCloseCallback(mon->client, virLXCMonitorEOFNotify, mon, virLXCMonitorCloseFreeCallback); Is the problem occurring due to invocation of “*virNetClientRegisterAsyncIO" api before the virNetClientAddProgram.Probably once we register for aysnc IO , immediately an event comes in and that thread takes priority and bails out since it does not find the client->prog?Also the client is not retrying to establish a new connection.* *Please let me any thoughts/comments.Is there any patch already available which has fixed this issue?We are using libvirt 1.2.15* *-Thanks,* *Rammohan*

1 0

[libvirt] [PATCH] rpc: wait longer for session daemon to start up
by Cole Robinson 17 Mar '16

17 Mar '16

https://bugzilla.redhat.com/show_bug.cgi?id=1271183 We only wait .5 seconds for the session daemon to start up and present its socket, which isn't sufficient for many users. Bump up the sleep interval and retry amount so we wait for a total of 5 seconds. --- danpb suggests dropping the reverting this: commit be78814ae07f092d9c4e71fd82dd1947aba2f029 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Apr 2 14:41:17 2015 +0200 virNetSocketNewConnectUNIX: Use flocks when spawning a daemon Prior to that we didn't need the retry logic at all... but that's a bit more involved and boxes users are suffering with this issue in the meantime src/rpc/virnetsocket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b0d5b1c..d909b94 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -614,7 +614,7 @@ int virNetSocketNewConnectUNIX(const char *path, char *lockpath = NULL; int lockfd = -1; int fd = -1; - int retries = 100; + int retries = 500; virSocketAddr localAddr; virSocketAddr remoteAddr; char *rundir = NULL; @@ -707,7 +707,7 @@ int virNetSocketNewConnectUNIX(const char *path, daemonLaunched = true; } - usleep(5000); + usleep(10000); } localAddr.len = sizeof(localAddr.data); -- 2.5.0

4 4

[libvirt] [PATCH] virlog: Fix build breaker with "comparison between signed and unsigned"
by Erik Skultety 17 Mar '16

17 Mar '16

Refactor series 0b231195 worked with virLogDestination type which, depending on the compiler, might be (and probably will be) an unsigned data type. However, virEnumFromString may return -1 in case of an error. So, when enum happens to be unsigned, some compilers will naturally complain about foo: 'if (foo < 0)' --- I pushed the patch under build breaker rule. src/util/virlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 591d38e..007fc65 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1088,7 +1088,7 @@ virLogParseOutput(const char *src) char *abspath = NULL; size_t count = 0; virLogPriority prio; - virLogDestination dest; + int dest; bool isSUID = virIsSUID(); if (!src) -- 2.4.3

1 0

[libvirt] [PATCH v2 0/7] vz: add disk and controller check in domainPostParse phase
by Maxim Nestratov 17 Mar '16

17 Mar '16

Changes from v1 =============== A new patch moving prlsdkCheckDiskUnsupportedParams to vz_utils.c added. Commit messages reworded. Minor formatting issues fixed. Maxim Nestratov (1): vz: move prlsdkCheckDiskUnsupportedParams to vz_utils.c Mikhail Feoktistov (6): vz: save vz version in connection structure vz: add vzCapabilities to connection structure vz: check supported disk format and bus vz: report correct disk format in domainGetXMLDesc vz: check supported controllers vz: set default SCSI model src/vz/vz_driver.c | 61 +++-------- src/vz/vz_sdk.c | 203 +++++++--------------------------- src/vz/vz_sdk.h | 2 +- src/vz/vz_utils.c | 314 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_utils.h | 24 ++++ 5 files changed, 397 insertions(+), 207 deletions(-) -- 2.4.3

2 9

[libvirt] Where does 'rx_drop' in 'domifstat' come from?
by Yaniv Kaul 16 Mar '16

16 Mar '16

Any idea why I'd see drops on an interface? mini@ykaul-mini:~/ovirt-system-tests$ sudo virsh domifstat 111 vnet1 vnet1 rx_bytes 25488 vnet1 rx_packets 387 vnet1 rx_errs 0 *vnet1 rx_drop 1424* vnet1 tx_bytes 5751 vnet1 tx_packets 39 vnet1 tx_errs 0 vnet1 tx_drop 0 I have several others VMs in the same host, pretty much identically configured, all are fine, all on the same bridge: mini@ykaul-mini:~/ovirt-system-tests$ sudo brctl show bridge name bridge id STP enabled interfaces 5e85-930e31b 8000.525400247745 yes 5e85-93031b-nic vnet0 vnet1 vnet2 vnet3 vnet4 virbr0 8000.5254005e7e4b yes virbr0-nic Network (host0 is the problematic one): virsh # net-dumpxml 5e85-930e31b9b9 <network connections='5'> <name>5e85-930e31b9b9</name> <uuid>6f52f5a8-5322-4b57-890e-d4d5a0a7ed50</uuid> <forward mode='nat'> <nat> <port start='1024' end='65535'/> </nat> </forward> <bridge name='5e85-930e31b' stp='on' delay='0'/> <mac address='52:54:00:24:77:45'/> <dns forwardPlainNames='yes'/> <ip address='192.168.200.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.200.100' end='192.168.200.254'/> <host mac='54:52:c0:a8:c8:04' name='lago_basic_suite_3_6_host1' ip='192.168.200.4'/> <host mac='54:52:c0:a8:c8:03' name='lago_basic_suite_3_6_engine' ip='192.168.200.3'/> <host mac='54:52:c0:a8:c8:02' name='lago_basic_suite_3_6_storage-iscsi' ip='192.168.200.2'/> <host mac='54:52:c0:a8:c8:05' name='lago_basic_suite_3_6_storage-nfs' ip='192.168.200.5'/> <host mac='54:52:c0:a8:c8:06' name='lago_basic_suite_3_6_host0' ip='192.168.200.6'/> </dhcp> </ip> </network> Domain XML attached. Running libvirt 1.2.18, on latest F23. TIA, Y.

1 0

[libvirt] [PATCH 0/6] vz: add disk and controller check in domainPostParse phase
by Mikhail Feoktistov 16 Mar '16

16 Mar '16

Mikhail Feoktistov (6): vz: save vz version in connection structure vz: add vzCapabilities to connection structure vz: check supported disk format and bus vz: report correct disk format in domainGetXMLDesc vz: check supported controllers vz: set default SCSI model src/vz/vz_driver.c | 61 +++++------------ src/vz/vz_sdk.c | 80 +++++++++++----------- src/vz/vz_sdk.h | 2 +- src/vz/vz_utils.c | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_utils.h | 24 +++++++ 5 files changed, 274 insertions(+), 84 deletions(-) -- 1.8.3.1

2 9

[libvirt] [Issue]: Regarding client socket getting closed from the server once the lxc container is started
by Rammohan Gowrimoole (rgowrimo) 16 Mar '16

16 Mar '16

Hi Folks, Using libvirt python bindings we are creating an lxc container.Here is the problem that we see sometimes (say 20 % of the time) when we create a new container. 1.container gets created, and also starts.However the we are not able to enter the namepace of the container.It throws an error initPid not available.We see that the using netstat command , socket connection is closed. 2.To get around this problem we have to stop and start the container again.We see that socket under (/var/run/libvirt/*) connection is established and we are able to enter the namespace. Enabled the libvirtd debug logs to debug this issue. For success case we see that for new client connection gets created and is able to handle async incoming events, 2016-03-12 08:18:55.748+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54005460 classname=virLXCMonitor 2016-03-12 08:18:55.748+0000: 1247: debug : virNetSocketNew:159 : localAddr=0x7fed7cd1d170 remoteAddr=0x7fed7cd1d200 fd=28 errfd=-1 pid=0 2016-03-12 08:18:55.749+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54009040 classname=virNetSocket 2016-03-12 08:18:55.749+0000: 1247: info : virNetSocketNew:209 : RPC_SOCKET_NEW: sock=0x7fed54009040 fd=28 errfd=-1 pid=0 localAddr=127.0.0.1;0, remoteAddr=127.0.0.1;0 2016-03-12 08:18:55.749+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed54009d10 classname=virNetClient 2016-03-12 08:18:55.749+0000: 1247: info : virNetClientNew:327 : RPC_CLIENT_NEW: client=0x7fed54009d10 sock=0x7fed54009040 2016-03-12 08:18:55.749+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54009d10 2016-03-12 08:18:55.749+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54009040 2016-03-12 08:18:55.750+0000: 1247: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed540009a0 classname=virNetClientProgram 2016-03-12 08:18:55.750+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed540009a0 2016-03-12 08:18:55.750+0000: 1247: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed54005460 2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c168eb0 2016-03-12 08:18:55.750+0000: 1247: debug : virLXCProcessCleanInterfaces:475 : Cleared net names: eth0 2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c168eb0 2016-03-12 08:18:55.750+0000: 1247: info : virObjectUnref:259 : OBJECT_UNREF: obj=0x7fed5c169600 2016-03-12 08:18:55.755+0000: 1244: debug : virNetClientIncomingEvent:1808 : client=0x7fed54009d10 wantclose=0 2016-03-12 08:18:55.755+0000: 1244: debug : virNetClientIncomingEvent:1816 : Event fired 0x7fed54009040 1 2016-03-12 08:18:55.755+0000: 1244: debug : virNetMessageDecodeLength:151 : Got length, now need 36 total (32 more) 2016-03-12 08:18:55.756+0000: 1244: info : virNetClientCallDispatch:1116 : RPC_CLIENT_MSG_RX: client=0x7fed54009d10 len=36 prog=305402420 vers=1 proc=2 type=2 status=0 serial=1 2016-03-12 08:18:55.756+0000: 1244: debug : virKeepAliveCheckMessage:377 : ka=(nil), client=0x7fed81fc5ed4, msg=0x7fed54009d78 2016-03-12 08:18:55.756+0000: 1244: debug : virNetClientProgramDispatch:220 : prog=305402420 ver=1 type=2 status=0 serial=1 proc=2 2016-03-12 08:18:55.756+0000: 1244: debug : virLXCMonitorHandleEventInit:109 : Event init 1420 For failure case ,we see that the client socket connection is initiated and gets closed immediately after receiving an incoming event.In this case, I don’t see an object for virNetClientProgram being created. Incoming event comes in and since the its unable to find client->prog it bails out and closes the connection. Snaphost of the code, static int virNetClientCallDispatchMessage(virNetClientPtr client) { size_t i; virNetClientProgramPtr prog = NULL; for (i = 0; i < client->nprograms; i++) { if (virNetClientProgramMatches(client->programs[i], &client->msg)) { prog = client->programs[i]; break; } } if (!prog) { VIR_DEBUG("No program found for event with prog=%d vers=%d", client->msg.header.prog, client->msg.header.vers); return -1; } 2016-03-12 08:19:15.935+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed5c168eb0 2016-03-12 08:19:15.935+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd7bc0 2016-03-12 08:19:15.935+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8120 classname=virLXCMonitor 2016-03-12 08:19:15.935+0000: 1246: debug : virNetSocketNew:159 : localAddr=0x7fed7d51e170 remoteAddr=0x7fed7d51e200 fd=31 errfd=-1 pid=0 2016-03-12 08:19:15.936+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8660 classname=virNetSocket 2016-03-12 08:19:15.936+0000: 1246: info : virNetSocketNew:209 : RPC_SOCKET_NEW: sock=0x7fed82bd8660 fd=31 errfd=-1 pid=0 localAddr=127.0.0.1;0, remoteAddr=127.0.0.1;0 2016-03-12 08:19:15.936+0000: 1246: info : virObjectNew:202 : OBJECT_NEW: obj=0x7fed82bd8ca0 classname=virNetClient 2016-03-12 08:19:15.936+0000: 1246: info : virNetClientNew:327 : RPC_CLIENT_NEW: client=0x7fed82bd8ca0 sock=0x7fed82bd8660 2016-03-12 08:19:15.936+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd8ca0 2016-03-12 08:19:15.936+0000: 1246: info : virObjectRef:296 : OBJECT_REF: obj=0x7fed82bd8660 2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientIncomingEvent:1808 : client=0x7fed82bd8ca0 wantclose=0 2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientIncomingEvent:1816 : Event fired 0x7fed82bd8660 1 2016-03-12 08:19:15.942+0000: 1244: debug : virNetMessageDecodeLength:151 : Got length, now need 36 total (32 more) 2016-03-12 08:19:15.942+0000: 1244: info : virNetClientCallDispatch:1116 : RPC_CLIENT_MSG_RX: client=0x7fed82bd8ca0 len=36 prog=305402420 vers=1 proc=2 type=2 status=0 serial=1 2016-03-12 08:19:15.942+0000: 1244: debug : virKeepAliveCheckMessage:377 : ka=(nil), client=0x7fed81fc5ed4, msg=0x7fed82bd8d08 2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientCallDispatchMessage:1008 : No program found for event with prog=305402420 vers=1 2016-03-12 08:19:15.942+0000: 1244: debug : virNetMessageClear:57 : msg=0x7fed82bd8d08 nfds=0 2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientMarkClose:632 : client=0x7fed82bd8ca0, reason=0 2016-03-12 08:19:15.942+0000: 1244: debug : virNetClientCloseLocked:648 : client=0x7fed82bd8ca0, sock=0x7fed82bd8660, reason=0 Here is the snapshot of code , virLXCMonitorPtr virLXCMonitorNew(virDomainObjPtr vm, const char *socketdir, virLXCMonitorCallbacksPtr cb) { virLXCMonitorPtr mon; char *sockpath = NULL; if (virLXCMonitorInitialize() < 0) return NULL; if (!(mon = virObjectLockableNew(virLXCMonitorClass))) return NULL; if (virAsprintf(&sockpath, "%s/%s.sock", socketdir, vm->def->name) < 0) goto error; if (!(mon->client = virNetClientNewUNIX(sockpath, false, NULL))) goto error; if (virNetClientRegisterAsyncIO(mon->client) < 0) goto error; if (!(mon->program = virNetClientProgramNew(VIR_LXC_MONITOR_PROGRAM, VIR_LXC_MONITOR_PROGRAM_VERSION, virLXCMonitorEvents, ARRAY_CARDINALITY(virLXCMonitorEvents), mon))) goto error; if (virNetClientAddProgram(mon->client, mon->program) < 0) goto error; mon->vm = vm; memcpy(&mon->cb, cb, sizeof(mon->cb)); virObjectRef(mon); virNetClientSetCloseCallback(mon->client, virLXCMonitorEOFNotify, mon, virLXCMonitorCloseFreeCallback); Is the problem occurring due to invocation of “virNetClientRegisterAsyncIO" api before the virNetClientAddProgram.Probably once we register for aysnc IO , immediately an event comes in and that thread takes priority and bails out since it does not find the client->prog?Also the client is not retrying to establish a new connection. Please let me any thoughts/comments.Is there any patch already available which has fixed this issue? -Thanks, Rammohan

1 0

[libvirt] [PATCH 00/21] Various (tiny) clean-ups and changes for daemon/admin
by Martin Kletzander 16 Mar '16

16 Mar '16

I wanted to make virAdmConnectListAllServers()'s dispatch function generated by our mighty gendispatch script. And when doing that I stumbled upon various other things, changed what seemed better and at the end I ended up with one huge commit. Because lot of those changes should not be done together in one commit, I split each tiny part so it's nicer to review. However, some might point out that some commits do not belong together. To that I say it was a pain splitting the commit, don't make me split the series as well, please =) This "conflicts" with Erik's series that deals with worker threads tuning. We about know that and we will merge those together, or rather rebase on top of each other based on which version of virAdmConnectLookupServer{,ByName}() you and we like better. Martin Kletzander (21): admin: Make virAdmServerFree() handle NULL gracefully admin: Check for flags properly server: Store server name in server object daemon: Get server name from the server itself virerror: Introduce new error type NO_SERVER daemon: Set error for unknown server name daemon: Properly check for clients Expose virNetServerGetName admin: Do not work with virAdm on the server side Change virNetDaemonGetServerNames to virNetDaemonGetServers admin: Don't use priority for admin APIs virt-admin: Don't leak uri all over the place admin: Be consistent when resetting errors gendispatch: Cluster, don't capture if not needed gendispatch: Be able to generate multi-return values admin: Generate ConnectListServers dispatch helpers gendispatch: Accept server as an argument admin: Add virAdmConnectLookupServer gendispatch: Remember the name of snapshot variable name gendispatch: Support modern listing of more types remote: Generate what's possible daemon/admin.c | 49 +-- daemon/admin_server.c | 36 +-- daemon/admin_server.h | 12 +- daemon/libvirtd.c | 10 +- daemon/remote.c | 599 ------------------------------------ include/libvirt/libvirt-admin.h | 4 + include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 - src/admin/admin_protocol.x | 21 +- src/admin/admin_remote.c | 63 ---- src/admin_protocol-structs | 8 + src/libvirt-admin.c | 48 ++- src/libvirt_admin_private.syms | 2 + src/libvirt_admin_public.syms | 1 + src/libvirt_remote.syms | 2 + src/locking/lock_daemon.c | 5 +- src/logging/log_daemon.c | 5 +- src/lxc/lxc_controller.c | 5 +- src/remote/remote_driver.c | 654 ---------------------------------------- src/remote/remote_protocol.x | 40 +-- src/rpc/gendispatch.pl | 374 +++++++++++++++++------ src/rpc/virnetdaemon.c | 65 ++-- src/rpc/virnetdaemon.h | 3 +- src/rpc/virnetserver.c | 20 +- src/rpc/virnetserver.h | 6 +- src/util/virerror.c | 6 + tests/virnetdaemontest.c | 10 +- tools/virt-admin.c | 8 +- 28 files changed, 509 insertions(+), 1549 deletions(-) -- 2.7.2

5 55