- Devel - libvirt List Archives

[libvirt] [libvirt-tck PATCH] Add missing %end to kickstart file
by Guido Günther 23 Oct '12

23 Oct '12

--- conf/ks.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/ks.cfg b/conf/ks.cfg index 27e50e4..de82a26 100644 --- a/conf/ks.cfg +++ b/conf/ks.cfg @@ -27,3 +27,4 @@ poweroff @base @core @hardware-support +%end -- 1.7.10.4

2 4

[libvirt] [PATCH] storage: Don't do wait loops from VolLookupByPath
by Cole Robinson 23 Oct '12

23 Oct '12

virStorageVolLookupByPath is an API call that virt-manager uses quite a bit when dealing with storage. This call use BackendStablePath which has several usleep() heuristics that can be tripped up and hang virt-manager for a while. Current example: an empty mpath pool pointing to /dev/mapper makes _any_ calls to virStorageVolLookupByPath take 5 seconds. The sleep heuristics are actually only needed in certain cases when we are waiting for new storage to appear, so let's skip the timeout steps when calling from LookupByPath. --- src/storage/storage_backend.c | 12 ++++++++---- src/storage/storage_backend.h | 3 ++- src/storage/storage_backend_disk.c | 2 +- src/storage/storage_backend_scsi.c | 3 ++- src/storage/storage_driver.c | 3 ++- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index aea70e2..85b8287 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1338,10 +1338,14 @@ virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, * * Typically target.path is one of the /dev/disk/by-XXX dirs * with stable paths. + * + * If 'wait' is true, we use a timeout loop to give dynamic paths + * a change to appear. */ char * virStorageBackendStablePath(virStoragePoolObjPtr pool, - const char *devpath) + const char *devpath, + bool wait) { DIR *dh; struct dirent *dent; @@ -1372,7 +1376,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, reopen: if ((dh = opendir(pool->def->target.path)) == NULL) { opentries++; - if (errno == ENOENT && opentries < 50) { + if (wait && errno == ENOENT && opentries < 50) { usleep(100 * 1000); goto reopen; } @@ -1387,7 +1391,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, * the target directory and figure out which one points * to this device node. * - * And it might need some time till the stabe path shows + * And it might need some time till the stable path shows * up, so add timeout to retry here. */ retry: @@ -1411,7 +1415,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, VIR_FREE(stablepath); } - if (++retry < 100) { + if (wait && ++retry < 100) { usleep(100 * 1000); goto retry; } diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index a67eeb7..71935a7 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -130,7 +130,8 @@ virStorageBackendDetectBlockVolFormatFD(virStorageVolTargetPtr target, int fd); char *virStorageBackendStablePath(virStoragePoolObjPtr pool, - const char *devpath); + const char *devpath, + bool wait); typedef int (*virStorageBackendListVolRegexFunc)(virStoragePoolObjPtr pool, char **const groups, diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 5d9e72f..3cd4362 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -83,7 +83,7 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, * dir every time its run. Should figure out a more efficient * way of doing this... */ - vol->target.path = virStorageBackendStablePath(pool, devpath); + vol->target.path = virStorageBackendStablePath(pool, devpath, true); VIR_FREE(devpath); if (vol->target.path == NULL) return -1; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 27dcbb6..4e832eb 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -246,7 +246,8 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, * way of doing this... */ if ((vol->target.path = virStorageBackendStablePath(pool, - devpath)) == NULL) { + devpath, + true)) == NULL) { retval = -1; goto free_vol; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 28829d3..4fbc0c0 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1318,7 +1318,8 @@ storageVolumeLookupByPath(virConnectPtr conn, const char *stable_path; stable_path = virStorageBackendStablePath(driver->pools.objs[i], - cleanpath); + cleanpath, + false); if (stable_path == NULL) { /* Don't break the whole lookup process if it fails on * getting the stable path for some of the pools. -- 1.7.11.7

2 2

