- Devel - libvirt List Archives

[libvirt] [PATCH RFC] LXC: add HOME environment variable
by Chen Hanxiao 04 Sep '14

04 Sep '14

We lacked of HOME environment variable, set 'HOME=/' as default. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1cf2c8f..9df9c04 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -236,6 +236,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); virCommandAddEnvString(cmd, "container=lxc-libvirt"); + virCommandAddEnvString(cmd, "HOME=/"); virCommandAddEnvPair(cmd, "container_uuid", uuidstr); if (nttyPaths > 1) virCommandAddEnvPair(cmd, "container_ttys", virBufferCurrentContent(&buf)); -- 1.9.0

6 7

Re: [libvirt] [PATCH] add migration support for OpenVZ driver
by Hongbin Lu 04 Sep '14

04 Sep '14

Resent the email below. Thanks. On Sun, Aug 31, 2014 at 2:05 PM, Hongbin Lu <hongbin034(a)gmail.com> wrote: > This patch adds initial migration support to the OpenVZ driver, > using the VIR_DRV_FEATURE_MIGRATION_PARAMS family of migration > functions. > --- > src/openvz/openvz_conf.h | 5 +- > src/openvz/openvz_driver.c | 348 > ++++++++++++++++++++++++++++++++++++++++++++ > src/openvz/openvz_driver.h | 10 ++ > 3 files changed, 361 insertions(+), 2 deletions(-) > > diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h > index a7de7d2..33998d6 100644 > --- a/src/openvz/openvz_conf.h > +++ b/src/openvz/openvz_conf.h > @@ -35,8 +35,9 @@ > > > /* OpenVZ commands - Replace with wrapper scripts later? */ > -# define VZLIST "/usr/sbin/vzlist" > -# define VZCTL "/usr/sbin/vzctl" > +# define VZLIST "/usr/sbin/vzlist" > +# define VZCTL "/usr/sbin/vzctl" > +# define VZMIGRATE "/usr/sbin/vzmigrate" > # define VZ_CONF_FILE "/etc/vz/vz.conf" > > # define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + > 1) > diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c > index 851ed30..0f46872 100644 > --- a/src/openvz/openvz_driver.c > +++ b/src/openvz/openvz_driver.c > @@ -2207,6 +2207,348 @@ openvzNodeGetCPUMap(virConnectPtr conn > ATTRIBUTE_UNUSED, > } > > > +static int > +openvzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int > feature) > +{ > + switch (feature) { > + case VIR_DRV_FEATURE_MIGRATION_PARAMS: > + case VIR_DRV_FEATURE_MIGRATION_V3: > + return 1; > + default: > + return 0; > + } > +} > + > + > +static char * > +openvzDomainMigrateBegin3Params(virDomainPtr domain, > + virTypedParameterPtr params, > + int nparams, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + unsigned int flags) > +{ > + virDomainObjPtr vm = NULL; > + struct openvz_driver *driver = domain->conn->privateData; > + char *xml = NULL; > + int status; > + > + virCheckFlags(OPENVZ_MIGRATION_FLAGS, NULL); > + if (virTypedParamsValidate(params, nparams, > OPENVZ_MIGRATION_PARAMETERS) < 0) > + return NULL; > + > + openvzDriverLock(driver); > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + openvzDriverUnlock(driver); > + > + if (!vm) { > + virReportError(VIR_ERR_NO_DOMAIN, "%s", > + _("no domain with matching uuid")); > + goto cleanup; > + } > + > + if (!virDomainObjIsActive(vm)) { > + virReportError(VIR_ERR_OPERATION_INVALID, > + "%s", _("domain is not running")); > + goto cleanup; > + } > + > + if (openvzGetVEStatus(vm, &status, NULL) == -1) > + goto cleanup; > + > + if (status != VIR_DOMAIN_RUNNING) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("domain is not in running state")); > + goto cleanup; > + } > + > + xml = virDomainDefFormat(vm->def, VIR_DOMAIN_XML_SECURE); > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return xml; > +} > + > +static int > +openvzDomainMigratePrepare3Params(virConnectPtr dconn, > + virTypedParameterPtr params, > + int nparams, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + char **uri_out, > + unsigned int fflags ATTRIBUTE_UNUSED) > +{ > + struct openvz_driver *driver = dconn->privateData; > + const char *dom_xml = NULL; > + const char *uri_in = NULL; > + virDomainDefPtr def = NULL; > + virDomainObjPtr vm = NULL; > + char *hostname = NULL; > + virURIPtr uri = NULL; > + int ret = -1; > + > + if (virTypedParamsValidate(params, nparams, > OPENVZ_MIGRATION_PARAMETERS) < 0) > + goto error; > + > + if (virTypedParamsGetString(params, nparams, > + VIR_MIGRATE_PARAM_DEST_XML, > + &dom_xml) < 0 || > + virTypedParamsGetString(params, nparams, > + VIR_MIGRATE_PARAM_URI, > + &uri_in) < 0) > + goto error; > + > + if (!dom_xml) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("no domain XML passed")); > + goto error; > + } > + > + if (!(def = virDomainDefParseString(dom_xml, driver->caps, > driver->xmlopt, > + 1 << VIR_DOMAIN_VIRT_OPENVZ, > + VIR_DOMAIN_XML_INACTIVE))) > + goto error; > + > + if (!(vm = virDomainObjListAdd(driver->domains, def, > + driver->xmlopt, > + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | > + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, > + NULL))) > + goto error; > + def = NULL; > + > + if (!uri_in) { > + if ((hostname = virGetHostname()) == NULL) > + goto error; > + > + if (STRPREFIX(hostname, "localhost")) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("hostname on destination resolved to > localhost," > + " but migration requires an FQDN")); > + goto error; > + } > + } else { > + uri = virURIParse(uri_in); > + > + if (uri == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("unable to parse URI: %s"), > + uri_in); > + goto error; > + } > + > + if (uri->server == NULL) { > + virReportError(VIR_ERR_INVALID_ARG, > + _("missing host in migration URI: %s"), > + uri_in); > + goto error; > + } else { > + hostname = uri->server; > + } > + } > + > + if (virAsprintf(uri_out, "tcp://%s", hostname) < 0) > + goto error; > + > + ret = 0; > + goto done; > + > + error: > + virDomainDefFree(def); > + if (vm) { > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + } > + > + done: > + virURIFree(uri); > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static int > +openvzDomainMigratePerform3Params(virDomainPtr domain, > + const char *dconnuri ATTRIBUTE_UNUSED, > + virTypedParameterPtr params, > + int nparams, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + unsigned int flags) > +{ > + struct openvz_driver *driver = domain->conn->privateData; > + virDomainObjPtr vm = NULL; > + const char *uri_str = NULL; > + virURIPtr uri = NULL; > + virCommandPtr cmd = virCommandNew(VZMIGRATE); > + int ret = -1; > + > + virCheckFlags(OPENVZ_MIGRATION_FLAGS, -1); > + if (virTypedParamsValidate(params, nparams, > OPENVZ_MIGRATION_PARAMETERS) < 0) > + goto cleanup; > + > + if (virTypedParamsGetString(params, nparams, > + VIR_MIGRATE_PARAM_URI, > + &uri_str) < 0) > + goto cleanup; > + > + openvzDriverLock(driver); > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + openvzDriverUnlock(driver); > + > + if (!vm) { > + virReportError(VIR_ERR_NO_DOMAIN, "%s", > + _("no domain with matching uuid")); > + goto cleanup; > + } > + > + /* parse dst host:port from uri */ > + uri = virURIParse(uri_str); > + if (uri == NULL || uri->server == NULL) > + goto cleanup; > + > + if (flags & VIR_MIGRATE_LIVE) > + virCommandAddArg(cmd, "--live"); > + virCommandAddArg(cmd, uri->server); > + virCommandAddArg(cmd, vm->def->name); > + > + if (virCommandRun(cmd, NULL) < 0) > + goto cleanup; > + > + ret = 0; > + > + cleanup: > + virCommandFree(cmd); > + virURIFree(uri); > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > +static virDomainPtr > +openvzDomainMigrateFinish3Params(virConnectPtr dconn, > + virTypedParameterPtr params, > + int nparams, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + char **cookieout ATTRIBUTE_UNUSED, > + int *cookieoutlen ATTRIBUTE_UNUSED, > + unsigned int flags, > + int cancelled) > +{ > + struct openvz_driver *driver = dconn->privateData; > + virDomainObjPtr vm = NULL; > + const char *dname = NULL; > + virDomainPtr dom = NULL; > + int status; > + > + if (cancelled) > + goto cleanup; > + > + virCheckFlags(OPENVZ_MIGRATION_FLAGS, NULL); > + if (virTypedParamsValidate(params, nparams, > OPENVZ_MIGRATION_PARAMETERS) < 0) > + goto cleanup; > + > + if (virTypedParamsGetString(params, nparams, > + VIR_MIGRATE_PARAM_DEST_NAME, > + &dname) < 0) > + goto cleanup; > + > + if (!dname || > + !(vm = virDomainObjListFindByName(driver->domains, dname))) { > + /* Migration obviously failed if the domain doesn't exist */ > + virReportError(VIR_ERR_OPERATION_FAILED, > + _("Migration failed. No domain on destination host > " > + "with matching name '%s'"), > + NULLSTR(dname)); > + goto cleanup; > + } > + > + if (openvzGetVEStatus(vm, &status, NULL) == -1) > + goto cleanup; > + > + if (status != VIR_DOMAIN_RUNNING) { > + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > + _("domain is not running on destination host")); > + goto cleanup; > + } > + > + vm->def->id = strtoI(vm->def->name); > + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, > VIR_DOMAIN_RUNNING_MIGRATED); > + > + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); > + if (dom) > + dom->id = vm->def->id; > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return dom; > +} > + > +static int > +openvzDomainMigrateConfirm3Params(virDomainPtr domain, > + virTypedParameterPtr params, > + int nparams, > + const char *cookiein ATTRIBUTE_UNUSED, > + int cookieinlen ATTRIBUTE_UNUSED, > + unsigned int flags, > + int cancelled) > +{ > + struct openvz_driver *driver = domain->conn->privateData; > + virDomainObjPtr vm = NULL; > + int status; > + int ret = -1; > + > + virCheckFlags(OPENVZ_MIGRATION_FLAGS, -1); > + if (virTypedParamsValidate(params, nparams, > OPENVZ_MIGRATION_PARAMETERS) < 0) > + goto cleanup; > + > + openvzDriverLock(driver); > + vm = virDomainObjListFindByUUID(driver->domains, domain->uuid); > + openvzDriverUnlock(driver); > + > + if (!vm) { > + virReportError(VIR_ERR_NO_DOMAIN, "%s", > + _("no domain with matching uuid")); > + goto cleanup; > + } > + > + if (cancelled) { > + if (openvzGetVEStatus(vm, &status, NULL) == -1) > + goto cleanup; > + > + if (status == VIR_DOMAIN_RUNNING) { > + ret = 0; > + } else { > + VIR_DEBUG("Domain '%s' does not recover after failed > migration", > + vm->def->name); > + } > + > + goto cleanup; > + } > + > + vm->def->id = -1; > + > + VIR_DEBUG("Domain '%s' successfully migrated", vm->def->name); > + > + virDomainObjListRemove(driver->domains, vm); > + vm = NULL; > + > + ret = 0; > + > + cleanup: > + if (vm) > + virObjectUnlock(vm); > + return ret; > +} > + > + > static virDriver openvzDriver = { > .no = VIR_DRV_OPENVZ, > .name = "OPENVZ", > @@ -2265,6 +2607,12 @@ static virDriver openvzDriver = { > .connectIsAlive = openvzConnectIsAlive, /* 0.9.8 */ > .domainUpdateDeviceFlags = openvzDomainUpdateDeviceFlags, /* 0.9.13 */ > .domainGetHostname = openvzDomainGetHostname, /* 0.10.0 */ > + .connectSupportsFeature = openvzConnectSupportsFeature, /* 1.2.8 */ > + .domainMigrateBegin3Params = openvzDomainMigrateBegin3Params, /* > 1.2.8 */ > + .domainMigratePrepare3Params = openvzDomainMigratePrepare3Params, /* > 1.2.8 */ > + .domainMigratePerform3Params = openvzDomainMigratePerform3Params, /* > 1.2.8 */ > + .domainMigrateFinish3Params = openvzDomainMigrateFinish3Params, /* > 1.2.8 */ > + .domainMigrateConfirm3Params = openvzDomainMigrateConfirm3Params, /* > 1.2.8 */ > }; > > int openvzRegister(void) > diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h > index b39e81c..0c7a070 100644 > --- a/src/openvz/openvz_driver.h > +++ b/src/openvz/openvz_driver.h > @@ -31,6 +31,16 @@ > > # include "internal.h" > > +# define OPENVZ_MIGRATION_FLAGS \ > + (VIR_MIGRATE_LIVE) > + > +/* All supported migration parameters and their types. */ > +# define OPENVZ_MIGRATION_PARAMETERS \ > + VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ > + VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ > + VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ > + NULL > + > int openvzRegister(void); > > #endif > -- > 1.7.1 > >

