- Devel - libvirt List Archives

[libvirt] [PATCH] qemudDomainGetSecurityLabel: avoid dead store to "type"
by Jim Meyering 07 Apr '10

07 Apr '10

And another: >From 61f50761015a82906aec31e5a1cdeef0eaf2b0a1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Apr 2010 17:51:56 +0200 Subject: [PATCH] qemudDomainGetSecurityLabel: avoid dead store to "type" * src/qemu/qemu_driver.c (qemudDomainGetSecurityLabel): Remove store and declaration. --- src/qemu/qemu_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e60591..f5cf1f1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5564,7 +5564,6 @@ static int qemudDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr sec { struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; virDomainObjPtr vm; - const char *type; int ret = -1; qemuDriverLock(driver); @@ -5580,7 +5579,7 @@ static int qemudDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr sec goto cleanup; } - if (!(type = virDomainVirtTypeToString(vm->def->virtType))) { + if (!virDomainVirtTypeToString(vm->def->virtType)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("unknown virt type in domain definition '%d'"), vm->def->virtType); -- 1.7.1.rc0.212.gbd88f

2 2

[libvirt] [PATCH] Don't ignore guest CPU selection when unsupported by HV
by Jiri Denemark 07 Apr '10

07 Apr '10

When qemu libvirt driver doesn't support guest CPU selection with given qemu binary, guests requiring specific CPU should fail to start instead of being silently supplied with a default CPU. --- src/qemu/qemu_conf.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 592360f..3fb0074 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3249,9 +3249,16 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, virBuffer buf = VIR_BUFFER_INITIALIZER; int i; - if (def->cpu && def->cpu->model - && qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) - goto cleanup; + if (def->cpu && def->cpu->model) { + if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) + goto cleanup; + + if (!ncpus || !host) { + qemuReportError(VIR_ERR_NO_SUPPORT, "%s", + _("CPU specification not supported by hypervisor")); + goto cleanup; + } + } if (ncpus > 0 && host) { virCPUCompareResult cmp; -- 1.7.0.4

2 2

[libvirt] [PATCH] Document all options of virsh dumpxml
by Jiri Denemark 07 Apr '10

07 Apr '10

--- tools/virsh.pod | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a59e9b0..9e9f4e0 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -342,10 +342,15 @@ configuration format named by I<format>. Dumps the core of a domain to a file for analysis. -=item B<dumpxml> I<domain-id> - -Output the domain information as an XML dump to stdout, this format -can be used by the B<create> command. +=item B<dumpxml> I<domain-id> optional I<--inactive> I<--security-info> I<--update-cpu> + +Output the domain information as an XML dump to stdout, this format can be used +by the B<create> command. Additional options affecting the XML dump may be +used. I<--inactive> tells virsh to dump domain configuration that will be used +on next start of the domain as opposed to the current domain configuration. +Using I<--security-info> security sensitive information will also be included +in the XML dump. I<--update-cpu> updates domain CPU requirements according to +host CPU. =item B<edit> I<domain-id> -- 1.7.0.4

2 2

[libvirt] [PATCH] createRawFileOpHook: avoid dead stores
by Jim Meyering 07 Apr '10

07 Apr '10

Here are two more dead stores. >From 7c3d498d8572556d72d4633e9b39f89a08a0a682 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Apr 2010 18:30:55 +0200 Subject: [PATCH] createRawFileOpHook: avoid dead stores * src/storage/storage_backend.c (createRawFileOpHook): Remove dead stores and declaration of each stored-to variable. --- src/storage/storage_backend.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 7294a00..f0074ed 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -308,12 +308,11 @@ static int createRawFileOpHook(int fd, void *data) { * update every 9s is a fair-enough trade-off */ unsigned long long bytes = 512 * 1024 * 1024; - int r; if (bytes > remain) bytes = remain; - if ((r = safezero(fd, 0, hdata->vol->allocation - remain, - bytes)) != 0) { + if (safezero(fd, 0, hdata->vol->allocation - remain, + bytes) != 0) { ret = errno; virReportSystemError(errno, _("cannot fill file '%s'"), hdata->vol->target.path); @@ -322,9 +321,7 @@ static int createRawFileOpHook(int fd, void *data) { remain -= bytes; } } else { /* No progress bars to be shown */ - int r; - - if ((r = safezero(fd, 0, 0, remain)) != 0) { + if (safezero(fd, 0, 0, remain) != 0) { ret = errno; virReportSystemError(errno, _("cannot fill file '%s'"), hdata->vol->target.path); -- 1.7.1.rc0.212.gbd88f

2 1

[libvirt] [PATCH] xenXMDomainDefineXML: remove dead store and useless/leaky virGetDomain
by Jim Meyering 07 Apr '10

07 Apr '10

clang complained about the dead store. Dan Berrange confirmed that this code has been useless-looking for ages. >From e6315e0b0d4b83b744cff86529b6b9e3144e2012 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Apr 2010 20:17:44 +0200 Subject: [PATCH] xenXMDomainDefineXML: remove dead store and useless/leaky virGetDomain * src/xen/xm_internal.c (xenXMDomainDefineXML): Remove useless and leak-inducing call to virGetDomain, as well as decl of now-unused local. --- src/xen/xm_internal.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index d1265ba..a7a09a0 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -2622,7 +2622,6 @@ cleanup: */ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainPtr ret; - virDomainPtr olddomain; char filename[PATH_MAX]; const char * oldfilename; virDomainDefPtr def = NULL; @@ -2688,10 +2687,6 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { goto error; } - /* XXX wtf.com is this line for - it appears to be amemory leak */ - if (!(olddomain = virGetDomain(conn, def->name, entry->def->uuid))) - goto error; - /* Remove the name -> filename mapping */ if (virHashRemoveEntry(priv->nameConfigMap, def->name, NULL) < 0) { xenXMError(VIR_ERR_INTERNAL_ERROR, -- 1.7.1.rc0.212.gbd88f

2 1

[libvirt] qemuDomainSnapshotLoad leak
by Jim Meyering 07 Apr '10

07 Apr '10

clang reports that the assignment to "snap" below is a dead store. Actually it's also a leak, and it seems like it deserves a diagnostic if/when that function returns NULL. It looks to me like this function should return something other than "void", so that it can inform its caller of such a failure. No? This is from qemu_driver.c: static void qemuDomainSnapshotLoad(void *payload, const char *name ATTRIBUTE_UNUSED, void *data) { ... virDomainSnapshotObjPtr snap = NULL; ... while ((entry = readdir(dir))) { ... def = virDomainSnapshotDefParseString(xmlStr, 0); if (def == NULL) { /* Nothing we can do here, skip this one */ VIR_ERROR("Failed to parse snapshot XML from file '%s'", fullpath); VIR_FREE(xmlStr); continue; } snap = virDomainSnapshotAssignDef(&vm->snapshots, def); VIR_FREE(xmlStr); } /* FIXME: qemu keeps internal track of snapshots. We can get access * to this info via the "info snapshots" monitor command for running * domains, or via "qemu-img snapshot -l" for shutoff domains. It would * be nice to update our internal state based on that, but there is a * a problem. qemu doesn't track all of the same metadata that we do. * In particular we wouldn't be able to fill in the <parent>, which is * pretty important in our metadata. */ virResetLastError(); cleanup: if (dir) closedir(dir); VIR_FREE(snapDir); virDomainObjUnlock(vm); }

2 4

[libvirt] [PATCH] maint: s/initialis/initializ/
by Eric Blake 07 Apr '10

07 Apr '10

git grep found 12 of the former but 100 of the latter in src/. * src/remote/remote_driver.c (initialise_gnutls): Rename... (initialize_gnutls): ...to this. (doRemoteOpen): Adjust caller. * src/xen/xen_driver.c (xenUnifiedOpen): Adjust output string. * src/util/network.c: Adjust comments. Suggested by Matthias Bolte. --- Should be a pretty trivial conversion from British to American English for a single word. Is it worth adding a rule to cfg.mk to have 'make syntax-check' diagnose future introductions of 'initialis.*'? src/remote/remote_driver.c | 14 +++++++------- src/util/network.c | 8 ++++---- src/xen/xen_driver.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 20ad6c8..d5b68dd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -271,7 +271,7 @@ void remoteDomainEventQueueFlush(int timer, void *opaque); static char *get_transport_from_scheme (char *scheme); /* GnuTLS functions used by remoteOpen. */ -static int initialise_gnutls (virConnectPtr conn); +static int initialize_gnutls (virConnectPtr conn); static gnutls_session_t negotiate_gnutls_on_connection (virConnectPtr conn, struct private_data *priv, int no_verify); #ifdef WITH_LIBVIRTD @@ -425,7 +425,7 @@ doRemoteOpen (virConnectPtr conn, transport = trans_unix; } - /* Local variables which we will initialise. These can + /* Local variables which we will initialize. These can * get freed in the failed: path. */ char *name = NULL, *command = NULL, *sockname = NULL, *netcat = NULL; @@ -579,7 +579,7 @@ doRemoteOpen (virConnectPtr conn, /* Connect to the remote service. */ switch (transport) { case trans_tls: - if (initialise_gnutls (conn) == -1) goto failed; + if (initialize_gnutls (conn) == -1) goto failed; priv->uses_tls = 1; priv->is_secure = 1; @@ -1140,12 +1140,12 @@ check_cert_file(const char *type, const char *file) static int -initialise_gnutls (virConnectPtr conn) +initialize_gnutls (virConnectPtr conn) { - static int initialised = 0; + static int initialized = 0; int err; - if (initialised) return 0; + if (initialized) return 0; gnutls_global_init (); @@ -1193,7 +1193,7 @@ initialise_gnutls (virConnectPtr conn) return -1; } - initialised = 1; + initialized = 1; return 0; } diff --git a/src/util/network.c b/src/util/network.c index 76f2791..6e24792 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -1,7 +1,7 @@ /* * network.c: network helper APIs for libvirt * - * Copyright (C) 2009-2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -116,7 +116,7 @@ virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr) { /* * virSocketFormatAddr: - * @addr: an initialised virSocketAddrPtr + * @addr: an initialized virSocketAddrPtr * * Returns a string representation of the given address * Returns NULL on any error @@ -158,7 +158,7 @@ virSocketFormatAddr(virSocketAddrPtr addr) { /* * virSocketSetPort: - * @addr: an initialised virSocketAddrPtr + * @addr: an initialized virSocketAddrPtr * @port: the port number to set * * Set the transport layer port of the given virtSocketAddr @@ -189,7 +189,7 @@ virSocketSetPort(virSocketAddrPtr addr, int port) { /* * virSocketGetPort: - * @addr: an initialised virSocketAddrPtr + * @addr: an initialized virSocketAddrPtr * * Returns the transport layer port of the given virtSocketAddr * Returns -1 if @addr is invalid diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 68b627a..5ab169d 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -297,7 +297,7 @@ xenUnifiedOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags) } if (virMutexInit(&priv->lock) < 0) { xenUnifiedError(VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot initialise mutex")); + "%s", _("cannot initialize mutex")); VIR_FREE(priv); return VIR_DRV_OPEN_ERROR; } @@ -1892,7 +1892,7 @@ out: } -/*----- Register with libvirt.c, and initialise Xen drivers. -----*/ +/*----- Register with libvirt.c, and initialize Xen drivers. -----*/ /* The interface which we export upwards to libvirt.c. */ static virDriver xenUnifiedDriver = { -- 1.6.6.1

2 2

[libvirt] Live Migration with non-shared storage for kvm
by Kenneth Nagin 07 Apr '10

07 Apr '10

On February 16th I posted a patch and description for libvirt support of 'Live Migration with non-shared strorage for kvm.' What is the status of the proposed enhancement? Kenneth Nagin

2 4

[libvirt] [PATCH] domain_event.c: don't deref NULL on an OOM error path
by Jim Meyering 07 Apr '10

07 Apr '10

This fixes a pair of potential segfault-inducing bugs: >From 7ca7e9cd366b17e41da9207b68de7e9166a88da2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 29 Mar 2010 17:43:01 +0200 Subject: [PATCH] domain_event.c: don't deref NULL on an OOM error path * src/conf/domain_event.c (virDomainEventGraphicsNewFromDom): Return NULL when handling out-of-memory error, rather than falling through with ev=NULL and then assigning to ev->member. (virDomainEventGraphicsNewFromObj): Likewise. --- src/conf/domain_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 41c70fc..1cf03e3 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -681,19 +681,19 @@ virDomainEventPtr virDomainEventGraphicsNewFromDom(virDomainPtr dom, { virDomainEventPtr ev = virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_GRAPHICS, dom->id, dom->name, dom->uuid); if (ev) { ev->data.graphics.phase = phase; if (!(ev->data.graphics.authScheme = strdup(authScheme))) { virDomainEventFree(ev); - ev = NULL; + return NULL; } ev->data.graphics.local = local; ev->data.graphics.remote = remote; ev->data.graphics.subject = subject; } return ev; } @@ -706,19 +706,19 @@ virDomainEventPtr virDomainEventGraphicsNewFromObj(virDomainObjPtr obj, { virDomainEventPtr ev = virDomainEventNewInternal(VIR_DOMAIN_EVENT_ID_GRAPHICS, obj->def->id, obj->def->name, obj->def->uuid); if (ev) { ev->data.graphics.phase = phase; if (!(ev->data.graphics.authScheme = strdup(authScheme))) { virDomainEventFree(ev); - ev = NULL; + return NULL; } ev->data.graphics.local = local; ev->data.graphics.remote = remote; ev->data.graphics.subject = subject; } return ev; } -- 1.7.0.3.448.g82eeb

2 2

[libvirt] [TCK PATCH] maint: use correct Red Hat copyright
by Eric Blake 07 Apr '10

07 Apr '10

* scripts/domain/050-transient-lifecycle.t: Correct the copyright line. * scripts/domain/051-transient-autostart.t: Likewise. * scripts/domain/060-persistent-lifecycle.t: Likewise. * scripts/domain/061-persistent-autostart.t: Likewise. * scripts/domain/065-persistent-redefine.t: Likewise. * scripts/domain/070-transient-to-persistent.t: Likewise. * scripts/domain/080-unique-id-define.t: Likewise. * scripts/domain/081-unique-id-create.t: Likewise. * scripts/domain/090-invalid-ops-when-inactive.t: Likewise. * scripts/domain/100-transient-save-restore.t: Likewise. * scripts/domain/101-persistent-save-restore.t: Likewise. * scripts/domain/102-broken-save-restore.t: Likewise. * scripts/domain/120-disks-stats.t: Likewise. * scripts/domain/200-disk-hotplug.t: Likewise. * scripts/domain/205-disk-hotplug-ordering.t: Likewise. * scripts/domain/210-nic-hotplug.t: Likewise. * scripts/domain/215-nic-hotplug-many.t: Likewise. * scripts/domain/240-usb-host-hotplug.t: Likewise. * scripts/domain/250-pci-host-hotplug.t: Likewise. * scripts/qemu/100-disk-encryption.t: Likewise. * scripts/storage/100-create-vol-dir.t: Likewise. * scripts/storage/200-clone-vol-dir.t: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This probably counts as trivial, but since this is my first libvirt-tck patch, I thought I'd ask first. scripts/domain/050-transient-lifecycle.t | 2 +- scripts/domain/051-transient-autostart.t | 2 +- scripts/domain/060-persistent-lifecycle.t | 2 +- scripts/domain/061-persistent-autostart.t | 2 +- scripts/domain/065-persistent-redefine.t | 2 +- scripts/domain/070-transient-to-persistent.t | 2 +- scripts/domain/080-unique-id-define.t | 2 +- scripts/domain/081-unique-id-create.t | 2 +- scripts/domain/090-invalid-ops-when-inactive.t | 2 +- scripts/domain/100-transient-save-restore.t | 2 +- scripts/domain/101-persistent-save-restore.t | 2 +- scripts/domain/102-broken-save-restore.t | 2 +- scripts/domain/120-disks-stats.t | 2 +- scripts/domain/200-disk-hotplug.t | 2 +- scripts/domain/205-disk-hotplug-ordering.t | 2 +- scripts/domain/210-nic-hotplug.t | 2 +- scripts/domain/215-nic-hotplug-many.t | 2 +- scripts/domain/240-usb-host-hotplug.t | 2 +- scripts/domain/250-pci-host-hotplug.t | 2 +- scripts/qemu/100-disk-encryption.t | 2 +- scripts/storage/100-create-vol-dir.t | 2 +- scripts/storage/200-clone-vol-dir.t | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/scripts/domain/050-transient-lifecycle.t b/scripts/domain/050-transient-lifecycle.t index 22e5c70..89c9d1a 100644 --- a/scripts/domain/050-transient-lifecycle.t +++ b/scripts/domain/050-transient-lifecycle.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/051-transient-autostart.t b/scripts/domain/051-transient-autostart.t index 9114a28..d43caa1 100644 --- a/scripts/domain/051-transient-autostart.t +++ b/scripts/domain/051-transient-autostart.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/060-persistent-lifecycle.t b/scripts/domain/060-persistent-lifecycle.t index 55bdc6c..ddffa02 100644 --- a/scripts/domain/060-persistent-lifecycle.t +++ b/scripts/domain/060-persistent-lifecycle.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/061-persistent-autostart.t b/scripts/domain/061-persistent-autostart.t index c39ec72..5200454 100644 --- a/scripts/domain/061-persistent-autostart.t +++ b/scripts/domain/061-persistent-autostart.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/065-persistent-redefine.t b/scripts/domain/065-persistent-redefine.t index 712803c..c19b292 100644 --- a/scripts/domain/065-persistent-redefine.t +++ b/scripts/domain/065-persistent-redefine.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/070-transient-to-persistent.t b/scripts/domain/070-transient-to-persistent.t index 346b329..7d85ef6 100644 --- a/scripts/domain/070-transient-to-persistent.t +++ b/scripts/domain/070-transient-to-persistent.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/080-unique-id-define.t b/scripts/domain/080-unique-id-define.t index 066c2e8..ed4a8fc 100644 --- a/scripts/domain/080-unique-id-define.t +++ b/scripts/domain/080-unique-id-define.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/081-unique-id-create.t b/scripts/domain/081-unique-id-create.t index c081674..425116f 100644 --- a/scripts/domain/081-unique-id-create.t +++ b/scripts/domain/081-unique-id-create.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/090-invalid-ops-when-inactive.t b/scripts/domain/090-invalid-ops-when-inactive.t index 28f4936..86f332b 100644 --- a/scripts/domain/090-invalid-ops-when-inactive.t +++ b/scripts/domain/090-invalid-ops-when-inactive.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/100-transient-save-restore.t b/scripts/domain/100-transient-save-restore.t index 314493c..bab42da 100644 --- a/scripts/domain/100-transient-save-restore.t +++ b/scripts/domain/100-transient-save-restore.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/101-persistent-save-restore.t b/scripts/domain/101-persistent-save-restore.t index 251aacd..f1c8d4b 100644 --- a/scripts/domain/101-persistent-save-restore.t +++ b/scripts/domain/101-persistent-save-restore.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/102-broken-save-restore.t b/scripts/domain/102-broken-save-restore.t index 2981d64..b93e274 100644 --- a/scripts/domain/102-broken-save-restore.t +++ b/scripts/domain/102-broken-save-restore.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/120-disks-stats.t b/scripts/domain/120-disks-stats.t index c8b3420..5cbaf8c 100644 --- a/scripts/domain/120-disks-stats.t +++ b/scripts/domain/120-disks-stats.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/200-disk-hotplug.t b/scripts/domain/200-disk-hotplug.t index 1272448..0f10dbf 100644 --- a/scripts/domain/200-disk-hotplug.t +++ b/scripts/domain/200-disk-hotplug.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/205-disk-hotplug-ordering.t b/scripts/domain/205-disk-hotplug-ordering.t index f41d45c..a2e3088 100644 --- a/scripts/domain/205-disk-hotplug-ordering.t +++ b/scripts/domain/205-disk-hotplug-ordering.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/210-nic-hotplug.t b/scripts/domain/210-nic-hotplug.t index 6451fd2..7521978 100644 --- a/scripts/domain/210-nic-hotplug.t +++ b/scripts/domain/210-nic-hotplug.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 48fdfcf..7465f2c 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/240-usb-host-hotplug.t b/scripts/domain/240-usb-host-hotplug.t index ac71e7b..6e74434 100644 --- a/scripts/domain/240-usb-host-hotplug.t +++ b/scripts/domain/240-usb-host-hotplug.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009-2010 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009-2010 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/domain/250-pci-host-hotplug.t b/scripts/domain/250-pci-host-hotplug.t index 5bb4fd9..a9fe422 100644 --- a/scripts/domain/250-pci-host-hotplug.t +++ b/scripts/domain/250-pci-host-hotplug.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009-2010 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009-2010 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/qemu/100-disk-encryption.t b/scripts/qemu/100-disk-encryption.t index 5964aa5..d594607 100644 --- a/scripts/qemu/100-disk-encryption.t +++ b/scripts/qemu/100-disk-encryption.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/storage/100-create-vol-dir.t b/scripts/storage/100-create-vol-dir.t index 2a09036..3a12596 100644 --- a/scripts/storage/100-create-vol-dir.t +++ b/scripts/storage/100-create-vol-dir.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify diff --git a/scripts/storage/200-clone-vol-dir.t b/scripts/storage/200-clone-vol-dir.t index dbc17c5..3b4d864 100644 --- a/scripts/storage/200-clone-vol-dir.t +++ b/scripts/storage/200-clone-vol-dir.t @@ -1,6 +1,6 @@ # -*- perl -*- # -# Copyright (C) 2009 Red Hat +# Copyright (C) 2009-2010 Red Hat, Inc. # Copyright (C) 2009 Daniel P. Berrange # # This program is free software; You can redistribute it and/or modify -- 1.6.6.1

3 5

[libvirt] [PATCH] nwfiler: fix due to non-symmetric src mac address match in iptables
by Stefan Berger 07 Apr '10

07 Apr '10

The attached patch fixes a problem due to the mac match in iptables only supporting --mac-source and no --mac-destination, thus it not being symmetric. Therefore a rule like this one <rule action='drop' direction='out'> <all match='no' srcmacaddr='$MAC'/> </rule> should only have the MAC match on traffic leaving the VM and not test for the same source MAC address on traffic that the VM receives. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 61 +++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 10 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -772,11 +772,18 @@ static int iptablesHandleSrcMacAddr(virBufferPtr buf, virNWFilterHashTablePtr vars, nwItemDescPtr srcMacAddr, - int directionIn ATTRIBUTE_UNUSED) + int directionIn, + bool *srcmacskipped) { char macaddr[VIR_MAC_STRING_BUFLEN]; + *srcmacskipped = false; if (HAS_ENTRY_ITEM(srcMacAddr)) { + if (directionIn) { + *srcmacskipped = true; + return 0; + } + if (printDataType(vars, macaddr, sizeof(macaddr), srcMacAddr)) @@ -1039,6 +1046,8 @@ _iptablesCreateRuleInstance(int directio virBuffer buf = VIR_BUFFER_INITIALIZER; const char *target; const char *iptables_cmd = (isIPv6) ? IP6TABLES_CMD : IPTABLES_CMD; + unsigned int bufUsed; + bool srcMacSkipped = false; PRINT_IPT_ROOT_CHAIN(chain, chainPrefix, ifname); @@ -1052,10 +1061,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p tcp"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.tcpHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1093,10 +1105,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p udp"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1121,10 +1136,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p udplite"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.udpliteHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1144,10 +1162,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p esp"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.espHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1167,10 +1188,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p ah"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.ahHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1190,10 +1214,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p sctp"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.sctpHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1221,10 +1248,13 @@ _iptablesCreateRuleInstance(int directio else virBufferAddLit(&buf, " -p icmpv6"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.icmpHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1272,10 +1302,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p igmp"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.igmpHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1295,10 +1328,13 @@ _iptablesCreateRuleInstance(int directio virBufferAddLit(&buf, " -p all"); + bufUsed = virBufferUse(&buf); + if (iptablesHandleSrcMacAddr(&buf, vars, &rule->p.allHdrFilter.dataSrcMACAddr, - directionIn)) + directionIn, + &srcMacSkipped)) goto err_exit; if (iptablesHandleIpHdr(&buf, @@ -1313,6 +1349,11 @@ _iptablesCreateRuleInstance(int directio return -1; } + if (srcMacSkipped && bufUsed == virBufferUse(&buf)) { + virBufferFreeAndReset(&buf); + return 0; + } + if (match) virBufferVSprintf(&buf, " %s", match);

2 2

[libvirt] qemu smbios options in domain xml format
by vincent 07 Apr '10

07 Apr '10

Still no support for the smbios arg ? any other way to pass this arg to qemu (and continue to use libvirt)? Vincent On 12/09/2009 10:47 PM, Phillip Balli wrote: Hello, I could not find any explicit mention of support for the -smbios options which are present in qemu 0.10.5+ in the domain xml format or the qemu/kvm hypervisor driver pages. Is there some way to specify commands and options which are not described in the xml config by adjusting something in the way libvirt processes the xml? Or is providing smbios options just not supported currently? No, it's currently not supported. Paolo

1 0

[libvirt] [PATCH] qemu_driver.c: don't close an arbitrary file descriptor
by Jim Meyering 07 Apr '10

07 Apr '10

clang spotted this: An early failure makes us "goto" the cleanup code that tests (and probably closes) the "logfile" fd. >From 49e46a427832681b686b712fbfbc24a312c286c1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 7 Apr 2010 09:17:27 +0200 Subject: [PATCH] qemu_driver.c: don't close an arbitrary file descriptor * src/qemu/qemu_driver.c (qemudStartVMDaemon): Initialize "logfile" to ensure that we don't use it uninitialized -- thus closing an arbitrary file descriptor -- in the cleanup block. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ce43fd3..60fa95a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3159,7 +3159,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, int pos = -1; char ebuf[1024]; char *pidfile = NULL; - int logfile; + int logfile = -1; qemuDomainObjPrivatePtr priv = vm->privateData; struct qemudHookData hookData; -- 1.7.0.4.552.gc303

2 1

[libvirt] [Fwd: Re: virsh dump blocking problem]
by Gui Jianfeng 07 Apr '10

07 Apr '10

Hi all, I think this is the right place to post the problem here. :) So I forward this mail. =========== On Tue, 06 Apr 2010 09:35:09 +0800 Gui Jianfeng <guijianfeng(a)cn.fujitsu.com> wrote: > Hi all, > > I'm not sure whether it's appropriate to post the problem here. > I played with "virsh" under Fedora 12, and started a KVM fedora12 guest > by "virsh start" command. The fedora12 guest is successfully started. > Than I run the following command to dump the guest core: > #virsh dump 1 mycoredump (domain id is 1) > > This command seemed blocking and not return. According to he strace > output, virsh dump seems that it's blocking at poll() call. I think > the following should be the call trace of virsh. > > cmdDump() > -> virDomainCoreDump() > -> remoteDomainCoreDump() > -> call() > -> remoteIO() > -> remoteIOEventLoop() > -> poll(fds, ARRAY_CARDINALITY(fds), -1) > > > Any one encounters this problem also, any thoughts? > I met and it seems qemu-kvm continues to counting the number of dirty pages and does no answer to libvirt. Guest never work and I have to kill it. I met this with 2.6.32+ qemu-0.12.3+ libvirt 0.7.7.1. When I updated the host kernel to 2.6.33, qemu-kvm never work. So, I moved back to fedora12's latest qemu-kvm. Now, 2.6.34-rc3+ qemu-0.11.0-13.fc12.x86_64 + libvirt 0.7.7.1 # virsh dump xxxx xxxx hangs. In most case, I see following 2 back trace.(with gdb) (gdb) bt #0 ram_save_remaining () at /usr/src/debug/qemu-kvm-0.11.0/vl.c:3104 #1 ram_bytes_remaining () at /usr/src/debug/qemu-kvm-0.11.0/vl.c:3112 #2 0x00000000004ab2cf in do_info_migrate (mon=0x16b7970) at migration.c:150 #3 0x0000000000414b1a in monitor_handle_command (mon=<value optimized out>, cmdline=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/monitor.c:2870 #4 0x0000000000414c6a in monitor_command_cb (mon=0x16b7970, cmdline=<value optimized out>, opaque=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/monitor.c:3160 #5 0x000000000048b71b in readline_handle_byte (rs=0x208d6a0, ch=<value optimized out>) at readline.c:369 #6 0x0000000000414cdc in monitor_read (opaque=<value optimized out>, buf=0x7fff1b1104b0 "info migrate\r", size=13) at /usr/src/debug/qemu-kvm-0.11.0/monitor.c:3146 #7 0x00000000004b2a53 in tcp_chr_read (opaque=0x1614c30) at qemu-char.c:2006 #8 0x000000000040a6c7 in main_loop_wait (timeout=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:4188 #9 0x000000000040eed5 in main_loop (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:4414 #10 main (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:6263 (gdb) bt #0 0x0000003c2680e0bd in write () at ../sysdeps/unix/syscall-template.S:82 #1 0x00000000004b304a in unix_write (fd=11, buf=<value optimized out>, len1=40) at qemu-char.c:512 #2 send_all (fd=11, buf=<value optimized out>, len1=40) at qemu-char.c:528 #3 0x0000000000411201 in monitor_flush (mon=0x16b7970) at /usr/src/debug/qemu-kvm-0.11.0/monitor.c:131 #4 0x0000000000414cdc in monitor_read (opaque=<value optimized out>, buf=0x7fff1b1104b0 "info migrate\r", size=13) at /usr/src/debug/qemu-kvm-0.11.0/monitor.c:3146 #5 0x00000000004b2a53 in tcp_chr_read (opaque=0x1614c30) at qemu-char.c:2006 #6 0x000000000040a6c7 in main_loop_wait (timeout=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:4188 #7 0x000000000040eed5 in main_loop (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:4414 #8 main (argc=<value optimized out>, argv=<value optimized out>, envp=<value optimized out>) at /usr/src/debug/qemu-kvm-0.11.0/vl.c:6263 And see no dump progress. I'm sorry if this is not a hang but just verrrrry slow. I don't see any progress at lease for 15 minutes and qemu-kvm continues to use 75% of cpus. I'm not sure why "dump" command trigger migration code... How long it takes to do "virsh dump xxx xxxx", an idle VM with 2G memory ? I'm sorry if I ask wrong mailing list. Thanks, -Kame

1 0

[libvirt] Linux-vServer Support in libvirt
by Walter Stanish 07 Apr '10

07 Apr '10

Hi libvir-list (cc: vserver list), I am another Linux-vServer user who would like to see support in libvirt. >From a very brief look back through the archives it appears that there may have been some architectural concerns re: libvirt's assumptions about what kind of network stack a virtualisation platform provides, in that Linux-vServer doesn't use a traditional approach to networking and thus may break previously valid assumptions. I found 2007 posts and a post last year (2009). Would it be possible for someone with a good overall understanding of previous integration attempts and the results thereof to summarise what issues were encountered and how difficult it would be to overcome these, so that users can understand what's going on. Thanks! - Walter

3 2

[libvirt] Release schedule ... 0.8.0 coming
by Daniel Veillard 07 Apr '10

07 Apr '10

Okay, since the snapshot API is in I suggest to start the freeze toward the 0.8.0 release. There is still 3 things I think we should look at and allow: 1/ the very large cleanup patch set from Matthias, as this should not break anything (isn't it :-) 2/ the nwfilter IP detection code, it still need a review, I didn't do it, libpcap intimidates me a bit, but I think I can be convinced. 3/ an ESX snapshot support if Matthias (or someone else !) manage to write one in the next days 2/ and 3/ sound fairly contained and about a new functionalitry in this release so the risk of breaking an existing feature is very limited. So hopefully we can ship 0.8.0 by the end of the week-end, now we need testing testing testing :-) Thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] nwfilter: Add filter schema for nwfilter XML, extend domain XML schema
by Stefan Berger 06 Apr '10

06 Apr '10

This patch adds a relaxng nwfilter schema along with a test that verifies all the test output XML against the schema. The input XMLs contain a lot of intentional out-of-range values that make them fail the schema verification, so I am not verifying against those. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Signed-off-by: Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> --- docs/schemas/Makefile.am | 3 docs/schemas/domain.rng | 31 + docs/schemas/nwfilter.rng | 783 ++++++++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 1 tests/Makefile.am | 4 tests/nwfilterschematest | 11 6 files changed, 831 insertions(+), 2 deletions(-) Index: libvirt-acl/docs/schemas/Makefile.am =================================================================== --- libvirt-acl.orig/docs/schemas/Makefile.am +++ libvirt-acl/docs/schemas/Makefile.am @@ -10,6 +10,7 @@ schema_DATA = \ storagepool.rng \ storagevol.rng \ nodedev.rng \ - capability.rng + capability.rng \ + nwfilter.rng EXTRA_DIST = $(schema_DATA) Index: libvirt-acl/libvirt.spec.in =================================================================== --- libvirt-acl.orig/libvirt.spec.in +++ libvirt-acl/libvirt.spec.in @@ -785,6 +785,7 @@ fi %{_datadir}/libvirt/schemas/interface.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storageencryption.rng +%{_datadir}/libvirt/schemas/filter.rng %{_datadir}/libvirt/cpu_map.xml Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- /dev/null +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -0,0 +1,783 @@ +<?xml version="1.0" encoding="UTF-8"?> +<grammar ns="" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"> + <start> + <ref name="filter"/> + </start> + <define name="filter"> + <element name="filter"> + <ref name="filter-node-attributes"/> + <zeroOrMore> + <choice> + <element name="filterref"> + <ref name="filterref-node-attributes"/> + </element> + <element name="uuid"> + <ref name="UUID"/> + </element> + </choice> + </zeroOrMore> + <zeroOrMore> + <element name="rule"> + <ref name="rule-node-attributes"/> + <optional> + <zeroOrMore> + <element name="mac"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="mac-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="arp"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="arp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ip"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-port-attributes"/> + <ref name="ip-attributes"/> + <ref name="dscp-attribute"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ipv6"> + <ref name="match-attribute"/> + <ref name="common-l2-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-port-attributes"/> + <ref name="ip-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="tcp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="sctp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="icmp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + <ref name="icmp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="igmp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="all"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="esp"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ah"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udplite"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ip-attributes-p1"/> + <ref name="common-ip-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="tcp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="sctp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-port-attributes"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="icmpv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + <ref name="icmp-attributes"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="all-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="esp-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="ah-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + <optional> + <zeroOrMore> + <element name="udplite-ipv6"> + <ref name="match-attribute"/> + <ref name="srcmac-attribute"/> + <ref name="common-ipv6-attributes-p1"/> + <ref name="common-ipv6-attributes-p2"/> + </element> + </zeroOrMore> + </optional> + </element> + </zeroOrMore> + </element> + </define> + +  + + <define name="filter-node-attributes"> + <attribute name="name"> + <data type="NCName"/> + </attribute> + <optional> + <attribute name="chain"> + <choice> + <value>root</value> + <value>arp</value> + <value>ipv4</value> + <value>ipv6</value> + </choice> + </attribute> + </optional> + </define> + + <define name="filterref-node-attributes"> + <attribute name="filter"> + <data type="NCName"/> + </attribute> + <optional> + <element name="parameter"> + <attribute name="name"> + <ref name="parameter-name"/> + </attribute> + <attribute name="value"> + <ref name="parameter-value"/> + </attribute> + </element> + </optional> + </define> + + <define name="rule-node-attributes"> + <attribute name="action"> + <ref name='action-type'/> + </attribute> + <attribute name="direction"> + <ref name='direction-type'/> + </attribute> + <optional> + <attribute name="priority"> + <ref name='priority-type'/> + </attribute> + </optional> + </define> + + <define name="match-attribute"> + <interleave> + <optional> + <attribute name="match"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> + </interleave> + </define> + + <define name="srcmac-attribute"> + <interleave> + <optional> + <attribute name="srcmacaddr"> + <ref name="addrMAC"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-l2-attributes"> + <interleave> + <ref name="srcmac-attribute"/> + <optional> + <attribute name="srcmacmask"> + <ref name="addrMAC"/> + </attribute> + </optional> + <optional> + <attribute name="dstmacaddr"> + <ref name="addrMAC"/> + </attribute> + </optional> + <optional> + <attribute name="dstmacmask"> + <ref name="addrMAC"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-ip-attributes-p1"> + <interleave> + <optional> + <attribute name="srcipaddr"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="srcipmask"> + <ref name="addrMask"/> + </attribute> + </optional> + <optional> + <attribute name="dstipaddr"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="dstipmask"> + <ref name="addrMask"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-ip-attributes-p2"> + <interleave> + <optional> + <attribute name="srcipfrom"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="srcipto"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="dstipfrom"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="dstipto"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="dscp"> + <ref name="sixbitrange"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-ipv6-attributes-p1"> + <interleave> + <optional> + <attribute name="srcipaddr"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="srcipmask"> + <ref name="addrMaskv6"/> + </attribute> + </optional> + <optional> + <attribute name="dstipaddr"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="dstipmask"> + <ref name="addrMaskv6"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-ipv6-attributes-p2"> + <interleave> + <optional> + <attribute name="srcipfrom"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="srcipto"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="dstipfrom"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="dstipto"> + <ref name="addrIPv6"/> + </attribute> + </optional> + <optional> + <attribute name="dscp"> + <ref name="sixbitrange"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="common-port-attributes"> + <interleave> + <optional> + <attribute name="srcportstart"> + <ref name="uint16range"/> + </attribute> + </optional> + <optional> + <attribute name="srcportend"> + <ref name="uint16range"/> + </attribute> + </optional> + <optional> + <attribute name="dstportstart"> + <ref name="uint16range"/> + </attribute> + </optional> + <optional> + <attribute name="dstportend"> + <ref name="uint16range"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="icmp-attributes"> + <interleave> + <optional> + <attribute name="type"> + <ref name="uint8range"/> + </attribute> + </optional> + <optional> + <attribute name="code"> + <ref name="uint8range"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="mac-attributes"> + <interleave> + <optional> + <attribute name="protocolid"> + <ref name="mac-protocolid"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="arp-attributes"> + <interleave> + <optional> + <attribute name="arpsrcmacaddr"> + <ref name="addrMAC"/> + </attribute> + </optional> + <optional> + <attribute name="arpsrcipaddr"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="arpdstmacaddr"> + <ref name="addrMAC"/> + </attribute> + </optional> + <optional> + <attribute name="arpdstipaddr"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="hwtype"> + <ref name="uint16range"/> + </attribute> + </optional> + <optional> + <attribute name="opcode"> + <ref name="arpOpcodeType"/> + </attribute> + </optional> + <optional> + <attribute name="protocoltype"> + <ref name="uint16range"/> + </attribute> + </optional> + </interleave> + </define> + + <define name="ip-attributes"> + <optional> + <attribute name="protocol"> + <ref name="ipProtocolType"/> + </attribute> + </optional> + </define> + + <define name="dscp-attribute"> + <optional> + <attribute name="dscp"> + <ref name="sixbitrange"/> + </attribute> + </optional> + </define> + +  + + <define name="UUID"> + <choice> + <data type="string"> + <param name="pattern">[a-fA-F0-9]{32}</param> + </data> + + <data type="string"> + <param name="pattern">[a-fA-F0-9]{8}\-([a-fA-F0-9]{4}\-){3}[a-fA-F0-9]{12}</param> + </data> + </choice> + </define> + + <define name="addrMAC"> + <choice> +  + <data type="string"> + <param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param> + </data> + + <data type="string"> + <param name="pattern">([a-fA-F0-9]{1,2}:){5}[a-fA-F0-9]{1,2}</param> + </data> + </choice> + </define> + + <define name="addrIP"> + <choice> +  + <data type="string"> + <param name="pattern">[\\$]{1}[a-zA-Z0-9_]+</param> + </data> + + <data type="string"> + <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> + </data> + </choice> + </define> + + <define name="addrIPv6"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="string"> + <param name="pattern">([a-fA-F0-9]{0,4}:){2,7}([a-fA-F0-9]*)(([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9])?</param> + </data> + </choice> + </define> + + <define name="addrMask"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">32</param> + </data> + + <data type="string"> + <param name="pattern">([0-2]?[0-9]?[0-9]\.){3}[0-2]?[0-9]?[0-9]</param> + </data> + </choice> + </define> + + <define name="addrMaskv6"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">128</param> + </data> + + <data type="string"> + <param name="pattern">([a-fA-F0-9]{0,4}:){2,7}([a-fA-F0-9]*)</param> + </data> + </choice> + </define> + + <define name="sixbitrange"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">63</param> + </data> + </choice> + </define> + + <define name="mac-protocolid"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">1536</param> + <param name="maxInclusive">65535</param> + </data> + + <choice> + <value>arp</value> + <value>ipv4</value> + <value>ipv6</value> + </choice> + </choice> + </define> + + <define name="uint8range"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + </choice> + </define> + + <define name="uint16range"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">65535</param> + </data> + </choice> + </define> + + <define name="arpOpcodeType"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">65535</param> + </data> + + <data type="string"> + <param name="pattern">([Rr]eply|[Rr]equest|[Rr]equest_[Rr]everse|[Rr]eply_[Rr]everse|DRARP_[Rr]equest|DRARP_[Rr]eply|DRARP_[Ee]rror|InARP_[Rr]equest|ARP_NAK)</param> + </data> + + </choice> + </define> + + <define name="ipProtocolType"> + <choice> +  + <data type="string"> + <param name="pattern">^[\\$]{1}[a-zA-Z0-9_]+$</param> + </data> + + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">255</param> + </data> + + <choice> + <value>tcp</value> + <value>udp</value> + <value>udplite</value> + <value>esp</value> + <value>ah</value> + <value>icmp</value> + <value>igmp</value> + <value>sctp</value> + <value>icmpv6</value> + </choice> + </choice> + </define> + + <define name="parameter-name"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_]+</param> + </data> + </define> + + <define name="parameter-value"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.:]+</param> + </data> + </define> + + <define name='action-type'> + <choice> + <value>drop</value> + <value>accept</value> + </choice> + </define> + + <define name='direction-type'> + <choice> + <value>in</value> + <value>out</value> + <value>inout</value> + </choice> + </define> + + <define name='priority-type'> + <data type="int"> + <param name="minInclusive">0</param> + <param name="maxInclusive">1000</param> + </data> + </define> +</grammar> Index: libvirt-acl/tests/Makefile.am =================================================================== --- libvirt-acl.orig/tests/Makefile.am +++ libvirt-acl/tests/Makefile.am @@ -74,6 +74,7 @@ EXTRA_DIST = \ xml2vmxdata \ nwfilterxml2xmlout \ nwfilterxml2xmlin \ + nwfilterschematest \ $(patsubst %,qemuhelpdata/%,$(qemuhelpdata)) noinst_PROGRAMS = virshtest conftest \ @@ -120,7 +121,8 @@ test_scripts = \ storagepoolschematest \ storagevolschematest \ domainschematest \ - nodedevschematest + nodedevschematest \ + nwfilterschematest if WITH_LIBVIRTD test_scripts += \ Index: libvirt-acl/tests/nwfilterschematest =================================================================== --- /dev/null +++ libvirt-acl/tests/nwfilterschematest @@ -0,0 +1,11 @@ +#!/bin/sh + +: ${srcdir=.} +. $srcdir/test-lib.sh +. $abs_srcdir/schematestutils.sh + +DIRS="nwfilterxml2xmlout" +SCHEMA="nwfilter.rng" + +check_schema "$DIRS" "$SCHEMA" + Index: libvirt-acl/docs/schemas/domain.rng =================================================================== --- libvirt-acl.orig/docs/schemas/domain.rng +++ libvirt-acl/docs/schemas/domain.rng @@ -894,6 +894,11 @@ <optional> <ref name="address"/> </optional> + <optional> + <element name="filterref"> + <ref name="filterref-node-attributes"/> + </element> + </optional> </interleave> </define> <!-- @@ -1577,6 +1582,22 @@ </element> </define> + <define name="filterref-node-attributes"> + <attribute name="filter"> + <data type="NCName"/> + </attribute> + <optional> + <element name="parameter"> + <attribute name="name"> + <ref name="parameter-name"/> + </attribute> + <attribute name="value"> + <ref name="parameter-value"/> + </attribute> + </element> + </optional> + </define> + <!-- Type library @@ -1737,4 +1758,14 @@ <param name="pattern">[a-zA-Z0-9_\.\+\-/]+</param> </data> </define> + <define name="parameter-name"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_]+</param> + </data> + </define> + <define name="parameter-value"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.:]+</param> + </data> + </define> </grammar>

2 7

[libvirt] [PATCH] Fix 'avialable' typo
by Matthias Bolte 06 Apr '10

06 Apr '10

Reported by Paul Jenner --- I just pushed this patch. src/util/util.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 28a3c7e..405c5f3 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2682,7 +2682,7 @@ char * virGetUserDirectory(uid_t uid ATTRIBUTE_UNUSED) { virUtilError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserDirectory is not avialable")); + "%s", _("virGetUserDirectory is not available")); return NULL; } @@ -2691,7 +2691,7 @@ char * virGetUserName(uid_t uid ATTRIBUTE_UNUSED) { virUtilError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserName is not avialable")); + "%s", _("virGetUserName is not available")); return NULL; } @@ -2700,7 +2700,7 @@ int virGetUserID(const char *name ATTRIBUTE_UNUSED, uid_t *uid ATTRIBUTE_UNUSED) { virUtilError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserID is not avialable")); + "%s", _("virGetUserID is not available")); return 0; } @@ -2710,7 +2710,7 @@ int virGetGroupID(const char *name ATTRIBUTE_UNUSED, gid_t *gid ATTRIBUTE_UNUSED) { virUtilError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetGroupID is not avialable")); + "%s", _("virGetGroupID is not available")); return 0; } -- 1.6.3.3

1 0

[libvirt] [PATCH] build: avoid autogen on 'make clean'
by Eric Blake 06 Apr '10

06 Apr '10

Tested by running 'git submodule foreach git pull origin master', then seeing that 'make clean' skips autogen although 'make' properly runs it. * cfg.mk (_clean_requested): New check, to speed up 'make clean' even if gnulib submodule is outdated. Suggested by Daniel P. Berrange. --- cfg.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index 70465c3..f422a53 100644 --- a/cfg.mk +++ b/cfg.mk @@ -301,7 +301,8 @@ ifeq (0,$(MAKELEVEL)) git diff .gnulib); \ stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ test "$$stamp" = "$$actual"; echo $$?) - ifeq (1,$(_update_required)) + _clean_requested = $(filter %clean,$(MAKECMDGOALS)) + ifeq (1,$(_update_required)$(_clean_requested)) $(info INFO: gnulib update required; running ./autogen.sh first) Makefile: _autogen endif -- 1.6.6.1

2 2

[libvirt] [PATCH] virterror.c: avoid erroneous case "fall-through"
by Jim Meyering 06 Apr '10

06 Apr '10

IMHO, this qualifies as an "obvious" fix, but I'll wait for an ACK. >From 0c9eb193ccb0ad507c7dd6dbfe944bb9a0c8ff93 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 6 Apr 2010 19:07:14 +0200 Subject: [PATCH] virterror.c: avoid erroneous case "fall-through" * src/util/virterror.c (virErrorMsg): Insert missing "break;" --- src/util/virterror.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index d29f95b..96dd1e7 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1,10 +1,10 @@ /* * virterror.c: implements error handling and reporting code for libvirt * - * Copy: Copyright (C) 2006, 2008, 2009 Red Hat, Inc. + * Copy: Copyright (C) 2006, 2008-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Author: Daniel Veillard <veillard(a)redhat.com> */ @@ -1147,12 +1147,13 @@ virErrorMsg(virErrorNumber error, const char *info) break; case VIR_ERR_MIGRATE_PERSIST_FAILED: if (info == NULL) errmsg = _("Failed to make domain persistent after migration"); else errmsg = _("Failed to make domain persistent after migration: %s"); + break; case VIR_ERR_HOOK_SCRIPT_FAILED: if (info == NULL) errmsg = _("Hook script execution failed"); else errmsg = _("Hook script execution failed: %s"); break; -- 1.7.0.4.552.gc303

3 3

[libvirt] [PATCH] nwfilter: Fix instantiated layer 2 rules for 'inout' direction
by Stefan Berger 06 Apr '10

06 Apr '10

The following rule for direction 'in' <rule direction='in' action='drop'> <mac srcmacaddr='1:2:3:4:5:6'/> </rule> drops all traffic from the given mac address. The following rule for direction 'out' <rule direction='out' action='drop'> <mac dstmacaddr='1:2:3:4:5:6'/> </rule> drops all traffic to the given mac address. The following rule in direction 'inout' <rule direction='inout' action='drop'> <mac srcmacaddr='1:2:3:4:5:6'/> </rule> now drops all traffic from and to the given MAC address. So far it would have dropped traffic from the given MAC address and outgoing traffic with the given MAC address, which is not useful since the packets will always have the VM's MAC address as source MAC address. The attached patch fixes this. This is the last bug I currently know of and want to fix. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 67 ++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 22 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -294,7 +294,8 @@ ebiptablesAddRuleInst(virNWFilterRuleIns static int ebtablesHandleEthHdr(virBufferPtr buf, virNWFilterHashTablePtr vars, - ethHdrDataDefPtr ethHdr) + ethHdrDataDefPtr ethHdr, + bool reverse) { char macaddr[VIR_MAC_STRING_BUFLEN]; @@ -305,7 +306,8 @@ ebtablesHandleEthHdr(virBufferPtr buf, goto err_exit; virBufferVSprintf(buf, - " -s %s %s", + " %s %s %s", + reverse ? "-d" : "-s", ENTRY_GET_NEG_SIGN(&ethHdr->dataSrcMACAddr), macaddr); @@ -328,7 +330,8 @@ ebtablesHandleEthHdr(virBufferPtr buf, goto err_exit; virBufferVSprintf(buf, - " -d %s %s", + " %s %s %s", + reverse ? "-s" : "-d", ENTRY_GET_NEG_SIGN(&ethHdr->dataDstMACAddr), macaddr); @@ -1425,6 +1428,7 @@ iptablesCreateRuleInstance(virNWFilterDe * @ifname : The name of the interface to apply the rule to * @vars : A map containing the variables to resolve * @res : The data structure to store the result(s) into + * @reverse : Whether to reverse src and dst attributes * * Convert a single rule into its representation for later instantiation * @@ -1438,7 +1442,8 @@ ebtablesCreateRuleInstance(char chainPre virNWFilterRuleDefPtr rule, const char *ifname, virNWFilterHashTablePtr vars, - virNWFilterRuleInstPtr res) + virNWFilterRuleInstPtr res, + bool reverse) { char macaddr[VIR_MAC_STRING_BUFLEN], ipaddr[INET_ADDRSTRLEN], @@ -1464,7 +1469,8 @@ ebtablesCreateRuleInstance(char chainPre if (ebtablesHandleEthHdr(&buf, vars, - &rule->p.ethHdrFilter.ethHdr)) + &rule->p.ethHdrFilter.ethHdr, + reverse)) goto err_exit; if (HAS_ENTRY_ITEM(&rule->p.ethHdrFilter.dataProtocolID)) { @@ -1487,7 +1493,8 @@ ebtablesCreateRuleInstance(char chainPre if (ebtablesHandleEthHdr(&buf, vars, - &rule->p.arpHdrFilter.ethHdr)) + &rule->p.arpHdrFilter.ethHdr, + reverse)) goto err_exit; virBufferAddLit(&buf, " -p arp"); @@ -1532,7 +1539,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --arp-ip-src %s %s", + " %s %s %s", + reverse ? "--arp-ip-dst" : "--arp-ip-src", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPSrcIPAddr), ipaddr); } @@ -1544,7 +1552,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --arp-ip-dst %s %s", + " %s %s %s", + reverse ? "--arp-ip-src" : "--arp-ip-dst", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPDstIPAddr), ipaddr); } @@ -1556,7 +1565,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --arp-mac-src %s %s", + " %s %s %s", + reverse ? "--arp-mac-dst" : "--arp-mac-src", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPSrcMACAddr), macaddr); } @@ -1568,7 +1578,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --arp-mac-dst %s %s", + " %s %s %s", + reverse ? "--arp-mac-src" : "--arp-mac-dst", ENTRY_GET_NEG_SIGN(&rule->p.arpHdrFilter.dataARPDstMACAddr), macaddr); } @@ -1581,7 +1592,8 @@ ebtablesCreateRuleInstance(char chainPre if (ebtablesHandleEthHdr(&buf, vars, - &rule->p.ipHdrFilter.ethHdr)) + &rule->p.ipHdrFilter.ethHdr, + reverse)) goto err_exit; virBufferAddLit(&buf, @@ -1594,7 +1606,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip-source %s %s", + " %s %s %s", + reverse ? "--ip-destination" : "--ip-source", ENTRY_GET_NEG_SIGN(&rule->p.ipHdrFilter.ipHdr.dataSrcIPAddr), ipaddr); @@ -1617,7 +1630,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip-destination %s %s", + " %s %s %s", + reverse ? "--ip-source" : "--ip-destination", ENTRY_GET_NEG_SIGN(&rule->p.ipHdrFilter.ipHdr.dataDstIPAddr), ipaddr); @@ -1652,7 +1666,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip-source-port %s %s", + " %s %s %s", + reverse ? "--ip-destination-port" : "--ip-source-port", ENTRY_GET_NEG_SIGN(&rule->p.ipHdrFilter.portData.dataSrcPortStart), number); @@ -1676,7 +1691,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip-destination-port %s %s", + " %s %s %s", + reverse ? "--ip-source-port" : "--ip-destination-port", ENTRY_GET_NEG_SIGN(&rule->p.ipHdrFilter.portData.dataDstPortStart), number); @@ -1712,7 +1728,8 @@ ebtablesCreateRuleInstance(char chainPre if (ebtablesHandleEthHdr(&buf, vars, - &rule->p.ipv6HdrFilter.ethHdr)) + &rule->p.ipv6HdrFilter.ethHdr, + reverse)) goto err_exit; virBufferAddLit(&buf, @@ -1725,7 +1742,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip6-source %s %s", + " %s %s %s", + reverse ? "--ip6-destination" : "--ip6-source", ENTRY_GET_NEG_SIGN(&rule->p.ipv6HdrFilter.ipHdr.dataSrcIPAddr), ipv6addr); @@ -1748,7 +1766,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip6-destination %s %s", + " %s %s %s", + reverse ? "--ip6-source" : "--ip6-destination", ENTRY_GET_NEG_SIGN(&rule->p.ipv6HdrFilter.ipHdr.dataDstIPAddr), ipv6addr); @@ -1783,7 +1802,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip6-source-port %s %s", + " %s %s %s", + (!reverse) ? "--ip6-source-port" : "--ip6-destination-port", ENTRY_GET_NEG_SIGN(&rule->p.ipv6HdrFilter.portData.dataSrcPortStart), number); @@ -1807,7 +1827,8 @@ ebtablesCreateRuleInstance(char chainPre goto err_exit; virBufferVSprintf(&buf, - " --ip6-destination-port %s %s", + " %s %s %s", + reverse ? "--ip6-source-port" : "--ip6-destination-port", ENTRY_GET_NEG_SIGN(&rule->p.ipv6HdrFilter.portData.dataDstPortStart), number); @@ -1900,7 +1921,8 @@ ebiptablesCreateRuleInstance(virConnectP rule, ifname, vars, - res); + res, + rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT); if (rc) return rc; } @@ -1912,7 +1934,8 @@ ebiptablesCreateRuleInstance(virConnectP rule, ifname, vars, - res); + res, + 0); } break;

2 2

[libvirt] [PATCH] virsh: improve documentation
by Eric Blake 06 Apr '10

06 Apr '10

Document several missing commands. There's more work that could be done, but incremental improvements is better than no patch at all. * tools/virsh.pod (autostart, connect): Improve grammar. (create): Improve example. (domjobabort, domjobinfo, domxml-from-native, domxml-to-native): Document. (storage pool commands): New section. --- tools/virsh.pod | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 154 insertions(+), 13 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 62395d7..fdf687f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -103,10 +103,12 @@ Will print the current directory. =item B<connect> I<URI> optional I<--readonly> -(Re)-Connect to the hypervisor. This is a build-in command after shell -start up, and usually get an I<URI> parameter specifying how to connect -to the hypervisor. The documentation page at L<http://libvirt.org/uri.html> -list the values supported but the most common are: +(Re)-Connect to the hypervisor. When the shell is first started, this +is automatically run with the I<URI> parameter requested by the C<-c> +option on the command line. The I<URI> parameter specifies how to +connect to the hypervisor. The documentation page at +L<http://libvirt.org/uri.html> list the values supported, but the most +common are: =over 4 @@ -116,11 +118,11 @@ this is used to connect to the local Xen hypervisor, this is the default =item qemu:///system -allow to connect locally as root to the daemon supervising QEmu and KVM domains +connect locally as root to the daemon supervising QEmu and KVM domains =item qemu:///session -allow to connect locally as a normal user to his own set of QEmu and KVM domains +connect locally as a normal user to his own set of QEmu and KVM domains =item lxc:/// @@ -252,7 +254,7 @@ I<domain-id> can be specified as an short integer, a name or a full UUID. Configure a domain to be automatically started at boot. -The option I<--disable> disable autostarting. +The option I<--disable> disables autostarting. =item B<console> I<domain-id> @@ -260,11 +262,15 @@ Connect the virtual serial console for the guest. =item B<create> I<FILE> -Create a domain from an XML <file>. An easy way to create the XML <file> is to use the B<dumpxml> command to obtain the definition of a pre-existing guest. +Create a domain from an XML <file>. An easy way to create the XML +<file> is to use the B<dumpxml> command to obtain the definition of a +pre-existing guest. B<Example> -virsh dumpxml <domain-id> > file. +virsh dumpxml <domain-id> > +edit file +virsh create < file =item B<define> I<FILE> @@ -306,6 +312,14 @@ Convert a domain name (or UUID) to a domain id Returns basic information about the domain. +=item B<domjobabort I<domain-id-or-uuid> + +Abort the currently running domain job. + +=item B<domjobinfo> I<domain-id-or-uuid> + +Returns information about jobs running on a domain. + =item B<domname> I<domain-id-or-uuid> Convert a domain Id (or UUID) to domain name @@ -314,13 +328,24 @@ Convert a domain Id (or UUID) to domain name Returns state about a running domain. +=item B<domxml-from-native> I<format> I<config> + +Convert the file I<config> in the native guest configuration format +named by I<format> to a domain XML format. + +=item B<domxml-to-native> I<format> I<xml> + +Convert the file I<xml> in domain XML format to the native guest +configuration format named by I<format>. + =item B<dump> I<domain-id> I<corefilepath> Dumps the core of a domain to a file for analysis. =item B<dumpxml> I<domain-id> -Output the domain information as an XML dump to stdout, this format can be used by the B<create> command. +Output the domain information as an XML dump to stdout, this format +can be used by the B<create> command. =item B<edit> I<domain-id> @@ -566,7 +591,7 @@ Edit the XML configuration file for a network. This is equivalent to: virsh net-dumpxml network > network.xml edit network.xml - virsh define network.xml + virsh net-define network.xml except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment @@ -596,6 +621,122 @@ Convert a network name to network UUID. =back +=head1 STORAGE POOL COMMANDS + +The following commands manipulate storage pools. Libvirt has the +capability to manage various storage solutions, including files, raw +partitions, and domain-specific formats, used to provide the storage +volumes visible as devices within virtual machines. For more detailed +information about this feature, see the documentation at +L<http://libvirt.org/formatstorage.html> . A lot of the commands for +pools are similar to the ones used for domains. + +=over 4 + +=item B<find-storage-pool-sources> I<type> optional I<srcSpec> + +Returns XML describing all storage pools of a given I<type> that could +be found. If I<srcSpec> is provided, it is a file that contains XML +to further restrict the query for pools. + +=item B<find-storage-pool-sources> I<type> optional I<host> I<port> + +Returns XML describing all storage pools of a given I<type> that could +be found. If I<host> and I<port> are provided, they control where the +query is performed. + +=item B<pool-autostart> I<pool-or-uuid> optional I<--disable> + +Configure whether I<pool> should automatically start at boot. + +=item B<pool-build> I<pool-or-uuid> + +Build a given pool. + +=item B<pool-create> I<file> + +Create and start a pool object from the XML I<file>. + +=item B<pool-create-as> I<name> I<--print-xml> I<type> optional I<source-host> +I<source-path> I<source-dev> I<source-name> <target> + +Create and start a pool object I<name> from the raw parameters. If +I<--print-xml> is specified, then print the XML of the pool object +without creating the pool. Otherwise, the pool has the specified +I<type>. + +=item B<pool-define> I<file> + +Create, but do not start, a pool object from the XML I<file>. + +=item B<pool-define-as> I<name> I<--print-xml> I<type> optional I<source-host> +I<source-path> I<source-dev> I<source-name> <target> + +Create, but do not start, a pool object I<name> from the raw parameters. If +I<--print-xml> is specified, then print the XML of the pool object +without defining the pool. Otherwise, the pool has the specified +I<type>. + +=item B<pool-destroy> I<pool-or-uuid> + +Destroy a given I<pool> object. Libvirt will no longer manage the +storage described by the pool object, but the raw data contained in +the pool is not changed, and can be later recovered with +B<pool-create>. + +=item B<pool-delete> I<pool-or-uuid> + +Destroy the resources used by a given I<pool> object. This operation +is non-recoverable. The I<pool> object will still exist after this +command. + +=item B<pool-dumpxml> I<pool-or-uuid> + +Returns the XML information about the I<pool> object. + +=item B<pool-edit> I<pool-or-uuid> + +Edit the XML configuration file for a storage pool. + +This is equivalent to: + virsh pool-dumpxml pool > pool.xml + edit pool.xml + virsh pool-define pool.xml +except that it does some error checking. + +The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment +variables, and defaults to C<vi>. + +=item B<pool-info> I<pool-or-uuid> + +Returns basic information about the I<pool> object. + +=item B<pool-list> optional I<--inactive> I<--all> + +List pool objects known to libvirt. By default, only pools in use by +active domains are listed; I<--inactive> lists just the inactive +pools, and I<--all> lists all pools. + +=item B<pool-name> I<uuid> + +Convert the I<uuid> to a pool name. + +=item B<pool-refresh> I<pool-or-uuid> + +Refresh the list of volumes contained in I<pool>. + +=item B<pool-start> I<pool-or-uuid> + +Start the storage I<pool>, which is previously defined but inactive. + +=item B<pool-undefine> I<pool-or-uuid> + +Undefine the configuration for an inactive I<pool>. + +=item B<pool-uuid> I<pool> + +Returns the UUID of the named I<pool>. + =head1 SECRET COMMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases and @@ -653,11 +794,11 @@ format as accepted by the B<connect> option. =item VISUAL -The editor to use by the B<edit> and B<net-edit> options. +The editor to use by the B<edit> and related options. =item EDITOR -The editor to use by the B<edit> and B<net-edit> options, if C<VISUAL> +The editor to use by the B<edit> and related options, if C<VISUAL> is not set. =item LIBVIRT_DEBUG=LEVEL -- 1.6.6.1

2 2

[libvirt] [PATCH] Clarify an error message in setmem.
by Chris Lalancette 06 Apr '10

06 Apr '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ad64bc0..d241fa0 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2407,7 +2407,8 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) if (kilobytes > info.maxMem) { virDomainFree(dom); - vshError(ctl, _("Invalid value of %d for memory size"), kilobytes); + vshError(ctl, _("Requested memory size %d kb is larger than maximum of %lu kb"), + kilobytes, info.maxMem); return FALSE; } -- 1.6.6.1

2 2

[libvirt] [PATCH] Fix up comments for isEncrypted, isSecure, domainIsActive, and domainIsPersistent.
by Chris Lalancette 06 Apr '10

06 Apr '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/lxc/lxc_driver.c | 8 ++++---- src/opennebula/one_driver.c | 4 ++-- src/phyp/phyp_driver.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- src/uml/uml_driver.c | 8 ++++---- src/vbox/vbox_tmpl.c | 8 ++++---- src/xen/xen_driver.c | 8 ++++---- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b5d422c..c6b652d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2527,10 +2527,10 @@ static virDriver lxcDriver = { NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReset */ NULL, /* domainMigratePrepareTunnel */ - lxcIsEncrypted, - lxcIsSecure, - lxcDomainIsActive, - lxcDomainIsPersistent, + lxcIsEncrypted, /* isEncrypted */ + lxcIsSecure, /* isSecure */ + lxcDomainIsActive, /* domainIsActive */ + lxcDomainIsPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 4554d95..0d80d1f 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -781,8 +781,8 @@ static virDriver oneDriver = { NULL, /* nodeDeviceReAttach; */ NULL, /* nodeDeviceReset; */ NULL, /* domainMigratePrepareTunnel */ - oneIsEncrypted, - oneIsSecure, + oneIsEncrypted, /* isEncrypted */ + oneIsSecure, /* isSecure */ NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ NULL, /* cpuCompare */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 28e17ff..b712d0a 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1640,8 +1640,8 @@ virDriver phypDriver = { NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReset */ NULL, /* domainMigratePrepareTunnel */ - phypIsEncrypted, - phypIsSecure, + phypIsEncrypted, /* isEncrypted */ + phypIsSecure, /* isSecure */ NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ NULL, /* cpuCompare */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a87b974..bc94ce6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11325,10 +11325,10 @@ static virDriver qemuDriver = { qemudNodeDeviceReAttach, /* nodeDeviceReAttach */ qemudNodeDeviceReset, /* nodeDeviceReset */ qemudDomainMigratePrepareTunnel, /* domainMigratePrepareTunnel */ - qemuIsEncrypted, - qemuIsSecure, - qemuDomainIsActive, - qemuDomainIsPersistent, + qemuIsEncrypted, /* isEncrypted */ + qemuIsSecure, /* isSecure */ + qemuDomainIsActive, /* domainIsActive */ + qemuDomainIsPersistent, /* domainIsPersistent */ qemuCPUCompare, /* cpuCompare */ qemuCPUBaseline, /* cpuBaseline */ qemuDomainGetJobInfo, /* domainGetJobInfo */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index dfa5de5..0179b2e 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1926,10 +1926,10 @@ static virDriver umlDriver = { NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReset */ NULL, /* domainMigratePrepareTunnel */ - umlIsEncrypted, - umlIsSecure, - umlDomainIsActive, - umlDomainIsPersistent, + umlIsEncrypted, /* isEncrypted */ + umlIsSecure, /* isSecure */ + umlDomainIsActive, /* domainIsActive */ + umlDomainIsPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 62fd8e1..4b00a80 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8138,10 +8138,10 @@ virDriver NAME(Driver) = { NULL, /* nodeDeviceReAttach */ NULL, /* nodeDeviceReset */ NULL, /* domainMigratePrepareTunnel */ - vboxIsEncrypted, - vboxIsSecure, - vboxDomainIsActive, - vboxDomainIsPersistent, + vboxIsEncrypted, /* isEncrypted */ + vboxIsSecure, /* isSecure */ + vboxDomainIsActive, /* domainIsActive */ + vboxDomainIsPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 7c4eb5e..0835406 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1969,10 +1969,10 @@ static virDriver xenUnifiedDriver = { xenUnifiedNodeDeviceReAttach, /* nodeDeviceReAttach */ xenUnifiedNodeDeviceReset, /* nodeDeviceReset */ NULL, /* domainMigratePrepareTunnel */ - xenUnifiedIsEncrypted, - xenUnifiedIsSecure, - xenUnifiedDomainIsActive, - xenUnifiedDomainisPersistent, + xenUnifiedIsEncrypted, /* isEncrypted */ + xenUnifiedIsSecure, /* isSecure */ + xenUnifiedDomainIsActive, /* domainIsActive */ + xenUnifiedDomainisPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ NULL, /* cpuBaseline */ NULL, /* domainGetJobInfo */ -- 1.6.6.1

2 2

[libvirt] [PATCH] Document snapshot virsh commands in the man page.
by Chris Lalancette 06 Apr '10

06 Apr '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tools/virsh.pod | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 62395d7..9e2c3e5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -639,6 +639,55 @@ Output a list of UUIDs of known secrets to stdout. =back +=head1 SNAPSHOT COMMMANDS + +The following commands manipulate domain snapshots. Snapshots take the +disk, memory, and device state of a domain at a point-of-time, and save it +for future use. They have many uses, from saving a "clean" copy of an OS +image to saving a domain's state before a potentially destructive operation. +Snapshots are identified with a unique name. See +L<http://libvirt.org/formatsnapshot.html> for documentation of the XML format +used to represent properties of snapshots. + +=over 4 + +=item B<snapshot-create> I<domain> I<xmlfile> + +Create a snapshot for domain I<domain> with the properties specified in +I<xmlfile>. The only properties settable for a domain snapshot are the +<name> and <description>; the rest of the fields are ignored, and +automatically filled in by libvirt. If I<xmlfile> is completely ommitted, +then libvirt will choose a value for all fields. + +=item B<snapshot-current> I<domain> + +Output the snapshot XML for the domain's current snapshot (if any). + +=item B<snapshot-list> I<domain> + +List all of the available snapshots for the given domain. + +=item B<snapshot-dumpxml> I<domain> I<snapshot> + +Output the snapshot XML for the domain's snapshot named I<snapshot>. + +=item B<revert-to-snapshot> I<domain> I<snapshot> + +Revert the given domain to the snapshot specified by I<snapshot>. Be aware +that this is a destructive action; any changes in the domain since the +snapshot is taken will be lost. Also note that the state of the domain after +revert-to-snapshot is complete will be the state of the domain at the time +the original snapshot was taken. + +=item B<snapshot-delete> I<domain> I<snapshot> I<--children> + +Delete the snapshot for the domain named I<snapshot>. If this snapshot +has child snapshots, changes from this snapshot will be merged into the +children. If I<--children> is passed, then delete this snapshot and any +children of this snapshot. + +=back + =head1 ENVIRONMENT The following environment variables can be set to alter the behaviour -- 1.6.6.1

2 2