[libvirt] [PATCH] docs: Fix installation of internals/*.html
by Cole Robinson 23 Oct '12

23 Oct '12

We were just installing them in the top level html directory, which broke navigation and overwrote other pages. https://bugzilla.redhat.com/show_bug.cgi?id=837825 --- docs/Makefile.am | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 91c3d33..4fea3a0 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -71,8 +71,14 @@ gif = \ architecture.gif \ node.gif -dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) todo.html.in hvsupport.html.in \ - $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) + +internals_html_in = \ + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/internals/*.html.in)) +internals_html = $(internals_html_in:%.html.in=%.html) + +dot_html_in = $(notdir $(wildcard $(srcdir)/*.html.in)) \ + todo.html.in \ + hvsupport.html.in dot_html = $(dot_html_in:%.html.in=%.html) dot_php_in = $(notdir $(wildcard $(srcdir)/*.php.in)) @@ -112,6 +118,7 @@ EXTRA_DIST= \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(qemu_xml) $(fig) $(png) $(css) \ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ + $(internals_html_in) $(internals_html) \ sitemap.html.in \ todo.pl hvsupport.pl todo.cfg-example @@ -119,6 +126,7 @@ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ $(addprefix $(srcdir)/,$(devhelphtml)) \ + $(addprefix $(srcdir)/,$(internals_html)) \ $(addprefix $(srcdir)/,$(dot_php)) all-am: web @@ -126,7 +134,8 @@ all-am: web api: $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml qemu_api: $(srcdir)/libvirt-qemu-api.xml $(srcdir)/libvirt-qemu-refs.xml -web: $(dot_html) html/index.html devhelp/index.html $(dot_php) +web: $(dot_html) $(internals_html) html/index.html devhelp/index.html \ + $(dot_php) todo.html.in: todo.pl if [ -f todo.cfg ]; then \ @@ -256,6 +265,9 @@ install-data-local: $(INSTALL) -m 0644 $(srcdir)/$$h $(DESTDIR)$(HTML_DIR)/html; done for p in $(apipng); do \ $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done + $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/internals + for f in $(internals_html); do \ + $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/internals; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ -- 1.7.11.7

2 2

[libvirt] [PATCH] spec: Fix multilib issue with systemtap tapsets
by Cole Robinson 23 Oct '12

23 Oct '12

If building on a 64bit host, rename the affected tapsets to <name>-64.stp. This is similar to what the python package does in fedora. https://bugzilla.redhat.com/show_bug.cgi?id=831425 --- libvirt.spec.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b3b280b..ac70465 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1384,6 +1384,15 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ sed -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests %endif +%if %{with_dtrace} +%ifarch %{power64} s390x x86_64 ia64 alpha sparc64 +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp +mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ + $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp +%endif +%endif + %clean rm -fr %{buildroot} @@ -1835,8 +1844,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_libdir}/lib*.so.* %if %{with_dtrace} -%{_datadir}/systemtap/tapset/libvirt_probes.stp -%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp +%{_datadir}/systemtap/tapset/libvirt_probes*.stp +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp %endif -- 1.7.11.7

2 2

[libvirt] [PATCH] qemu: Don't use -enable-nesting with qemu 1.2.0+
by Cole Robinson 23 Oct '12

23 Oct '12

Since the option doesn't exist. Fixes booting with cpu mode='host-model' and qemu 1.2.0 --- src/qemu/qemu_capabilities.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9a4ab7..d691d51 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2162,7 +2162,6 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) qemuCapsSet(caps, QEMU_CAPS_NODEFCONFIG); qemuCapsSet(caps, QEMU_CAPS_BOOT_MENU); qemuCapsSet(caps, QEMU_CAPS_FSDEV); - qemuCapsSet(caps, QEMU_CAPS_NESTING); qemuCapsSet(caps, QEMU_CAPS_NAME_PROCESS); qemuCapsSet(caps, QEMU_CAPS_DRIVE_READONLY); qemuCapsSet(caps, QEMU_CAPS_SMBIOS_TYPE); -- 1.7.11.7

3 4

[libvirt] [PATCH] put dnsmasq parameters into a file instead of the command line
by Gene Czarcinski 23 Oct '12

23 Oct '12

This patch changes the way parameters are passed to dnsmasq. They are put into a conf-file instead of being on the dnsmasq command line. This patch includes the --interface patch and has updated the related tests for the new data format, etc. **NOTE** The command line now contains --conf-file=<filename> and a new parameter --conf-dir=<directoryname> has been added. The new file and directory are put in the same directory as the leases file. --- src/network/bridge_driver.c | 245 ++++++++++++--------- src/network/bridge_driver.h | 8 +- tests/networkxml2argvdata/isolated-network.argv | 25 ++- .../networkxml2argvdata/nat-network-dns-hosts.argv | 15 +- .../nat-network-dns-srv-record-minimal.argv | 36 +-- .../nat-network-dns-srv-record.argv | 36 +-- .../nat-network-dns-txt-record.argv | 30 ++- tests/networkxml2argvdata/nat-network.argv | 28 ++- tests/networkxml2argvdata/netboot-network.argv | 29 ++- .../networkxml2argvdata/netboot-proxy-network.argv | 26 ++- tests/networkxml2argvdata/routed-network.argv | 13 +- tests/networkxml2argvtest.c | 44 +--- 12 files changed, 296 insertions(+), 239 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8837843..137e480 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -65,7 +65,6 @@ #include "virnetdevtap.h" #include "virnetdevvportprofile.h" #include "virdbus.h" -#include "virfile.h" #define NETWORK_PID_DIR LOCALSTATEDIR "/run/libvirt/network" #define NETWORK_STATE_DIR LOCALSTATEDIR "/lib/libvirt/network" @@ -136,6 +135,16 @@ networkDnsmasqLeaseFileNameFunc networkDnsmasqLeaseFileName = networkDnsmasqLeaseFileNameDefault; static char * +networkDnsmasqConfigFileName(const char *netname) +{ + char *conffile; + + ignore_value(virAsprintf(&conffile, DNSMASQ_STATE_DIR "/%s.conf", + netname)); + return conffile; +} + +static char * networkRadvdPidfileBasename(const char *netname) { /* this is simple but we want to be sure it's consistently done */ @@ -559,23 +568,25 @@ networkBuildDnsmasqHostsfile(dnsmasqContext *dctx, return 0; } - + /* build the dnsmasq conf file contents */ static int -networkBuildDnsmasqArgv(virNetworkObjPtr network, +networkDnsmasqConfContents(virNetworkObjPtr network, virNetworkIpDefPtr ipdef, const char *pidfile, - virCommandPtr cmd, + char **configstr, dnsmasqContext *dctx) { - int r, ret = -1; + virBuffer configbuf = VIR_BUFFER_INITIALIZER;; + int r, ret = -1, ii; int nbleases = 0; - int ii; char *record = NULL; char *recordPort = NULL; char *recordWeight = NULL; char *recordPriority = NULL; virNetworkIpDefPtr tmpipdef; + *configstr = NULL; + /* * NB, be careful about syntax for dnsmasq options in long format. * @@ -595,28 +606,22 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, * very explicit on this. */ - /* - * Needed to ensure dnsmasq uses same algorithm for processing - * multiple namedriver entries in /etc/resolv.conf as GLibC. - */ - virCommandAddArgList(cmd, "--strict-order", "--bind-interfaces", NULL); - + /* create dnsmasq config file appropriate for this network */ + virBufferAsprintf(&configbuf, "# dnsmasq conf file created by libvirt\n" + "strict-order\n" + "bind-interfaces\n" + "except-interface=lo\n" + "domain-needed\n" + "local=/%s/\n", + network->def->domain ? network->def->domain : ""); if (network->def->domain) - virCommandAddArgPair(cmd, "--domain", network->def->domain); - /* need to specify local even if no domain specified */ - virCommandAddArgFormat(cmd, "--local=/%s/", - network->def->domain ? network->def->domain : ""); - virCommandAddArg(cmd, "--domain-needed"); + virBufferAsprintf(&configbuf, + "domain=%s\n" + "expand-hosts\n", + network->def->domain); if (pidfile) - virCommandAddArgPair(cmd, "--pid-file", pidfile); - - /* *no* conf file */ - virCommandAddArg(cmd, "--conf-file="); - - virCommandAddArgList(cmd, - "--except-interface", "lo", - NULL); + virBufferAsprintf(&configbuf, "pid-file=%s\n", pidfile); /* If this is an isolated network, set the default route option * (3) to be empty to avoid setting a default route that's @@ -626,16 +631,21 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, * to build a connection to the outside). */ if (network->def->forwardType == VIR_NETWORK_FORWARD_NONE) { - virCommandAddArgList(cmd, "--dhcp-option=3", - "--no-resolv", NULL); + virBufferAsprintf(&configbuf, "dhcp-option=3\n" + "no-resolv\n"); } + /* + * Needed to ensure dnsmasq uses same algorithm for processing + * multiple namedriver entries in /etc/resolv.conf as GLibC. + */ + if (network->def->dns != NULL) { virNetworkDNSDefPtr dns = network->def->dns; int i; for (i = 0; i < dns->ntxtrecords; i++) { - virCommandAddArgFormat(cmd, "--txt-record=%s,%s", + virBufferAsprintf(&configbuf, "txt-record=%s,%s\n", dns->txtrecords[i].name, dns->txtrecords[i].value); } @@ -673,7 +683,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, goto cleanup; } - virCommandAddArgPair(cmd, "--srv-host", record); + virBufferAsprintf(&configbuf, "srv-host=%s\n", record); VIR_FREE(record); VIR_FREE(recordPort); VIR_FREE(recordWeight); @@ -682,21 +692,20 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, } } - /* - * --interface does not actually work with dnsmasq < 2.47, - * due to DAD for ipv6 addresses on the interface. - * - * virCommandAddArgList(cmd, "--interface", ipdef->bridge, NULL); - * - * So listen on all defined IPv[46] addresses + /* This must be defined so that the kernel knows which dnsmasq to route + * packets to when more than one instance if running */ + if (network->def->bridge != NULL) + virBufferAsprintf(&configbuf, "interface=%s\n", network->def->bridge); + for (ii = 0; (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); - ii++) { + ii++) + { char *ipaddr = virSocketAddrFormat(&tmpipdef->address); if (!ipaddr) goto cleanup; - virCommandAddArgList(cmd, "--listen-address", ipaddr, NULL); + virBufferAsprintf(&configbuf, "listen-address=%s\n", ipaddr); VIR_FREE(ipaddr); } @@ -710,8 +719,8 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, VIR_FREE(saddr); goto cleanup; } - virCommandAddArg(cmd, "--dhcp-range"); - virCommandAddArgFormat(cmd, "%s,%s", saddr, eaddr); + virBufferAsprintf(&configbuf, "dhcp-range=%s,%s\n", + saddr, eaddr); VIR_FREE(saddr); VIR_FREE(eaddr); nbleases += virSocketAddrGetRange(&ipdef->ranges[r].start, @@ -727,8 +736,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, char *bridgeaddr = virSocketAddrFormat(&ipdef->address); if (!bridgeaddr) goto cleanup; - virCommandAddArg(cmd, "--dhcp-range"); - virCommandAddArgFormat(cmd, "%s,static", bridgeaddr); + virBufferAsprintf(&configbuf, "dhcp-range=%s,static\n", bridgeaddr); VIR_FREE(bridgeaddr); } @@ -736,17 +744,13 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, char *leasefile = networkDnsmasqLeaseFileName(network->def->name); if (!leasefile) goto cleanup; - virCommandAddArgFormat(cmd, "--dhcp-leasefile=%s", leasefile); + virBufferAsprintf(&configbuf, "dhcp-leasefile=%s\n", leasefile); VIR_FREE(leasefile); - virCommandAddArgFormat(cmd, "--dhcp-lease-max=%d", nbleases); + virBufferAsprintf(&configbuf, "dhcp-lease-max=%d\n", nbleases); } if (ipdef->nranges || ipdef->nhosts) - virCommandAddArg(cmd, "--dhcp-no-override"); - - /* add domain to any non-qualified hostnames in /etc/hosts or addn-hosts */ - if (network->def->domain) - virCommandAddArg(cmd, "--expand-hosts"); + virBufferAsprintf(&configbuf, "dhcp-no-override\n"); if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0) goto cleanup; @@ -756,38 +760,42 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, * file to allow for runtime additions. */ if (ipdef->nranges || ipdef->nhosts) - virCommandAddArgPair(cmd, "--dhcp-hostsfile", + virBufferAsprintf(&configbuf, "dhcp-hostsfile=%s\n", dctx->hostsfile->path); /* Likewise, always create this file and put it on the commandline, to allow for * for runtime additions. */ - virCommandAddArgPair(cmd, "--addn-hosts", + virBufferAsprintf(&configbuf, "addn-hosts=%s\n", dctx->addnhostsfile->path); if (ipdef->tftproot) { - virCommandAddArgList(cmd, "--enable-tftp", - "--tftp-root", ipdef->tftproot, - NULL); + virBufferAsprintf(&configbuf, "enable-tftp\n"); + virBufferAsprintf(&configbuf, "tftp-root=%s\n", ipdef->tftproot); } if (ipdef->bootfile) { - virCommandAddArg(cmd, "--dhcp-boot"); if (VIR_SOCKET_ADDR_VALID(&ipdef->bootserver)) { char *bootserver = virSocketAddrFormat(&ipdef->bootserver); if (!bootserver) goto cleanup; - virCommandAddArgFormat(cmd, "%s%s%s", + virBufferAsprintf(&configbuf, "dhcp-boot=%s%s%s\n", ipdef->bootfile, ",,", bootserver); VIR_FREE(bootserver); } else { - virCommandAddArg(cmd, ipdef->bootfile); + virBufferAsprintf(&configbuf, "dhcp-boot=%s\n", ipdef->bootfile); } } } + if (!(*configstr = virBufferContentAndReset(&configbuf))) { + virReportOOMError(); + goto cleanup; + } ret = 0; + cleanup: + virBufferFreeAndReset(&configbuf); VIR_FREE(record); VIR_FREE(recordPort); VIR_FREE(recordWeight); @@ -795,13 +803,18 @@ cleanup: return ret; } + /* build the dnsmasq command line */ int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, - char *pidfile, dnsmasqContext *dctx) + char *pidfile, dnsmasqContext *dctx, + char *configdir, + int testOnly, char **testConfigStr) { virCommandPtr cmd = NULL; int ret = -1, ii; virNetworkIpDefPtr ipdef; + char *configfile = NULL; + char *configstr = NULL; network->dnsmasqPid = -1; @@ -825,15 +838,41 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdou if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) return 0; - cmd = virCommandNew(DNSMASQ); - if (networkBuildDnsmasqArgv(network, ipdef, pidfile, cmd, dctx) < 0) { + if (networkDnsmasqConfContents(network, ipdef, pidfile, &configstr, dctx) < 0) + goto cleanup; + if (!configstr) + goto cleanup; + + if (testOnly) { + *testConfigStr = configstr; + return 0; + } + + /* construct the filename */ + if (!(configfile = networkDnsmasqConfigFileName(network->def->name))) { + virReportOOMError(); + goto cleanup; + } + + /* Write the file */ + if (virFileWriteStr(configfile, configstr, 0600) < 0) { + virReportSystemError(errno, + _("couldn't write dnsmasq config file '%s'"), + configfile); goto cleanup; } + VIR_INFO("dnsmasq conf file %s written", configfile); + + cmd = virCommandNew(DNSMASQ); + virCommandAddArgFormat(cmd, "--conf-file=%s", configfile); + virCommandAddArgFormat(cmd, "--conf-dir=%s", configdir); if (cmdout) *cmdout = cmd; ret = 0; cleanup: + VIR_FREE(configstr); + VIR_FREE(configfile); if (ret < 0) virCommandFree(cmd); return ret; @@ -844,9 +883,12 @@ networkStartDhcpDaemon(virNetworkObjPtr network) { virCommandPtr cmd = NULL; char *pidfile = NULL; + char *testconfigstr = NULL; + char *configdir = NULL; int ret = -1; dnsmasqContext *dctx = NULL; + VIR_INFO("starting dhcp daemon (dnsmasq)"); if (!virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, 0)) { /* no IPv6 addresses, so we don't need to run radvd */ ret = 0; @@ -882,7 +924,18 @@ networkStartDhcpDaemon(virNetworkObjPtr network) if (dctx == NULL) goto cleanup; - ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx); + ignore_value(virAsprintf(&configdir, DNSMASQ_STATE_DIR "/%s.d", + network->def->name)); + if (virFileMakePath(configdir) < 0) { + virReportSystemError(errno, + _("cannot create directory %s"), + configdir); + goto cleanup; + } + + + ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx, + configdir, 0, &testconfigstr); if (ret < 0) goto cleanup; @@ -911,6 +964,7 @@ networkStartDhcpDaemon(virNetworkObjPtr network) ret = 0; cleanup: VIR_FREE(pidfile); + VIR_FREE(configdir); virCommandFree(cmd); dnsmasqContextFree(dctx); return ret; @@ -988,22 +1042,19 @@ networkRestartDhcpDaemon(virNetworkObjPtr network) static int networkRadvdConfContents(virNetworkObjPtr network, char **configstr) { - virBuffer configbuf = VIR_BUFFER_INITIALIZER; + virBuffer configbuf = VIR_BUFFER_INITIALIZER;; int ret = -1, ii; virNetworkIpDefPtr ipdef; bool v6present = false; *configstr = NULL; - /* create radvd config file appropriate for this network; - * IgnoreIfMissing allows radvd to start even when the bridge is down - */ + /* create radvd config file appropriate for this network */ virBufferAsprintf(&configbuf, "interface %s\n" "{\n" " AdvSendAdvert on;\n" " AdvManagedFlag off;\n" " AdvOtherConfigFlag off;\n" - " IgnoreIfMissing on;\n" "\n", network->def->bridge); @@ -2072,7 +2123,6 @@ networkStartNetworkVirtual(struct network_driver *driver, virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; char *macTapIfName = NULL; - int tapfd = -1; /* Check to see if any network IP collides with an existing route */ if (networkCheckRouteCollision(network) < 0) @@ -2094,13 +2144,10 @@ networkStartNetworkVirtual(struct network_driver *driver, virReportOOMError(); goto err0; } - /* Keep tun fd open and interface up to allow for IPv6 DAD to happen */ if (virNetDevTapCreateInBridgePort(network->def->bridge, &macTapIfName, &network->def->mac, - NULL, &tapfd, NULL, NULL, - VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE | - VIR_NETDEV_TAP_CREATE_IFUP | - VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { + NULL, NULL, NULL, NULL, + VIR_NETDEV_TAP_CREATE_USE_MAC_FOR_BRIDGE) < 0) { VIR_FREE(macTapIfName); goto err0; } @@ -2164,15 +2211,6 @@ networkStartNetworkVirtual(struct network_driver *driver, if (v6present && networkStartRadvd(network) < 0) goto err4; - /* DAD has happened (dnsmasq waits for it), dnsmasq is now bound to the - * bridge's IPv6 address, so we can now set the dummy tun down. - */ - if (tapfd >= 0) { - if (virNetDevSetOnline(macTapIfName, false) < 0) - goto err4; - VIR_FORCE_CLOSE(tapfd); - } - if (virNetDevBandwidthSet(network->def->bridge, network->def->bandwidth) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot set bandwidth limits on %s"), @@ -2211,7 +2249,6 @@ networkStartNetworkVirtual(struct network_driver *driver, save_err = virSaveLastError(); if (macTapIfName) { - VIR_FORCE_CLOSE(tapfd); ignore_value(virNetDevTapDelete(macTapIfName)); VIR_FREE(macTapIfName); } @@ -2334,10 +2371,8 @@ networkStartNetwork(struct network_driver *driver, break; } - if (ret < 0) { - virNetworkObjUnsetDefTransient(network); + if (ret < 0) return ret; - } /* Persist the live configuration now that anything autogenerated * is setup. @@ -2397,7 +2432,13 @@ static int networkShutdownNetwork(struct network_driver *driver, } network->active = 0; - virNetworkObjUnsetDefTransient(network); + + if (network->newDef) { + virNetworkDefFree(network->def); + network->def = network->newDef; + network->newDef = NULL; + } + return ret; } @@ -2618,7 +2659,6 @@ networkValidate(virNetworkDefPtr def) { int ii; bool vlanUsed, vlanAllowed; - const char *defaultPortGroup = NULL; /* The only type of networks that currently support transparent * vlan configuration are those using hostdev sr-iov devices from @@ -2639,17 +2679,6 @@ networkValidate(virNetworkDefPtr def) == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)) { vlanAllowed = true; } - if (def->portGroups[ii].isDefault) { - if (defaultPortGroup) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("network '%s' has multiple default " - "<portgroup> elements (%s and %s), " - "but only one default is allowed"), - def->name, defaultPortGroup, - def->portGroups[ii].name); - } - defaultPortGroup = def->portGroups[ii].name; - } } if (vlanUsed && !vlanAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -2841,6 +2870,14 @@ static int networkUndefine(virNetworkPtr net) { } } + { + char *configfile = networkDnsmasqConfigFileName(network->def->name); + if (!configfile) + goto cleanup; + unlink(configfile); + VIR_FREE(configfile); + } + if (dhcp_present) { char *leasefile; dnsmasqContext *dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); @@ -2933,8 +2970,8 @@ networkUpdate(virNetworkPtr net, * is active, else change CONFIG */ isActive = virNetworkObjIsActive(network); - if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE | - VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == + if ((flags & (VIR_NETWORK_UPDATE_AFFECT_LIVE + | VIR_NETWORK_UPDATE_AFFECT_CONFIG)) == VIR_NETWORK_UPDATE_AFFECT_CURRENT) { if (isActive) flags |= VIR_NETWORK_UPDATE_AFFECT_LIVE; @@ -3870,8 +3907,8 @@ networkNotifyActualDevice(virDomainNetDefPtr iface) for (ii = 0; ii < netdef->nForwardIfs; ii++) { if (netdef->forwardIfs[ii].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI && - virDevicePCIAddressEqual(&hostdev->source.subsys.u.pci, - &netdef->forwardIfs[ii].device.pci)) { + (virDevicePCIAddressEqual(hostdev->source.subsys.u.pci, + netdef->forwardIfs[ii].device.pci) == 0)) { dev = &netdef->forwardIfs[ii]; break; } @@ -4022,8 +4059,8 @@ networkReleaseActualDevice(virDomainNetDefPtr iface) for (ii = 0; ii < netdef->nForwardIfs; ii++) { if (netdef->forwardIfs[ii].type == VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_PCI && - virDevicePCIAddressEqual(&hostdev->source.subsys.u.pci, - &netdef->forwardIfs[ii].device.pci)) { + (virDevicePCIAddressEqual(hostdev->source.subsys.u.pci, + netdef->forwardIfs[ii].device.pci) == 0)) { dev = &netdef->forwardIfs[ii]; break; } diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 0fae275..608c622 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -48,15 +48,17 @@ int networkGetNetworkAddress(const char *netname, char **netaddr) int networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, virCommandPtr *cmdout, char *pidfile, - dnsmasqContext *dctx) - ; + dnsmasqContext *dctx, + char *configdir, + int testOnly, char **testConfigStr); # else /* Define no-op replacements that don't drag in any link dependencies. */ # define networkAllocateActualDevice(iface) 0 # define networkNotifyActualDevice(iface) 0 # define networkReleaseActualDevice(iface) 0 # define networkGetNetworkAddress(netname, netaddr) (-2) -# define networkBuildDhcpDaemonCommandLine(network, cmdout, pidfile, dctx) 0 +# define networkBuildDhcpDaemonCommandLine(network, cmdout, pidfile, \ + dctx, configdir, testOnly, testConfigStr) 0 # endif typedef char *(*networkDnsmasqLeaseFileNameFunc)(const char *netname); diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 13e77b2..abcde93 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,9 +1,16 @@ -@DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo --dhcp-option=3 --no-resolv \ ---listen-address 192.168.152.1 \ ---dhcp-range 192.168.152.2,192.168.152.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ ---dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +dhcp-option=3 +no-resolv +interface=virbr2 +listen-address=192.168.152.1 +dhcp-range=192.168.152.2,192.168.152.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 03a0676..7dce6f9 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,4 +1,11 @@ -@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ ---expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=/example.com/ +domain=example.com +expand-hosts +interface=virbr0 +listen-address=192.168.122.1 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index 210a60c..d87d438 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,17 +1,19 @@ -@DNSMASQ@ \ ---strict-order \ ---bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo \ ---srv-host=name.tcp.,,,, \ ---listen-address 192.168.122.1 \ ---listen-address 192.168.123.1 \ ---listen-address 2001:db8:ac10:fe01::1 \ ---listen-address 2001:db8:ac10:fd01::1 \ ---listen-address 10.24.10.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +srv-host=name.tcp.,,,, +interface=virbr0 +listen-address=192.168.122.1 +listen-address=192.168.123.1 +listen-address=2001:db8:ac10:fe01::1 +listen-address=2001:db8:ac10:fd01::1 +listen-address=10.24.10.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 833d3cd..53882fe 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,17 +1,19 @@ -@DNSMASQ@ \ ---strict-order \ ---bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo \ ---srv-host=name.tcp.test-domain-name,.,1024,10,10 \ ---listen-address 192.168.122.1 \ ---listen-address 192.168.123.1 \ ---listen-address 2001:db8:ac10:fe01::1 \ ---listen-address 2001:db8:ac10:fd01::1 \ ---listen-address 10.24.10.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 \ ---dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +srv-host=name.tcp.test-domain-name,.,1024,10,10 +interface=virbr0 +listen-address=192.168.122.1 +listen-address=192.168.123.1 +listen-address=2001:db8:ac10:fe01::1 +listen-address=2001:db8:ac10:fd01::1 +listen-address=10.24.10.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 3481507..cc3ed28 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,11 +1,19 @@ -@DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo '--txt-record=example,example value' \ ---listen-address 192.168.122.1 --listen-address 192.168.123.1 \ ---listen-address 2001:db8:ac10:fe01::1 \ ---listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +txt-record=example,example value +interface=virbr0 +listen-address=192.168.122.1 +listen-address=192.168.123.1 +listen-address=2001:db8:ac10:fe01::1 +listen-address=2001:db8:ac10:fd01::1 +listen-address=10.24.10.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 37fd2fc..431fffb 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,10 +1,18 @@ -@DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ ---listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ ---listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ ---dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +interface=virbr0 +listen-address=192.168.122.1 +listen-address=192.168.123.1 +listen-address=2001:db8:ac10:fe01::1 +listen-address=2001:db8:ac10:fd01::1 +listen-address=10.24.10.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 5408eb7..8405095 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,10 +1,19 @@ -@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ ---dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \ ---enable-tftp \ ---tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=/example.com/ +domain=example.com +expand-hosts +interface=virbr1 +listen-address=192.168.122.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts +enable-tftp +tftp-root=/var/lib/tftproot +dhcp-boot=pxeboot.img diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 21e01e3..d7c8966 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,9 +1,17 @@ -@DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ ---dhcp-range 192.168.122.2,192.168.122.254 \ ---dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ ---dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ ---addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \ ---dhcp-boot pxeboot.img,,10.20.30.40\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=/example.com/ +domain=example.com +expand-hosts +interface=virbr1 +listen-address=192.168.122.1 +dhcp-range=192.168.122.2,192.168.122.254 +dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases +dhcp-lease-max=253 +dhcp-no-override +dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile +addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts +dhcp-boot=pxeboot.img,,10.20.30.40 diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index 9fedb2b..771240f 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,4 +1,9 @@ -@DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ ---addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts\ +# dnsmasq conf file created by libvirt +strict-order +bind-interfaces +except-interface=lo +domain-needed +local=// +interface=virbr1 +listen-address=192.168.122.1 +addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts diff --git a/tests/networkxml2argvtest.c b/tests/networkxml2argvtest.c index 87519e4..275b190 100644 --- a/tests/networkxml2argvtest.c +++ b/tests/networkxml2argvtest.c @@ -15,37 +15,6 @@ #include "memory.h" #include "network/bridge_driver.h" -/* Replace all occurrences of @token in @buf by @replacement and adjust size of - * @buf accordingly. Returns 0 on success and -1 on out-of-memory errors. */ -static int replaceTokens(char **buf, const char *token, const char *replacement) { - size_t token_start, token_end; - size_t buf_len, rest_len; - const size_t token_len = strlen(token); - const size_t replacement_len = strlen(replacement); - const int diff = replacement_len - token_len; - - buf_len = rest_len = strlen(*buf) + 1; - token_end = 0; - for (;;) { - char *match = strstr(*buf + token_end, token); - if (match == NULL) - break; - token_start = match - *buf; - rest_len -= token_start + token_len - token_end; - token_end = token_start + token_len; - buf_len += diff; - if (diff > 0) - if (VIR_REALLOC_N(*buf, buf_len) < 0) - return -1; - if (diff != 0) - memmove(*buf + token_end + diff, *buf + token_end, rest_len); - memcpy(*buf + token_start, replacement, replacement_len); - token_end += diff; - } - /* if diff < 0, we could shrink the buffer here... */ - return 0; -} - static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { char *inXmlData = NULL; char *outArgvData = NULL; @@ -55,6 +24,7 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { virNetworkObjPtr obj = NULL; virCommandPtr cmd = NULL; char *pidfile = NULL; + char *configdir = NULL; dnsmasqContext *dctx = NULL; if (virtTestLoadFile(inxml, &inXmlData) < 0) @@ -62,10 +32,6 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (virtTestLoadFile(outargv, &outArgvData) < 0) goto fail; - - if (replaceTokens(&outArgvData, "@DNSMASQ@", DNSMASQ)) - goto fail; - if (!(dev = virNetworkDefParseString(inXmlData))) goto fail; @@ -78,12 +44,9 @@ static int testCompareXMLToArgvFiles(const char *inxml, const char *outargv) { if (dctx == NULL) goto fail; - if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, dctx) < 0) - goto fail; - - if (!(actual = virCommandToString(cmd))) + if (networkBuildDhcpDaemonCommandLine(obj, &cmd, pidfile, + dctx, configdir, 1, &actual) < 0) goto fail; - if (STRNEQ(outArgvData, actual)) { virtTestDifference(stderr, outArgvData, actual); goto fail; @@ -147,7 +110,6 @@ mymain(void) if (virtTestRun("Network XML-2-Argv " name, \ 1, testCompareXMLToArgvHelper, (name)) < 0) \ ret = -1 - DO_TEST("isolated-network"); DO_TEST("routed-network"); DO_TEST("nat-network"); -- 1.7.11.7

1 0

[libvirt] [PATCH] qemu: Fix the unused parameter which causes the build failure
by Osier Yang 22 Oct '12

22 Oct '12

--- Pushed under build-breaker rule. --- src/qemu/qemu_process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eef1ddb..969e3ce 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1999,7 +1999,7 @@ qemuProcessSetLinkStates(virDomainObjPtr vm) /* Set CPU affinities for vcpus if vcpupin xml provided. */ static int -qemuProcessSetVcpuAffinites(virConnectPtr conn, +qemuProcessSetVcpuAffinites(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2032,7 +2032,7 @@ cleanup: /* Set CPU affinities for emulator threads. */ static int -qemuProcessSetEmulatorAffinites(virConnectPtr conn, +qemuProcessSetEmulatorAffinites(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainObjPtr vm) { virBitmapPtr cpumask; -- 1.7.7.6

2 2

[libvirt] [PATCHv8 00/11] blockjob: storage migration via block-copy
by Eric Blake 22 Oct '12

22 Oct '12

v7 of these patches is here: https://www.redhat.com/archives/libvir-list/2012-September/msg01122.html Since then, I have rebased the series on top of my block-commit work, which changed (and simplified) several patches. Also, upstream qemu is closer to taking Paolo's patches that actually add the 'drive-mirror' monitor command, although it still isn't official there; so I'm still a bit reluctant to push patches 3-11 into libvirt.git until qemu.git actually gains support for block copy. Patches 1 and 2 are new, and can be applied now if they get a good review. I've done some light testing with the qemu-kvm-rhev of RHEV 3.0, so I'm fairly confident that my rebase work is correct. Also available at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/blockjob git fetch git://repo.or.cz/libvirt/ericb.git blockjob Eric Blake (11): storage: let format probing work on root-squash NFS blockjob: sanity check when creating snapshot blockjob: add qemu capabilities related to block jobs blockjob: react to active block copy blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: make drive-reopen safer blockjob: implement block copy for qemu blockjob: allow for existing files in block-copy blockjob: allow mirroring under SELinux and cgroup blockjob: relabel entire existing chain include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 12 ++ src/conf/domain_conf.h | 1 + src/libvirt.c | 7 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 431 ++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 52 +++++ src/qemu/qemu_monitor.h | 14 ++ src/qemu/qemu_monitor_json.c | 96 ++++++++- src/qemu/qemu_monitor_json.h | 21 +- src/qemu/qemu_process.c | 3 + src/storage/storage_backend_fs.c | 2 +- src/util/storage_file.c | 4 +- src/util/storage_file.h | 2 +- 17 files changed, 646 insertions(+), 16 deletions(-) -- 1.7.11.7

3 18

[libvirt] how libvirt communicate with qemu?
by yue 22 Oct '12

22 Oct '12

i am reading source code, begin with tracing simple command line ,like virsh list and forth. please look at my qurestions 1.how libvirt communicate with qemu? call qemu'lib or open special device/socket? 2. i do not find the implement of function qemuAgentOpen---->qemuAgentInitialize(). i also search qemu-kvm source 3. qemuListAllDomains is the function which corespond to virsh-list. please explain this function . virDomainList(conn, driver->domains.objs, domains, flags); i) it seems driver->domains.objs have gotten all dmains. so when and where driver->domains.objs is assigned. ii)and what is conn,and its definition? thanks.

4 3

[libvirt] [PATCH RFC] helper of copy-storage-* features
by liguang 22 Oct '12

22 Oct '12

help to create disk images copy-storage-* required, try to do non-shared migration without bothering to create disk images at target by hand. consider this situation: 1. non-shared migration virsh migrate --copy-storage-all ... 2. migration fails 3. create disk images required qemu-img create ... 4 migration run smoothly so, try do remove step 2, 3, 4 this kind of use had been discussed before, http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html maybe there're some flaws: - It did not handle more about complete situations suggested by Daniel P. Berrange, https://www.redhat.com/archives/libvir-list/2012-October/msg00407.html but may try to take care of them later. so, now only normal disk image files be handled. - for creation of disk images, size was setting as 0xffffffff boldly, hope it can consolidate qemu, haven't constructed a comfortable idea to solve it. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_migration.c | 87 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 85 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..5c3ad9f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -49,6 +49,7 @@ #include "storage_file.h" #include "viruri.h" #include "hooks.h" +#include "dirname.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -70,6 +71,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +79,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "copystorage"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_COPYSTORAGE = (1 << QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +442,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + virBufferAsprintf(buf, " <copystorage/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +668,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE)) { + if (virXPathBoolean("count(./copystorage) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + } + return 0; error: @@ -721,6 +732,9 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1168,6 +1182,14 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1215,6 +1237,54 @@ qemuMigrationPrepareCleanup(struct qemud_driver *driver, qemuDomainObjDiscardAsyncJob(driver, vm); } +static int qemuMigrationHandleDiskFiles(virDomainDefPtr def, int pin) +{ + char *tmp_dir = NULL, *outbuf = NULL; + char *size = _("0xffffffff"); + virCommandPtr cmd = NULL; + int i, ret = -1; + + if (!def->ndisks) + return 0; + for (i = 0; i < def->ndisks; i++) { + if (STRNEQ(def->disks[i]->driverName, "qemu")) + continue; + if (def->disks[i]->src == NULL) + continue; + if (def->disks[i]->driverType == NULL) + goto cleanup; + if (virFileExists(def->disks[i]->src) && pin) + continue; + if (!pin && !virFileExists(def->disks[i]->src)) + continue; + if ((tmp_dir = mdir_name(def->disks[i]->src)) == NULL) + continue; + if (!virFileExists(tmp_dir)) + if (virFileMakePath(tmp_dir) < 0) + continue; + if (pin) { + cmd = virCommandNewArgList("qemu-img", "create", "-f", + def->disks[i]->driverType, def->disks[i]->src, + size, NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + } else + cmd = virCommandNewArgList("rm", "-f", def->disks[i]->src, NULL); + + if (virCommandRun(cmd, NULL) < 0) { + goto cleanup; + virReportSystemError(errno, "%s", + _("unable create disk images by qemu-img")); + } + } + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(tmp_dir); + return ret; +} + static int qemuMigrationPrepareAny(struct qemud_driver *driver, virConnectPtr dconn, @@ -1308,6 +1378,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* virDomainAssignDef already set the error */ goto cleanup; } + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE))) + goto cleanup; + + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + if (qemuMigrationHandleDiskFiles(def, 1) < 0) + goto cleanup; + def = NULL; priv = vm->privateData; priv->origname = origname; @@ -2929,7 +3008,7 @@ qemuMigrationFinish(struct qemud_driver *driver, int newVM = 1; qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; - int cookie_flags = 0; + int cookie_flags = 0, migration_status = 0; qemuDomainObjPrivatePtr priv = vm->privateData; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " @@ -3088,7 +3167,11 @@ qemuMigrationFinish(struct qemud_driver *driver, if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) VIR_WARN("Unable to encode migration cookie"); + migration_status = 1; + endjob: + if (!migration_status) + qemuMigrationHandleDiskFiles(vm->def, 0); if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; } else if (!vm->persistent && !virDomainObjIsActive(vm)) { -- 1.7.2.5

4 3

[libvirt] [PATCH 0/2] qemu: Check if qemu is VNC capable
by Doug Goldstein 22 Oct '12

22 Oct '12

This is the initial series where I'll be exposing the graphical support that QEMU has via capabilities but I'm breaking it up to get in as much as possible based on my available time. This initial set adds checks to see that your QEMU binary has VNC support instead of assuming that it does. A large Gentoo user apparently just uses SPICE and as a result we now provide the ability to install QEMU without VNC. While this is not a recommended configuration its certainly valid and libvirt should not assume it exists. Doug Goldstein (2): test: Don't assume VNC is always available qemu: Don't blindly assume VNC is supported src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 +++ tests/qemuhelptest.c | 48 +++++++++++++------- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 4 -- .../qemuxml2argv-disk-copy_on_read.args | 6 +- .../qemuxml2argv-disk-copy_on_read.xml | 5 -- .../qemuxml2argv-disk-ioeventfd.args | 6 +- .../qemuxml2argv-disk-ioeventfd.xml | 5 -- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 8 --- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 8 --- tests/qemuxml2argvtest.c | 10 ++-- 15 files changed, 64 insertions(+), 66 deletions(-) -- 1.7.8.6

3 6

[libvirt] [PATCH v2] virsh: Fix segfault of snapshot-list
by Osier Yang 22 Oct '12

22 Oct '12

'snaps' is used after free()'ed. --- tools/virsh-snapshot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6dd8bf2..fc6c5b3 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -866,7 +866,7 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, goto cleanup; } if (from) { - snaps[snaplist->nsnaps++] = from; + snaplist->snaps[snaplist->nsnaps++].snap = from; virDomainSnapshotRef(from); } } -- 1.7.7.6

2 2

[libvirt] [PATCH] virsh: Improve the error for snapshot-list
by Osier Yang 22 Oct '12

22 Oct '12

It reports error "roots and --from are exclusive" even "--current" is specified with "--roots", but no "--from". --- tools/virsh-snapshot.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index b828371..6dd8bf2 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1197,7 +1197,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) } if (from) { vshError(ctl, "%s", - _("--roots and --from are mutually exclusive")); + _("--roots is mutually exclusive with either " + "--from or --current")); goto cleanup; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; -- 1.7.7.6

3 3

[libvirt] [PATCH] virsh: Fix segfault of snapshot-list
by Osier Yang 22 Oct '12

22 Oct '12

"snaps" is used after free'ed, and the additional one entry should be added to the list. --- tools/virsh-snapshot.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 6dd8bf2..635edd8 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -856,9 +856,6 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, snaplist->snaps = vshCalloc(ctl, count + (tree && from), sizeof(*snaplist->snaps)); snaplist->nsnaps = count; - for (i = 0; i < count; i++) - snaplist->snaps[i].snap = snaps[i]; - VIR_FREE(snaps); if (tree) { for (i = 0; i < count; i++) { if (vshGetSnapshotParent(ctl, snaplist->snaps[i].snap, @@ -870,6 +867,9 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virDomainSnapshotRef(from); } } + for (i = 0; i < snaplist->nsnaps; i++) + snaplist->snaps[i].snap = snaps[i]; + VIR_FREE(snaps); goto success; } -- 1.7.7.6

2 1

[libvirt] [PATCH] qemu: Pin the emulator when only cpuset is specified
by Martin Kletzander 22 Oct '12

22 Oct '12

According to our recent changes (clarifications), we should be pinning qemu's emulator processes using the <vcpu> 'cpuset' attribute in case there is no <emulatorpin> specified. This however doesn't work entirely as expected and this patch should resolve all the remaining issues. --- src/qemu/qemu_cgroup.c | 25 ++++++++++++++++--------- src/qemu/qemu_cgroup.h | 4 ++-- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_process.c | 16 ++++++++-------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 166f9b9..6b94686 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -501,7 +501,7 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, for (i = 0; i < nvcpupin; i++) { if (vcpuid == vcpupin[i]->vcpuid) { - return qemuSetupCgroupEmulatorPin(cgroup, vcpupin[i]); + return qemuSetupCgroupEmulatorPin(cgroup, vcpupin[i]->cpumask); } } @@ -509,12 +509,12 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, } int qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup, - virDomainVcpuPinDefPtr vcpupin) + virBitmapPtr cpumask) { int rc = 0; char *new_cpus = NULL; - new_cpus = virBitmapFormat(vcpupin->cpumask); + new_cpus = virBitmapFormat(cpumask); if (!new_cpus) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to convert cpu mask")); @@ -643,6 +643,7 @@ cleanup: int qemuSetupCgroupForEmulator(struct qemud_driver *driver, virDomainObjPtr vm) { + virBitmapPtr cpumask = NULL; virCgroupPtr cgroup = NULL; virCgroupPtr cgroup_emulator = NULL; virDomainDefPtr def = vm->def; @@ -690,12 +691,18 @@ int qemuSetupCgroupForEmulator(struct qemud_driver *driver, } } - if (def->cputune.emulatorpin && - qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET)) { - rc = qemuSetupCgroupEmulatorPin(cgroup_emulator, - def->cputune.emulatorpin); - if (rc < 0) - goto cleanup; + if (def->cputune.emulatorpin) + cpumask = def->cputune.emulatorpin->cpumask; + else if (def->cpumask) + cpumask = def->cpumask; + + if (cpumask) { + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPUSET)) { + rc = qemuSetupCgroupEmulatorPin(cgroup_emulator, cpumask); + if (rc < 0) + goto cleanup; + } + cpumask = NULL; /* sanity */ } if (period || quota) { diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index b7b0211..362080a 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -1,7 +1,7 @@ /* * qemu_cgroup.h: QEMU cgroup management * - * Copyright (C) 2006-2007, 2009-2011 Red Hat, Inc. + * Copyright (C) 2006-2007, 2009-2012 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -57,7 +57,7 @@ int qemuSetupCgroupVcpuPin(virCgroupPtr cgroup, virDomainVcpuPinDefPtr *vcpupin, int nvcpupin, int vcpuid); -int qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup, virDomainVcpuPinDefPtr vcpupin); +int qemuSetupCgroupEmulatorPin(virCgroupPtr cgroup, virBitmapPtr cpumask); int qemuSetupCgroupForVcpu(struct qemud_driver *driver, virDomainObjPtr vm); int qemuSetupCgroupForEmulator(struct qemud_driver *driver, virDomainObjPtr vm); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fa37bfd..adfbfa6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4245,7 +4245,8 @@ qemudDomainPinEmulator(virDomainPtr dom, if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup_dom, 0) == 0) { if (virCgroupForEmulator(cgroup_dom, &cgroup_emulator, 0) == 0) { - if (qemuSetupCgroupEmulatorPin(cgroup_emulator, newVcpuPin[0]) < 0) { + if (qemuSetupCgroupEmulatorPin(cgroup_emulator, + newVcpuPin[0]->cpumask) < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("failed to set cpuset.cpus in cgroup" " for emulator threads")); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a94e9c4..e08ec67 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2024,11 +2024,12 @@ cleanup: return ret; } -/* Set CPU affinities for emulator threads if emulatorpin xml provided. */ +/* Set CPU affinities for emulator threads. */ static int qemuProcessSetEmulatorAffinites(virConnectPtr conn, virDomainObjPtr vm) { + virBitmapPtr cpumask; virDomainDefPtr def = vm->def; virNodeInfo nodeinfo; int ret = -1; @@ -2036,15 +2037,14 @@ qemuProcessSetEmulatorAffinites(virConnectPtr conn, if (virNodeGetInfo(conn, &nodeinfo) != 0) return -1; - if (!def->cputune.emulatorpin) - return 0; - - if (virProcessInfoSetAffinity(vm->pid, - def->cputune.emulatorpin->cpumask) < 0) { + if (def->cputune.emulatorpin) + cpumask = def->cputune.emulatorpin->cpumask; + else if (def->cpumask) + cpumask = def->cpumask; + else goto cleanup; - } - ret = 0; + ret = virProcessInfoSetAffinity(vm->pid, cpumask); cleanup: return ret; } -- 1.7.12.3

3 6

[libvirt] [PATCH] migrate: v2: use VIR_DOMAIN_XML_MIGRATABLE when available
by Ján Tomko 22 Oct '12

22 Oct '12

In v2 migration protocol, XML is obtained by calling domainGetXMLDesc. This includes the default USB controller in XML, which breaks migration to older libvirt (before 0.9.2). Commit 409b5f549530e7b3a33f4505f2cad2e26896107c qemu: Emit compatible XML when migrating a domain only fixed this for v3 migration. This patch uses the new VIR_DOMAIN_XML_MIGRATABLE flag (detected by VIR_DRV_FEATURE_XML_MIGRATABLE) to obtain XML without the default controller, enabling backward v2 migration. --- src/libvirt.c | 13 ++++++++++--- src/libvirt_internal.h | 5 +++++ src/qemu/qemu_driver.c | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index e3ddf27..f6f5b91 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4620,6 +4620,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, int cookielen = 0, ret; virDomainInfo info; virErrorPtr orig_err = NULL; + unsigned int getxml_flags = 0; int cancelled; VIR_DOMAIN_DEBUG(domain, "dconn=%p, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", @@ -4646,9 +4647,15 @@ virDomainMigrateVersion2 (virDomainPtr domain, virDispatchError(domain->conn); return NULL; } - dom_xml = domain->conn->driver->domainGetXMLDesc(domain, - VIR_DOMAIN_XML_SECURE | - VIR_DOMAIN_XML_UPDATE_CPU); + + if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_XML_MIGRATABLE)) { + getxml_flags |= VIR_DOMAIN_XML_MIGRATABLE; + } else { + getxml_flags |= VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_UPDATE_CPU; + } + + dom_xml = domain->conn->driver->domainGetXMLDesc(domain, getxml_flags); if (!dom_xml) return NULL; diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 23e7153..71483e4 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -95,6 +95,11 @@ enum { * messages). */ VIR_DRV_FEATURE_PROGRAM_KEEPALIVE = 10, + + /* + * Support for VIR_DOMAIN_XML_MIGRATABLE flag in domainGetXMLDesc + */ + VIR_DRV_FEATURE_XML_MIGRATABLE = 11, }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 76730c6..0c35dad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1130,6 +1130,7 @@ qemudSupportsFeature (virConnectPtr conn ATTRIBUTE_UNUSED, int feature) case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_XML_MIGRATABLE: return 1; default: return 0; -- 1.7.8.6

2 1

[libvirt] [PATCH] qemu: set seamless migration capability
by Michal Privoznik 22 Oct '12

22 Oct '12

As we switched to setting capabilities based on QMP communication, qemu seamless-migration capability was not set. In the -help output this knob is called seamless-migration=[on|off]. The equivalent in QMP world is SPICE_MIGRATE_COMPLETED event (qemu upstream commit 2fdd16e2). --- src/qemu/qemu_capabilities.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e897f86..0ddab80 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1905,6 +1905,8 @@ qemuCapsProbeQMPEvents(qemuCapsPtr caps, if (STREQ(name, "BALLOON_CHANGE")) qemuCapsSet(caps, QEMU_CAPS_BALLOON_EVENT); + if (STREQ(name, "SPICE_MIGRATE_COMPLETED")) + qemuCapsSet(caps, QEMU_CAPS_SEAMLESS_MIGRATION); VIR_FREE(name); } VIR_FREE(events); -- 1.7.8.6

2 2

[libvirt] [PATCH] qemu: Cleanup the unused 'nodeinfo'
by Osier Yang 22 Oct '12

22 Oct '12

"nodeinfo" is not used in these two functions, and it's waste of goto in qemuProcessSetEmulatorAffinites --- src/qemu/qemu_process.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d3951d1..9b7be08 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1993,14 +1993,9 @@ qemuProcessSetVcpuAffinites(virConnectPtr conn, { qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; - virNodeInfo nodeinfo; int vcpu, n; int ret = -1; - if (virNodeGetInfo(conn, &nodeinfo) != 0) { - return -1; - } - if (!def->cputune.nvcpupin) return 0; @@ -2031,23 +2026,16 @@ qemuProcessSetEmulatorAffinites(virConnectPtr conn, { virBitmapPtr cpumask; virDomainDefPtr def = vm->def; - virNodeInfo nodeinfo; int ret = -1; - if (virNodeGetInfo(conn, &nodeinfo) != 0) - return -1; - - if (def->cputune.emulatorpin) { + if (def->cputune.emulatorpin) cpumask = def->cputune.emulatorpin->cpumask; - } else if (def->cpumask) { + else if (def->cpumask) cpumask = def->cpumask; - } else { - ret = 0; - goto cleanup; - } + else + return 0; ret = virProcessInfoSetAffinity(vm->pid, cpumask); -cleanup: return ret; } -- 1.7.7.6

2 2

[libvirt] [PATCH] network: always create dnsmasq hosts and addnhosts files, even if empty
by Laine Stump 22 Oct '12

22 Oct '12

This fixes the problem reported in: https://bugzilla.redhat.com/show_bug.cgi?id=868389 Previously, the dnsmasq hosts file (used for static dhcp entries, and addnhosts file (used for additional dns host entries) were only created/referenced on the dnsmasq commandline if there was something to put in them at the time the network was started. Once we can update a network definition while it's active (which is now possible with virNetworkUpdate), this is no longer a valid strategy - if there were 0 dhcp static hosts (resulting in no reference to the hosts file on the commandline), then one was later added, the commandline wouldn't have linked dnsmasq up to the file, so even though we create it, dnsmasq doesn't pay any attention. The solution is to just always create these files and reference them on the dnsmasq commandline (almost always, anyway). That way dnsmasq can notice when a new entry is added at runtime (a SIGHUP is sent to dnsmasq by virNetworkUdpate whenever a host entry is added or removed) The exception to this is that the dhcp static hosts file isn't created if there are no lease ranges *and* no static hosts. This is because in this case dnsmasq won't be setup to listen for dhcp requests anyway - in that case, if the count of dhcp hosts goes from 0 to 1, dnsmasq will need to be restarted anyway (to get it listening on the dhcp port). Likewise, if the dhcp hosts count goes from 1 to 0 (and there are no dhcp ranges) we need to restart dnsmasq so that it will stop listening on port 67. These special situations are handled in the bridge driver's networkUpdate() by checking for ((bool) nranges||nhosts) both before and after the update, and triggering a dnsmasq restart if the before and after don't match. --- src/network/bridge_driver.c | 56 +++++++++++++++++++--- src/util/dnsmasq.c | 12 +++-- tests/networkxml2argvdata/isolated-network.argv | 4 +- .../nat-network-dns-srv-record-minimal.argv | 3 +- .../nat-network-dns-srv-record.argv | 3 +- .../nat-network-dns-txt-record.argv | 3 +- tests/networkxml2argvdata/nat-network.argv | 3 +- tests/networkxml2argvdata/netboot-network.argv | 5 +- .../networkxml2argvdata/netboot-proxy-network.argv | 2 + tests/networkxml2argvdata/routed-network.argv | 3 +- 10 files changed, 75 insertions(+), 19 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fa909a1..1c97f29 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -751,12 +751,19 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, if (networkBuildDnsmasqHostsfile(dctx, ipdef, network->def->dns) < 0) goto cleanup; - if (dctx->hostsfile->nhosts) + /* Even if there are currently no static hosts, if we're + * listening for DHCP, we should write a 0-length hosts + * file to allow for runtime additions. + */ + if (ipdef->nranges || ipdef->nhosts) virCommandAddArgPair(cmd, "--dhcp-hostsfile", dctx->hostsfile->path); - if (dctx->addnhostsfile->nhosts) - virCommandAddArgPair(cmd, "--addn-hosts", - dctx->addnhostsfile->path); + + /* Likewise, always create this file and put it on the commandline, to allow for + * for runtime additions. + */ + virCommandAddArgPair(cmd, "--addn-hosts", + dctx->addnhostsfile->path); if (ipdef->tftproot) { virCommandAddArgList(cmd, "--enable-tftp", @@ -2882,7 +2889,10 @@ networkUpdate(virNetworkPtr net, { struct network_driver *driver = net->conn->networkPrivateData; virNetworkObjPtr network = NULL; - int isActive, ret = -1; + int isActive, ret = -1, ii; + virNetworkIpDefPtr ipdef; + bool oldDhcpActive = false; + virCheckFlags(VIR_NETWORK_UPDATE_AFFECT_LIVE | VIR_NETWORK_UPDATE_AFFECT_CONFIG, @@ -2897,6 +2907,16 @@ networkUpdate(virNetworkPtr net, goto cleanup; } + /* see if we are listening for dhcp pre-modification */ + for (ii = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); + ii++) { + if (ipdef->nranges || ipdef->nhosts) { + oldDhcpActive = true; + break; + } + } + /* VIR_NETWORK_UPDATE_AFFECT_CURRENT means "change LIVE if network * is active, else change CONFIG */ @@ -2938,8 +2958,30 @@ networkUpdate(virNetworkPtr net, if (networkRestartDhcpDaemon(network) < 0) goto cleanup; - } else if (section == VIR_NETWORK_SECTION_IP_DHCP_HOST || - section == VIR_NETWORK_SECTION_DNS_HOST || + } else if (section == VIR_NETWORK_SECTION_IP_DHCP_HOST) { + /* if we previously weren't listening for dhcp and now we + * are (or vice-versa) then we need to do a restart, + * otherwise we just need to do a refresh (redo the config + * files and send SIGHUP) + */ + bool newDhcpActive = false; + + for (ii = 0; + (ipdef = virNetworkDefGetIpByIndex(network->def, AF_INET, ii)); + ii++) { + if (ipdef->nranges || ipdef->nhosts) { + newDhcpActive = true; + break; + } + } + + if ((newDhcpActive != oldDhcpActive && + networkRestartDhcpDaemon(network) < 0) || + networkRefreshDhcpDaemon(network) < 0) { + goto cleanup; + } + + } else if (section == VIR_NETWORK_SECTION_DNS_HOST || section == VIR_NETWORK_SECTION_DNS_TXT || section == VIR_NETWORK_SECTION_DNS_SRV) { /* these sections only change things in config files, so we diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 91bf2c5..9d1c07b 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2010 Satoru SATOH <satoru.satoh(a)gmail.com> * * This library is free software; you can redistribute it and/or @@ -176,8 +176,9 @@ addnhostsWrite(const char *path, unsigned int i, ii; int rc = 0; - if (nhosts == 0) - return rc; + /* even if there are 0 hosts, create a 0 length file, to allow + * for runtime addition. + */ if (virAsprintf(&tmp, "%s.new", path) < 0) return -ENOMEM; @@ -364,8 +365,9 @@ hostsfileWrite(const char *path, unsigned int i; int rc = 0; - if (nhosts == 0) - return rc; + /* even if there are 0 hosts, create a 0 length file, to allow + * for runtime addition. + */ if (virAsprintf(&tmp, "%s.new", path) < 0) return -ENOMEM; diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 048c72b..13e77b2 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -4,4 +4,6 @@ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ ---dhcp-no-override\ +--dhcp-no-override \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/private.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/private.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index a1e4200..210a60c 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -13,4 +13,5 @@ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 \ --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 8af38c4..833d3cd 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -13,4 +13,5 @@ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 \ --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 404b56a..3481507 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -7,4 +7,5 @@ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 1dc8f73..37fd2fc 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -6,4 +6,5 @@ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/default.leases \ --dhcp-lease-max=253 --dhcp-no-override \ ---dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile\ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/default.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 5a85ec2..5408eb7 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -3,5 +3,8 @@ --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ ---dhcp-lease-max=253 --dhcp-no-override --expand-hosts --enable-tftp \ +--dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \ +--enable-tftp \ --tftp-root /var/lib/tftproot --dhcp-boot pxeboot.img\ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 36836b0..21e01e3 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -4,4 +4,6 @@ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ +--dhcp-hostsfile=/var/lib/libvirt/dnsmasq/netboot.hostsfile \ +--addn-hosts=/var/lib/libvirt/dnsmasq/netboot.addnhosts \ --dhcp-boot pxeboot.img,,10.20.30.40\ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index 77e802f..9fedb2b 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,3 +1,4 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1\ +--except-interface lo --listen-address 192.168.122.1 \ +--addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts\ -- 1.7.11.7

2 2

[libvirt] [PATCH] tools: Only install guests init script if --with-init=script=redhat
by Cole Robinson 22 Oct '12

22 Oct '12

Required to fix https://bugzilla.redhat.com/show_bug.cgi?id=789747 --- libvirt.spec.in | 5 ++++- tools/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 511949e..b3b280b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1380,7 +1380,9 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} +%if ! %{with_systemd} sed -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests +%endif %clean rm -fr %{buildroot} @@ -1593,8 +1595,10 @@ fi %if %{with_systemd} %{_unitdir}/libvirtd.service +%{_unitdir}/libvirt-guests.service %else %{_sysconfdir}/rc.d/init.d/libvirtd +%{_sysconfdir}/rc.d/init.d/libvirt-guests %endif %doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd @@ -1856,7 +1860,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_datadir}/libvirt/cpu_map.xml -%{_sysconfdir}/rc.d/init.d/libvirt-guests %if %{with_systemd} %{_unitdir}/libvirt-guests.service %endif diff --git a/tools/Makefile.am b/tools/Makefile.am index 0d7822d..86e48e0 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -217,12 +217,12 @@ EXTRA_DIST += libvirt-guests.service.in SYSTEMD_UNIT_DIR = /lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: libvirt-guests.service install-initscript install-sysconfig +install-systemd: libvirt-guests.service install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirt-guests.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service -uninstall-systemd: uninstall-initscript uninstall-sysconfig +uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: -- 1.7.11.7

2 2

[libvirt] [PATCH] qemu: Fix domxml-to-native network model conversion
by Cole Robinson 22 Oct '12

22 Oct '12

https://bugzilla.redhat.com/show_bug.cgi?id=636832 --- src/qemu/qemu_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index feda4d9..c2ddba7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5362,6 +5362,13 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, for (i = 0 ; i < def->nnets ; i++) { virDomainNetDefPtr net = def->nets[i]; int bootIndex = net->info.bootIndex; + char *model = NULL; + + if (net->model && !(model = strdup(net->model))) { + virReportOOMError(); + goto cleanup; + } + if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { int actualType = virDomainNetGetActualType(net); const char *brname; @@ -5418,8 +5425,10 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, net->data.ethernet.dev = brname; net->data.ethernet.ipaddr = ipaddr; } + VIR_FREE(net->virtPortProfile); net->info.bootIndex = bootIndex; + net->model = model; } monitor_json = qemuCapsGet(caps, QEMU_CAPS_MONITOR_JSON); -- 1.7.11.7

2 2

[libvirt] [PATCH] Fix disabling of apparmor security driver
by Christophe Fergeau 22 Oct '12

22 Oct '12

When using --without-apparmor --without-secdriver-apparmor, configure will fail saying that AppArmor development package must be installed. This is caused by a small bug in --with-secdriver-apparmor handling in configure.ac which treats --without-secdriver-apparmor as if the user had requested to enable apparmor. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 13967e9..6ffcb03 100644 --- a/configure.ac +++ b/configure.ac @@ -1562,7 +1562,8 @@ AC_ARG_WITH([secdriver-apparmor], if test "$with_apparmor" != "yes" ; then if test "$with_secdriver_apparmor" = "check" ; then with_secdriver_apparmor=no - else + fi + if test "$with_secdriver_apparmor" != "no" ; then AC_MSG_ERROR([You must install the AppArmor development package in order to compile libvirt]) fi else -- 1.7.12.1

1 1

[libvirt] [PATCH] Log file name passed to virConfReadFile
by Cole Robinson 22 Oct '12

22 Oct '12

--- src/util/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/conf.c b/src/util/conf.c index 4df62b1..346b3df 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -35,6 +35,7 @@ #include "conf.h" #include "util.h" #include "c-ctype.h" +#include "logging.h" #include "memory.h" #include "virfile.h" @@ -763,6 +764,8 @@ virConfReadFile(const char *filename, unsigned int flags) int len; virConfPtr conf; + VIR_DEBUG("filename=%s", NULLSTR(filename)); + if (filename == NULL) { virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return NULL; -- 1.7.11.7

2 2

[libvirt] [PATCH] docs: virsh: clarify behavior of send-key
by Cole Robinson 22 Oct '12

22 Oct '12

https://bugzilla.redhat.com/show_bug.cgi?id=860004 --- tools/virsh.pod | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 0481e1f..8a30ce2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1295,6 +1295,10 @@ will be held for that many milliseconds. The default codeset is B<linux>, but use of the I<--codeset> option allows other codesets to be chosen. +If multiple keycodes are specified, they are all sent simultaneously +to the guest, and they may be received in random order. If you need +distinct keypresses, you must use multiple send-key invocations. + =over 4 =item B<linux> @@ -1359,10 +1363,14 @@ bit of the first byte. No symbolic names are provided. =back B<Examples> - # send three strokes 'k', 'e', 'y', using xt codeset + # send three strokes 'k', 'e', 'y', using xt codeset. these + # are all pressed simultaneously and may be received by the guest + # in random order virsh send-key dom --codeset xt 37 18 21 + # send one stroke 'right-ctrl+C' virsh send-key dom KEY_RIGHTCTRL KEY_C + # send a tab, held for 1 second virsh send-key --holdtime 1000 0xf -- 1.7.11.7

2 2

[libvirt] [PATCH] daemon: Avoid 'Could not find keytab file' in syslog
by Cole Robinson 22 Oct '12

22 Oct '12

On F17 at least, every time libvirtd starts we get this in syslog: libvirtd: Could not find keytab file: /etc/libvirt/krb5.tab: No such file or directory This comes from cyrus-sasl, and happens regardless of whether the gssapi plugin is requested, which is what actually uses /etc/libvirt/krb5.tab. While cyrus-sasl shouldn't complain, we can easily make it shut up by commenting out the keytab value by default. Also update the keytab comment to the more modern one from qemu's sasl config file. --- daemon/libvirtd.sasl | 9 ++++++--- docs/auth.html.in | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.sasl b/daemon/libvirtd.sasl index e24a130..bfa056f 100644 --- a/daemon/libvirtd.sasl +++ b/daemon/libvirtd.sasl @@ -18,9 +18,12 @@ mech_list: digest-md5 # qemu+tcp://hostname/system?auth=sasl.gssapi #mech_list: digest-md5 gssapi -# MIT kerberos ignores this option & needs KRB5_KTNAME env var. -# May be useful for other non-Linux OS though.... -keytab: /etc/libvirt/krb5.tab +# Some older builds of MIT kerberos on Linux ignore this option & +# instead need KRB5_KTNAME env var. +# For modern Linux, and other OS, this should be sufficient +# +# There is no default value here, uncomment if you need this +#keytab: /etc/libvirt/krb5.tab # If using digest-md5 for username/passwds, then this is the file # containing the passwds. Use 'saslpasswd2 -a libvirt [username]' diff --git a/docs/auth.html.in b/docs/auth.html.in index 60e4f11..d792eb1 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -233,7 +233,8 @@ The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>. The <code>mech_list</code> parameter must first be changed to <code>gssapi</code> -instead of the default <code>digest-md5</code>. If SASL is enabled on the UNIX +instead of the default <code>digest-md5</code>, and keytab should be set to +<code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos mechanism provides data encryption of the session. </p> -- 1.7.11.7

2 2

[libvirt] [PATCH] Log parameters passed to virFileMakePath
by Cole Robinson 22 Oct '12

22 Oct '12

--- src/util/util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/util.c b/src/util/util.c index bf60837..117a50f 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1261,6 +1261,8 @@ static int virFileMakePathHelper(char *path, mode_t mode) struct stat st; char *p; + VIR_DEBUG("path=%s mode=0%o", path, mode); + if (stat(path, &st) >= 0) { if (S_ISDIR(st.st_mode)) return 0; -- 1.7.11.7

2 2

[libvirt] [libvirt-tck PATCH] Use recent Fedora version
by Guido Günther 21 Oct '12

21 Oct '12

F12 isn't available on standard mirrors anymore. --- conf/ks.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/ks.cfg b/conf/ks.cfg index de82a26..b6269e9 100644 --- a/conf/ks.cfg +++ b/conf/ks.cfg @@ -1,6 +1,6 @@ install text -url --url=http://ftp-stud.hs-esslingen.de/Mirrors/fedora.redhat.com/linux/releases/12/Fedora/i386/os/ +url --url=http://ftp-stud.hs-esslingen.de/Mirrors/fedora.redhat.com/linux/releases/17/Fedora/i386/os/ lang en_US.UTF-8 keyboard de-latin1-nodeadkeys network --device eth0 --bootproto dhcp -- 1.7.10.4

2 2

[libvirt] [libvirt-tck PATCH] Debian calls mkisofs genisoimage
by Guido Günther 21 Oct '12

21 Oct '12

so check for that too when generating the iso. --- lib/Sys/Virt/TCK/NetworkHelpers.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Sys/Virt/TCK/NetworkHelpers.pm b/lib/Sys/Virt/TCK/NetworkHelpers.pm index f7f6d70..5e1bac1 100644 --- a/lib/Sys/Virt/TCK/NetworkHelpers.pm +++ b/lib/Sys/Virt/TCK/NetworkHelpers.pm @@ -32,8 +32,10 @@ sub build_cdrom_ks_image { unless (-e $isoimage) { my $isofiledir = $tck->bucket_dir($bucket1); my $ksfile = $tck->get_scratch_resource($ks, $bucket1, "ks.cfg"); + my @progs = `which mkisofs genisoimage`; + chomp(@progs); - `mkisofs -o "$isoimage" $isofiledir`; + `$progs[0] -o "$isoimage" $isofiledir`; } return ($isoimage, "cdrom:/ks.cfg"); -- 1.7.10.4

2 2

[libvirt] [PATCH] network: don't allow multiple default portgroups
by Laine Stump 21 Oct '12

21 Oct '12

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868483 virNetworkUpdate, virNetworkDefine, and virNetworkCreate all three allow network definitions to contain multiple <portgroup> elements with default='yes'. Only a single default portgroup should be allowed for each network. This patch updates networkValidate() (called by both virNetworkCreate() and virNetworkDefine()) and virNetworkDefUpdatePortGroup (called by virNetworkUpdate() to not allow multiple default portgroups. --- src/conf/network_conf.c | 35 ++++++++++++++++++++++++++--------- src/network/bridge_driver.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 2f9ad2e..8976f2a 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2752,7 +2752,8 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, /* virNetworkUpdateFlags */ unsigned int fflags ATTRIBUTE_UNUSED) { - int ii, ret = -1; + int ii, foundName = -1, foundDefault = -1; + int ret = -1; virPortGroupDef portgroup; memset(&portgroup, 0, sizeof(portgroup)); @@ -2766,9 +2767,11 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, /* check if a portgroup with same name already exists */ for (ii = 0; ii < def->nPortGroups; ii++) { if (STREQ(portgroup.name, def->portGroups[ii].name)) - break; + foundName = ii; + if (def->portGroups[ii].isDefault) + foundDefault = ii; } - if (ii == def->nPortGroups && + if (foundName == -1 && ((command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) || (command == VIR_NETWORK_UPDATE_COMMAND_DELETE))) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2776,7 +2779,7 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, "in network '%s' matching <portgroup name='%s'>"), def->name, portgroup.name); goto cleanup; - } else if (ii < def->nPortGroups && + } else if (foundName >= 0 && ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || (command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST))) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2787,11 +2790,25 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, goto cleanup; } + /* if there is already a different default, we can't make this + * one the default. + */ + if (command != VIR_NETWORK_UPDATE_COMMAND_DELETE && + portgroup.isDefault && + foundDefault >= 0 && foundDefault != foundName) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("a different portgroup entry in " + "network '%s' is already set as the default. " + "Only one default is allowed."), + def->name); + goto cleanup; + } + if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) { /* replace existing entry */ - virPortGroupDefClear(&def->portGroups[ii]); - def->portGroups[ii] = portgroup; + virPortGroupDefClear(&def->portGroups[foundName]); + def->portGroups[foundName] = portgroup; memset(&portgroup, 0, sizeof(portgroup)); } else if ((command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST) || @@ -2816,9 +2833,9 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, } else if (command == VIR_NETWORK_UPDATE_COMMAND_DELETE) { /* remove it */ - virPortGroupDefClear(&def->portGroups[ii]); - memmove(def->portGroups + ii, def->portGroups + ii + 1, - sizeof(*def->portGroups) * (def->nPortGroups - ii - 1)); + virPortGroupDefClear(&def->portGroups[foundName]); + memmove(def->portGroups + foundName, def->portGroups + foundName + 1, + sizeof(*def->portGroups) * (def->nPortGroups - foundName - 1)); def->nPortGroups--; ignore_value(VIR_REALLOC_N(def->portGroups, def->nPortGroups)); } else { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1c97f29..8837843 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2618,6 +2618,7 @@ networkValidate(virNetworkDefPtr def) { int ii; bool vlanUsed, vlanAllowed; + const char *defaultPortGroup = NULL; /* The only type of networks that currently support transparent * vlan configuration are those using hostdev sr-iov devices from @@ -2638,6 +2639,17 @@ networkValidate(virNetworkDefPtr def) == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)) { vlanAllowed = true; } + if (def->portGroups[ii].isDefault) { + if (defaultPortGroup) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' has multiple default " + "<portgroup> elements (%s and %s), " + "but only one default is allowed"), + def->name, defaultPortGroup, + def->portGroups[ii].name); + } + defaultPortGroup = def->portGroups[ii].name; + } } if (vlanUsed && !vlanAllowed) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.7.11.7

2 2

[libvirt] 0.10.2 virtualport profileid (802.1Qbh) malformed
by Tom Lanyon 21 Oct '12

21 Oct '12

Hi, I've just upgraded a test libvirtd host to 0.10.2 from 0.9.4 to be able to make use of the new 'virsh net-update add portgroup' live updates, however can't get my private/802.1Qbh interfaces working at all after the upgrade. Trying to start an existing domain or install a new domain after the upgrade gives: "ERROR internal error corrupted profileid string" and a corresponding error in the libvirtd log: "error : virNetDevVPortProfileMerge:381 : internal error corrupted profileid string" I've tried all sorts of profileid combinations and tried defining the virtualport in the domain instead of in the network, to no avail. The source indicates this is to do with a malformed (not null terminated) profile id when merging the port profile. Why would this be happening? Any hints how to debug it? My example network definition: <network> <name>testnet</name> <uuid>76d32a2d-8433-6873-9c15-cdae30e7a632</uuid> <forward dev='eth1' mode='private'> <interface dev='eth1'/> <interface dev='eth2'/> <interface dev='eth3'/> ... </forward> <portgroup name='server1' default='yes'> <virtualport type='802.1Qbh'> <parameters profileid='profile-server1'/> </virtualport> </portgroup> <portgroup name='server2'> <virtualport type='802.1Qbh'> <parameters profileid='profile-server2'/> </virtualport> </portgroup> <portgroup name='server3'> <virtualport type='802.1Qbh'> <parameters profileid='profile-server3'/> </virtualport> </portgroup> </network> and a domain definition which throws an error on start-up: <interface type='network'> <mac address='52:54:00:d1:94:5f'/> <source network='testnet' portgroup='server1'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> Tom

2 1

[libvirt] [PATCH 0/4] snapshot: work towards external system checkpoint
by Eric Blake 20 Oct '12

20 Oct '12

I've previously posted 1/4, it is now rebased to latest and some bugs fixed that I found while testing later patches: https://www.redhat.com/archives/libvir-list/2012-August/msg01252.html The other three are new. My next snapshot task will be hooking up external snapshots for an offline domain. Eric Blake (4): snapshot: new XML for external system checkpoint snapshot: improve disk align checking snapshot: populate new XML info for qemu snapshots snapshot: merge pre-snapshot checks docs/formatsnapshot.html.in | 11 ++ docs/schemas/domainsnapshot.rng | 23 ++++ src/conf/snapshot_conf.c | 91 ++++++++++---- src/conf/snapshot_conf.h | 4 + src/qemu/qemu_driver.c | 133 ++++++++++----------- tests/domainsnapshotxml2xmlin/external_vm.xml | 10 ++ tests/domainsnapshotxml2xmlin/noparent.xml | 9 ++ tests/domainsnapshotxml2xmlout/all_parameters.xml | 1 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 43 +++++++ tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmlout/noparent.xml | 1 + .../noparent_nodescription.xml | 1 + .../noparent_nodescription_noactive.xml | 1 + tests/domainsnapshotxml2xmltest.c | 1 + 16 files changed, 241 insertions(+), 91 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/external_vm.xml create mode 100644 tests/domainsnapshotxml2xmlin/noparent.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm.xml -- 1.7.11.4

2 11

[libvirt] [PATCH] network: free/null newDef if network fails to start
by Laine Stump 20 Oct '12

20 Oct '12

https://bugzilla.redhat.com/show_bug.cgi?id=866364 pointed out a crash due to virNetworkObjAssignDef free'ing network->newDef without NULLing it afterward. A fix for this is in upstream commit b7e9202401ebaa039b8f05acdefda8c24081537a. While the NULLing of newDef was a legitimate fix, newDef should have already been empty (NULL) anyway (as indicated in the comment that was deleted by that commit). The reason that newDef had a non-NULL value (i.e. the root cause) was that networkStartNetwork() had failed after populating network->newDef, but then neglected to free/NULL newDef in the cleanup. (A bit of background here: network->newDef should contain the persistent config of a network when a network is active (and of course only when it is persisten), and NULL at all other times. There is also a network->def which should contain the persistent definition of the network when it is inactive, and the current live state at all other times. The idea is that you can make changes to network->newDef which will take effect the next time the network is restarted, but won't mess with the current state of the network (virDomainObj has a similar pair of virDomainDefs that behave in the same fashion). Personally I think there should be a network->live and network->config, and the location of the persistent config should *always* be in network->config, but that's for a later cleanup). Since I love things to be symmetric, I created a new function called virNetworkObjUnsetDefTransient(), which reverses the effects of virNetworkObjSetDefTransient(). I don't really like the name of the new function, but then I also didn't really like the name of the old one either (it's just named that way to match a similar function in the domain conf code). --- src/conf/network_conf.c | 14 ++++++++++++++ src/conf/network_conf.h | 1 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 12 ++++-------- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 0f7470d..2f9ad2e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -352,6 +352,20 @@ virNetworkObjSetDefTransient(virNetworkObjPtr network, bool live) return network->newDef ? 0 : -1; } +/* virNetworkObjUnsetDefTransient: + * + * This *undoes* what virNetworkObjSetDefTransient did. + */ +void +virNetworkObjUnsetDefTransient(virNetworkObjPtr network) +{ + if (network->def) { + virNetworkDefFree(network->def); + network->def = network->newDef; + network->newDef = NULL; + } +} + /* * virNetworkObjGetPersistentDef: * @network: network object pointer diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 55502fb..4c0c8c1 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -253,6 +253,7 @@ int virNetworkObjAssignDef(virNetworkObjPtr network, const virNetworkDefPtr def, bool live); int virNetworkObjSetDefTransient(virNetworkObjPtr network, bool live); +void virNetworkObjUnsetDefTransient(virNetworkObjPtr network); virNetworkDefPtr virNetworkObjGetPersistentDef(virNetworkObjPtr network); int virNetworkObjReplacePersistentDef(virNetworkObjPtr network, virNetworkDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a0c2f6..fd30024 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -872,6 +872,7 @@ virNetworkObjLock; virNetworkObjReplacePersistentDef; virNetworkObjSetDefTransient; virNetworkObjUnlock; +virNetworkObjUnsetDefTransient; virNetworkObjUpdate; virNetworkRemoveInactive; virNetworkSaveConfig; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5578373..fa909a1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2327,8 +2327,10 @@ networkStartNetwork(struct network_driver *driver, break; } - if (ret < 0) + if (ret < 0) { + virNetworkObjUnsetDefTransient(network); return ret; + } /* Persist the live configuration now that anything autogenerated * is setup. @@ -2388,13 +2390,7 @@ static int networkShutdownNetwork(struct network_driver *driver, } network->active = 0; - - if (network->newDef) { - virNetworkDefFree(network->def); - network->def = network->newDef; - network->newDef = NULL; - } - + virNetworkObjUnsetDefTransient(network); return ret; } -- 1.7.11.7

2 1

[libvirt] [PATCH] add --interface to dnsmasq command line so bind-interfaces works
by Gene Czarcinski 20 Oct '12

20 Oct '12

The problem is that, without SO_BINDTODEVICE, there is no guarantee that the kernel will route DHCP (v4 or v6) packets to the correct instance of dnsmasq, when there is more than one. --- src/network/bridge_driver.c | 20 ++++++++++++++------ tests/networkxml2argvdata/isolated-network.argv | 1 + tests/networkxml2argvdata/nat-network-dns-hosts.argv | 3 ++- .../nat-network-dns-srv-record-minimal.argv | 1 + .../nat-network-dns-srv-record.argv | 1 + .../nat-network-dns-txt-record.argv | 1 + tests/networkxml2argvdata/nat-network.argv | 3 ++- tests/networkxml2argvdata/netboot-network.argv | 3 ++- tests/networkxml2argvdata/netboot-proxy-network.argv | 3 ++- tests/networkxml2argvdata/routed-network.argv | 3 ++- 10 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 5578373..821b955 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -682,14 +682,22 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, } } - /* - * --interface does not actually work with dnsmasq < 2.47, - * due to DAD for ipv6 addresses on the interface. - * - * virCommandAddArgList(cmd, "--interface", ipdef->bridge, NULL); + /* It may have been important not to use --interface at one time, + * but with with dnsmasq => 2.61 there is a problem if + * --interface is not specified because --bind-interfaces + * will have no effect. Here is what Simon Kelly (dnsmasq + * developer) has to say on the subject: + * "The problem is that, without SO_BINDTODEVICE, there is + * no guarantee that the kernel will route DHCP (v4 or v6) + * packets to the correct instance of dnsmasq, + * when there is more than one." * - * So listen on all defined IPv[46] addresses + * --interface is added but the --listen-address parameters + * are left in. */ + + virCommandAddArgList(cmd, "--interface", network->def->bridge, NULL); + for (ii = 0; (tmpipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); ii++) { diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 048c72b..c27f793 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,6 +1,7 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ +--interface virbr2 \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/private.leases --dhcp-lease-max=253 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 03a0676..0b72bcd 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,4 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ --local=/example.com/ --domain-needed \ ---conf-file= --except-interface lo --listen-address 192.168.122.1 \ +--conf-file= --except-interface lo \ +--interface virbr0 --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index a1e4200..f1273de 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -4,6 +4,7 @@ --local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.,,,, \ +--interface virbr0 \ --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 8af38c4..6aac056 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -4,6 +4,7 @@ --local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.test-domain-name,.,1024,10,10 \ +--interface virbr0 \ --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 404b56a..a65e9a8 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,6 +1,7 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --conf-file= \ --except-interface lo '--txt-record=example,example value' \ +--interface virbr0 \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 1dc8f73..f25979d 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,6 +1,7 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ +--except-interface lo --interface virbr0 \ +--listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 5a85ec2..59a0266 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,6 +1,7 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ --local=/example.com/ --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ +--except-interface lo --interface virbr1 \ +--listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --expand-hosts --enable-tftp \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 36836b0..e3fe668 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,6 +1,7 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ --local=/example.com/ --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1 \ +--except-interface lo --interface virbr1 \ +--listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ --dhcp-lease-max=253 --dhcp-no-override --expand-hosts \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index 77e802f..093c0ee 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,3 +1,4 @@ @DNSMASQ@ --strict-order --bind-interfaces \ --local=// --domain-needed --conf-file= \ ---except-interface lo --listen-address 192.168.122.1\ +--except-interface lo --interface virbr1 \ +--listen-address 192.168.122.1\ -- 1.7.11.7

2 1

[libvirt] [PATCH v3] selinux: relabel tapfd in qemuPhysIfaceConnect
by Guannan Ren 20 Oct '12

20 Oct '12

Relabeling tapfd right after the tap device is created. qemuPhysIfaceConnect is common function called both for static netdevs and for hotplug netdevs. --- src/qemu/qemu_command.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c0c400..81bed38 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -170,12 +170,21 @@ qemuPhysIfaceConnect(virDomainDefPtr def, vmop, driver->stateDir, virDomainNetGetActualBandwidth(net)); if (rc >= 0) { + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + def, rc) < 0) + goto error; + virDomainAuditNetDevice(def, net, res_ifname, true); VIR_FREE(net->ifname); net->ifname = res_ifname; } return rc; + +error: + VIR_FREE(res_ifname); + VIR_FORCE_CLOSE(rc); + return -1; } @@ -5425,10 +5434,6 @@ qemuBuildCommandLine(virConnectPtr conn, if (tapfd < 0) goto error; - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, tapfd) < 0) - goto error; - last_good_net = i; virCommandTransferFD(cmd, tapfd); -- 1.7.11.4