2 2

[libvirt] [PATCH] apparmor: allow reading cap_last_cap
by Felix Geyer 04 Sep '14

04 Sep '14

libcap-ng >= 0.7.4 fails when it can't read /sys/kernel/cap_last_cap and thus running a qemu guest fails. Allow reading cap_last_cap in the libvirt-qemu apparmor abstraction. --- examples/apparmor/libvirt-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 83814ec..1a98182 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -21,6 +21,7 @@ /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, + @{PROC}/sys/kernel/cap_last_cap r, # For hostdev access. The actual devices will be added dynamically /sys/bus/usb/devices/ r, -- 2.1.0

3 2

[libvirt] [PATCH 0/4] Introduce new cputune event
by Pavel Hrdina 04 Sep '14

04 Sep '14

This patch series introduces new cputune event to inform management applications about every change of cputune values for running domains. Pavel Hrdina (4): domain_conf: separate cputune struct from virDomainDef event: introduce new event for cputune add an example how to use cputune event cputune_event: queue the event for cputune updates daemon/remote.c | 87 ++++++++++++++++++++++++++ examples/object-events/event-test.c | 39 +++++++++++- include/libvirt/libvirt.h.in | 62 +++++++++++++++++++ src/conf/domain_conf.h | 27 ++++---- src/conf/domain_event.c | 120 ++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 7 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 6 ++ src/qemu/qemu_driver.c | 27 ++++++++ src/remote/remote_driver.c | 110 +++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 39 +++++++++++- src/remote_protocol-structs | 32 ++++++++++ tools/virsh-domain.c | 49 +++++++++++++++ 13 files changed, 594 insertions(+), 13 deletions(-) -- 1.8.5.5