2 4

[libvirt] [PATCH v4 0/4] command line fd passing using fd sets
by Corey Bryant 19 Oct '12

19 Oct '12

This series adds command line file descriptor passing support via a new -add-fd option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 The new -add-fd option is designed to mirror the add-fd QMP option as much as possible. Corey Bryant (4): monitor: Allow add-fd to any specified fd set monitor: Enable adding an inherited fd to an fd set monitor: Prevent removing fd from set during init qemu-config: Add new -add-fd command line option monitor.c | 142 ++++++++++++++++++++++++++++++++++--------------------- monitor.h | 3 ++ qapi-schema.json | 2 +- qemu-config.c | 22 +++++++++ qemu-options.hx | 36 ++++++++++++++ vl.c | 78 ++++++++++++++++++++++++++++++ 6 files changed, 228 insertions(+), 55 deletions(-) -- 1.7.11.4

3 9

[libvirt] [PATCH] qemu: Allow migration with host USB devices
by Jiri Denemark 19 Oct '12

19 Oct '12

Recently, patches were added support for (managed)saving, restoring, and migrating domains with host USB devices. However, qemu driver would still forbid migration of such domains because qemuMigrationIsAllowed was not updated. --- src/qemu/qemu_migration.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 65cd6ec..a2402ce 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -800,6 +800,8 @@ qemuMigrationIsAllowed(struct qemud_driver *driver, virDomainObjPtr vm, virDomainDefPtr def) { int nsnapshots; + bool forbid; + int i; if (vm) { if (qemuProcessAutoDestroyActive(driver, vm)) { @@ -817,9 +819,23 @@ qemuMigrationIsAllowed(struct qemud_driver *driver, virDomainObjPtr vm, def = vm->def; } - if (def->nhostdevs > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain with assigned host devices cannot be migrated")); + + /* Migration with USB host devices is allowed, all other devices are + * forbidden. + */ + forbid = false; + for (i = 0; i < def->nhostdevs; i++) { + virDomainHostdevDefPtr hostdev = def->hostdevs[i]; + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { + forbid = true; + break; + } + } + if (forbid) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain with assigned non-USB host devices " + "cannot be migrated")); return false; } -- 1.7.12.4

2 2

[libvirt] [PATCH] qemu: Fix emulator affinity
by Martin Kletzander 19 Oct '12

19 Oct '12

Commit ba63d8f7d843461f77a8206c1ef9da38388713e5 introduced a bug that makes machines, that don't have either cpuset in <vcpu> or <emulatorpin> specified, fail. Because the function that sets affinity is called without any check, the function must not fail unless there is an error. --- src/qemu/qemu_process.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e08ec67..b97aaef 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2029,22 +2029,24 @@ static int qemuProcessSetEmulatorAffinites(virConnectPtr conn, virDomainObjPtr vm) { - virBitmapPtr cpumask; + virBitmapPtr cpumask = NULL; virDomainDefPtr def = vm->def; virNodeInfo nodeinfo; int ret = -1; - if (virNodeGetInfo(conn, &nodeinfo) != 0) - return -1; + if (virNodeGetInfo(conn, &nodeinfo) < 0) + goto cleanup; if (def->cputune.emulatorpin) cpumask = def->cputune.emulatorpin->cpumask; else if (def->cpumask) cpumask = def->cpumask; + + if (cpumask) + ret = virProcessInfoSetAffinity(vm->pid, cpumask); else - goto cleanup; + ret = 0; - ret = virProcessInfoSetAffinity(vm->pid, cpumask); cleanup: return ret; } -- 1.7.12.3

3 3

[libvirt] [PATCH] qemu: Set arch to i686 if qemu-system-i386 is found
by Guido Günther 19 Oct '12

19 Oct '12

If we can't probe the architecture from QMP we parse the architecture from the qemu binaries name. This results in the architecture being i386 instead of i686 which then results in QEMU_CAPS_PCI_MULTIBUS being unset which gives a broken qemu command line. This probably didn't show up earlier since most of the time there's also a /usr/bin/qemu around which results in i686 capabilities. --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7c391b3..e897f86 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2055,6 +2055,8 @@ qemuCapsInitHelp(qemuCapsPtr caps) /* For historical compat we use 'itanium' as arch name */ if (STREQ(tmp, "ia64")) tmp = "itanium"; + else if (STREQ(tmp, "i386")) + tmp = "i686"; } else { uname_normalize(&ut); tmp = ut.machine; -- 1.7.10.4

2 2

[libvirt] [PATCH][RFC] helper of copy-storage-* features
by liguang 19 Oct '12

19 Oct '12

help to create disk images copy-storage-* required, try to do non-shared migration without bothering to create disk images at target by hand. consider this situation: 1. non-shared migration virsh migrate --copy-storage-all ... 2. migration fails 3. create disk images required qemu-img create ... 4 migration run smoothly so, try do remove step 2, 3, 4 this kind of use had been discussed before, http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html It did not handle more about complete situations suggested by Daniel P. Berrange, https://www.redhat.com/archives/libvir-list/2012-October/msg00407.html Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_migration.c | 92 +++++++++++++++++++++++++++++++++++++++++++- src/util/util.c | 17 ++++++++ src/util/util.h | 1 + 4 files changed, 108 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a8c81e7..a293184 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1202,6 +1202,7 @@ virArgvToString; virAsprintf; virBuildPathInternal; virDirCreate; +virDirOfFile; virDoubleToStr; virEnumFromString; virEnumToString; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..ac3e1c3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "copystorage"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_COPYSTORAGE = (1 << QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,10 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + virBufferAsprintf(buf, " <copystorage/>\n"); + + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +668,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE)) { + if (virXPathBoolean("count(./copystorage) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + } + return 0; error: @@ -1215,6 +1226,60 @@ qemuMigrationPrepareCleanup(struct qemud_driver *driver, qemuDomainObjDiscardAsyncJob(driver, vm); } +static int qemuMigrationHandleDiskFiles(const char *dom_xml, int pin) +{ + xmlDocPtr doc = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlNodePtr *disks = NULL; + virCommandPtr cmd = NULL; + int i, nr, ret = -1; + char *file_name[] = {}, *file_fmt[] = {}; + char *driver_name, *tmp_dir; + + if (!(doc = virXMLParseStringCtxt(dom_xml, _("(domain_definition)"), &ctxt))) + goto cleanup; + + if ((nr = virXPathNodeSet("./devices/disk", ctxt, &disks)) <= 0) + goto cleanup; + + for (i = 0; i < nr; i++) { + ctxt->node = disks[i]; + driver_name = virXPathString("string(./driver/@name)", ctxt); + if (STRNEQ(driver_name, "qemu")) + continue; + file_fmt[i] = virXPathString("string(./driver/@type)", ctxt); + file_name[i] = virXPathString("string(./source/file)", ctxt); + if (virFileExists(file_name[i]) && !pin) + continue; + if ((tmp_dir = virDirOfFile(file_name[i])) == NULL) + continue; + if (!virFileExists(tmp_dir)) + if (virFileMakePath(tmp_dir) < 0) + continue; + if (pin) + cmd = virCommandNewArgList("qemu-img", "create", "-f", + file_fmt[i], file_name[i], ~0UL, NULL); + else + cmd = virCommandNewArgList("rm", "-f", file_name[i], NULL); + if (virCommandRun(cmd, NULL) < 0) { + goto cleanup; + virReportSystemError(errno, "%s", + _("unable create disk images by qemu-img")); + } + } + + ret = 0; + +cleanup: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(doc); + VIR_FREE(disks); + virCommandFree(cmd); + VIR_FREE(driver_name); + VIR_FREE(tmp_dir); + return ret; +} + static int qemuMigrationPrepareAny(struct qemud_driver *driver, virConnectPtr dconn, @@ -1314,6 +1379,14 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, origname = NULL; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE))) + goto cleanup; + + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + if (qemuMigrationHandleDiskFiles(dom_xml, 1) < 0) + goto cleanup; + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_LOCKSTATE))) goto cleanup; @@ -1900,8 +1973,13 @@ qemuMigrationRun(struct qemud_driver *driver, if (flags & VIR_MIGRATE_NON_SHARED_DISK) migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_DISK; - if (flags & VIR_MIGRATE_NON_SHARED_INC) + if (flags & VIR_MIGRATE_NON_SHARED_INC) { migrate_flags |= QEMU_MONITOR_MIGRATE_NON_SHARED_INC; + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE) < 0) + goto cleanup; + } /* connect to the destination qemu if needed */ if (spec->destType == MIGRATION_DEST_CONNECT_HOST && @@ -2929,14 +3007,18 @@ qemuMigrationFinish(struct qemud_driver *driver, int newVM = 1; qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; - int cookie_flags = 0; + int cookie_flags = 0, migration_status = 0; qemuDomainObjPrivatePtr priv = vm->privateData; + char *dom_xml = NULL; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", driver, dconn, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, retcode); + if (!(dom_xml = qemuDomainFormatXML(driver, vm, VIR_DOMAIN_XML_SECURE, false))) + goto cleanup; + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) goto cleanup; @@ -3088,7 +3170,11 @@ qemuMigrationFinish(struct qemud_driver *driver, if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) VIR_WARN("Unable to encode migration cookie"); + migration_status = 1; + endjob: + if (!migration_status) + qemuMigrationHandleDiskFiles(dom_xml, 0); if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; } else if (!vm->persistent && !virDomainObjIsActive(vm)) { diff --git a/src/util/util.c b/src/util/util.c index 348c388..1f51a77 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3108,3 +3108,20 @@ virValidateWWN(const char *wwn) { return true; } + +char *virDirOfFile(const char *file) +{ + char *p, *tmp; + + if (file == NULL) + return NULL; + if ((tmp = strdup(file)) == NULL) + return NULL; + if ((p = strrchr(file, '/')) == NULL) + return getcwd(tmp, strlen(file)); + if (strlen(p) == 0) + return NULL; + tmp[strlen(file) - strlen(p)] = '\0'; + + return tmp; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..255b7b2 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -114,6 +114,7 @@ enum { }; int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid, unsigned int flags) ATTRIBUTE_RETURN_CHECK; +char *virDirOfFile(const char *file) ATTRIBUTE_RETURN_CHECK; int virFileMakePath(const char *path) ATTRIBUTE_RETURN_CHECK; int virFileMakePathWithMode(const char *path, mode_t mode) ATTRIBUTE_RETURN_CHECK; -- 1.7.2.5

4 7

[libvirt] [PATCH] qemu: Don't fail without emulatorpin or cpumask
by Guido Günther 19 Oct '12

19 Oct '12

This unbreaks qemu:///session that got broken by ba63d8f7d843461f77a8206c1ef9da38388713e5. --- src/qemu/qemu_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e08ec67..293ffe9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2041,8 +2041,10 @@ qemuProcessSetEmulatorAffinites(virConnectPtr conn, cpumask = def->cputune.emulatorpin->cpumask; else if (def->cpumask) cpumask = def->cpumask; - else + else { + ret = 0; goto cleanup; + } ret = virProcessInfoSetAffinity(vm->pid, cpumask); cleanup: -- 1.7.10.4

2 2

[libvirt] [PATCH] Autogenerate AUTHORS
by Cole Robinson 19 Oct '12

19 Oct '12

AUTHORS.in tracks the maintainers, as well as some folks who were previously in AUTHORS but don't have a git commit with proper attribution. Generated output is sorted alphabetically and lacks pretty spacing, so tweak AUTHORS.in to follow the same format. Additionally, drop the syntax-check rule that previously validated AUTHORS against git log. --- .gitignore | 1 + .mailmap | 15 +++- AUTHORS | 279 --------------------------------------------------------- AUTHORS.in | 88 ++++++++++++++++++ Makefile.am | 12 ++- bootstrap.conf | 3 +- cfg.mk | 15 ---- 7 files changed, 116 insertions(+), 297 deletions(-) delete mode 100644 AUTHORS create mode 100644 AUTHORS.in diff --git a/.gitignore b/.gitignore index c185cbc..804eda4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ .memdump .sc-start-sc_* /ABOUT-NLS +/AUTHORS /COPYING /ChangeLog /GNUmakefile diff --git a/.mailmap b/.mailmap index 98ff6dc..c430200 100644 --- a/.mailmap +++ b/.mailmap @@ -3,7 +3,6 @@ # Email consolidation: # <Preferred address in AUTHORS> <other alias used by same author> -<amy.griffis(a)hp.com> <aron.griffis(a)hp.com> <bozzolan(a)gmail.com> <redshift(a)gmx.com> <charles_duffy(a)messageone.com> <charles(a)dyfis.net> <dfj(a)redhat.com> <dfj(a)dfj.bne.redhat.com> @@ -35,6 +34,8 @@ <gerd(a)egidy.de> <gerd.von.egidy(a)intra2net.com> <benoar(a)dolka.fr> <benjamin.cama(a)telecom-bretagne.eu> <zhlcindy(a)linux.vnet.ibm.com> <zhlcindy(a)gmail.com> +<serge.hallyn(a)canonical.com> <serue(a)us.ibm.com> +<pritesh.kothari(a)sun.com> <Pritesh.Kothari(a)Sun.COM> # Name consolidation: # Preferred author spelling <preferred email> @@ -43,3 +44,15 @@ Royce Lv <lvroyce(a)linux.vnet.ibm.com> Daniel J Walsh <dwalsh(a)redhat.com> Ján Tomko <jtomko(a)redhat.com> Gerd von Egidy <gerd(a)egidy.de> +MATSUDA Daiki <matsudadik(a)intellilink.co.jp> +Tang Chen <tangchen(a)cn.fujitsu.com> +Peng Zhou <ailvpeng25(a)gmail.com> +Dirk Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> +Thibault VINCENT <thibault.vincent(a)smartjog.com> +Aurelien Rougemont <beorn(a)binaries.fr> +Serge E. Hallyn <serge.hallyn(a)canonical.com> +Henrik Persson E <henrik.e.persson(a)ericsson.com> +Philipp Hahn <hahn(a)univention.de> +Marco Bozzolan <bozzolan(a)gmail.com> +Marco Bozzolan <redshift(a)gmx.com> +Pritesh Kothari <pritesh.kothari(a)sun.com> diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 27c4eda..0000000 --- a/AUTHORS +++ /dev/null @@ -1,279 +0,0 @@ - libvirt Authors - =============== - -The libvirt project was initiated by: - - Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> - -The primary maintainers and people with commit access rights: - - Daniel Veillard <veillard(a)redhat.com> - Daniel Berrange <berrange(a)redhat.com> - Richard W.M. Jones <rjones(a)redhat.com> - Mark McLoughlin <markmc(a)redhat.com> - Anthony Liguori <aliguori(a)us.ibm.com> - Jim Meyering <meyering(a)redhat.com> - Jim Fehlig <jfehlig(a)suse.com> - Chris Lalancette <clalance(a)redhat.com> - Cole Robinson <crobinso(a)redhat.com> - Guido Günther <agx(a)sigxcpu.org> - John Levon <john.levon(a)sun.com> - Matthias Bolte <matthias.bolte(a)googlemail.com> - Jiří Denemark <jdenemar(a)redhat.com> - Dave Allan <dallan(a)redhat.com> - Laine Stump <laine(a)redhat.com> - Stefan Berger <stefanb(a)us.ibm.com> - Eric Blake <eblake(a)redhat.com> - Justin Clift <jclift(a)redhat.com> - Osier Yang <jyang(a)redhat.com> - Wen Congyang <wency(a)cn.fujitsu.com> - Michal Prívozník <mprivozn(a)redhat.com> - Peter Krempa <pkrempa(a)redhat.com> - Christophe Fergeau <cfergeau(a)redhat.com> - Alex Jia <ajia(a)redhat.com> - Martin Kletzander <mkletzan(a)redhat.com> - -Previous maintainers: - Karel Zak <kzak(a)redhat.com> - Atsushi SAKAI <sakaia(a)jp.fujitsu.com> - Dave Leskovec <dlesko(a)linux.vnet.ibm.com> - Dan Smith <danms(a)us.ibm.com> - -Patches have also been contributed by: - - David Lutterkort <dlutter(a)redhat.com> - Andrew Puch <apuch(a)redhat.com> - Philippe Berthault <philippe.berthault(a)Bull.net> - Hugh Brock <hbrock(a)redhat.com> - Michel Ponceau <michel.ponceau(a)bull.net> - Jeremy Katz <katzj(a)redhat.com> - Pete Vetere <pvetere(a)redhat.com> - Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> - Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> - Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> - Takahashi Tomohiro <takatom(a)jp.fujitsu.com> - Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> - Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> - Mark Johnson <johnson.nh(a)gmail.com> - Christian Ehrhardt <ehrhardt(a)linux.vnet.ibm.com> - Shuveb Hussain <shuveb(a)binarykarma.com> - Jim Paris <jim(a)jtan.com> - Daniel Hokka Zakrisson <daniel(a)hozac.com> - Mads Chr. Olesen <shiyee(a)shiyee.dk> - Anton Protopopov <aspsk2(a)gmail.com> - Stefan de Konink <dekonink(a)kinkrsoftware.nl> - Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> - Evgeniy Sokolov <evg(a)openvz.org> - David Lively <dlively(a)virtualiron.com> - Charles Duffy <Charles_Duffy(a)messageone.com> - Nguyen Anh Quynh <aquynh(a)gmail.com> - James Morris <jmorris(a)namei.org> - Chris Wright <chrisw(a)redhat.com> - Ben Guthro <ben.guthro(a)gmail.com> - Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> - Gerd von Egidy <gerd(a)egidy.de> - Itamar Heim <iheim(a)redhat.com> - Markus Armbruster <armbru(a)redhat.com> - Ryota Ozaki <ozaki.ryota(a)gmail.com> - Daniel J Walsh <dwalsh(a)redhat.com> - Maximilian Wilhelm <max(a)rfc2324.org> - Pritesh Kothari <Pritesh.Kothari(a)Sun.COM> - Amit Shah <amit.shah(a)redhat.com> - Florian Vichot <florian.vichot(a)diateam.net> - Serge E. Hallyn <serue(a)us.ibm.com> - Soren Hansen <soren(a)linux2go.dk> - Abel Míguez Rodríguez<amiguezr(a)pdi.ucm.es> - Doug Goldstein <cardoe(a)cardoe.com> - Javier Fontan <jfontan(a)gmail.com> - Federico Simoncelli <fsimonce(a)redhat.com> - Amy Griffis <amy.griffis(a)hp.com> - Henrik Persson E <henrik.e.persson(a)ericsson.com> - Satoru SATOH <satoru.satoh(a)gmail.com> - Paolo Bonzini <pbonzini(a)redhat.com> - Miloslav Trmač <mitr(a)redhat.com> - Jamie Strandboge <jamie(a)canonical.com> - Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> - Matthew Booth <mbooth(a)redhat.com> - Diego Elio Pettenò <flameeyes(a)gmail.com> - Adam Litke <agl(a)us.ibm.com> - Steve Yarmie <steve.yarmie(a)gmail.com> - Dan Kenigsberg <danken(a)redhat.com> - Yuji NISHIDA <nishidy(a)nict.go.jp> - Dustin Xiong <x_k_123(a)hotmail.com> - Rolf Eike Beer <eike(a)sf-mail.de> - Wolfgang Mauerer <wolfgang.mauerer(a)siemens.com> - Philipp Hahn <hahn(a)univention.de> - Ed Swierk <eswierk(a)aristanetworks.com> - Paolo Smiraglia <paolo.smiraglia(a)gmail.com> - Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> - Chris Wong <wongc-redhat(a)hoku.net> - Daniel Berteaud <daniel(a)firewall-services.com> - Dustin Kirkland <kirkland(a)canonical.com> - Luiz Capitulino <lcapitulino(a)redhat.com> - Ryan Harper <ryanh(a)us.ibm.com> - Spencer Shimko <sshimko(a)tresys.com> - Marco Bozzolan <bozzolan(a)gmail.com> - Alex Williamson <alex.williamson(a)redhat.com> - Ersek Laszlo <lacos(a)caesar.elte.hu> - Kenneth Nagin <NAGIN(a)il.ibm.com> - Klaus Ethgen <Klaus(a)Ethgen.de> - Bryan Kearney <bkearney(a)redhat.com> - Darry L. Pierce <dpierce(a)redhat.com> - David Jorm <dfj(a)redhat.com> - Eduardo Otubo <otubo(a)linux.vnet.ibm.com> - Garry Dolley <gdolley(a)arpnetworks.com> - Harshavardhana <harsha(a)gluster.com> - Jonas Eriksson <jonas.j.eriksson(a)ericsson.com> - Jun Koi <junkoi2004(a)gmail.com> - Olivier Fourdan <ofourdan(a)redhat.com> - Ron Yorston <rmy(a)tigress.co.uk> - Shahar Klein <shaharklein(a)yahoo.com> - Taizo ITO <taizo.ito(a)hde.co.jp> - Thomas Treutner <thomas(a)scripty.at> - Jean-Baptiste Rouault <jean-baptiste.rouault(a)diateam.net> - Марк Коренберг <socketpair(a)gmail.com> - Alan Pevec <apevec(a)redhat.com> - Aurelien Rougemont <beorn(a)binaries.fr> - Patrick Dignan <pat_dignan(a)dell.com> - Serge Hallyn <serge.hallyn(a)canonical.com> - Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> - Lai Jiangshan <laijs(a)cn.fujitsu.com> - Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> - John Morrissey <jwm(a)horde.net> - KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> - Hu Tao <hutao(a)cn.fujitsu.com> - Laurent Léonard <laurent(a)open-minds.org> - MORITA Kazutaka <morita.kazutaka(a)lab.ntt.co.jp> - Josh Durgin <josh.durgin(a)inktank.com> - Roopa Prabhu <roprabhu(a)cisco.com> - Paweł Krześniak <pawel.krzesniak(a)gmail.com> - Kay Schubert <kayegypt(a)web.de> - Marc-André Lureau <marcandre.lureau(a)redhat.com> - Juerg Haefliger <juerg.haefliger(a)hp.com> - Matthias Dahl <mdvirt(a)designassembly.de> - Niels de Vos <ndevos(a)redhat.com> - Davidlohr Bueso <dave(a)gnu.org> - Alon Levy <alevy(a)redhat.com> - Hero Phương <herophuong93(a)gmail.com> - Zdenek Styblik <stybla(a)turnovfree.net> - Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> - Michal Novotny <minovotn(a)redhat.com> - Markus Groß <gross(a)univention.de> - Phil Petty <phpetty(a)cisco.com> - Taku Izumi <izumi.taku(a)jp.fujitsu.com> - Minoru Usui <usui(a)mxm.nes.nec.co.jp> - Tiziano Mueller <dev-zero(a)gentoo.org> - Thibault VINCENT <thibault.vincent(a)smartjog.com> - Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com> - Jesse Cook <code.crashenx(a)gmail.com> - Alexander Todorov <atodorov(a)otb.bg> - Richard Laager <rlaager(a)wiktel.com> - Mark Wu <dwu(a)redhat.com> - Yufang Zhang <yuzhang(a)redhat.com> - Supriya Kannery <supriyak(a)linux.vnet.ibm.com> - Dirk Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> - Taisuke Yamada <tai(a)rakugaki.org> - Heath Petersen <HeathPetersen(a)Kandre.com> - Neil Wilson <neil(a)aldur.co.uk> - Ohad Levy <ohadlevy(a)gmail.com> - Michael Chapman <mike(a)very.puzzling.org> - Daniel Gollub <gollub(a)b1-systems.de> - David S. Wang <dwang2(a)cisco.com> - Ruben Kerkhof <ruben(a)rubenkerkhof.com> - Scott Moser <smoser(a)ubuntu.com> - Guannan Ren <gren(a)redhat.com> - John Williams <john.williams(a)petalogix.com> - Michael Santos <michael.santos(a)gmail.com> - Oskari Saarenmaa <os(a)ohmu.fi> - Nan Zhang <nzhang(a)redhat.com> - Wieland Hoffmann <themineo(a)googlemail.com> - Douglas Schilling Landgraf <dougsland(a)redhat.com> - Tom Vijlbrief <tom.vijlbrief(a)xs4all.nl> - Shradha Shah <sshah(a)solarflare.com> - Steve Hodgson <shodgson(a)solarflare.com> - Xu He Jie <xuhj(a)linux.vnet.ibm.com> - Lei Li <lilei(a)linux.vnet.ibm.com> - Matthias Witte <witte(a)netzquadrat.de> - Tang Chen <tangchen(a)cn.fujitsu.com> - Dan Horák <dan(a)danny.cz> - Sage Weil <sage(a)newdream.net> - David L Stevens <dlstevens(a)us.ibm.com> - Tyler Coumbes <coumbes(a)gmail.com> - Royce Lv <lvroyce(a)linux.vnet.ibm.com> - Patrice LACHANCE <patlachance(a)gmail.com> - Eli Qiao <taget(a)linux.vnet.ibm.com> - Michael Wood <esiotrot(a)gmail.com> - Bharata B Rao <bharata(a)linux.vnet.ibm.com> - Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> - Chang Liu <lingjiao.lc(a)taobao.com> - Lorin Hochstein <lorin(a)isi.edu> - Christian Franke <nobody(a)nowhere.ws> - Prerna Saxena <prerna(a)linux.vnet.ibm.com> - Michael Ellerman <michael(a)ellerman.id.au> - Rommer <rommer(a)active.by> - Yuri Chornoivan <yurchor(a)ukr.net> - Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com> - Laszlo Ersek <lersek(a)redhat.com> - Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> - Marcelo Cerri <mhcerri(a)linux.vnet.ibm.com> - Hendrik Schwartke <hendrik(a)os-t.de> - Ansis Atteka <aatteka(a)nicira.com> - Dan Wendlandt <dan(a)nicira.com> - Kyle Mestery <kmestery(a)cisco.com> - Lincoln Myers <lincoln_myers(a)yahoo.com> - Peter Robinson <pbrobinson(a)gmail.com> - Benjamin Cama <benoar(a)dolka.fr> - Duncan Rance <libvirt(a)dunquino.com> - Peng Zhou <ailvpeng25(a)gmail.com> - Li Zhang <zhlcindy(a)linux.vnet.ibm.com> - Stef Walter <stefw(a)gnome.org> - Christian Benvenuti <benve(a)cisco.com> - Ilja Livenson <ilja.livenson(a)gmail.com> - Stefan Bader <stefan.bader(a)canonical.com> - MATSUDA Daiki <matsudadik(a)intellilink.co.jp> - Jan Kiszka <jan.kiszka(a)siemens.com> - Ryan Woodsmall <rwoodsmall(a)gmail.com> - Wido den Hollander <wido(a)widodh.nl> - Eugen Feller <eugen.feller(a)inria.fr> - Dmitry Guryanov <dguryanov(a)parallels.com> - William Jon McCann <william.jon.mccann(a)gmail.com> - David Weber <wb(a)munzinger.de> - Marti Raudsepp <marti(a)juffo.org> - Radu Caragea <dmns_serp(a)yahoo.com> - Beat Jörg <Beat.Joerg(a)ssatr.ch> - Gao feng <gaofeng(a)cn.fujitsu.com> - Dipankar Sarma <dipankar(a)in.ibm.com> - Gerd Hoffmann <kraxel(a)redhat.com> - Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> - Thang Pham <thang.pham(a)us.ibm.com> - Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> - Sascha Peilicke <saschpe(a)suse.de> - Chuck Short <chuck.short(a)canonical.com> - Sebastian Wiedenroth <wiedi(a)frubar.net> - Ata E Husain Bohra <ata.husain(a)hotmail.com> - Ján Tomko <jtomko(a)redhat.com> - Richa Marwaha <rmarwah(a)linux.vnet.ibm.com> - Peter Feiner <peter(a)gridcentric.ca> - Frido Roose <frido.roose(a)gmail.com> - Asad Saeed <asad.saeed(a)acidseed.com> - Sukadev Bhattiprolu <sukadev(a)linux.vnet.ibm.com> - Thomas Woerner <twoerner(a)redhat.com> - J.B. Joret <jb(a)linux.vnet.ibm.com> - Stefan Hajnoczi <stefanha(a)linux.vnet.ibm.com> - Gene Czarcinski <gene(a)czarc.net> - Nishank Trivedi <nistrive(a)cisco.com> - Jasper Lievisse Adriaanse <jasper(a)humppa.nl> - Paul Eggert <eggert(a)cs.ucla.edu> - Dwight Engen <dwight.engen(a)oracle.com> - liguang <lig.fnst(a)cn.fujitsu.com> - Chuck Short <zulcss(a)gmail.com> - Alexander Larsson <alexl(a)redhat.com> - - [....send patches to get your name here....] - -The libvirt Logo was designed by Diana Fong - --- End -;; Local Variables: -;; coding: utf-8 -;; End: diff --git a/AUTHORS.in b/AUTHORS.in new file mode 100644 index 0000000..f4c8a8a --- /dev/null +++ b/AUTHORS.in @@ -0,0 +1,88 @@ + libvirt Authors + =============== + +The libvirt project was initiated by: + + Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> + +The primary maintainers and people with commit access rights: + +Daniel Veillard <veillard(a)redhat.com> +Daniel Berrange <berrange(a)redhat.com> +Richard W.M. Jones <rjones(a)redhat.com> +Mark McLoughlin <markmc(a)redhat.com> +Anthony Liguori <aliguori(a)us.ibm.com> +Jim Meyering <meyering(a)redhat.com> +Jim Fehlig <jfehlig(a)suse.com> +Chris Lalancette <clalance(a)redhat.com> +Cole Robinson <crobinso(a)redhat.com> +Guido Günther <agx(a)sigxcpu.org> +John Levon <john.levon(a)sun.com> +Matthias Bolte <matthias.bolte(a)googlemail.com> +Jiří Denemark <jdenemar(a)redhat.com> +Dave Allan <dallan(a)redhat.com> +Laine Stump <laine(a)redhat.com> +Stefan Berger <stefanb(a)us.ibm.com> +Eric Blake <eblake(a)redhat.com> +Justin Clift <jclift(a)redhat.com> +Osier Yang <jyang(a)redhat.com> +Wen Congyang <wency(a)cn.fujitsu.com> +Michal Prívozník <mprivozn(a)redhat.com> +Peter Krempa <pkrempa(a)redhat.com> +Christophe Fergeau <cfergeau(a)redhat.com> +Alex Jia <ajia(a)redhat.com> +Martin Kletzander <mkletzan(a)redhat.com> + +Previous maintainers: + +Karel Zak <kzak(a)redhat.com> +Atsushi SAKAI <sakaia(a)jp.fujitsu.com> +Dave Leskovec <dlesko(a)linux.vnet.ibm.com> +Dan Smith <danms(a)us.ibm.com> + +Patches have also been contributed by: + +David Lutterkort <dlutter(a)redhat.com> +Andrew Puch <apuch(a)redhat.com> +Philippe Berthault <philippe.berthault(a)Bull.net> +Hugh Brock <hbrock(a)redhat.com> +Michel Ponceau <michel.ponceau(a)bull.net> +Jeremy Katz <katzj(a)redhat.com> +Pete Vetere <pvetere(a)redhat.com> +Kazuki Mizushima <mizushima.kazuk(a)jp.fujitsu.com> +Saori Fukuta <fukuta.saori(a)jp.fujitsu.com> +Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> +Takahashi Tomohiro <takatom(a)jp.fujitsu.com> +Nobuhiro Itou <fj0873gn(a)aa.jp.fujitsu.com> +Masayuki Sunou <fj1826dm(a)aa.jp.fujitsu.com> +Mark Johnson <johnson.nh(a)gmail.com> +Christian Ehrhardt <ehrhardt(a)linux.vnet.ibm.com> +Shuveb Hussain <shuveb(a)binarykarma.com> +Daniel Hokka Zakrisson <daniel(a)hozac.com> +Mads Chr. Olesen <shiyee(a)shiyee.dk> +Anton Protopopov <aspsk2(a)gmail.com> +Stefan de Konink <dekonink(a)kinkrsoftware.nl> +Kaitlin Rupert <kaitlin(a)linux.vnet.ibm.com> +Evgeniy Sokolov <evg(a)openvz.org> +David Lively <dlively(a)virtualiron.com> +James Morris <jmorris(a)namei.org> +Ben Guthro <ben.guthro(a)gmail.com> +Shigeki Sakamoto <fj0588di(a)aa.jp.fujitsu.com> +Amit Shah <amit.shah(a)redhat.com> +Itamar Heim <iheim(a)redhat.com> +Markus Armbruster <armbru(a)redhat.com> +Abel Míguez Rodríguez <amiguezr(a)pdi.ucm.es> +Javier Fontan <jfontan(a)gmail.com> +Matthias Witte <witte(a)netzquadrat.de> +Dan Wendlandt <dan(a)nicira.com> + +#authorlist# + +[....send patches to get your name here....] + +The libvirt logo was designed by Diana Fong + +-- End +;; Local Variables: +;; coding: utf-8 +;; End: diff --git a/Makefile.am b/Makefile.am index 333e300..671c946 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ EXTRA_DIST = \ cfg.mk \ examples/domain-events/events-python \ run.in \ + AUTHORS.in \ $(XML_EXAMPLES) pkgconfigdir = $(libdir)/pkgconfig @@ -78,7 +79,7 @@ MAINTAINERCLEANFILES = .git-module-status # disable this check distuninstallcheck: -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. @@ -91,3 +92,12 @@ gen-ChangeLog: rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi + +.PHONY: gen-AUTHORS +gen-AUTHORS: + if test -d .git; then \ + out="$$(git log --pretty=format:'%aN <%aE>' | sort | uniq)" && \ + cat AUTHORS.in | perl -p -e "s/#authorlist#/$$out/" > \ + $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/bootstrap.conf b/bootstrap.conf index f8b7c4d..c40db3d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -223,7 +223,8 @@ if `(${PYTHON_CONFIG-python-config} --version; PYTHON_CONFIG=true fi -# Automake requires that ChangeLog exist. +# Automake requires that ChangeLog and AUTHORS exist. +touch AUTHORS || exit 1 touch ChangeLog || exit 1 # Override bootstrap's list - we don't use mdate-sh or texinfo.tex. diff --git a/cfg.mk b/cfg.mk index e1fbf4f..eed7fd8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -43,7 +43,6 @@ _test_script_regex = \<$init\|test-lib$\.sh\> # Tests not to run as part of "make distcheck". local-checks-to-skip = \ changelog-check \ - check-AUTHORS \ makefile-check \ makefile_path_separator_check \ patch-check \ @@ -711,20 +710,6 @@ _autogen: $(srcdir)/autogen.sh ./config.status -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/$[^a-zA-Z0-9_@-]$/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - # regenerate HACKING as part of the syntax-check syntax-check: $(top_srcdir)/HACKING -- 1.7.11.7

2 1

[libvirt] [PATCH v3 4/4] qemu-config: Add new -add-fd command line option
by Corey Bryant 19 Oct '12

19 Oct '12

This option can be used for passing file descriptors on the command line. It mirrors the existing add-fd QMP command which allows an fd to be passed to QEMU via SCM_RIGHTS and added to an fd set. This can be combined with commands such as -drive to link file descriptors in an fd set to a drive: qemu-kvm -add-fd fd=3,set=2,opaque="rdwr:/path/to/file" -add-fd fd=4,set=2,opaque="rdonly:/path/to/file" -drive file=/dev/fdset/2,index=0,media=disk This example adds dups of fds 4 and 5, and the accompanying opaque strings to the fd set with ID=2. qemu_open() already knows how to handle a filename of this format. qemu_open() searches the corresponding fd set for an fd and when it finds a match, QEMU goes on to use a dup of that fd just like it would have used an fd that it opened itself. Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v2: - The -add-fd option is new in v2 (eblake(a)redhat.com) v3: - Require passed fd to be > stderr (eblake(a)redhat.com) - Changed fds in examples to fd=3 and fd=4 - Add dup of passed fd to fd set and close passed fds after processing all -add-fd commands (eblake(a)redhat.com) qemu-config.c | 22 ++++++++++++++++++ qemu-options.hx | 36 +++++++++++++++++++++++++++++ vl.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) diff --git a/qemu-config.c b/qemu-config.c index cd1ec21..601237d 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -653,6 +653,27 @@ QemuOptsList qemu_boot_opts = { }, }; +static QemuOptsList qemu_add_fd_opts = { + .name = "add-fd", + .head = QTAILQ_HEAD_INITIALIZER(qemu_add_fd_opts.head), + .desc = { + { + .name = "fd", + .type = QEMU_OPT_NUMBER, + .help = "file descriptor of which a duplicate is added to fd set", + },{ + .name = "set", + .type = QEMU_OPT_NUMBER, + .help = "ID of the fd set to add fd to", + },{ + .name = "opaque", + .type = QEMU_OPT_STRING, + .help = "free-form string used to describe fd", + }, + { /* end of list */ } + }, +}; + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, @@ -669,6 +690,7 @@ static QemuOptsList *vm_config_groups[32] = { &qemu_boot_opts, &qemu_iscsi_opts, &qemu_sandbox_opts, + &qemu_add_fd_opts, NULL, }; diff --git a/qemu-options.hx b/qemu-options.hx index 7d97f96..a70182a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -257,6 +257,14 @@ qemu-system-i386 -drive file=file,index=2,media=disk qemu-system-i386 -drive file=file,index=3,media=disk @end example +You can open an image using pre-opened file descriptors from an fd set: +@example +qemu-system-i386 +-add-fd fd=3,set=2,opaque="rdwr:/path/to/file" +-add-fd fd=4,set=2,opaque="rdonly:/path/to/file" +-drive file=/dev/fdset/2,index=0,media=disk +@end example + You can connect a CDROM to the slave of ide0: @example qemu-system-i386 -drive file=file,if=ide,index=1,media=cdrom @@ -289,6 +297,34 @@ qemu-system-i386 -hda a -hdb b @end example ETEXI +DEF("add-fd", HAS_ARG, QEMU_OPTION_add_fd, + "-add-fd fd=fd,set=set[,opaque=opaque]\n" + " Add 'fd' to fd 'set'\n", QEMU_ARCH_ALL) +STEXI +@item -add-fd fd=@var{fd},set=@var{set}[,opaque=@var{opaque}] +@findex -add-fd + +Add a file descriptor to an fd set. Valid options are: + +@table @option +@item fd=@var{fd} +This option defines the file descriptor of which a duplicate is added to fd set. +The file descriptor cannot be stdin, stdout, or stderr. +@item set=@var{set} +This option defines the ID of the fd set to add the file descriptor to. +@item opaque=@var{opaque} +This option defines a free-form string that can be used to describe @var{fd}. +@end table + +You can open an image using pre-opened file descriptors from an fd set: +@example +qemu-system-i386 +-add-fd fd=3,set=2,opaque="rdwr:/path/to/file" +-add-fd fd=4,set=2,opaque="rdonly:/path/to/file" +-drive file=/dev/fdset/2,index=0,media=disk +@end example +ETEXI + DEF("set", HAS_ARG, QEMU_OPTION_set, "-set group.id.arg=value\n" " set <arg> parameter for item <id> of type <group>\n" diff --git a/vl.c b/vl.c index 5b357a3..83205c0 100644 --- a/vl.c +++ b/vl.c @@ -790,6 +790,65 @@ static int parse_sandbox(QemuOpts *opts, void *opaque) return 0; } +static int parse_add_fd(QemuOpts *opts, void *opaque) +{ + int fd, dupfd; + int64_t fdset_id; + const char *fd_opaque = NULL; + + fd = qemu_opt_get_number(opts, "fd", -1); + fdset_id = qemu_opt_get_number(opts, "set", -1); + fd_opaque = qemu_opt_get(opts, "opaque"); + + if (fd < 0) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, + "fd option is required and must be non-negative"); + return -1; + } + + if (fd <= STDERR_FILENO) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, + "fd cannot be a standard I/O stream"); + return -1; + } + + if (fdset_id < 0) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, + "set option is required and must be non-negative"); + return -1; + } + +#ifdef F_DUPFD_CLOEXEC + dupfd = fcntl(fd, F_DUPFD_CLOEXEC, 0); +#else + dupfd = dup(fd); + if (dupfd != -1) { + qemu_set_cloexec(dupfd); + } +#endif + if (dupfd == -1) { + qerror_report(ERROR_CLASS_GENERIC_ERROR, + "Error duplicating fd: %s", strerror(errno)); + return -1; + } + + /* add the duplicate fd, and optionally the opaque string, to the fd set */ + monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false, + fd_opaque, NULL); + + return 0; +} + +static int cleanup_add_fd(QemuOpts *opts, void *opaque) +{ + int fd; + + fd = qemu_opt_get_number(opts, "fd", -1); + close(fd); + + return 0; +} + /***********************************************************/ /* QEMU Block devices */ @@ -3309,6 +3368,11 @@ int main(int argc, char **argv, char **envp) exit(0); } break; + case QEMU_OPTION_add_fd: + opts = qemu_opts_parse(qemu_find_opts("add-fd"), optarg, 0); + if (!opts) { + exit(0); + } default: os_parse_cmd_args(popt->index, optarg); } @@ -3320,6 +3384,14 @@ int main(int argc, char **argv, char **envp) exit(1); } + if (qemu_opts_foreach(qemu_find_opts("add-fd"), parse_add_fd, NULL, 1)) { + exit(1); + } + + if (qemu_opts_foreach(qemu_find_opts("add-fd"), cleanup_add_fd, NULL, 1)) { + exit(1); + } + if (machine == NULL) { fprintf(stderr, "No machine found.\n"); exit(1); -- 1.7.11.4

3 8

[libvirt] [PATCHv2 00/16] qemu block-commit support
by Eric Blake 19 Oct '12

19 Oct '12

I figured I'd better post this now, while I still iron out the remaining kinks in my SELinux handling (but I'm certainly a lot closer, now that I have libvirt actually identifying which files need the temporary SELinux labels). With this, you can now do things like 'virsh blockcommit $dom $disk --top relative_name --shallow' even when the backing chain refers to an absolute backing file name; the QMP command passed to qemu will have the correct absolute names. Patches 1-6: practically unchanged since v1, although not reviewed yet https://www.redhat.com/archives/libvir-list/2012-October/msg00075.html Patches 7-13: new to this series Patches 14-15: minor changes since v1 ACKs; see details in each commit https://www.redhat.com/archives/libvir-list/2012-October/msg00089.html Patch 16: new to this series Also available at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/blockjob git fetch git://repo.or.cz/libvirt/ericb.git blockjob Eric Blake (16): storage: list more file types storage: treat 'aio' like 'raw' at parse time storage: match RNG to supported driver types storage: use enum for default driver type storage: use enum for disk driver type storage: use enum for snapshot driver type storage: don't probe non-files storage: get entire metadata chain in one call storage: don't require caller to pre-allocate metadata struct storage: remember relative names in backing chain storage: make it easier to find file within chain storage: cache backing chain while qemu domain is live storage: use cache to walk backing chain blockjob: manage qemu block-commit monitor command blockjob: wire up online qemu block-commit blockjob: implement shallow commit flag in qemu docs/schemas/domaincommon.rng | 27 +- docs/schemas/domainsnapshot.rng | 2 +- src/conf/capabilities.h | 4 +- src/conf/domain_conf.c | 160 ++++-------- src/conf/domain_conf.h | 8 +- src/conf/snapshot_conf.c | 23 +- src/conf/snapshot_conf.h | 2 +- src/conf/storage_conf.c | 15 +- src/libvirt.c | 2 - src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 42 ++-- src/libxl/libxl_driver.c | 6 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 12 +- src/qemu/qemu_command.c | 18 +- src/qemu/qemu_domain.c | 40 ++- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 236 +++++++++++------ src/qemu/qemu_hotplug.c | 9 +- src/qemu/qemu_monitor.c | 30 +++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 34 +++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 23 ++ src/security/security_dac.c | 7 - src/security/security_selinux.c | 11 - src/security/virt-aa-helper.c | 27 +- src/storage/storage_backend_fs.c | 15 +- src/util/storage_file.c | 279 ++++++++++++++++----- src/util/storage_file.h | 43 ++-- src/vbox/vbox_tmpl.c | 6 +- src/xenxs/xen_sxpr.c | 26 +- src/xenxs/xen_xm.c | 28 ++- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- 38 files changed, 773 insertions(+), 392 deletions(-) -- 1.7.11.7