3 13

[libvirt] [PATCH] tests: force FIPS testing mode with new enough GNU TLS versions
by Giuseppe Scrivano 04 Sep '14

04 Sep '14

Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- tests/virnettlscontexttest.c | 2 ++ tests/virnettlssessiontest.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 51a0369..a3e24a3 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -113,6 +113,8 @@ mymain(void) { int ret = 0; + setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + testTLSInit(KEYFILE); # define DO_CTX_TEST(_isServer, _caCrt, _crt, _expectFail) \ diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index 1e2683c..3af948a 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -240,6 +240,8 @@ mymain(void) { int ret = 0; + setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + testTLSInit(KEYFILE); # define DO_SESS_TEST(_caCrt, _serverCrt, _clientCrt, _expectServerFail, \ -- 1.9.3

2 2

[libvirt] [PATCH] selinux: Avoid label reservations for type = none during restart
by Shivaprasad G Bhat 04 Sep '14

04 Sep '14

The problem is libvirt kills the guests during libvirt restart if more than guest has security type as none. This is because, libvirt as part of guest- reconnect tries to reserve the security labels. In case of type=none, the range of security context happen to be same for several guests. During reservation, the second attempt to reserve the same range fails and the Guests would be killed. The fix is to avoid reserving labels for type = none during libvirt restart. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/security/security_selinux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 008c58c..2f8a7f2 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -739,7 +739,8 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, virSecurityLabelDefPtr seclabel; seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); - if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) + if (!seclabel || seclabel->type == VIR_DOMAIN_SECLABEL_STATIC || + seclabel->type == VIR_DOMAIN_SECLABEL_NONE) return 0; if (getpidcon_raw(pid, &pctx) == -1) {

3 3

[libvirt] [PATCH] security: fix DH key generation when FIPS mode is on
by Giuseppe Scrivano 04 Sep '14

04 Sep '14

When FIPS mode is on, gnutls_dh_params_generate2 will fail if 1024 is specified as the prime's number of bits, a bigger value works in both cases. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- with the development version of GNU TLS is possible to test FIPS mode setting the env variable GNUTLS_FORCE_FIPS_MODE=2 src/rpc/virnettlscontext.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 31aac9d..947038d 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -43,7 +43,7 @@ #include "virthread.h" #include "configmake.h" -#define DH_BITS 1024 +#define DH_BITS 2048 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" #define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" -- 1.9.3

2 2

[libvirt] [PATCH] qemu: numatune/domiftune no support in session mode
by Erik Skultety 04 Sep '14

04 Sep '14

Tuning NUMA or network interface parameters require root privileges, thus an attempt to set some of these parameters in session mode should be invalid followed by an error. As an example might be memory tuning which raises an error in such case. This patch provides similar behavior for numatune and domiftune. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1126762 --- src/qemu/qemu_command.c | 33 ++++++++++++++++++++++++++++++++- src/qemu/qemu_driver.c | 20 ++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c84c7c3..c021080 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7443,7 +7443,7 @@ qemuBuildCommandLine(virConnectPtr conn, emulator = def->emulator; if (!cfg->privileged) { - /* If we have no cgroups than we can have no tunings that + /* If we have no cgroups then we can have no tunings that * require them */ if (def->mem.hard_limit || def->mem.soft_limit || @@ -7466,6 +7466,37 @@ qemuBuildCommandLine(virConnectPtr conn, _("CPU tuning is not available in session mode")); goto error; } + + if (virDomainNumatuneGetNodeset(def->numatune, NULL, -1) || + virDomainNumatuneGetMode(def->numatune, -1)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto error; + } + + virDomainNetDefPtr *nets = def->nets; + size_t nnets = def->nnets; + for (i = 0; i < nnets; i++) { + if (nets[i]->bandwidth) { + if (nets[i]->bandwidth->in && + (nets[i]->bandwidth->in->average || + nets[i]->bandwidth->in->peak || + nets[i]->bandwidth->in->burst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto error; + } + + if (nets[i]->bandwidth->out && + (nets[i]->bandwidth->out->average || + nets[i]->bandwidth->out->peak || + nets[i]->bandwidth->out->burst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto error; + } + } + } } for (i = 0; i < def->ngraphics; ++i) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 239a300..b46e12f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8779,6 +8779,12 @@ qemuDomainSetNumaParameters(virDomainPtr dom, if (virDomainSetNumaParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -8870,6 +8876,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; + virQEMUDriverConfigPtr cfg = NULL; char *nodeset = NULL; int ret = -1; virCapsPtr caps = NULL; @@ -8888,10 +8895,17 @@ qemuDomainGetNumaParameters(virDomainPtr dom, return -1; priv = vm->privateData; + cfg = virQEMUDriverGetConfig(driver); if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("NUMA tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -9889,6 +9903,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, if (virDomainSetInterfaceParametersEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; + if (!cfg->privileged) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Network bandwidth tuning is not available in session mode")); + goto cleanup; + } + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; -- 1.9.3

2 2

[libvirt] [PATCH 0/6] Coverity patches to resolve RESOURCE_LEAK
by Wang Rui 03 Sep '14

03 Sep '14

Another six pathes to fix resource leak. But this may not be the end. Wang Rui (6): tests: Resolve Coverity RESOURCE_LEAK in commandhelper test_conf: Resolve Coverity RESOURCE_LEAK remote: Resolve Coverity RESOURCE_LEAK qemu_process: Resolve Coverity RESOURCE_LEAK vircgroup: Resolve Coverity RESOURCE_LEAK lxc_container: Resolve Coverity RESOURCE_LEAK daemon/remote.c | 4 +++- src/lxc/lxc_container.c | 4 ++++ src/qemu/qemu_process.c | 1 + src/util/vircgroup.c | 2 +- tests/commandhelper.c | 15 +++++++++------ tests/test_conf.c | 4 ++-- 6 files changed, 20 insertions(+), 10 deletions(-) -- 1.7.12.4

2 7

[libvirt] [PATCH] command: test umask support
by Eric Blake 03 Sep '14

03 Sep '14

Add testsuite coverage for the previous patch. * tests/commandhelper.c (main): Output umask. * tests/commandtest.c (test15): Also test umask. (mymain): Add test. * tests/commanddata/*.log: Update expected output. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/commanddata/test10.log | 1 + tests/commanddata/test11.log | 1 + tests/commanddata/test12.log | 1 + tests/commanddata/test13.log | 1 + tests/commanddata/test14.log | 1 + tests/commanddata/test15.log | 1 + tests/commanddata/test2.log | 1 + tests/commanddata/test20.log | 1 + tests/commanddata/test21.log | 1 + tests/commanddata/test24.log | 1 + tests/commanddata/test3.log | 1 + tests/commanddata/test4.log | 1 + tests/commanddata/test5.log | 1 + tests/commanddata/test6.log | 1 + tests/commanddata/test7.log | 1 + tests/commanddata/test8.log | 1 + tests/commanddata/test9.log | 1 + tests/commandhelper.c | 3 +++ tests/commandtest.c | 3 +++ 19 files changed, 23 insertions(+) diff --git a/tests/commanddata/test10.log b/tests/commanddata/test10.log index e1d6092..6b22786 100644 --- a/tests/commanddata/test10.log +++ b/tests/commanddata/test10.log @@ -12,3 +12,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test11.log b/tests/commanddata/test11.log index e1d6092..6b22786 100644 --- a/tests/commanddata/test11.log +++ b/tests/commanddata/test11.log @@ -12,3 +12,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test12.log b/tests/commanddata/test12.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test12.log +++ b/tests/commanddata/test12.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test13.log b/tests/commanddata/test13.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test13.log +++ b/tests/commanddata/test13.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test14.log b/tests/commanddata/test14.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test14.log +++ b/tests/commanddata/test14.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test15.log b/tests/commanddata/test15.log index f439a85..edb2fc3 100644 --- a/tests/commanddata/test15.log +++ b/tests/commanddata/test15.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:.../commanddata +UMASK:0002 diff --git a/tests/commanddata/test2.log b/tests/commanddata/test2.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test2.log +++ b/tests/commanddata/test2.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test20.log b/tests/commanddata/test20.log index 7d48121..a0475e6 100644 --- a/tests/commanddata/test20.log +++ b/tests/commanddata/test20.log @@ -11,3 +11,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test21.log b/tests/commanddata/test21.log index 1b59206..703e6da 100644 --- a/tests/commanddata/test21.log +++ b/tests/commanddata/test21.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test24.log b/tests/commanddata/test24.log index 8670952..38cbb54 100644 --- a/tests/commanddata/test24.log +++ b/tests/commanddata/test24.log @@ -5,3 +5,4 @@ FD:3 FD:4 DAEMON:yes CWD:/ +UMASK:0022 diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log index c6da253..f44400b 100644 --- a/tests/commanddata/test3.log +++ b/tests/commanddata/test3.log @@ -12,3 +12,4 @@ FD:5 FD:7 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test4.log b/tests/commanddata/test4.log index 1876685..6cd2095 100644 --- a/tests/commanddata/test4.log +++ b/tests/commanddata/test4.log @@ -10,3 +10,4 @@ FD:1 FD:2 DAEMON:yes CWD:/ +UMASK:0022 diff --git a/tests/commanddata/test5.log b/tests/commanddata/test5.log index f745c3f..f801dca 100644 --- a/tests/commanddata/test5.log +++ b/tests/commanddata/test5.log @@ -8,3 +8,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test6.log b/tests/commanddata/test6.log index 5394428..1476995 100644 --- a/tests/commanddata/test6.log +++ b/tests/commanddata/test6.log @@ -4,3 +4,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test7.log b/tests/commanddata/test7.log index cdfe445..e30efe7 100644 --- a/tests/commanddata/test7.log +++ b/tests/commanddata/test7.log @@ -9,3 +9,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test8.log b/tests/commanddata/test8.log index 87874fd..897bf6e 100644 --- a/tests/commanddata/test8.log +++ b/tests/commanddata/test8.log @@ -5,3 +5,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commanddata/test9.log b/tests/commanddata/test9.log index 3a93c19..e9e1611 100644 --- a/tests/commanddata/test9.log +++ b/tests/commanddata/test9.log @@ -18,3 +18,4 @@ FD:1 FD:2 DAEMON:no CWD:/tmp +UMASK:0022 diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 796b89d..03fe506 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <fcntl.h> #include <string.h> +#include <sys/stat.h> #include "internal.h" #include "virutil.h" @@ -121,6 +122,8 @@ int main(int argc, char **argv) { fprintf(log, "CWD:%s\n", cwd); VIR_FREE(cwd); + fprintf(log, "UMASK:%04o\n", umask(0)); + VIR_FORCE_FCLOSE(log); if (argc > 1 && STREQ(argv[1], "--close-stdin")) { diff --git a/tests/commandtest.c b/tests/commandtest.c index 5f52a00..6400ea2 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -617,6 +617,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) if (virAsprintf(&cwd, "%s/commanddata", abs_srcdir) < 0) goto cleanup; virCommandSetWorkingDirectory(cmd, cwd); + virCommandSetUmask(cmd, 002); if (virCommandRun(cmd, NULL) < 0) { virErrorPtr err = virGetLastError(); @@ -1133,6 +1134,8 @@ mymain(void) if (chdir("/tmp") < 0) return EXIT_FAILURE; + umask(022); + setpgid(0, 0); ignore_value(setsid()); -- 1.9.3

2 2

[libvirt] [PATCH] Storage: Fix allocation for raw files.
by Prerna Saxena 03 Sep '14

03 Sep '14

When virsh vol-clone is attempted on a raw file where capacity > allocation, the resulting cloned volume has a size that matches the virtual-size of the parent; in place of matching its actual, disk size. For example : Given this image: [root@localhost]# qemu-img info /var/lib/libvirt/images/f20.raw image: /var/lib/libvirt/images/f20.raw file format: raw virtual size: 2.0G (2147483648 bytes) disk size: 617M When this disk is copied using virsh vol-clone : [root@localhost~] vol-clone --vol f20.raw --newname f20-copy.raw --pool default Vol f20-copy.raw cloned from f20.raw [root@localhost~] The characteristics of the cloned disk differ in "disk size". Its allocated disk size is more than the allocated size of parent file; which is an anomaly. It has picked up an allocated size matching the parent's virtual size. [root@localhost~] qemu-img info /var/lib/libvirt/images/f20-copy.raw image: /var/lib/libvirt/images/f20-copy.raw file format: raw virtual size: 2.0G (2147483648 bytes) disk size: 2.0G This patch fixes the cloned disk to have same _allocated_size_ as the parent file from which it was cloned. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/storage/storage_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 433d7b7..930b45a 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1821,11 +1821,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; - /* Make sure allocation is at least as large as the destination cap, - * to make absolutely sure we copy all possible contents */ - if (newvol->target.allocation < origvol->target.capacity) - newvol->target.allocation = origvol->target.capacity; - if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support volume creation from an existing volume")); -- 1.9.3 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 1

[libvirt] [PATCH] util: don't shadow global umask declaration
by Martin Kletzander 03 Sep '14

03 Sep '14

Commit 0e1a1a8c introduced umask for virCommand, but the variables used emit a warning on older compilers about shadowed global declaration. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker && trivial. src/util/vircommand.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index efb5f69..cbe94f8 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -133,7 +133,7 @@ struct _virCommand { #if defined(WITH_SECDRIVER_APPARMOR) char *appArmorProfile; #endif - int umask; + int mask; }; /* See virCommandSetDryRun for description for this variable */ @@ -583,8 +583,8 @@ virExec(virCommandPtr cmd) /* child */ - if (cmd->umask) - umask(cmd->umask); + if (cmd->mask) + umask(cmd->mask); ret = EXIT_CANCELED; openmax = sysconf(_SC_OPEN_MAX); if (openmax < 0) { @@ -1085,12 +1085,12 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files) cmd->maxFiles = files; } -void virCommandSetUmask(virCommandPtr cmd, int umask) +void virCommandSetUmask(virCommandPtr cmd, int mask) { if (!cmd || cmd->has_error) return; - cmd->umask = umask; + cmd->mask = mask; } /** -- 2.1.0

1 0

[libvirt] [PATCH] sanlock: Avoid freeing uninitialized value
by Jiri Denemark 03 Sep '14

03 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1136788 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index aade437..aa6b8fb 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -885,7 +885,7 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, int *fd) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - struct sanlk_options *opt; + struct sanlk_options *opt = NULL; struct sanlk_resource **res_args; int res_count; bool res_free = false; -- 2.1.0

3 2

[libvirt] [PATCH V2] fix: unix sockets created for virtio-serail has insufficient permissions
by Chunyan Liu 03 Sep '14

03 Sep '14

Add umask to _virCommand, allow user to set umask to command. Set umask(002) to qemu process to overwrite default umask(022) so that unix sockets created for virtio-serial has expected permissions. Fix problem reported here: https://sourceware.org/bugzilla/show_bug.cgi?id=13078#c11 https://bugzilla.novell.com/show_bug.cgi?id=888166 To use virtio-serial device, unix socket created for chardev with default umask(022) has insufficient permissions. e.g.: -device virtio-serial \ -chardev socket,path=/tmp/foo,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.fedoraproject.port.0 srwxr-xr-x 1 qemu qemu 0 21. Jul 14:19 /tmp/somefile.sock Other users in the same group (like real user, test engines, etc) cannot write to this socket. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- Changes: * set umask(002) to the whole qemu process instead of calling umask in qemu unix_listen_opts. V1 is here: http://www.mail-archive.com/libvir-list@redhat.com/msg101513.html src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 1 + src/util/vircommand.c | 11 +++++++++++ src/util/vircommand.h | 1 + 4 files changed, 14 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 71fc063..f136d24 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1171,6 +1171,7 @@ virCommandSetPidFile; virCommandSetPreExecHook; virCommandSetSELinuxLabel; virCommandSetUID; +virCommandSetUmask; virCommandSetWorkingDirectory; virCommandToString; virCommandWait; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f68dfbe..f76aa5a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4141,6 +4141,7 @@ int qemuProcessStart(virConnectPtr conn, virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData); virCommandSetMaxProcesses(cmd, cfg->maxProcesses); virCommandSetMaxFiles(cmd, cfg->maxFiles); + virCommandSetUmask(cmd, 0x002); VIR_DEBUG("Setting up security labelling"); if (virSecurityManagerSetChildProcessLabel(driver->securityManager, diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 1d6dbd9..efb5f69 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -133,6 +133,7 @@ struct _virCommand { #if defined(WITH_SECDRIVER_APPARMOR) char *appArmorProfile; #endif + int umask; }; /* See virCommandSetDryRun for description for this variable */ @@ -582,6 +583,8 @@ virExec(virCommandPtr cmd) /* child */ + if (cmd->umask) + umask(cmd->umask); ret = EXIT_CANCELED; openmax = sysconf(_SC_OPEN_MAX); if (openmax < 0) { @@ -1082,6 +1085,14 @@ virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files) cmd->maxFiles = files; } +void virCommandSetUmask(virCommandPtr cmd, int umask) +{ + if (!cmd || cmd->has_error) + return; + + cmd->umask = umask; +} + /** * virCommandClearCaps: * @cmd: the command to modify diff --git a/src/util/vircommand.h b/src/util/vircommand.h index d3b286d..bf65de4 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -72,6 +72,7 @@ void virCommandSetUID(virCommandPtr cmd, uid_t uid); void virCommandSetMaxMemLock(virCommandPtr cmd, unsigned long long bytes); void virCommandSetMaxProcesses(virCommandPtr cmd, unsigned int procs); void virCommandSetMaxFiles(virCommandPtr cmd, unsigned int files); +void virCommandSetUmask(virCommandPtr cmd, int umask); void virCommandClearCaps(virCommandPtr cmd); -- 1.8.4.5

3 3

[libvirt] [PATCH v1 0/6] ivshmem support
by Maxime Leroy 03 Sep '14

03 Sep '14

The following patches are an implementation of a new shmem device to support ivshmem in libvirt. Any feedback is welcome. Changes since RFC: - replace <ivshmem> by a more generic term <shmem> - remove role attribute - libvirt is able to start and stop an ivshmem server - update xml format from: <ivshmem use_server='yes' role='master'> <source file='/tmp/socket-ivshmem0'/> <size unit='M'>32</size> <msi vectors='32' ioeventfd='on'/> </ivshmem> to: <shmem name='shmem0' model='ivshmem'> <server path='/tmp/sockect-ivshem0' start='yes'/> <size unit='M'>32</size> <msi vectors='32' ioeventfd='on'/> </shmem> Maxime Leroy (6): doc: schema: Add documentation for the shmem support conf: Parse and format shmem device XML qemu: Add cap flag QEMU_CAPS_IVSHMEM qemu: Build command line for ivshmem device tests: Add tests for ivshmem device handling ivshmem: add start param to server attribute configure.ac | 4 + docs/formatdomain.html.in | 71 ++++++ docs/schemas/domaincommon.rng | 52 +++++ po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 264 ++++++++++++++++++++++- src/conf/domain_conf.h | 42 ++++ src/libvirt_private.syms | 7 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 112 +++++++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 10 + src/util/virivshmemserver.c | 141 ++++++++++++ src/util/virivshmemserver.h | 28 +++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 17 +- tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args | 10 + tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml | 35 +++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 27 files changed, 808 insertions(+), 7 deletions(-) create mode 100644 src/util/virivshmemserver.c create mode 100644 src/util/virivshmemserver.h create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml -- 1.9.3

4 32

[libvirt] [PATCH] spec: Fix preun script for daemon
by Jiri Denemark 03 Sep '14

03 Sep '14

%systemd_preun macro cannot be split in several lines. https://bugzilla.redhat.com/show_bug.cgi?id=1136736 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4dc801b..4756d7d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1677,11 +1677,7 @@ fi %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun \ - libvirtd.socket \ - libvirtd.service \ - virtlockd.socket \ - virtlockd.service + %systemd_preun libvirtd.socket libvirtd.service virtlockd.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade -- 2.1.0

2 2

[libvirt] [PATCH 0/2] bulk api: implement block group
by Li Wei 03 Sep '14

03 Sep '14

This patchset implement the block group for bulk stats, currently only support JSON monitor. Li Wei (2): qemu: implement block group for bulk stats. virsh: add block group for bulk stats. include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 13 ++++ src/qemu/qemu_driver.c | 31 ++++++++ src/qemu/qemu_monitor.c | 23 ++++++ src/qemu/qemu_monitor.h | 5 ++ src/qemu/qemu_monitor_json.c | 170 +++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 ++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh.pod | 4 +- 9 files changed, 257 insertions(+), 2 deletions(-) -- 1.9.3

3 6

[libvirt] ignore this message
by Gene Czarcinski 02 Sep '14

02 Sep '14

Sorry about that. I am having some trouble posting to this mailing list. Just ignore this message.

1 0

[libvirt] ignore this message
by Gene Czarcinski 02 Sep '14

02 Sep '14

Sorry about that. I am having some trouble posting to this mailing list. Just ignore this message. Gene

1 1

[libvirt] [PATCH RFC] qemu: add some synchronizations for snapshot
by Jincheng Miao 02 Sep '14

02 Sep '14

Currently it lacks synchronization to modify domain's snapshot object list, that race condition causes unsafe access to some freed snapshot objects. Therefore, this patch wraps all access of snapshot object list in vm job lock. Only the qemuDomainSnapshotCreateXML is not synchronized, it is related to QEMU_ASYNC_JOB_SNAPSHOT async job for --disk-only snapshot. I am not sure if it's ok to remove it, so need your ideas for qemuDomainSnapshotCreateXML. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/qemu/qemu_driver.c | 137 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 112 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 73959da..7329aa9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13609,6 +13609,7 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13619,8 +13620,12 @@ static int qemuDomainSnapshotListNames(virDomainPtr domain, char **names, if (virDomainSnapshotListNamesEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainSnapshotObjListGetNames(vm->snapshots, NULL, names, nameslen, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); cleanup: if (vm) @@ -13633,6 +13638,7 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13643,8 +13649,13 @@ static int qemuDomainSnapshotNum(virDomainPtr domain, if (virDomainSnapshotNumEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainSnapshotObjListNum(vm->snapshots, NULL, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13657,6 +13668,7 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, { virDomainObjPtr vm = NULL; int n = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_ROOTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13667,8 +13679,13 @@ qemuDomainListAllSnapshots(virDomainPtr domain, virDomainSnapshotPtr **snaps, if (virDomainListAllSnapshotsEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + n = virDomainListSnapshots(vm->snapshots, NULL, domain, snaps, flags); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13684,6 +13701,7 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13694,12 +13712,18 @@ qemuDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot, if (virDomainSnapshotListChildrenNamesEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainSnapshotObjListGetNames(vm->snapshots, snap, names, nameslen, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13713,6 +13737,7 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13723,11 +13748,17 @@ qemuDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, if (virDomainSnapshotNumChildrenEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainSnapshotObjListNum(vm->snapshots, snap, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13742,6 +13773,7 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; virDomainSnapshotObjPtr snap = NULL; int n = -1; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_FILTERS_ALL, -1); @@ -13752,12 +13784,18 @@ qemuDomainSnapshotListAllChildren(virDomainSnapshotPtr snapshot, if (virDomainSnapshotListAllChildrenEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + n = virDomainListSnapshots(vm->snapshots, snap, snapshot->domain, snaps, flags); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13771,6 +13809,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr snapshot = NULL; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, NULL); @@ -13780,11 +13819,17 @@ static virDomainSnapshotPtr qemuDomainSnapshotLookupByName(virDomainPtr domain, if (virDomainSnapshotLookupByNameEnsureACL(domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromName(vm, name))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromName(vm, name))) + goto endjob; + snapshot = virGetDomainSnapshot(domain, snap->def->name); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13796,6 +13841,7 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, { virDomainObjPtr vm; int ret = -1; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, -1); @@ -13805,8 +13851,13 @@ static int qemuDomainHasCurrentSnapshot(virDomainPtr domain, if (virDomainHasCurrentSnapshotEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + ret = (vm->current_snapshot != NULL); + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13820,6 +13871,7 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, virDomainObjPtr vm; virDomainSnapshotObjPtr snap = NULL; virDomainSnapshotPtr parent = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, NULL); @@ -13829,18 +13881,24 @@ qemuDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, if (virDomainSnapshotGetParentEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!snap->def->parent) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, _("snapshot '%s' does not have a parent"), snap->def->name); - goto cleanup; + goto endjob; } parent = virGetDomainSnapshot(snapshot->domain, snap->def->parent); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13852,6 +13910,7 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, { virDomainObjPtr vm; virDomainSnapshotPtr snapshot = NULL; + virQEMUDriverPtr driver = domain->conn->privateData; virCheckFlags(0, NULL); @@ -13861,14 +13920,20 @@ static virDomainSnapshotPtr qemuDomainSnapshotCurrent(virDomainPtr domain, if (virDomainSnapshotCurrentEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + if (!vm->current_snapshot) { virReportError(VIR_ERR_NO_DOMAIN_SNAPSHOT, "%s", _("the domain does not have a current snapshot")); - goto cleanup; + goto endjob; } snapshot = virGetDomainSnapshot(domain, vm->current_snapshot->def->name); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13882,6 +13947,7 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, char *xml = NULL; virDomainSnapshotObjPtr snap = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(VIR_DOMAIN_XML_SECURE, NULL); @@ -13891,13 +13957,19 @@ static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, if (virDomainSnapshotGetXMLDescEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + virUUIDFormat(snapshot->domain->uuid, uuidstr); xml = virDomainSnapshotDefFormat(uuidstr, snap->def, flags, 0); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13911,6 +13983,7 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, -1); @@ -13920,12 +13993,18 @@ qemuDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, if (virDomainSnapshotIsCurrentEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + ret = (vm->current_snapshot && STREQ(snapshot->name, vm->current_snapshot->def->name)); + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -13940,6 +14019,7 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, virDomainObjPtr vm = NULL; int ret = -1; virDomainSnapshotObjPtr snap = NULL; + virQEMUDriverPtr driver = snapshot->domain->conn->privateData; virCheckFlags(0, -1); @@ -13949,14 +14029,20 @@ qemuDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, if (virDomainSnapshotHasMetadataEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + /* XXX Someday, we should recognize internal snapshots in qcow2 * images that are not tied to a libvirt snapshot; if we ever do * that, then we would have a reason to return 0 here. */ ret = 1; + endjob: + ignore_value(qemuDomainObjEndJob(driver, vm)); + cleanup: if (vm) virObjectUnlock(vm); @@ -14027,9 +14113,12 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto cleanup; } - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!vm->persistent && snap->def->state != VIR_DOMAIN_RUNNING && snap->def->state != VIR_DOMAIN_PAUSED && @@ -14038,13 +14127,13 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("transient domain needs to request run or pause " "to revert to inactive snapshot")); - goto cleanup; + goto endjob; } if (virDomainSnapshotIsExternal(snap)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("revert to external snapshot not supported yet")); - goto cleanup; + goto endjob; } if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { @@ -14052,7 +14141,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, _("snapshot '%s' lacks domain '%s' rollback info"), snap->def->name, vm->def->name); - goto cleanup; + goto endjob; } if (virDomainObjIsActive(vm) && !(snap->def->state == VIR_DOMAIN_RUNNING @@ -14061,7 +14150,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED))) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, "%s", _("must respawn qemu to start inactive snapshot")); - goto cleanup; + goto endjob; } } @@ -14070,7 +14159,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, cfg->snapshotDir) < 0) - goto cleanup; + goto endjob; vm->current_snapshot = NULL; /* XXX Should we restore vm->current_snapshot after this point * in the failure cases where we know there was no change? */ @@ -14085,12 +14174,9 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (snap->def->dom) { config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, true); if (!config) - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - switch ((virDomainState) snap->def->state) { case VIR_DOMAIN_RUNNING: case VIR_DOMAIN_PAUSED: @@ -14400,9 +14486,13 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (virDomainSnapshotDeleteEnsureACL(snapshot->domain->conn, vm->def) < 0) goto cleanup; - if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (!(snap = qemuSnapObjFromSnapshot(vm, snapshot))) + goto endjob; + if (!metadata_only) { if (!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) && virDomainSnapshotIsExternal(snap)) @@ -14415,13 +14505,10 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("deletion of %d external disk snapshots not " "supported yet"), external); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) { rem.driver = driver; -- 1.7.1

2 1

[libvirt] [PATCH] remote: Fix memory leak on error path when deserializing bulk stats
by Peter Krempa 02 Sep '14

02 Sep '14

The 'elem' variable along with the domain object would be leaked when taking the error path. Found by coverity. --- src/remote/remote_driver.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fda27f7..8bc4baa 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7730,7 +7730,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, size_t i; remote_connect_get_all_domain_stats_args args; remote_connect_get_all_domain_stats_ret ret; - + virDomainStatsRecordPtr elem = NULL; virDomainStatsRecordPtr *tmpret = NULL; if (ndoms) { @@ -7769,7 +7769,6 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, goto cleanup; for (i = 0; i < ret.retStats.retStats_len; i++) { - virDomainStatsRecordPtr elem; remote_domain_stats_record *rec = ret.retStats.retStats_val + i; if (VIR_ALLOC(elem) < 0) @@ -7786,6 +7785,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, goto cleanup; tmpret[i] = elem; + elem = NULL; } *retStats = tmpret; @@ -7793,6 +7793,10 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, rv = ret.retStats.retStats_len; cleanup: + if (elem) { + virObjectUnref(elem->dom); + VIR_FREE(elem); + } virDomainStatsRecordListFree(tmpret); xdr_free((xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *) &ret); -- 2.0.2

2 2

[libvirt] [python PATCH] override: Fix two uninitialized variables in convertDomainStatsRecord
by Peter Krempa 02 Sep '14

02 Sep '14

py_record_domain and py_record_stats would be accessed uninitialized if an out-of-memory condition would happen in the first loop. Unlikely, but coverity complained. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1136354 --- Pushed as trivial. libvirt-override.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 17ea042..872e33b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7963,8 +7963,8 @@ convertDomainStatsRecord(virDomainStatsRecordPtr *records, { PyObject *py_retval; PyObject *py_record; - PyObject *py_record_domain; - PyObject *py_record_stats; + PyObject *py_record_domain = NULL; + PyObject *py_record_stats = NULL; size_t i; if (!(py_retval = PyList_New(nrecords))) -- 2.0.2

1 0

[libvirt] [PATCH 0/2] fix: unix sockets created for virtio-serail has insufficient permissions
by Chunyan Liu 02 Sep '14

02 Sep '14

https://sourceware.org/bugzilla/show_bug.cgi?id=13078#c11 https://bugzilla.novell.com/show_bug.cgi?id=888166 To use virtio-serial device, unix socket created for chardev with default umask(022) has insufficient permissions. e.g.: -device virtio-serial \ -chardev socket,path=/tmp/foo,server,nowait,id=foo \ -device virtserialport,chardev=foo,name=org.fedoraproject.port.0 #ls -l /tmp/somefile.sock srwxr-xr-x 1 qemu qemu 0 21. Jul 14:19 /tmp/somefile.sock Other users in the same group (like real user, test engines, etc) cannot write to this socket. These patch series contains a qemu patch and a libvirt patch: qemu patch: adds a new 'umask' option to -chardev, so that user can change the umask. libvirt patch: pass 'umask=0x002' paramter to qemu command line for virtio-serial device Chunyan Liu (2): qemu side: add 'umask' option to chardev libvirt side: qemu: add umask(002) to virtio-serial chardev commandline -- 1.8.4.5

4 7

[libvirt] [PATCH] Free ifname in testDomainGenerateIfnames
by Ján Tomko 02 Sep '14

02 Sep '14

https://bugzilla.redhat.com/show_bug.cgi?id=1135388 --- Pushed as trivial. src/test/test_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 3b22cf6..9918d2c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -521,6 +521,7 @@ testDomainGenerateIfname(virDomainDefPtr domdef) if (!found) return ifname; + VIR_FREE(ifname); } virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.8.5.5

1 0

[libvirt] [PATCH] virsh: Implement command to rename domain
by Tomas Meszaros 02 Sep '14

02 Sep '14

I've recently worked with rather large number of virtual machines and needed to rename all domains. I couldn't find better way how to rename domain other than: virsh dumpxml domain > domain.xml (change domain name in domain.xml) virsh undefine domain virsh define domain.xml This is rather pain to do every time I want to rename domain. I think there should be simple way to change domain name. So, I decided to implement new command which will basically perform all actions listed above. When running: virsh rename foo bar domain foo will be renamed to bar. Command rename is implemented using cmdUndefine options with addition of option name-name. I included opts_undefine into the opts_rename because I couldn't find any other way how to call cmdUndefine directly from the cmdRename and not getting vshCommandOpt assertion fails. In order to hide undefine options, I added VSH_OFLAG_HIDDEN flag to the Command Option Flags, so options flagged as hidden wont show up in help and autocompletion results. But it is still possible to run rename command with undefine flags: virsh rename foo bar --managed-save I would like to call cmdUndefine from cmdRename and not having to use undefine options as a part of rename options but I just don't know how to do it at this point. --- tools/virsh-domain.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 10 ++++ tools/virsh.h | 2 + tools/virsh.pod | 12 +++++ 4 files changed, 157 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c75cd73..cd8c663 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5103,6 +5103,133 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) } /* + * "rename" command + */ +static const vshCmdInfo info_rename[] = { + {.name = "help", + .data = N_("rename a domain") + }, + {.name = "desc", + .data = N_("Change domain name.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_rename[] = { + {.name = "domain", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("domain name or uuid") + }, + {.name = "new-name", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("new domain name") + }, + {.name = "managed-save", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "storage", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "remove-all-storage", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "wipe-storage", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = "snapshots-metadata", + .type = VSH_OT_BOOL, + .flags = VSH_OFLAG_HIDDEN, + }, + {.name = NULL} +}; + +static bool +cmdRename(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + virDomainPtr new_dom = NULL; + bool ret = false; + int dom_state; + int xml_size; + char *dom_xml = NULL; + const char *new_name = NULL; + xmlDocPtr doc = NULL; + xmlChar *new_dom_xml = NULL; + xmlNodePtr name_node = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (virDomainGetState(dom, &dom_state, NULL, 0) < 0) { + vshError(ctl, "%s", _("Failed to get domain state")); + goto cleanup; + } + + if (dom_state != VIR_DOMAIN_SHUTOFF) { + vshError(ctl, _("Please shutdown domain before renaming")); + goto cleanup; + } + + if (vshCommandOptString(cmd, "new-name", &new_name) <= 0) { + vshError(ctl, _("Failed to parse --new-name parameter")); + goto cleanup; + } + + if (!(dom_xml = virDomainGetXMLDesc(dom, 0))) + goto cleanup; + if (!(doc = virXMLParseStringCtxt(dom_xml, NULL, &ctxt))) + goto cleanup; + + obj = xmlXPathEval(BAD_CAST "/domain/name", ctxt); + if (obj == NULL || obj->type != XPATH_NODESET || obj->nodesetval == NULL || + obj->nodesetval->nodeNr == 0 || obj->nodesetval->nodeTab == NULL) { + vshError(ctl, _("Failed to extract domain name")); + goto cleanup; + } + + if (!(name_node = obj->nodesetval->nodeTab[0]->children)) + goto cleanup; + + xmlNodeSetContent(name_node, BAD_CAST new_name); + xmlDocDumpMemory(doc, &new_dom_xml, &xml_size); + if (new_dom_xml == NULL || xml_size <= 0) { + vshError(ctl, _("Failed to format new XML for domain %s"), new_name); + goto cleanup; + } + + if (!cmdUndefine(ctl, cmd)) + goto cleanup; + + if (!(new_dom = virDomainDefineXML(ctl->conn, (char *)new_dom_xml))) { + vshError(ctl, _("Failed to define domain %s"), new_name); + goto cleanup; + } + + vshPrint(ctl, _("Domain %s has been renamed to %s\n"), + virDomainGetName(dom), virDomainGetName(new_dom)); + ret = true; + + cleanup: + virDomainFree(dom); + if (new_dom) + virDomainFree(new_dom); + VIR_FREE(dom_xml); + VIR_FREE(new_dom_xml); + xmlFreeDoc(doc); + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + return ret; +} + +/* * "reset" command */ static const vshCmdInfo info_reset[] = { @@ -12057,6 +12184,12 @@ const vshCmdDef domManagementCmds[] = { .info = info_reboot, .flags = 0 }, + {.name = "rename", + .handler = cmdRename, + .opts = opts_rename, + .info = info_rename, + .flags = 0 + }, {.name = "reset", .handler = cmdReset, .opts = opts_reset, diff --git a/tools/virsh.c b/tools/virsh.c index 713c9a5..ef0d2df 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1299,6 +1299,10 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) const vshCmdOptDef *opt; for (opt = def->opts; opt->name; opt++) { const char *fmt = "%s"; + + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + switch (opt->type) { case VSH_OT_BOOL: fmt = "[--%s]"; @@ -1352,6 +1356,9 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname) const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + switch (opt->type) { case VSH_OT_BOOL: snprintf(buf, sizeof(buf), "--%s", opt->name); @@ -3001,6 +3008,9 @@ vshReadlineOptionsGenerator(const char *text, int state) /* ignore non --option */ continue; + if (opt->flags & VSH_OFLAG_HIDDEN) + continue; + if (len > 2) { if (STRNEQLEN(name, text + 2, len - 2)) continue; diff --git a/tools/virsh.h b/tools/virsh.h index b4df24b..5fa22d0 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -136,6 +136,8 @@ enum { VSH_OFLAG_REQ = (1 << 0), /* option required */ VSH_OFLAG_EMPTY_OK = (1 << 1), /* empty string option allowed */ VSH_OFLAG_REQ_OPT = (1 << 2), /* --optionname required */ + VSH_OFLAG_HIDDEN = (1 << 4), /* option doesn't show up in help + * messages and autocompletion */ }; /* forward declarations */ diff --git a/tools/virsh.pod b/tools/virsh.pod index ea9267e..3c56695 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1512,6 +1512,18 @@ try each mode is undefined, and not related to the order specified to virsh. For strict control over ordering, use a single mode at a time and repeat the command. +=item B<rename> I<domain> I<new-name> + +Rename a domain. This command changes current domain name to the new name +specified by the user. This is equivalent to: + + virsh dumpxml domain > domain.xml + (edit domain.xml, change <name>domain</name> to <name>new-name</name>) + virsh undefine domain + virsh define domain.xml + +B<Note>: Domain must be shut down before renaming. + =item B<reset> I<domain> Reset a domain immediately without any guest shutdown. B<reset> -- 1.9.3

3 3