3 54

[libvirt] [PATCH] network: Set to NULL after virNetworkDefFree()
by Michal Privoznik 19 Oct '12

19 Oct '12

which frees all allocated memory but doesn't set the passed pointer to NULL. Therefore, we must do it ourselves. This is causing actual libvirtd crash: Basically, when doing 'virsh net-edit' the newDef should be dropped. And the memory is freed, indeed. However, the pointer is not set to NULL but kept instead. And the next duo of calls 'virsh net-start' and 'virsh net-destroy' starts the disaster. The latter one does the same as 'virsh destroy'; it sees that newDef is nonNULL so it replaces def with newDef (which has been freed already as said a few lines above). Therefore any subsequent call accessing def will hit the ground. --- src/conf/network_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 891d48c..0f7470d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -260,8 +260,9 @@ virNetworkObjAssignDef(virNetworkObjPtr network, return -1; } } else if (!live) { - virNetworkDefFree(network->newDef); /* should be unnecessary */ + virNetworkDefFree(network->newDef); virNetworkDefFree(network->def); + network->newDef = NULL; network->def = def; } else { virReportError(VIR_ERR_OPERATION_INVALID, -- 1.7.8.6

3 3

[libvirt] [PATCH] selinux: relabel tapfd in qemuPhysIfaceConnect
by Guannan Ren 19 Oct '12

19 Oct '12

Relabeling tapfd right after the tap device is created. qemuPhysIfaceConnect is common function called both for static netdevs and for hotplug netdevs. --- src/qemu/qemu_command.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c0c400..b24e9b1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -170,6 +170,11 @@ qemuPhysIfaceConnect(virDomainDefPtr def, vmop, driver->stateDir, virDomainNetGetActualBandwidth(net)); if (rc >= 0) { + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + def, rc) < 0) { + VIR_FORCE_CLOSE(rc); + return -1; + } virDomainAuditNetDevice(def, net, res_ifname, true); VIR_FREE(net->ifname); net->ifname = res_ifname; @@ -5425,10 +5430,6 @@ qemuBuildCommandLine(virConnectPtr conn, if (tapfd < 0) goto error; - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, tapfd) < 0) - goto error; - last_good_net = i; virCommandTransferFD(cmd, tapfd); -- 1.7.11.4

2 6

[libvirt] any IRC servers i can join?
by yueluck 19 Oct '12

19 Oct '12

please tell me some libvirt-IRC severs,and channel? thanks

2 1

[libvirt] [PATCH] dist: added cpu/cpu_ppc_data.h to Makefile.am
by Viktor Mihajlovski 18 Oct '12

18 Oct '12

Missing entry for cpu_ppc_data.h added to fix RPM build. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9d3194d..187663f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -660,7 +660,7 @@ CPU_SOURCES = \ cpu/cpu_s390.h cpu/cpu_s390.c \ cpu/cpu_arm.h cpu/cpu_arm.c \ cpu/cpu_map.h cpu/cpu_map.c cpu/cpu_powerpc.h \ - cpu/cpu_powerpc.c + cpu/cpu_powerpc.c cpu/cpu_ppc_data.h VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h -- 1.7.0.4

2 1

[libvirt] [PATCH] qemu: Always format CPU topology
by Jiri Denemark 18 Oct '12

18 Oct '12

When libvirt cannot find a suitable CPU model for host CPU (easily reproducible by running libvirt in a guest), it would not provide CPU topology in capabilities XML either. Even though CPU topology is known and can be queried by virNodeGetInfo. With this patch, CPU topology will always be provided in capabilities XML regardless on the presence of CPU model. --- src/qemu/qemu_capabilities.c | 6 +++--- src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 4 +++- src/qemu/qemu_driver.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 985d4de..7c391b3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -685,6 +685,7 @@ qemuCapsInitGuest(virCapsPtr caps, nmachines = 0; if (caps->host.cpu && + caps->host.cpu->model && qemuCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) goto error; @@ -781,12 +782,11 @@ qemuCapsInitCPU(virCapsPtr caps, cpu->sockets = nodeinfo.sockets; cpu->cores = nodeinfo.cores; cpu->threads = nodeinfo.threads; + caps->host.cpu = cpu; if (!(data = cpuNodeData(arch)) || cpuDecode(cpu, data, NULL, 0, NULL) < 0) - goto error; - - caps->host.cpu = cpu; + goto cleanup; ret = 0; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9c72c10..9096b3c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4100,6 +4100,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, int hasSVM; if (!host || + !host->model || (ncpus = qemuCapsGetCPUDefinitions(caps, &cpus)) == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU specification not supported by hypervisor")); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 427258d..cbc621f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1227,7 +1227,9 @@ qemuDomainDefFormatBuf(struct qemud_driver *driver, if ((flags & VIR_DOMAIN_XML_UPDATE_CPU) && def_cpu && (def_cpu->mode != VIR_CPU_MODE_CUSTOM || def_cpu->model)) { - if (!driver->caps || !driver->caps->host.cpu) { + if (!driver->caps || + !driver->caps->host.cpu || + !driver->caps->host.cpu->model) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get host CPU capabilities")); goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index adfbfa6..76730c6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10180,7 +10180,8 @@ qemuCPUCompare(virConnectPtr conn, if (!driver->caps) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot get host capabilities")); - } else if (!driver->caps->host.cpu) { + } else if (!driver->caps->host.cpu || + !driver->caps->host.cpu->model) { VIR_WARN("cannot get host CPU capabilities"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; } else { -- 1.7.12.4

2 2

[libvirt] [PATCH v3 2/4] monitor: Enable adding an inherited fd to an fd set
by Corey Bryant 18 Oct '12

18 Oct '12

qmp_add_fd() gets an fd that was received over a socket with SCM_RIGHTS and adds it to an fd set. This patch adds support that will enable adding an fd that was inherited on the command line to an fd set. Note: All of the code added to monitor_fdset_add_fd(), with the exception of the error path for non-valid fdset-id, is code motion from qmp_add_fd(). Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v2: -Removed Error** parameter from monitor_fdset_add_fd() v3: -Added Error** parameter back to monitor_fdset_add_fd() -Move 'if (!mon_fdset_cur)' change to patch 1 (kwolf(a)redhat.com) -Move code that prevents removal of fd from fd set during init to it's own patch (eblake(a)redhat.com, kwolf(a)redhat.com) -Mention code motion in commit message (kwolf(a)redhat.com) monitor.c | 157 +++++++++++++++++++++++++++++++++----------------------------- monitor.h | 3 ++ 2 files changed, 86 insertions(+), 74 deletions(-) diff --git a/monitor.c b/monitor.c index 2e3248f..5d5de41 100644 --- a/monitor.c +++ b/monitor.c @@ -2135,9 +2135,6 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, { int fd; Monitor *mon = cur_mon; - MonFdset *mon_fdset = NULL; - MonFdsetFd *mon_fdset_fd; - AddfdInfo *fdinfo; fd = qemu_chr_fe_get_msgfd(mon->chr); if (fd == -1) { @@ -2145,77 +2142,8 @@ AddfdInfo *qmp_add_fd(bool has_fdset_id, int64_t fdset_id, bool has_opaque, goto error; } - if (has_fdset_id) { - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - /* Break if match found or match impossible due to ordering by ID */ - if (fdset_id <= mon_fdset->id) { - if (fdset_id < mon_fdset->id) { - mon_fdset = NULL; - } - break; - } - } - } - - if (mon_fdset == NULL) { - int64_t fdset_id_prev = -1; - MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); - - if (has_fdset_id) { - if (fdset_id < 0) { - error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", - "a non-negative value"); - goto error; - } - /* Use specified fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id < mon_fdset_cur->id) { - break; - } - } - } else { - /* Use first available fdset ID */ - QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { - mon_fdset_cur = mon_fdset; - if (fdset_id_prev == mon_fdset_cur->id - 1) { - fdset_id_prev = mon_fdset_cur->id; - continue; - } - break; - } - } - - mon_fdset = g_malloc0(sizeof(*mon_fdset)); - if (has_fdset_id) { - mon_fdset->id = fdset_id; - } else { - mon_fdset->id = fdset_id_prev + 1; - } - - /* The fdset list is ordered by fdset ID */ - if (!mon_fdset_cur) { - QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next); - } else if (mon_fdset->id < mon_fdset_cur->id) { - QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next); - } else { - QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next); - } - } - - mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd)); - mon_fdset_fd->fd = fd; - mon_fdset_fd->removed = false; - if (has_opaque) { - mon_fdset_fd->opaque = g_strdup(opaque); - } - QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next); - - fdinfo = g_malloc0(sizeof(*fdinfo)); - fdinfo->fdset_id = mon_fdset->id; - fdinfo->fd = mon_fdset_fd->fd; - - return fdinfo; + return monitor_fdset_add_fd(fd, has_fdset_id, fdset_id, + has_opaque, opaque, errp); error: if (fd != -1) { @@ -2301,6 +2229,87 @@ FdsetInfoList *qmp_query_fdsets(Error **errp) return fdset_list; } +AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, + bool has_opaque, const char *opaque, + Error **errp) +{ + MonFdset *mon_fdset = NULL; + MonFdsetFd *mon_fdset_fd; + AddfdInfo *fdinfo; + + if (has_fdset_id) { + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + /* Break if match found or match impossible due to ordering by ID */ + if (fdset_id <= mon_fdset->id) { + if (fdset_id < mon_fdset->id) { + mon_fdset = NULL; + } + break; + } + } + } + + if (mon_fdset == NULL) { + int64_t fdset_id_prev = -1; + MonFdset *mon_fdset_cur = QLIST_FIRST(&mon_fdsets); + + if (has_fdset_id) { + if (fdset_id < 0) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", + "a non-negative value"); + return NULL; + } + /* Use specified fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id < mon_fdset_cur->id) { + break; + } + } + } else { + /* Use first available fdset ID */ + QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { + mon_fdset_cur = mon_fdset; + if (fdset_id_prev == mon_fdset_cur->id - 1) { + fdset_id_prev = mon_fdset_cur->id; + continue; + } + break; + } + } + + mon_fdset = g_malloc0(sizeof(*mon_fdset)); + if (has_fdset_id) { + mon_fdset->id = fdset_id; + } else { + mon_fdset->id = fdset_id_prev + 1; + } + + /* The fdset list is ordered by fdset ID */ + if (!mon_fdset_cur) { + QLIST_INSERT_HEAD(&mon_fdsets, mon_fdset, next); + } else if (mon_fdset->id < mon_fdset_cur->id) { + QLIST_INSERT_BEFORE(mon_fdset_cur, mon_fdset, next); + } else { + QLIST_INSERT_AFTER(mon_fdset_cur, mon_fdset, next); + } + } + + mon_fdset_fd = g_malloc0(sizeof(*mon_fdset_fd)); + mon_fdset_fd->fd = fd; + mon_fdset_fd->removed = false; + if (has_opaque) { + mon_fdset_fd->opaque = g_strdup(opaque); + } + QLIST_INSERT_HEAD(&mon_fdset->fds, mon_fdset_fd, next); + + fdinfo = g_malloc0(sizeof(*fdinfo)); + fdinfo->fdset_id = mon_fdset->id; + fdinfo->fd = mon_fdset_fd->fd; + + return fdinfo; +} + int monitor_fdset_get_fd(int64_t fdset_id, int flags) { #ifndef _WIN32 diff --git a/monitor.h b/monitor.h index b6e7d95..d4c017e 100644 --- a/monitor.h +++ b/monitor.h @@ -90,6 +90,9 @@ int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret); int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret); +AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id, + bool has_opaque, const char *opaque, + Error **errp); int monitor_fdset_get_fd(int64_t fdset_id, int flags); int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd); int monitor_fdset_dup_fd_remove(int dup_fd); -- 1.7.11.4

3 3

[libvirt] [PATCH v3 3/4] monitor: Prevent removing fd from set during init
by Corey Bryant 18 Oct '12

18 Oct '12

If an fd is added to an fd set via the command line, and it is not referenced by another command line option (ie. -drive), then clean it up after QEMU initialization is complete. Signed-off-by: Corey Bryant <coreyb(a)linux.vnet.ibm.com> --- v3: - This patch was split into it's own patch in v3 (eblake(a)redhat.com, kwolf(a)redhat.com) monitor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 5d5de41..0dae7ac 100644 --- a/monitor.c +++ b/monitor.c @@ -2105,8 +2105,9 @@ static void monitor_fdset_cleanup(MonFdset *mon_fdset) MonFdsetFd *mon_fdset_fd_next; QLIST_FOREACH_SAFE(mon_fdset_fd, &mon_fdset->fds, next, mon_fdset_fd_next) { - if (mon_fdset_fd->removed || - (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) { + if ((mon_fdset_fd->removed || + (QLIST_EMPTY(&mon_fdset->dup_fds) && mon_refcount == 0)) && + runstate_is_running()) { close(mon_fdset_fd->fd); g_free(mon_fdset_fd->opaque); QLIST_REMOVE(mon_fdset_fd, next); -- 1.7.11.4

2 2