- Devel - libvirt List Archives

[libvirt] [PATCH] build: Distribute more files
by Jiri Denemark 13 Dec '12

13 Dec '12

--- src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 2791cb6..33b4ab0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,6 +367,7 @@ check-symfile: endif check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl $(USED_SYM_FILES) +EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ $(srcdir)/remote_protocol-structs \ @@ -389,7 +390,7 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif -EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl +EXTRA_DIST += $(PROTOCOL_STRUCTS) check-local: check-protocol check-symfile check-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) @@ -1575,6 +1576,9 @@ lockd_la_SOURCES = \ lockd_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) lockd_la_LDFLAGS = -module -avoid-version lockd_la_LIBADD = ../gnulib/lib/libgnu.la libvirt-net-rpc.la libvirt-net-rpc-client.la +augeas_DATA += locking/libvirt_lockd.aug +augeastest_DATA += test_libvirt_lockd.aug +CLEANFILES += test_libvirt_lockd.aug if WITH_DTRACE_PROBES lockd_la_LIBADD += libvirt_probes.lo endif @@ -1620,7 +1624,10 @@ EXTRA_DIST += $(LOCK_DAEMON_SOURCES) \ $(LOCK_DRIVER_LOCKD_SOURCES) endif -EXTRA_DIST += locking/virtlockd.sysconf +EXTRA_DIST += locking/virtlockd.sysconf \ + locking/lockd.conf \ + locking/libvirt_lockd.aug \ + locking/test_libvirt_lockd.aug.in install-sysconfig: mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig -- 1.8.0.2

1 1

[libvirt] [PATCH v2] Fix error reporting when fetching SCSI/LVM keys
by Daniel P. Berrange 13 Dec '12

13 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The current virStorageFileGet{LVM,SCSI}Key methods return the key as the return value. Unfortunately it is desirable for "NULL" to be a valid return value, as well as an error indicator. Thus the returned key must instead be provided as an out-parameter. When we invoke lvs or scsi_id to extract ID for block devices, we don't want virCommandWait logging errors messages. Thus we must explicitly check 'status != 0', rather than letting virCommandWait do it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/storage_file.c | 74 ++++++++++++++++++++++++++++++++----------------- src/util/storage_file.h | 6 ++-- 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 17a47cf..fe7e8b8 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -1192,62 +1192,75 @@ int virStorageFileIsClusterFS(const char *path) } #ifdef LVS -char *virStorageFileGetLVMKey(const char *path) +int virStorageFileGetLVMKey(const char *path, + char **key) { /* * # lvs --noheadings --unbuffered --nosuffix --options "uuid" LVNAME * 06UgP5-2rhb-w3Bo-3mdR-WeoL-pytO-SAa2ky */ - char *key = NULL; + int status; virCommandPtr cmd = virCommandNewArgList( LVS, "--noheadings", "--unbuffered", "--nosuffix", "--options", "uuid", path, NULL ); + int ret = -1; + + *key = NULL; /* Run the program and capture its output */ - virCommandSetOutputBuffer(cmd, &key); - if (virCommandRun(cmd, NULL) < 0) + virCommandSetOutputBuffer(cmd, key); + if (virCommandRun(cmd, &status) < 0) goto cleanup; - if (key) { + /* Explicitly check status == 0, rather than passing NULL + * to virCommandRun because we don't want to raise an actual + * error in this scenario, just return a NULL key. + */ + + if (status == 0 && *key) { char *nl; - char *tmp = key; + char *tmp = *key; /* Find first non-space character */ while (*tmp && c_isspace(*tmp)) { tmp++; } /* Kill leading spaces */ - if (tmp != key) - memmove(key, tmp, strlen(tmp)+1); + if (tmp != *key) + memmove(*key, tmp, strlen(tmp)+1); /* Kill trailing newline */ - if ((nl = strchr(key, '\n'))) + if ((nl = strchr(*key, '\n'))) *nl = '\0'; } - if (key && STREQ(key, "")) - VIR_FREE(key); + ret = 0; cleanup: + if (*key && STREQ(*key, "")) + VIR_FREE(*key); + virCommandFree(cmd); - return key; + return ret; } #else -char *virStorageFileGetLVMKey(const char *path) +int virStorageFileGetLVMKey(const char *path, + char **key) { virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path); - return NULL; + return -1; } #endif #ifdef HAVE_UDEV -char *virStorageFileGetSCSIKey(const char *path) +int virStorageFileGetSCSIKey(const char *path, + char **key) { - char *key = NULL; + int status; virCommandPtr cmd = virCommandNewArgList( "/lib/udev/scsi_id", "--replace-whitespace", @@ -1255,30 +1268,41 @@ char *virStorageFileGetSCSIKey(const char *path) "--device", path, NULL ); + int ret = -1; + + *key = NULL; /* Run the program and capture its output */ - virCommandSetOutputBuffer(cmd, &key); - if (virCommandRun(cmd, NULL) < 0) + virCommandSetOutputBuffer(cmd, key); + if (virCommandRun(cmd, &status) < 0) goto cleanup; - if (key && STRNEQ(key, "")) { - char *nl = strchr(key, '\n'); + /* Explicitly check status == 0, rather than passing NULL + * to virCommandRun because we don't want to raise an actual + * error in this scenario, just return a NULL key. + */ + if (status == 0 && *key) { + char *nl = strchr(*key, '\n'); if (nl) *nl = '\0'; - } else { - VIR_FREE(key); } + ret = 0; + cleanup: + if (*key && STREQ(*key, "")) + VIR_FREE(*key); + virCommandFree(cmd); - return key; + return ret; } #else -char *virStorageFileGetSCSIKey(const char *path) +int virStorageFileGetSCSIKey(const char *path, + char **key) { virReportSystemError(ENOSYS, _("Unable to get SCSI key for %s"), path); - return NULL; + return -1; } #endif diff --git a/src/util/storage_file.h b/src/util/storage_file.h index 9e4516e..6fbd275 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -101,7 +101,9 @@ int virStorageFileIsClusterFS(const char *path); int virStorageFileIsSharedFSType(const char *path, int fstypes); -char *virStorageFileGetLVMKey(const char *path); -char *virStorageFileGetSCSIKey(const char *path); +int virStorageFileGetLVMKey(const char *path, + char **key); +int virStorageFileGetSCSIKey(const char *path, + char **key); #endif /* __VIR_STORAGE_FILE_H__ */ -- 1.7.11.7

2 1

[libvirt] [PATCH] conf: Remove duplicate declaration of virNetworkDNSDefPtr
by Jiri Denemark 13 Dec '12

13 Dec '12

--- Pushed as trivial build-breaker. src/conf/network_conf.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 49fc0ca..8adc2a4 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -106,24 +106,22 @@ struct _virNetworkDNSHostDef { typedef struct _virNetworkDNSDef virNetworkDNSDef; typedef virNetworkDNSDef *virNetworkDNSDefPtr; struct _virNetworkDNSDef { size_t ntxts; virNetworkDNSTxtDefPtr txts; size_t nhosts; virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; }; -typedef struct _virNetworkDNSDef *virNetworkDNSDefPtr; - typedef struct _virNetworkIpDef virNetworkIpDef; typedef virNetworkIpDef *virNetworkIpDefPtr; struct _virNetworkIpDef { char *family; /* ipv4 or ipv6 - default is ipv4 */ virSocketAddr address; /* Bridge IP address */ /* One or the other of the following two will be used for a given * IP address, but never both. The parser guarantees this. * Use virNetworkIpDefPrefix/virNetworkIpDefNetmask rather * than accessing the data directly - these utility functions * will convert one into the other as necessary. -- 1.8.0

2 1

[libvirt] [PATCH 0/2] virsh: catch disconnections for non-default connections too
by Ján Tomko 13 Dec '12

13 Dec '12

Right now virsh says 'Failed to reconnect to the hypervisor' even for the first connection to the default URI and it fails to catch disconnections for connections to the non-default URI. Ján Tomko (2): virsh: don't lie about reconnection in vshReconnect virsh: use vshReconnect for non-default connections too tools/virsh.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) -- 1.7.8.6

2 4

[libvirt] [PATCH] Support network boot for HVM guests in libxl
by Jim Fehlig 13 Dec '12

13 Dec '12

The libxl driver ignored boot devices in the domain config, preventing PXE booting HVM domains. This patch accounts for user-specified boot devices when building the libxl domain configuration. --- I'm inclined to call this a bug fix since it is not possible to network boot HVM guests without this patch. Would it be ok to push this for 1.0.1? src/libxl/libxl_conf.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 5b6d6fb..4c0e961 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -438,6 +438,8 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) b_info->max_memkb = def->mem.max_balloon; b_info->target_memkb = def->mem.cur_balloon; if (hvm) { + char bootorder[VIR_DOMAIN_BOOT_LAST+1]; + libxl_defbool_set(&b_info->u.hvm.pae, def->features & (1 << VIR_DOMAIN_FEATURE_PAE)); libxl_defbool_set(&b_info->u.hvm.apic, @@ -450,6 +452,34 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, libxl_domain_config *d_config) libxl_defbool_set(&b_info->u.hvm.hpet, 1); } } + for (i = 0 ; i < def->os.nBootDevs ; i++) { + switch (def->os.bootDevs[i]) { + case VIR_DOMAIN_BOOT_FLOPPY: + bootorder[i] = 'a'; + break; + default: + case VIR_DOMAIN_BOOT_DISK: + bootorder[i] = 'c'; + break; + case VIR_DOMAIN_BOOT_CDROM: + bootorder[i] = 'd'; + break; + case VIR_DOMAIN_BOOT_NET: + bootorder[i] = 'n'; + break; + } + } + if (def->os.nBootDevs == 0) { + bootorder[0] = 'c'; + bootorder[1] = '\0'; + } + else { + bootorder[def->os.nBootDevs] = '\0'; + } + if ((b_info->u.hvm.boot = strdup(bootorder)) == NULL) { + virReportOOMError(); + goto error; + } /* * The following comment and calculation were taken directly from -- 1.8.0.1

2 2

[libvirt] [PATCH 00/14 v4] Implement virtlockd daemon
by Daniel P. Berrange 13 Dec '12

13 Dec '12

This is an update of https://www.redhat.com/archives/libvir-list/2012-September/msg00816.html This series was previously fully acked, but before pushing I noticed some problems and stopped. Since then I've done quite a few more changes to rebase to latest GIT & follow new best practice. I've also added support for a config file for the lockd plugin and the ability to use custom lockspaces for LVM and SCSI IDs. I've also added support to acquire leases based on a SHA256 sum of the file, instead of directly on the file As such I don't feel comfortable pushing, without further reviews. While we're past the freeze date, I'd like to request an exception, for all except the 14th patch. Without the 14th patch, this series has minimal impact on existing code that is used in libvirt so little regression possibility. Further I discovered yesterday that we already have people using this code as custom add-on patches, so I'd like to help them by including it in 1.0.1 .gitignore | 5 bootstrap.conf | 1 cfg.mk | 9 libvirt.spec.in | 16 po/POTFILES.in | 4 run.in | 2 src/Makefile.am | 214 ++++- src/internal.h | 22 src/libvirt_private.syms | 2 src/locking/libvirt_lockd.aug | 33 src/locking/lock_daemon.c | 1441 ++++++++++++++++++++++++++++++++++ src/locking/lock_daemon.h | 56 + src/locking/lock_daemon_config.c | 193 ++++ src/locking/lock_daemon_config.h | 50 + src/locking/lock_daemon_dispatch.c | 434 ++++++++++ src/locking/lock_daemon_dispatch.h | 31 src/locking/lock_driver_lockd.c | 834 +++++++++++++++++++ src/locking/lock_manager.c | 20 src/locking/lock_manager.h | 3 src/locking/lock_protocol.x | 95 ++ src/locking/lockd.conf | 68 + src/locking/test_libvirt_lockd.aug.in | 7 src/locking/virtlockd.init.in | 93 ++ src/locking/virtlockd.service.in | 13 src/locking/virtlockd.socket.in | 8 src/locking/virtlockd.sysconf | 3 src/qemu/qemu.conf | 17 src/qemu/qemu_conf.c | 12 src/qemu/qemu_conf.h | 3 src/qemu/qemu_driver.c | 24 src/qemu/test_libvirtd_qemu.aug.in | 2 src/util/storage_file.c | 30 src/util/storage_file.h | 4 33 files changed, 3697 insertions(+), 52 deletions(-)

4 41

[libvirt] Fix handling of QED file format
by Daniel P. Berrange 13 Dec '12

13 Dec '12

Libvirt mis-detected the QED file format as raw

2 8

[libvirt] [PATCH] Change virCgroupGetAppRoot stub on non-Linux to avoid unused param warning
by Daniel P. Berrange 13 Dec '12

13 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Fully stub out the virCgroupGetAppRoot method as done with other methods in the file, rather than just the body. This lets us annotate the unused parameter to avoid a warning Pushed as a Win32 build breaker fix --- src/util/cgroup.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index f867fb7..8f3b8b7 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -974,14 +974,17 @@ int virCgroupForDriver(const char *name ATTRIBUTE_UNUSED, * * Returns 0 on success */ +#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R int virCgroupGetAppRoot(virCgroupPtr *group) { -#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R return virCgroupNew("/", group); +} #else +int virCgroupGetAppRoot(virCgroupPtr *group ATTRIBUTE_UNUSED) +{ return -ENXIO; -#endif } +#endif /** * virCgroupForDomain: -- 1.7.11.7

1 0

[libvirt] [PATCH 00/12 v6] Unprivleged SG_IO support
by Osier Yang 13 Dec '12

13 Dec '12

As a result of RFC [1], this implements the unprivleged SG_IO support. v4 - v5: * Per discussion in [2], this set uses a hash table to store the shared disk's info. See 1/12 for more details. Osier Yang (12): qemu: Add a hash table for the shared disks docs: Add docs and rng schema for new XML cdbfilter conf: Parse and format the new XML tag cdbfilter util: Prepare helpers for unpriv_sgio setting qemu: Manage disk's unpriv_sgio in domain lifecyle qemu: Do not restore the sysfs unpriv_sgio if the disk is being shared qemu: Error out when domain starting if the cdbfilter setting conflicts qemu: Set unpriv_sgio when attaching disk qemu: Restore unpriv_sgio when detaching disk qemu: Error out if the shared disk conf conflicts with others when attaching qemu: Do not restore unpriv_sgio when detaching disk if it's still shared conf: Save disk's original unpriv_sgio state into status XML docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 52 +++++-- src/conf/domain_conf.c | 93 ++++++++++--- src/conf/domain_conf.h | 11 ++ src/libvirt_private.syms | 4 + src/qemu/qemu_conf.c | 60 ++++++++ src/qemu/qemu_conf.h | 22 +++ src/qemu/qemu_driver.c | 72 ++++++++++ src/qemu/qemu_process.c | 104 ++++++++++++++- src/qemu/qemu_process.h | 3 + src/util/util.c | 145 ++++++++++++++++++++ src/util/util.h | 8 + ...ml2argv-disk-scsi-lun-passthrough-cdbfilter.xml | 32 +++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 585 insertions(+), 35 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-cdbfilter.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00988.html [2] https://www.redhat.com/archives/libvir-list/2012-December/msg00325.html Regards, Osier

3 26

[libvirt] [PATCH v1 rebase 0/6] disable cgroup cpuset
by Hu Tao 13 Dec '12

13 Dec '12

This is merely a rebased version, so still tagged with v1. The reason to disable cgroup cpuset by default is: currently, sub-directories of cgroup cpuset won't be auto-updated if cpu hot-plug happens. For example, if we now have 0-3,5-7 pcpus online, the value of /sys/fs/cgroup/cpuset/libvirt/qemu/mydom/cpuset.cpus is 0-3,5-7, then pcpu 4 is hot-plugged, but the value of cpuset.cpus is still 0-3,5-7. This will cause a problem that we can't pin to a hot-plugged pcpu. Users can still enable cpuset by editing qemu.conf. Hu Tao (6): cgroup: Add a flag VIR_CGROUP_DISABLE_CPUSET create cgroup controllers for driver according to config create cgroup controllers for domain according to config create cgroup controllers for vcpu according to config create cgroup controllers for emulator according to config disable cgroup cpuset by default src/lxc/lxc_cgroup.c | 4 +- src/lxc/lxc_driver.c | 22 +++++------ src/lxc/lxc_process.c | 4 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 15 ++++---- src/qemu/qemu_conf.c | 1 - src/qemu/qemu_driver.c | 93 ++++++++++++++++++++++++++++++----------------- src/qemu/qemu_hotplug.c | 9 +++-- src/qemu/qemu_migration.c | 2 +- src/util/cgroup.c | 49 ++++++++++++++++++++----- src/util/cgroup.h | 12 ++++-- 11 files changed, 137 insertions(+), 76 deletions(-) -- 1.8.0.1.240.ge8a1f5a

4 10

[libvirt] [PATCH v1 0/6] disable cgroup cpuset
by Hu Tao 13 Dec '12

13 Dec '12

The reason to disable cgroup cpuset by default is: currently, sub-directories of cgroup cpuset won't be auto-updated if cpu hot-plug happens. For example, if we now have 0-3,5-7 pcpus online, the value of /sys/fs/cgroup/cpuset/libvirt/qemu/mydom/cpuset.cpus is 0-3,5-7, then pcpu 4 is hot-plugged, but the value of cpuset.cpus is still 0-3,5-7. This will cause a problem that we can't pin to a hot-plugged pcpu. Users can still enable cpuset by editing qemu.conf. Hu Tao (6): cgroup: Add a flag VIR_CGROUP_DISABLE_CPUSET create cgroup controllers for driver according to config create cgroup controllers for domain according to config create cgroup controllers for vcpu according to config create cgroup controllers for emulator according to config disable cgroup cpuset by default src/lxc/lxc_cgroup.c | 4 +-- src/lxc/lxc_driver.c | 22 ++++++------ src/lxc/lxc_process.c | 4 +-- src/qemu/qemu.conf | 2 +- src/qemu/qemu_cgroup.c | 15 ++++---- src/qemu/qemu_conf.c | 1 - src/qemu/qemu_driver.c | 92 +++++++++++++++++++++++++++++------------------ src/qemu/qemu_hotplug.c | 9 +++-- src/qemu/qemu_migration.c | 2 +- src/util/cgroup.c | 49 +++++++++++++++++++------ src/util/cgroup.h | 12 ++++--- 11 files changed, 136 insertions(+), 76 deletions(-) -- 1.7.11.7

2 11

[libvirt] [PATCH] network: match xml warning message
by Eric Blake 13 Dec '12

13 Dec '12

I noticed that /var/lib/libvirt/dnsmasq/*.conf used the wrong word; it was intended to match the wording in src/util/xml.c. * src/network/bridge_driver.c (networkDnsmasqConfContents): Fix typo. --- Pushing under the trivial rule. src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3dd98ad..4e1958d 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -669,7 +669,7 @@ networkDnsmasqConfContents(virNetworkObjPtr network, "##OVERWRITTEN AND LOST. Changes to this " "configuration should be made using:\n" "## virsh net-edit %s\n" - "## of other applications using the libvirt API.\n" + "## or other application using the libvirt API.\n" "##\n## dnsmasq conf file created by libvirt\n" "strict-order\n" "domain-needed\n", -- 1.8.0.2

1 1

[libvirt] RFC: Death to the BQDL (Big QEMU Driver Lock)
by Daniel P. Berrange 12 Dec '12

12 Dec '12

Many years ago when the QEMU driver was first written for libvirt the daemon was single threaded, so we didn't have to worry about locking at all. Then we introduced threads and so we had to have locking. Since then locking has been done at two levels. The big QEMU driver lock must be acquired first, then the per-VM lock could be acquired. If no field in the driver struct was used, we could quickly release the QEMU driver lock and only hold the per-VM lock. Over time though, our code has got more & more complicated to the point where we have to hold the big QEMU driver lock in the vast majority of methods. We mitigate this by releasing the locks when sleeping on monitor API calls, but this is still a huge bottleneck. This is particularly apparent when you look at concurrency when starting/stopping guests. This scalability limitation is at a point where it is unacceptable for us to continue as we do today. Band-aids no longer suffice. To fix this for the long term, we need to dramatically change the locking approach we use in the QEMU driver. The only way we can achieve this is by dramatically changing the way we update/access QEMU driver state. The core problem is that the qemu driver struct holds a vast array of (often unrelated) data, with differing access patterns. It is clear that a single lock is not a suitable level of granularity for this. Looking at what is in the struct we can classify data into a number of buckets 1. Read-only data that never changes for lifetime of libvirtd. eg - char *configDir - char *libDir - bool privileged; - const char *uri; - virThreadPoolPtr workerPool 2. Read-only data that never changes for as long as the config file is not reloaded. (Currently equivalent to previous bucket since we don't support reloading qemu.conf - we need to support that in the future) eg - uid_t user; - uid_t group; - int dynamicOwnership; - unsigned int vncTLS :1; - unsigned int vncSASL :1; - char *vncListen; 3. Read-write data that changes at arbitrary times eg - virDomainObjList domains - size_t nactive - pciDeviceList *activePciHostdevs; - usbDeviceList *activeUsbHostdevs; - virHashTablePtr closeCallbacks; My proposal for dealing with things is as follows 1. Read-only data that never changes for lifetime of libvirtd. Turn the current driver mutex into a driver RW-lock. All API calls will always acquire a read-lock at start, hold it for the lifetime of their execution and release it at the end. API calls will never directly acquire write locks. The QEMU driver startup / shutdown global initializers will acquire write-locks. This ensures the daemon can't shutdown while any APIs are being executed. 2. Read-only data that never changes for as long as the config file is not reloaded. Move all of this data out into a new virQEMUDriverConfigPtr struct, which is an instance of virObject. The virQEMUDriverPtr will hold the primary reference to the config. The contents of this object struct will be considered immutable once initialized. When an API needs to access config file, it will obtain a reference on the config object. Obtaining the reference will involve acquiring & releasing the driver lock. If the QEMU driver needs to reload the config, it will populate a completely new virQEMUDriverConfigPtr instance, and unref the existing one. Thus access to data in virQEMUDriverConfigPtr can be completely lockless once an instance has been acquired, despite the possiblity of the config being updated at an arbitrary time. cf RCU (read-copy-update) 3. Read-write data that changes at arbitrary times. All data that can be changed must be stored in a dedicated virObject based instance. Each object must provide its own internal locking mechanisms targetted to the type of data being stored. Some objects may need some re-architecting to allow them to operate effectively without the protection of the long lived QEMU driver lock. For example during domain startup, we rely on the QEMU driver lock to protect against races between the time we check for an existing VM with (name,uuid), and the time we actually finish starting the new VM & store it in the domain list. To deal with this the virDomainObjList will need to have some concept of a 'reserved name,uuid' so safety is ensured, despite not holding a lock for the whole start operation. So I lied slightly when I said this was the death of the big QEMU driver lock. The big QEMU driver lock still exists, but API calls only ever need to have read-locks. Write-locks are only held for libvirtd startup/shutdown, and for the tiny time window it takes to grab a reference to a virQEMUDriverConfigPtr. Access to config params is completely lockless, even allowing for their live update. All the remaining exclusive locks will be pushed down into individual objects which need them, hopefully ensuring high concurrency of operation. Implementing this all is a non-trivial job, so I envisage the following order of attack 1. Create the virQEMUDriverConfigPtr object & move config file parameters into that. 2. Encapsulte all read-writable state into objects with dedicated locking 3. Turn QEMU driver mutex into a read-write lock 4. Convert all APIs to only hold read-locks on QEMU driver. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH] util: rework error reporting in virGet(User|Group)IDByName
by Peter Krempa 12 Dec '12

12 Dec '12

This patch gets rid of the undeterministic error reporting code done on return values of get(pw|gr)nam_r. With this patch, if the group record is not returned by the corresponding function this error is not considered fatal even if errno != 0. The error is logged in such case. --- src/util/util.c | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 3f244f5..27af3c6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2530,23 +2530,16 @@ virGetUserIDByName(const char *name, uid_t *uid) } } - if (rc != 0) { - /* We explicitly test for the known error values returned by - * getpwnam_r as the manpage says: - * ERRORS - * 0 or ENOENT or ESRCH or EBADF or EPERM or ... - * The given name or uid was not found. - */ - if ((rc == EINTR) || (rc == EIO) || (rc == EMFILE) || - (rc == ENFILE) || (rc == ENOMEM)) { - virReportSystemError(rc, _("Failed to get user record for name '%s'"), - name); - goto cleanup; - } - } - if (!pw) { - VIR_DEBUG("User record for user '%s' does not exist", name); + if (rc != 0) { + char buf[1024]; + /* log the possible error from getpwnam_r. Unfortunately error + * reporting from this function is bad and we can't really + * rely on it, so we just report that the user wasn't found */ + VIR_WARN("User record for user '%s' does was not found: %s", + name, virStrerror(rc, buf, sizeof(buf))); + } + ret = 1; goto cleanup; } @@ -2621,23 +2614,16 @@ virGetGroupIDByName(const char *name, gid_t *gid) } } - if (rc != 0) { - /* We explicitly test for the known error values returned by - * getgrnam_r as the manpage says: - * ERRORS - * 0 or ENOENT or ESRCH or EBADF or EPERM or ... - * The given name or gid was not found. - */ - if ((rc == EINTR) || (rc == EIO) || (rc == EMFILE) || - (rc == ENFILE) || (rc == ENOMEM)) { - virReportSystemError(rc, _("Failed to get group record for name '%s'"), - name); - goto cleanup; - } - } - if (!gr) { - VIR_DEBUG("Group record for group '%s' does not exist", name); + if (rc != 0) { + char buf[1024]; + /* log the possible error from getgrnam_r. Unfortunately error + * reporting from this function is bad and we can't really + * rely on it, so we just report that the user wasn't found */ + VIR_WARN("Group record for user '%s' does was not found: %s", + name, virStrerror(rc, buf, sizeof(buf))); + } + ret = 1; goto cleanup; } -- 1.8.0

4 4

[libvirt] [PATCH] S390: Fix virSysinfoRead memory corruption
by Viktor Mihajlovski 12 Dec '12

12 Dec '12

There was a double free issue caused by virSysinfoRead on s390, as the same manufacturer string instance was assigned to more than one processor record. Cleaned up other potential memory issues and restructured the sysinfo parsing code by moving repeating patterns into a helper function. BTW: I hit an issue with using strchr(string,variable), as I am still compiling with gcc 4.4.x, see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36513 I circumvented this using index(), which is deprecated, but working. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/sysinfo.c | 160 ++++++++++++++++++++++----------------------------- 1 files changed, 69 insertions(+), 91 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index bac4b23..0be5b75 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -240,114 +240,91 @@ no_memory: #elif defined(__s390__) || defined(__s390x__) +static char * +virSysinfoParseDelimited(const char *base, const char *name, char **value, + char delim1, char delim2) +{ + const char *start; + char *end; + + if (delim1 != delim2 && + (start = strstr(base, name)) && + (start = index(start, delim1))) { /* using index as strchr produces compile error on older gcc's - see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36513 */ + start += 1; + end = strchrnul(start, delim2); + virSkipSpaces(&start); + if (!((*value) = strndup(start, end - start))) { + virReportOOMError(); + goto error; + } + virTrimSpaces(*value, NULL); + return end; + } + +error: + return NULL; +} + +static char * +virSysinfoParseLine(const char *base, const char *name, char **value) +{ + return virSysinfoParseDelimited(base, name, value, ':', '\n'); +} + static int virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol = NULL; - const char *property; - - /* Return if Manufacturer field is not found */ - if ((cur = strstr(base, "Manufacturer")) == NULL) + if (virSysinfoParseLine(base, "Manufacturer", + &ret->system_manufacturer) && + virSysinfoParseLine(base, "Type", + &ret->system_family) && + virSysinfoParseLine(base, "Sequence Code", + &ret->system_serial)) return 0; - - base = cur; - if ((cur = strstr(base, "Manufacturer")) != NULL) { - cur = strchr(cur, ':') + 1; - eol = strchr(cur, '\n'); - virSkipSpacesBackwards(cur, &eol); - if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - virSkipSpaces(&property); - ret->system_manufacturer = (char *) property; - } - if ((cur = strstr(base, "Type")) != NULL) { - cur = strchr(cur, ':') + 1; - eol = strchr(cur, '\n'); - virSkipSpacesBackwards(cur, &eol); - if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - virSkipSpaces(&property); - ret->system_family = (char *) property; - } - if ((cur = strstr(base, "Sequence Code")) != NULL) { - cur = strchr(cur, ':') + 1; - eol = strchr(cur, '\n'); - virSkipSpacesBackwards(cur, &eol); - if ((eol) && ((property = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - virSkipSpaces(&property); - ret->system_serial = (char *) property; - } - - return 0; - -no_memory: - return -1; + else + return -1; } static int virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) { - char *cur, *eol, *tmp_base; - char *manufacturer; - const char *tmp; + char *tmp_base; + char *manufacturer = NULL; + char *procline = NULL; + int result = -1; virSysinfoProcessorDefPtr processor; - if ((cur = strstr(base, "vendor_id")) != NULL) { - cur = strchr(cur, ':') + 1; - eol = strchr(cur, '\n'); - virSkipSpacesBackwards(cur, &eol); - if ((eol) && ((tmp = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - virSkipSpaces(&tmp); - manufacturer = (char *) tmp; - } - - /* Find processor N: line and gather the processor manufacturer, version, - * serial number, and family */ - while ((tmp_base = strstr(base, "processor ")) != NULL) { - base = tmp_base; - eol = strchr(base, '\n'); - cur = strchr(base, ':') + 1; + if (!(tmp_base=virSysinfoParseLine(base, "vendor_id", &manufacturer))) + goto cleanup; + /* Find processor N: line and gather the processor manufacturer, + version, serial number, and family */ + while ((tmp_base = strstr(tmp_base, "processor ")) + && (tmp_base = virSysinfoParseLine(tmp_base, "processor ", + &procline))) { if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { - goto no_memory; + virReportOOMError(); + goto cleanup; } - processor = &ret->processor[ret->nprocessor - 1]; - - /* Set the processor manufacturer */ - processor->processor_manufacturer = manufacturer; - - if ((cur = strstr(base, "version =")) != NULL) { - cur += sizeof("version ="); - eol = strchr(cur, ','); - if ((eol) && - ((processor->processor_version = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - } - if ((cur = strstr(base, "identification =")) != NULL) { - cur += sizeof("identification ="); - eol = strchr(cur, ','); - if ((eol) && - ((processor->processor_serial_number = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - } - if ((cur = strstr(base, "machine =")) != NULL) { - cur += sizeof("machine ="); - eol = strchr(cur, '\n'); - if ((eol) && - ((processor->processor_family = strndup(cur, eol - cur)) == NULL)) - goto no_memory; - } - - base = cur; + processor->processor_manufacturer = strdup(manufacturer); + if (!virSysinfoParseDelimited(procline, "version", + &processor->processor_version, + '=', ',') || + !virSysinfoParseDelimited(procline, "identification", + &processor->processor_serial_number, + '=', ',') || + !virSysinfoParseDelimited(procline, "machine", + &processor->processor_family, + '=', '\n')) + goto cleanup; } + result = 0; - return 0; - -no_memory: - return -1; +cleanup: + VIR_FREE(manufacturer); + VIR_FREE(procline); + return result; } /* virSysinfoRead for s390x @@ -388,6 +365,7 @@ virSysinfoRead(void) { return ret; no_memory: + virSysinfoDefFree(ret); VIR_FREE(outbuf); return NULL; } -- 1.7.0.4

3 8

Re: [libvirt] RFC: Enable Libvirt to handle OVA installation
by Ata Bohra 12 Dec '12

12 Dec '12

> > [AB]: Unfortunately I could not find any way to perform this rather than > > accomodating it inside libvirt. As mentioned more of the issue is: OVA > > installation is handled by hypervisor in more than one step, they do not > > expose specific APIs to load compressed disk associated with one VM, please > > correct me if my understanding is wrong here. It means then this feature > > could be blessed within libvirt framework at all :(. > > > > For educational purpose, I want to ask why is "OVA installtion" is > > considered so alien. To me it is one of the ways to manage VM distribution > > in an hypervisor agnostic way. > > > > Point me to an OVA that's available and a way to load it & run it > without forking money over to VMWare and I'll take a look and provide > suggestions on how to best implement this for you. > > -- > Doug Goldstein Please find a tiny OVA attached along with this mail, I wanted to share Microcore linux package but as size was 6.7 MB, mail was rejected by libvirt server (Mircrocore linux). ESX hypervisor comes in a free version and also it provides a web tool to access it (vSphere Client again free download), this tool allows to spit out OVA/OVF for installed VMs (installation can be done using free CD installations). OVAs can be generated using API calls as well. Steps using vSphere Client:1. Create a new VM giving path to OVA file.2. Select VM params such as: name, virtual hardware details (memory, CPU, datastore, networking etc.).3. Installation creates VMs, imports vdisks from OVA and gives a functional VM at the end. Steps using vSphere API (libvirt way to do it):1. ParseOVFDescriptor (this involves calling vSphere API with OVF descriptor stored in OVA). 2. InstallvAPP: this is responsible to create domain on the hypervisor and once it is done it returns a lease object (HttpLeaseObject). This object is to be used to upload the compressed virtual disk to the ESX hypervisor. Working with it I did not feel there is a need to get any license or pay VMWare in one way or the other, one can create OVAs easily and export it to different hypervisors as VM distros. Further, marketplace may provide free OVA downloads :-). Thanks!Ata

1 1

[libvirt] [PATCH] build: Fix make check with different object directory
by Viktor Mihajlovski 12 Dec '12

12 Dec '12

make check fails in check-symsorting if configure is not run in the source directory. Prefixing symfile names with $(srcdir) fixes this. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/Makefile.am | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7cb1d4a..8f7890b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -739,7 +739,7 @@ libvirt_driver_la_CFLAGS = $(NUMACTL_CFLAGS) $(GNUTLS_CFLAGS) \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) libvirt_driver_la_LIBADD = $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(DLOPEN_LIBS) -USED_SYM_FILES = libvirt_private.syms +USED_SYM_FILES = $(srcdir)/libvirt_private.syms if WITH_TEST noinst_LTLIBRARIES += libvirt_driver_test.la @@ -1337,43 +1337,43 @@ endif # if WITH_DRIVER_MODULES -USED_SYM_FILES += libvirt_driver_modules.syms +USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms endif if WITH_LINUX -USED_SYM_FILES += libvirt_linux.syms +USED_SYM_FILES += $(srcdir)/libvirt_linux.syms endif if WITH_ESX -USED_SYM_FILES += libvirt_esx.syms +USED_SYM_FILES += $(srcdir)/libvirt_esx.syms endif if WITH_LIBVIRTD -USED_SYM_FILES += libvirt_daemon.syms +USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms endif if WITH_OPENVZ -USED_SYM_FILES += libvirt_openvz.syms +USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms endif if WITH_VMX -USED_SYM_FILES += libvirt_vmx.syms +USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms endif if WITH_XENXS -USED_SYM_FILES += libvirt_xenxs.syms +USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms endif if HAVE_SASL -USED_SYM_FILES += libvirt_sasl.syms +USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms endif if HAVE_LIBSSH2 -USED_SYM_FILES += libvirt_libssh2.syms +USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms endif if WITH_ATOMIC_OPS_PTHREAD -USED_SYM_FILES += libvirt_atomic.syms +USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms endif EXTRA_DIST += \ -- 1.7.0.4

2 1

[libvirt] [PATCH v2 1/4] qemu: add qemu various VGA devices Caps flag
by Guannan Ren 12 Dec '12

12 Dec '12

QEMU_CAPS_DEVICE_QXL -device qxl QEMU_CAPS_DEVICE_VGA -device VGA QEMU_CAPS_DEVICE_CIRRUS_VGA -device cirrus-vga QEMU_CAPS_DEVICE_VMWARE_SVGA -device vmware-svga Fix a typo in qemuCapsObjectTypes, the string 'qxl' here should be -device qxl rather than -vga [...|qxl|..] --- src/qemu/qemu_capabilities.c | 10 ++++++++- src/qemu/qemu_capabilities.h | 4 ++++ tests/qemuhelptest.c | 48 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 52 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 01a1b98..97bc968 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -194,6 +194,11 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "usb-redir.bootindex", "usb-host.bootindex", "blockdev-snapshot-sync", + "qxl", + + "VGA", /* 200 */ + "cirrus-vga", + "vmware-svga", ); struct _qemuCaps { @@ -1322,11 +1327,14 @@ struct qemuCapsStringFlags qemuCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI_PCI }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, - { "qxl", QEMU_CAPS_VGA_QXL }, + { "qxl", QEMU_CAPS_DEVICE_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, { "scsi-cd", QEMU_CAPS_SCSI_CD }, { "ide-cd", QEMU_CAPS_IDE_CD }, + { "VGA", QEMU_CAPS_DEVICE_VGA }, + { "cirrus-vga", QEMU_CAPS_DEVICE_CIRRUS_VGA }, + { "vmware-svga", QEMU_CAPS_DEVICE_VMWARE_SVGA }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3da8672..28604ce 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -156,6 +156,10 @@ enum qemuCapsFlags { QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ + QEMU_CAPS_DEVICE_QXL = 119, /* -device qxl */ + QEMU_CAPS_DEVICE_VGA = 120, /* -device VGA */ + QEMU_CAPS_DEVICE_CIRRUS_VGA = 121, /* -device cirrus-vga */ + QEMU_CAPS_DEVICE_VMWARE_SVGA = 122, /* -device vmware-svga */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 021b3dc..2280f2d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -391,7 +391,11 @@ mymain(void) QEMU_CAPS_NO_ACPI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -477,7 +481,6 @@ mymain(void) QEMU_CAPS_NESTING, QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, - QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, @@ -495,7 +498,11 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_LSI, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -554,7 +561,11 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -623,7 +634,10 @@ mymain(void) QEMU_CAPS_CPU_HOST, QEMU_CAPS_SCSI_CD, QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA); DO_TEST("qemu-1.0", 1000000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -697,7 +711,11 @@ mymain(void) QEMU_CAPS_IDE_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-1.1.0", 1001000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -779,7 +797,11 @@ mymain(void) QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_BLOCKIO, - QEMU_CAPS_VNC); + QEMU_CAPS_VNC, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-1.2.0", 1002000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -871,7 +893,11 @@ mymain(void) QEMU_CAPS_DUMP_GUEST_CORE, QEMU_CAPS_VNC, QEMU_CAPS_USB_REDIR_BOOTINDEX, - QEMU_CAPS_USB_HOST_BOOTINDEX); + QEMU_CAPS_USB_HOST_BOOTINDEX, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -968,7 +994,11 @@ mymain(void) QEMU_CAPS_DUMP_GUEST_CORE, QEMU_CAPS_VNC, QEMU_CAPS_USB_REDIR_BOOTINDEX, - QEMU_CAPS_USB_HOST_BOOTINDEX); + QEMU_CAPS_USB_HOST_BOOTINDEX, + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_DEVICE_VGA, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DEVICE_VMWARE_SVGA); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.11.2

4 13

[libvirt] [PATCHv2 0/3] sysinfo: s390 bug fix and tests
by Viktor Mihajlovski 12 Dec '12

12 Dec '12

Another 'small' patch that developed into a series, hence the v2 denomination. Primarily this fixes a memory issue in virSysinfoRead on s390. As a side effect it became necessary to work around a GCC bug. Finally I have followed Daniel Berrange's suggestion to provide tests for sysinfo. Viktor Mihajlovski (3): build: Check for broken GCC -Wlogical-op in configure S390: Fix virSysinfoRead memory corruption tests: Add tests for sysinfo cfg.mk | 2 +- configure.ac | 23 ++++ src/libvirt_private.syms | 1 + src/util/sysinfo.c | 192 +++++++++++++++++---------------- tests/Makefile.am | 6 ++ tests/sysinfodata/dmidecode.sh | 3 + tests/sysinfodata/s390cpuinfo.data | 12 +++ tests/sysinfodata/s390sysinfo.data | 114 ++++++++++++++++++++ tests/sysinfodata/s390sysinfo.expect | 25 +++++ tests/sysinfodata/x86sysinfo.data | 83 +++++++++++++++ tests/sysinfodata/x86sysinfo.expect | 53 ++++++++++ tests/sysinfotest.c | 200 +++++++++++++++++++++++++++++++++++ 12 files changed, 619 insertions(+), 95 deletions(-) create mode 100755 tests/sysinfodata/dmidecode.sh create mode 100644 tests/sysinfodata/s390cpuinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.data create mode 100644 tests/sysinfodata/s390sysinfo.expect create mode 100644 tests/sysinfodata/x86sysinfo.data create mode 100644 tests/sysinfodata/x86sysinfo.expect create mode 100644 tests/sysinfotest.c -- 1.7.12.4

1 3

[libvirt] [PATCH] Revert "dnsmasq: Fix parsing of the version number"
by Michal Privoznik 12 Dec '12

12 Dec '12

This reverts commit 5114431396fd125b6ebe4d1a20a981111f948ee7 which was pushed accidentally. --- Sorry for the inconvenience. src/util/dnsmasq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index a627ed2..bee3b61 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) caps->noRefresh = true; - if (!(p = strstr(buf, DNSMASQ_VERSION_STR))) + p = STRSKIP(buf, DNSMASQ_VERSION_STR); + if (!p) goto fail; - p += sizeof(DNSMASQ_VERSION_STR) - 1; virSkipSpaces(&p); if (virParseVersionString(p, &caps->version, true) < 0) goto fail; -- 1.7.8.6

2 3

[libvirt] [PATCH 0/4] qemu: Refactor ManagedSave code and fix error reporting
by Peter Krempa 12 Dec '12

12 Dec '12

This series improves helpers to retrieve domain objects from virDomainPtrs and uses the improvements in the ManagedSave APIs. This series also fixes a bug in error reporting of qemuDomainManagedSaveRemove where if unlink() failed no error was reported but an error code was returned. Although there's a slight net increase of number of lines by this patch, it's mainly due to the docs added in 1/4 Peter Krempa (4): qemu: Add a new domain lookup helper and improve the docs qemu: Refactor managed save functions to use domain lookup helpers qemu: Small code cleanups in the managedsave functions qemu: Improve error reporting from qemuDomainManagedSaveRemove src/qemu/qemu_driver.c | 115 +++++++++++++++++++++++++++---------------------- 1 file changed, 63 insertions(+), 52 deletions(-) -- 1.8.0

2 12

[libvirt] [PATCH] util: Fix warning message in previous patch
by Peter Krempa 12 Dec '12

12 Dec '12

I didn't notice the extra "does" in the previous patch. Remove it. --- My mistake. Pushed under trivial rule. --- src/util/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 27af3c6..05e7ca7 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2536,7 +2536,7 @@ virGetUserIDByName(const char *name, uid_t *uid) /* log the possible error from getpwnam_r. Unfortunately error * reporting from this function is bad and we can't really * rely on it, so we just report that the user wasn't found */ - VIR_WARN("User record for user '%s' does was not found: %s", + VIR_WARN("User record for user '%s' was not found: %s", name, virStrerror(rc, buf, sizeof(buf))); } @@ -2620,7 +2620,7 @@ virGetGroupIDByName(const char *name, gid_t *gid) /* log the possible error from getgrnam_r. Unfortunately error * reporting from this function is bad and we can't really * rely on it, so we just report that the user wasn't found */ - VIR_WARN("Group record for user '%s' does was not found: %s", + VIR_WARN("Group record for user '%s' was not found: %s", name, virStrerror(rc, buf, sizeof(buf))); } -- 1.8.0

1 0

[libvirt] [PATCH] Fix sorting of libvirt_private.syms and add syntax check rule
by Daniel P. Berrange 12 Dec '12

12 Dec '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add check-symsorting.pl to perform case-insensitive alphabetical sorting of groups of symbols. Fix all violations it reports Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 4 +- src/check-symsorting.pl | 66 +++++++++++++++++++ src/libvirt_esx.syms | 2 +- src/libvirt_openvz.syms | 2 +- src/libvirt_private.syms | 161 ++++++++++++++++++++++++----------------------- 5 files changed, 152 insertions(+), 83 deletions(-) create mode 100644 src/check-symsorting.pl diff --git a/src/Makefile.am b/src/Makefile.am index 6d2816d..7cb1d4a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -326,6 +326,8 @@ check-symfile: libvirt.syms libvirt.la else check-symfile: endif +check-symsorting: + $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl $(USED_SYM_FILES) PROTOCOL_STRUCTS = \ $(srcdir)/remote_protocol-structs \ @@ -349,7 +351,7 @@ else !WITH_REMOTE check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl -check-local: check-protocol check-symfile +check-local: check-protocol check-symfile check-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc diff --git a/src/check-symsorting.pl b/src/check-symsorting.pl new file mode 100644 index 0000000..9c62246 --- /dev/null +++ b/src/check-symsorting.pl @@ -0,0 +1,66 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +die "syntax: $0 SYMFILE..." unless int(@ARGV) >= 1; + +my $ret = 0; +foreach my $symfile (@ARGV) { + open SYMFILE, $symfile or die "cannot read $symfile: $!"; + + my $line; + my @group; + + while (<SYMFILE>) { + chomp; + next if /^#/; + + if (/^\s*$/) { + if (@group) { + &check_sorting(\@group, $symfile, $line); + } + @group = (); + $line = $.; + } else { + $_ =~ s/;//; + push @group, $_; + } + } + + close SYMFILE; + if (@group) { + &check_sorting(\@group, $symfile, $line); + } +} + +sub check_sorting { + my $group = shift; + my $symfile = shift; + my $line = shift; + + my @group = @{$group}; + my @sorted = sort { lc $a cmp lc $b } @group; + my $sorted = 1; + my $first; + my $last; + for (my $i = 0 ; $i <= $#sorted ; $i++) { + if ($sorted[$i] ne $group[$i]) { + $first = $i unless defined $first; + $last = $i; + $sorted = 0; + } + } + if (!$sorted) { + @group = splice @group, $first, ($last-$first+1); + @sorted = splice @sorted, $first, ($last-$first+1); + print "Symbol block at $symfile:$line symbols not sorted\n"; + print map { " " . $_ . "\n" } @group; + print "Correct ordering\n"; + print map { " " . $_ . "\n" } @sorted; + print "\n"; + $ret = 1; + } +} + +exit $ret; diff --git a/src/libvirt_esx.syms b/src/libvirt_esx.syms index 3125b20..0341b66 100644 --- a/src/libvirt_esx.syms +++ b/src/libvirt_esx.syms @@ -3,5 +3,5 @@ # esxUtil_EscapeDatastoreItem; -esxVI_DateTime_ConvertToCalendarTime; esxUtil_ParseDatastorePath; +esxVI_DateTime_ConvertToCalendarTime; diff --git a/src/libvirt_openvz.syms b/src/libvirt_openvz.syms index 1993eb5..578d8b5 100644 --- a/src/libvirt_openvz.syms +++ b/src/libvirt_openvz.syms @@ -1,7 +1,7 @@ # # These symbols are dependent upon --with-openvz via WITH_OPENVZ # +openvzLocateConfFile; openvzReadConfigParam; openvzReadNetworkConf; -openvzLocateConfFile; openvzVEGetStringParam; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7d083e4..1e34210 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -85,25 +85,25 @@ virCgroupDenyDeviceMajor; virCgroupDenyDevicePath; virCgroupForDomain; virCgroupForDriver; -virCgroupGetAppRoot; virCgroupForEmulator; virCgroupForVcpu; virCgroupFree; +virCgroupGetAppRoot; virCgroupGetBlkioWeight; -virCgroupGetCpuCfsPeriod; -virCgroupGetCpuCfsQuota; -virCgroupGetCpuShares; virCgroupGetCpuacctPercpuUsage; virCgroupGetCpuacctStat; virCgroupGetCpuacctUsage; +virCgroupGetCpuCfsPeriod; +virCgroupGetCpuCfsQuota; virCgroupGetCpusetCpus; virCgroupGetCpusetMems; +virCgroupGetCpuShares; virCgroupGetFreezerState; -virCgroupGetMemSwapUsage; -virCgroupGetMemSwapHardLimit; virCgroupGetMemoryHardLimit; virCgroupGetMemorySoftLimit; virCgroupGetMemoryUsage; +virCgroupGetMemSwapHardLimit; +virCgroupGetMemSwapUsage; virCgroupKill; virCgroupKillPainfully; virCgroupKillRecursive; @@ -115,14 +115,14 @@ virCgroupSetBlkioDeviceWeight; virCgroupSetBlkioWeight; virCgroupSetCpuCfsPeriod; virCgroupSetCpuCfsQuota; -virCgroupSetCpuShares; virCgroupSetCpusetCpus; virCgroupSetCpusetMems; +virCgroupSetCpuShares; virCgroupSetFreezerState; -virCgroupSetMemSwapHardLimit; virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; +virCgroupSetMemSwapHardLimit; # command.h @@ -218,9 +218,9 @@ virGetConnect; virGetDomain; virGetDomainSnapshot; virGetInterface; -virGetNWFilter; virGetNetwork; virGetNodeDevice; +virGetNWFilter; virGetSecret; virGetStoragePool; virGetStorageVol; @@ -249,9 +249,9 @@ dnsmasqAddHost; dnsmasqCapsGet; dnsmasqCapsGetBinaryPath; dnsmasqCapsGetVersion; +dnsmasqCapsNewFromBinary; dnsmasqCapsNewFromBuffer; dnsmasqCapsNewFromFile; -dnsmasqCapsNewFromBinary; dnsmasqCapsRefresh; dnsmasqContextFree; dnsmasqContextNew; @@ -318,6 +318,7 @@ virDomainControllerTypeToString; virDomainCpuPlacementModeTypeFromString; virDomainCpuPlacementModeTypeToString; virDomainDefAddImplicitControllers; +virDomainDefAddSecurityLabelDef; virDomainDefCheckABIStability; virDomainDefClearDeviceAliases; virDomainDefClearPCIAddresses; @@ -327,8 +328,6 @@ virDomainDefFormat; virDomainDefFormatInternal; virDomainDefFree; virDomainDefGetSecurityLabelDef; -virDomainDiskDefGetSecurityLabelDef; -virDomainDefAddSecurityLabelDef; virDomainDefParseFile; virDomainDefParseNode; virDomainDefParseString; @@ -349,6 +348,7 @@ virDomainDiskCopyOnReadTypeToString; virDomainDiskDefAssignAddress; virDomainDiskDefForeachPath; virDomainDiskDefFree; +virDomainDiskDefGetSecurityLabelDef; virDomainDiskDeviceTypeToString; virDomainDiskErrorPolicyTypeFromString; virDomainDiskErrorPolicyTypeToString; @@ -370,17 +370,17 @@ virDomainDiskTypeFromString; virDomainDiskTypeToString; virDomainEmulatorPinAdd; virDomainEmulatorPinDel; +virDomainFeatureStateTypeFromString; +virDomainFeatureStateTypeToString; +virDomainFindByID; +virDomainFindByName; +virDomainFindByUUID; virDomainFSDefFree; virDomainFSIndexByName; virDomainFSTypeFromString; virDomainFSTypeToString; virDomainFSWrpolicyTypeFromString; virDomainFSWrpolicyTypeToString; -virDomainFeatureStateTypeFromString; -virDomainFeatureStateTypeToString; -virDomainFindByID; -virDomainFindByName; -virDomainFindByUUID; virDomainGetRootFilesystem; virDomainGraphicsAuthConnectedTypeFromString; virDomainGraphicsAuthConnectedTypeToString; @@ -536,14 +536,14 @@ virDomainVcpuPinDefFree; virDomainVcpuPinDel; virDomainVcpuPinFindByVcpu; virDomainVcpuPinIsDuplicate; -virDomainVideoDefFree; virDomainVideoDefaultRAM; virDomainVideoDefaultType; +virDomainVideoDefFree; virDomainVideoTypeFromString; virDomainVideoTypeToString; -virDomainVirtTypeToString; virDomainVirtioEventIdxTypeFromString; virDomainVirtioEventIdxTypeToString; +virDomainVirtTypeToString; virDomainWatchdogActionTypeFromString; virDomainWatchdogActionTypeToString; virDomainWatchdogModelTypeFromString; @@ -553,8 +553,8 @@ virDomainWatchdogModelTypeToString; # domain_event.h virDomainEventBalloonChangeNewFromDom; virDomainEventBalloonChangeNewFromObj; -virDomainEventBlockJobNewFromObj; virDomainEventBlockJobNewFromDom; +virDomainEventBlockJobNewFromObj; virDomainEventControlErrorNewFromDom; virDomainEventControlErrorNewFromObj; virDomainEventDiskChangeNewFromDom; @@ -570,25 +570,25 @@ virDomainEventNew; virDomainEventNewFromDef; virDomainEventNewFromDom; virDomainEventNewFromObj; +virDomainEventPMSuspendDiskNewFromDom; +virDomainEventPMSuspendDiskNewFromObj; virDomainEventPMSuspendNewFromDom; virDomainEventPMSuspendNewFromObj; virDomainEventPMWakeupNewFromDom; virDomainEventPMWakeupNewFromObj; -virDomainEventRTCChangeNewFromDom; -virDomainEventRTCChangeNewFromObj; virDomainEventRebootNew; virDomainEventRebootNewFromDom; virDomainEventRebootNewFromObj; +virDomainEventRTCChangeNewFromDom; +virDomainEventRTCChangeNewFromObj; virDomainEventStateDeregister; virDomainEventStateDeregisterID; virDomainEventStateEventID; -virDomainEventStateRegister; -virDomainEventStateRegisterID; virDomainEventStateFree; virDomainEventStateNew; virDomainEventStateQueue; -virDomainEventPMSuspendDiskNewFromDom; -virDomainEventPMSuspendDiskNewFromObj; +virDomainEventStateRegister; +virDomainEventStateRegisterID; virDomainEventTrayChangeNewFromDom; virDomainEventTrayChangeNewFromObj; virDomainEventWatchdogNewFromDom; @@ -596,14 +596,14 @@ virDomainEventWatchdogNewFromObj; # domain_lock.h -virDomainLockProcessStart; -virDomainLockProcessInquire; -virDomainLockProcessPause; -virDomainLockProcessResume; virDomainLockDiskAttach; virDomainLockDiskDetach; virDomainLockLeaseAttach; virDomainLockLeaseDetach; +virDomainLockProcessInquire; +virDomainLockProcessPause; +virDomainLockProcessResume; +virDomainLockProcessStart; # domain_nwfilter.h @@ -635,10 +635,10 @@ virEventPollUpdateTimeout; # fdstream.h -virFDStreamOpen; virFDStreamConnectUNIX; -virFDStreamOpenFile; virFDStreamCreateFile; +virFDStreamOpen; +virFDStreamOpenFile; # hash.h @@ -757,24 +757,24 @@ virJSONValueToString; # libvirt_internal.h -virDomainMigrateFinish2; +virDomainMigrateBegin3; +virDomainMigrateConfirm3; virDomainMigrateFinish; +virDomainMigrateFinish2; +virDomainMigrateFinish3; virDomainMigratePerform; -virDomainMigratePrepare2; +virDomainMigratePerform3; virDomainMigratePrepare; -virDomainMigratePrepareTunnel; -virDomainMigrateBegin3; +virDomainMigratePrepare2; virDomainMigratePrepare3; +virDomainMigratePrepareTunnel; virDomainMigratePrepareTunnel3; -virDomainMigratePerform3; -virDomainMigrateFinish3; -virDomainMigrateConfirm3; virDrvSupportsFeature; virRegisterDeviceMonitor; virRegisterDriver; virRegisterInterfaceDriver; -virRegisterNWFilterDriver; virRegisterNetworkDriver; +virRegisterNWFilterDriver; virRegisterSecretDriver; virRegisterStorageDriver; @@ -785,11 +785,11 @@ virLockManagerAddResource; virLockManagerFree; virLockManagerInquire; virLockManagerNew; +virLockManagerPluginGetName; virLockManagerPluginNew; virLockManagerPluginRef; virLockManagerPluginUnref; virLockManagerPluginUsesState; -virLockManagerPluginGetName; virLockManagerRelease; virLockManagerSetPluginDir; @@ -847,8 +847,8 @@ virNetDevVPortTypeToString; # network_conf.h virNetworkAssignDef; -virNetworkConfigFile; virNetworkConfigChangeSetup; +virNetworkConfigFile; virNetworkDefCopy; virNetworkDefFormat; virNetworkDefFree; @@ -885,9 +885,9 @@ virPortGroupFindByName; # node_device_conf.h +virNodeDevCapsDefFree; virNodeDevCapTypeFromString; virNodeDevCapTypeToString; -virNodeDevCapsDefFree; virNodeDeviceAssignDef; virNodeDeviceDefFormat; virNodeDeviceDefFree; @@ -908,11 +908,11 @@ virNodeDeviceObjUnlock; # nodeinfo.h nodeCapsInitNUMA; +nodeGetCellsFreeMemory; nodeGetCPUBitmap; nodeGetCPUCount; nodeGetCPUMap; nodeGetCPUStats; -nodeGetCellsFreeMemory; nodeGetFreeMemory; nodeGetInfo; nodeGetMemoryParameters; @@ -949,8 +949,8 @@ virNWFilterRuleActionTypeToString; virNWFilterRuleDirectionTypeToString; virNWFilterRuleProtocolTypeToString; virNWFilterTestUnassignDef; -virNWFilterUnRegisterCallbackDriver; virNWFilterUnlockFilterUpdates; +virNWFilterUnRegisterCallbackDriver; # nwfilter_ipaddrmap @@ -1051,31 +1051,33 @@ virSecurityManagerFree; virSecurityManagerGenLabel; virSecurityManagerGetDOI; virSecurityManagerGetModel; +virSecurityManagerGetMountOptions; virSecurityManagerGetNested; virSecurityManagerGetProcessLabel; virSecurityManagerNew; -virSecurityManagerNewStack; virSecurityManagerNewDAC; +virSecurityManagerNewStack; virSecurityManagerReleaseLabel; virSecurityManagerReserveLabel; -virSecurityManagerRestoreImageLabel; virSecurityManagerRestoreAllLabel; virSecurityManagerRestoreHostdevLabel; +virSecurityManagerRestoreImageLabel; virSecurityManagerRestoreSavedStateLabel; virSecurityManagerSetAllLabel; virSecurityManagerSetDaemonSocketLabel; +virSecurityManagerSetHostdevLabel; virSecurityManagerSetImageFDLabel; virSecurityManagerSetImageLabel; -virSecurityManagerSetHostdevLabel; virSecurityManagerSetProcessLabel; virSecurityManagerSetSavedStateLabel; virSecurityManagerSetSocketLabel; virSecurityManagerSetTapFDLabel; virSecurityManagerStackAddNested; virSecurityManagerVerify; -virSecurityManagerGetMountOptions; + # sexpr.h +sexpr2string; sexpr_append; sexpr_cons; sexpr_float; @@ -1089,7 +1091,6 @@ sexpr_node; sexpr_node_copy; sexpr_string; sexpr_u64; -sexpr2string; string2sexpr; @@ -1186,11 +1187,11 @@ virSysinfoRead; # threadpool.h virThreadPoolFree; -virThreadPoolNew; -virThreadPoolSendJob; -virThreadPoolGetMinWorkers; virThreadPoolGetMaxWorkers; +virThreadPoolGetMinWorkers; virThreadPoolGetPriorityWorkers; +virThreadPoolNew; +virThreadPoolSendJob; # threads.h @@ -1255,9 +1256,9 @@ virFileExists; virFileFindMountPoint; virFileHasSuffix; virFileIsAbsPath; +virFileIsDir; virFileIsExecutable; virFileIsLink; -virFileIsDir; virFileLinkPointsTo; virFileLock; virFileMakePath; @@ -1280,12 +1281,12 @@ virFormatIntDecimal; virGetGroupID; virGetGroupName; virGetHostname; -virGetUserDirectory; -virGetUserConfigDirectory; virGetUserCacheDirectory; -virGetUserRuntimeDirectory; +virGetUserConfigDirectory; +virGetUserDirectory; virGetUserID; virGetUserName; +virGetUserRuntimeDirectory; virHexToBin; virIndexToDiskName; virIsDevMapperDevice; @@ -1301,7 +1302,9 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrcpy; virStrIsPrint; +virStrncpy; virStrToDouble; virStrToLong_i; virStrToLong_l; @@ -1309,8 +1312,6 @@ virStrToLong_ll; virStrToLong_ui; virStrToLong_ul; virStrToLong_ull; -virStrcpy; -virStrncpy; virTrimSpaces; virValidateWWN; virVasprintf; @@ -1358,18 +1359,18 @@ virDBusGetSystemBus; # virfile.h -virFileLoopDeviceAssociate; virFileClose; virFileDirectFdFlag; -virFileWrapperFdCatchError; -virFileWrapperFdClose; -virFileWrapperFdFree; -virFileWrapperFdNew; virFileFclose; virFileFdopen; +virFileLoopDeviceAssociate; virFileRewrite; virFileTouch; virFileUpdatePerm; +virFileWrapperFdCatchError; +virFileWrapperFdClose; +virFileWrapperFdFree; +virFileWrapperFdNew; # virinitctl.h @@ -1384,13 +1385,13 @@ virKeycodeValueTranslate; # virkeyfile.h -virKeyFileNew; -virKeyFileLoadFile; -virKeyFileLoadData; virKeyFileFree; -virKeyFileHasValue; -virKeyFileHasGroup; virKeyFileGetValueString; +virKeyFileHasGroup; +virKeyFileHasValue; +virKeyFileLoadData; +virKeyFileLoadFile; +virKeyFileNew; # virlockspace.h @@ -1444,8 +1445,8 @@ virNetClientRegisterAsyncIO; virNetClientRegisterKeepAlive; virNetClientRemoteAddrString; virNetClientRemoveStream; -virNetClientSendNoReply; virNetClientSendNonBlock; +virNetClientSendNoReply; virNetClientSendWithReply; virNetClientSendWithReplyStream; virNetClientSetCloseCallback; @@ -1478,15 +1479,15 @@ virNetClientStreamSetError; # virnetdev.h virNetDevClearIPv4Address; virNetDevExists; -virNetDevGetIPv4Address; virNetDevGetIndex; +virNetDevGetIPv4Address; virNetDevGetMAC; virNetDevGetMTU; virNetDevGetPhysicalFunction; -virNetDevGetVLanID; virNetDevGetVirtualFunctionIndex; virNetDevGetVirtualFunctionInfo; virNetDevGetVirtualFunctions; +virNetDevGetVLanID; virNetDevIsOnline; virNetDevIsVirtualFunction; virNetDevLinkDump; @@ -1528,8 +1529,8 @@ virNetDevBridgeSetSTPDelay; # virnetdevmacvlan.h virNetDevMacVLanCreate; -virNetDevMacVLanDelete; virNetDevMacVLanCreateWithVPortProfile; +virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; virNetDevMacVLanRestartWithVPortProfile; virNetDevMacVLanVPortProfileRegisterCallback; @@ -1576,9 +1577,9 @@ virNetlinkEventAddClient; virNetlinkEventRemoveClient; virNetlinkEventServiceIsRunning; virNetlinkEventServiceLocalPid; +virNetlinkEventServiceStart; virNetlinkEventServiceStop; virNetlinkEventServiceStopAll; -virNetlinkEventServiceStart; virNetlinkShutdown; virNetlinkStartup; @@ -1586,14 +1587,14 @@ virNetlinkStartup; # virnetmessage.h virNetMessageClear; virNetMessageDecodeHeader; -virNetMessageDecodeNumFDs; virNetMessageDecodeLength; +virNetMessageDecodeNumFDs; virNetMessageDecodePayload; virNetMessageDupFD; virNetMessageEncodeHeader; +virNetMessageEncodeNumFDs; virNetMessageEncodePayload; virNetMessageEncodePayloadRaw; -virNetMessageEncodeNumFDs; virNetMessageFree; virNetMessageNew; virNetMessageQueuePush; @@ -1766,6 +1767,8 @@ virObjectUnref; virPidFileAcquire; virPidFileAcquirePath; virPidFileBuildPath; +virPidFileDelete; +virPidFileDeletePath; virPidFileRead; virPidFileReadIfAlive; virPidFileReadPath; @@ -1774,8 +1777,6 @@ virPidFileRelease; virPidFileReleasePath; virPidFileWrite; virPidFileWritePath; -virPidFileDelete; -virPidFileDeletePath; # virprocess.h @@ -1827,9 +1828,9 @@ virStrerror; # virstring.h -virStringSplit; -virStringJoin; virStringFreeList; +virStringJoin; +virStringSplit; # virtime.h -- 1.7.11.7

2 2

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

12 Dec '12

Most of this deals with moving the libvirt-guests.sh script which does all the work to /usr/libexec, so it can be shared by both systemd and traditional init. Previously systemd depended on the script being in /etc/init.d Required to fix https://bugzilla.redhat.com/show_bug.cgi?id=789747 --- Only change to the big script is dropping the LSB header .gitignore | 1 + libvirt.spec.in | 6 +- po/POTFILES.in | 2 +- tools/Makefile.am | 18 +- tools/libvirt-guests.init.in | 27 ++ tools/libvirt-guests.init.sh | 597 ---------------------------------------- tools/libvirt-guests.service.in | 4 +- tools/libvirt-guests.sh.in | 573 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 620 insertions(+), 608 deletions(-) create mode 100644 tools/libvirt-guests.init.in delete mode 100644 tools/libvirt-guests.init.sh create mode 100644 tools/libvirt-guests.sh.in diff --git a/.gitignore b/.gitignore index 0dadd21..ca7d07a 100644 --- a/.gitignore +++ b/.gitignore @@ -179,6 +179,7 @@ /tools/*.[18] /tools/libvirt-guests.init /tools/libvirt-guests.service +/tools/libvirt-guests.sh /tools/virsh /tools/virsh-*-edit.c /tools/virt-*-validate diff --git a/libvirt.spec.in b/libvirt.spec.in index d6e1fbe..d463c27 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1409,8 +1409,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} -sed -i -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/libvirt-guests - %if %{with_dtrace} %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ @@ -1657,10 +1655,13 @@ fi %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ +%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh %if %{with_systemd} %{_unitdir}/libvirtd.service +%{_unitdir}/libvirt-guests.service %else %{_sysconfdir}/rc.d/init.d/libvirtd +%{_sysconfdir}/rc.d/init.d/libvirt-guests %endif %doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd @@ -1925,7 +1926,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %{_datadir}/libvirt/cpu_map.xml -%{_sysconfdir}/rc.d/init.d/libvirt-guests %if %{with_systemd} %{_unitdir}/libvirt-guests.service %endif diff --git a/po/POTFILES.in b/po/POTFILES.in index 586aa2b..6d78f48 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -194,7 +194,7 @@ src/xenapi/xenapi_utils.c src/xenxs/xen_sxpr.c src/xenxs/xen_xm.c tools/console.c -tools/libvirt-guests.init.sh +tools/libvirt-guests.sh.in tools/virsh.c tools/virsh-domain-monitor.c tools/virsh-domain.c diff --git a/tools/Makefile.am b/tools/Makefile.am index d646bab..605bf3b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -41,6 +41,7 @@ DISTCLEANFILES = bin_SCRIPTS = virt-xml-validate virt-pki-validate bin_PROGRAMS = virsh virt-host-validate +libexec_SCRIPTS = libvirt-guests.sh if HAVE_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup @@ -187,7 +188,7 @@ uninstall-sysconfig: rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||: -EXTRA_DIST += libvirt-guests.init.sh +EXTRA_DIST += libvirt-guests.sh.in libvirt-guests.init.in install-initscript: libvirt-guests.init $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d @@ -208,7 +209,7 @@ install-init: uninstall-init: endif # LIBVIRT_INIT_SCRIPT_RED_HAT -libvirt-guests.init: libvirt-guests.init.sh $(top_builddir)/config.status +libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e 's!\@PACKAGE\@!$(PACKAGE)!g' \ -e 's!\@bindir\@!$(bindir)!g' \ @@ -219,20 +220,26 @@ libvirt-guests.init: libvirt-guests.init.sh $(top_builddir)/config.status < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ +BUILT_SOURCES += libvirt-guests.sh +libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh + $(AM_V_GEN)sed \ + -e 's!\@libexecdir\@!$(libexecdir)!g' \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ EXTRA_DIST += libvirt-guests.service.in - SYSTEMD_UNIT_DIR = /lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: libvirt-guests.service install-initscript install-sysconfig +install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) $(INSTALL_DATA) libvirt-guests.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service -uninstall-systemd: uninstall-initscript uninstall-sysconfig +uninstall-systemd: uninstall-sysconfig rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||: @@ -251,6 +258,7 @@ libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status -e 's!\@localstatedir\@!$(localstatedir)!g' \ -e 's!\@sbindir\@!$(sbindir)!g' \ -e 's!\@sysconfdir\@!$(sysconfdir)!g' \ + -e 's!\@libexecdir\@!$(libexecdir)!g' \ < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in new file mode 100644 index 0000000..5f9a60e --- /dev/null +++ b/tools/libvirt-guests.init.in @@ -0,0 +1,27 @@ +#!/bin/sh + +# the following is the LSB init header +# +### BEGIN INIT INFO +# Provides: libvirt-guests +# Required-Start: libvirtd +# Required-Stop: libvirtd +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: suspend/resume libvirt guests on shutdown/boot +# Description: This is a script for suspending active libvirt guests +# on shutdown and resuming them on next boot +# See http://libvirt.org +### END INIT INFO + +# the following is chkconfig init header +# +# libvirt-guests: suspend/resume libvirt guests on shutdown/boot +# +# chkconfig: 345 99 01 +# description: This is a script for suspending active libvirt guests \ +# on shutdown and resuming them on next boot \ +# See http://libvirt.org +# + +exec @libexecdir@/libvirt-guests.sh "$@" diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh deleted file mode 100644 index 99ef331..0000000 --- a/tools/libvirt-guests.init.sh +++ /dev/null @@ -1,597 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header -# -### BEGIN INIT INFO -# Provides: libvirt-guests -# Required-Start: libvirtd -# Required-Stop: libvirtd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: suspend/resume libvirt guests on shutdown/boot -# Description: This is a script for suspending active libvirt guests -# on shutdown and resuming them on next boot -# See http://libvirt.org -### END INIT INFO - -# the following is chkconfig init header -# -# libvirt-guests: suspend/resume libvirt guests on shutdown/boot -# -# chkconfig: 345 99 01 -# description: This is a script for suspending active libvirt guests \ -# on shutdown and resuming them on next boot \ -# See http://libvirt.org -# - -sysconfdir="@sysconfdir@" -localstatedir="@localstatedir@" -libvirtd="@sbindir@"/libvirtd - -# Source function library. -test ! -r "$sysconfdir"/rc.d/init.d/functions || - . "$sysconfdir"/rc.d/init.d/functions - -# Source gettext library. -# Make sure this file is recognized as having translations: _("dummy") -. "@bindir@"/gettext.sh - -export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" - -URIS=default -ON_BOOT=start -ON_SHUTDOWN=suspend -SHUTDOWN_TIMEOUT=300 -PARALLEL_SHUTDOWN=0 -START_DELAY=0 -BYPASS_CACHE=0 - -test -f "$sysconfdir"/sysconfig/libvirt-guests && - . "$sysconfdir"/sysconfig/libvirt-guests - -LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests -VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests - -RETVAL=0 - -# retval COMMAND ARGUMENTS... -# run command with arguments and convert non-zero return value to 1 and set -# the global return variable -retval() { - "$@" - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - else - return 0 - fi -} - -# run_virsh URI ARGUMENTS... -# start virsh and let it execute ARGUMENTS on URI -# If URI is "default" virsh is called without the "-c" argument -# (using libvirt's default connection) -run_virsh() { - uri=$1 - shift - - if [ "x$uri" = xdefault ]; then - virsh "$@" </dev/null - else - virsh -c "$uri" "$@" </dev/null - fi -} - -# run_virsh_c URI ARGUMENTS -# Same as "run_virsh" but the "C" locale is used instead of -# the system's locale. -run_virsh_c() { - ( export LC_ALL=C; run_virsh "$@" ) -} - -# test_connect URI -# check if URI is reachable -test_connect() -{ - uri=$1 - - run_virsh "$uri" connect 2>/dev/null - if [ $? -ne 0 ]; then - eval_gettext "Can't connect to \$uri. Skipping." - echo - return 1 - fi -} - -# list_guests URI PERSISTENT -# List running guests on URI. -# PERSISTENT argument options: -# --persistent: list only persistent guests -# --transient: list only transient guests -# [none]: list both persistent and transient guests -list_guests() { - uri=$1 - persistent=$2 - - list=$(run_virsh_c "$uri" list --uuid $persistent) - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - echo $list -} - -# guest_name URI UUID -# return name of guest UUID on URI -guest_name() { - uri=$1 - uuid=$2 - - run_virsh "$uri" domname "$uuid" 2>/dev/null -} - -# guest_is_on URI UUID -# check if guest UUID on URI is running -# Result is returned by variable "guest_running" -guest_is_on() { - uri=$1 - uuid=$2 - - guest_running=false - id=$(run_virsh "$uri" domid "$uuid") - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - [ -n "$id" ] && [ "x$id" != x- ] && guest_running=true - return 0 -} - -# started -# Create the startup lock file -started() { - touch "$VAR_SUBSYS_LIBVIRT_GUESTS" -} - -# start -# Start or resume the guests -start() { - [ -f "$LISTFILE" ] || { started; return 0; } - - if [ "x$ON_BOOT" != xstart ]; then - gettext "libvirt-guests is configured not to start any guests on boot" - echo - rm -f "$LISTFILE" - started - return 0 - fi - - isfirst=true - bypass= - test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - while read uri list; do - configured=false - set -f - for confuri in $URIS; do - set +f - if [ "x$confuri" = "x$uri" ]; then - configured=true - break - fi - done - set +f - if ! "$configured"; then - eval_gettext "Ignoring guests on \$uri URI"; echo - continue - fi - - test_connect "$uri" || continue - - eval_gettext "Resuming guests on \$uri URI..."; echo - for guest in $list; do - name=$(guest_name "$uri" "$guest") - eval_gettext "Resuming guest \$name: " - if guest_is_on "$uri" "$guest"; then - if "$guest_running"; then - gettext "already active"; echo - else - if "$isfirst"; then - isfirst=false - else - sleep $START_DELAY - fi - retval run_virsh "$uri" start $bypass "$name" \ - >/dev/null && \ - gettext "done"; echo - fi - fi - done - done <"$LISTFILE" - - rm -f "$LISTFILE" - started -} - -# suspend_guest URI GUEST -# Do a managed save on a GUEST on URI. This function returns after the guest -# was saved. -suspend_guest() -{ - uri=$1 - guest=$2 - - name=$(guest_name "$uri" "$guest") - label=$(eval_gettext "Suspending \$name: ") - bypass= - slept=0 - test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache - printf '%s...\n' "$label" - run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & - virsh_pid=$! - while true; do - sleep 1 - kill -0 "$virsh_pid" >/dev/null 2>&1 || break - - slept=$(($slept + 1)) - if [ $(($slept % 5)) -eq 0 ]; then - progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ - awk '/^Data processed:/{print $3, $4}') - if [ -n "$progress" ]; then - printf '%s%s\n' "$label" "$progress" - else - printf '%s%s\n' "$label" "..." - fi - fi - done - retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(gettext "done")" -} - -# shutdown_guest URI GUEST -# Start a ACPI shutdown of GUEST on URI. This function return after the quest -# was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expires. -shutdown_guest() -{ - uri=$1 - guest=$2 - - name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo - retval run_virsh "$uri" shutdown "$guest" >/dev/null || return - timeout=$SHUTDOWN_TIMEOUT - check_timeout=false - if [ $timeout -gt 0 ]; then - check_timeout=true - format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") - else - slept=0 - format=$(eval_gettext "Waiting for guest %s to shut down\n") - fi - while ! $check_timeout || [ "$timeout" -gt 0 ]; do - sleep 1 - guest_is_on "$uri" "$guest" || return - "$guest_running" || break - - if $check_timeout; then - if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" "$name" "$timeout" - fi - timeout=$(($timeout - 1)) - else - slept=$(($slept + 1)) - if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" "$name" - fi - fi - done - - if guest_is_on "$uri" "$guest"; then - if "$guest_running"; then - eval_gettext "Shutdown of guest \$name failed to complete in time." - else - eval_gettext "Shutdown of guest \$name complete." - fi - fi -} - -# shutdown_guest_async URI GUEST -# Start a ACPI shutdown of GUEST on URI. This function returns after the command -# was issued to libvirt to allow parallel shutdown. -shutdown_guest_async() -{ - uri=$1 - guest=$2 - - name=$(guest_name "$uri" "$guest") - eval_gettext "Starting shutdown on guest: \$name" - echo - retval run_virsh "$uri" shutdown "$guest" > /dev/null -} - -# guest_count GUEST_LIST -# Returns number of guests in GUEST_LIST -guest_count() -{ - set -- $1 - echo $# -} - -# check_guests_shutdown URI GUESTS -# check if shutdown is complete on guests in "GUESTS" and returns only -# guests that are still shutting down -check_guests_shutdown() -{ - uri=$1 - guests=$2 - - guests_up= - for guest in $guests; do - if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then - eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." - echo - continue - fi - if "$guest_running"; then - guests_up="$guests_up $guest" - fi - done - echo "$guests_up" -} - -# print_guests_shutdown URI BEFORE AFTER -# Checks for differences in the lists BEFORE and AFTER and prints -# a shutdown complete notice for guests that have finished -print_guests_shutdown() -{ - uri=$1 - before=$2 - after=$3 - - for guest in $before; do - case " $after " in - *" $guest "*) continue;; - esac - - name=$(guest_name "$uri" "$guest") - eval_gettext "Shutdown of guest \$name complete." - echo - done -} - -# shutdown_guests_parallel URI GUESTS -# Shutdown guests GUESTS on machine URI in parallel -shutdown_guests_parallel() -{ - uri=$1 - guests=$2 - - on_shutdown= - check_timeout=false - timeout=$SHUTDOWN_TIMEOUT - if [ $timeout -gt 0 ]; then - check_timeout=true - format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") - else - slept=0 - format=$(eval_gettext "Waiting for %d guests to shut down\n") - fi - while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do - while [ -n "$guests" ] && - [ $(guest_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ]; do - set -- $guests - guest=$1 - shift - guests=$* - shutdown_guest_async "$uri" "$guest" - on_shutdown="$on_shutdown $guest" - done - sleep 1 - - set -- $guests - guestcount=$# - set -- $on_shutdown - shutdowncount=$# - - if $check_timeout; then - if [ $(($timeout % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) "$timeout" - fi - timeout=$(($timeout - 1)) - if [ $timeout -le 0 ]; then - eval_gettext "Timeout expired while shutting down domains"; echo - RETVAL=1 - return - fi - else - slept=$(($slept + 1)) - if [ $(($slept % 5)) -eq 0 ]; then - printf "$format" $(($guestcount + $shutdowncount)) - fi - fi - - on_shutdown_prev=$on_shutdown - on_shutdown=$(check_guests_shutdown "$uri" "$on_shutdown") - print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" - done -} - -# stop -# Shutdown or save guests on the configured uris -stop() { - # last stop was not followed by start - [ -f "$LISTFILE" ] && return 0 - - suspending=true - if [ "x$ON_SHUTDOWN" = xshutdown ]; then - suspending=false - if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then - gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" - echo - RETVAL=6 - return - fi - fi - - : >"$LISTFILE" - set -f - for uri in $URIS; do - set +f - - test_connect "$uri" || continue - - eval_gettext "Running guests on \$uri URI: " - - list=$(list_guests "$uri") - if [ $? -eq 0 ]; then - empty=true - for uuid in $list; do - "$empty" || printf ", " - printf %s "$(guest_name "$uri" "$uuid")" - empty=false - done - - if "$empty"; then - gettext "no running guests." - fi - echo - fi - - if "$suspending"; then - transient=$(list_guests "$uri" "--transient") - if [ $? -eq 0 ]; then - empty=true - for uuid in $transient; do - if "$empty"; then - eval_gettext "Not suspending transient guests on URI: \$uri: " - empty=false - else - printf ", " - fi - printf %s "$(guest_name "$uri" "$uuid")" - done - echo - # reload domain list to contain only persistent guests - list=$(list_guests "$uri" "--persistent") - if [ $? -ne 0 ]; then - eval_gettext "Failed to list persistent guests on \$uri" - echo - RETVAL=1 - set +f - return - fi - else - gettext "Failed to list transient guests" - echo - RETVAL=1 - set +f - return - fi - fi - - if [ -n "$list" ]; then - echo "$uri" "$list" >>"$LISTFILE" - fi - done - set +f - - if [ -s "$LISTFILE" ]; then - while read uri list; do - if "$suspending"; then - eval_gettext "Suspending guests on \$uri URI..."; echo - else - eval_gettext "Shutting down guests on \$uri URI..."; echo - fi - - if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && - ! "$suspending"; then - shutdown_guests_parallel "$uri" "$list" - else - for guest in $list; do - if "$suspending"; then - suspend_guest "$uri" "$guest" - else - shutdown_guest "$uri" "$guest" - fi - done - fi - done <"$LISTFILE" - else - rm -f "$LISTFILE" - fi - - rm -f "$VAR_SUBSYS_LIBVIRT_GUESTS" -} - -# gueststatus -# List status of guests -gueststatus() { - set -f - for uri in $URIS; do - set +f - echo "* $uri URI:" - retval run_virsh "$uri" list || echo - done - set +f -} - -# rh_status -# Display current status: whether saved state exists, and whether start -# has been executed. We cannot use status() from the functions library, -# since there is no external daemon process matching this init script. -rh_status() { - if [ -f "$LISTFILE" ]; then - gettext "stopped, with saved guests"; echo - RETVAL=3 - else - if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - gettext "started"; echo - else - gettext "stopped, with no saved guests"; echo - fi - RETVAL=0 - fi -} - -# usage [val] -# Display usage string, then exit with VAL (defaults to 2). -usage() { - program_name=$0 - eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ -"condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo - exit ${1-2} -} - -# See how we were called. -if test $# != 1; then - usage -fi -case "$1" in - --help) - usage 0 - ;; - start|stop|gueststatus) - "$1" - ;; - restart) - stop && start - ;; - condrestart|try-restart) - [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ] && stop && start - ;; - reload|force-reload) - # Nothing to do; we reread configuration on each invocation - ;; - status) - rh_status - ;; - shutdown) - ON_SHUTDOWN=shutdown - stop - ;; - *) - usage - ;; -esac -exit $RETVAL diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index 0f0c41c..d41bf2b 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -6,8 +6,8 @@ After=syslog.target network.target EnvironmentFile=-/etc/sysconfig/libvirt-guests # Hack just call traditional service until we factor # out the code -ExecStart=/etc/init.d/libvirt-guests start -ExecStop=/etc/init.d/libvirt-guests stop +ExecStart=@libexecdir@/libvirt-guests.sh start +ExecStop=@libexecdir@/libvirt-guests.sh stop Type=oneshot RemainAfterExit=yes StandardOutput=journal+console diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in new file mode 100644 index 0000000..1c9c46b --- /dev/null +++ b/tools/libvirt-guests.sh.in @@ -0,0 +1,573 @@ +#!/bin/sh + +sysconfdir="@sysconfdir@" +localstatedir="@localstatedir@" +libvirtd="@sbindir@"/libvirtd + +# Source function library. +test ! -r "$sysconfdir"/rc.d/init.d/functions || + . "$sysconfdir"/rc.d/init.d/functions + +# Source gettext library. +# Make sure this file is recognized as having translations: _("dummy") +. "@bindir@"/gettext.sh + +export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@" + +URIS=default +ON_BOOT=start +ON_SHUTDOWN=suspend +SHUTDOWN_TIMEOUT=300 +PARALLEL_SHUTDOWN=0 +START_DELAY=0 +BYPASS_CACHE=0 + +test -f "$sysconfdir"/sysconfig/libvirt-guests && + . "$sysconfdir"/sysconfig/libvirt-guests + +LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests +VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests + +RETVAL=0 + +# retval COMMAND ARGUMENTS... +# run command with arguments and convert non-zero return value to 1 and set +# the global return variable +retval() { + "$@" + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + else + return 0 + fi +} + +# run_virsh URI ARGUMENTS... +# start virsh and let it execute ARGUMENTS on URI +# If URI is "default" virsh is called without the "-c" argument +# (using libvirt's default connection) +run_virsh() { + uri=$1 + shift + + if [ "x$uri" = xdefault ]; then + virsh "$@" </dev/null + else + virsh -c "$uri" "$@" </dev/null + fi +} + +# run_virsh_c URI ARGUMENTS +# Same as "run_virsh" but the "C" locale is used instead of +# the system's locale. +run_virsh_c() { + ( export LC_ALL=C; run_virsh "$@" ) +} + +# test_connect URI +# check if URI is reachable +test_connect() +{ + uri=$1 + + run_virsh "$uri" connect 2>/dev/null + if [ $? -ne 0 ]; then + eval_gettext "Can't connect to \$uri. Skipping." + echo + return 1 + fi +} + +# list_guests URI PERSISTENT +# List running guests on URI. +# PERSISTENT argument options: +# --persistent: list only persistent guests +# --transient: list only transient guests +# [none]: list both persistent and transient guests +list_guests() { + uri=$1 + persistent=$2 + + list=$(run_virsh_c "$uri" list --uuid $persistent) + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + echo $list +} + +# guest_name URI UUID +# return name of guest UUID on URI +guest_name() { + uri=$1 + uuid=$2 + + run_virsh "$uri" domname "$uuid" 2>/dev/null +} + +# guest_is_on URI UUID +# check if guest UUID on URI is running +# Result is returned by variable "guest_running" +guest_is_on() { + uri=$1 + uuid=$2 + + guest_running=false + id=$(run_virsh "$uri" domid "$uuid") + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + [ -n "$id" ] && [ "x$id" != x- ] && guest_running=true + return 0 +} + +# started +# Create the startup lock file +started() { + touch "$VAR_SUBSYS_LIBVIRT_GUESTS" +} + +# start +# Start or resume the guests +start() { + [ -f "$LISTFILE" ] || { started; return 0; } + + if [ "x$ON_BOOT" != xstart ]; then + gettext "libvirt-guests is configured not to start any guests on boot" + echo + rm -f "$LISTFILE" + started + return 0 + fi + + isfirst=true + bypass= + test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache + while read uri list; do + configured=false + set -f + for confuri in $URIS; do + set +f + if [ "x$confuri" = "x$uri" ]; then + configured=true + break + fi + done + set +f + if ! "$configured"; then + eval_gettext "Ignoring guests on \$uri URI"; echo + continue + fi + + test_connect "$uri" || continue + + eval_gettext "Resuming guests on \$uri URI..."; echo + for guest in $list; do + name=$(guest_name "$uri" "$guest") + eval_gettext "Resuming guest \$name: " + if guest_is_on "$uri" "$guest"; then + if "$guest_running"; then + gettext "already active"; echo + else + if "$isfirst"; then + isfirst=false + else + sleep $START_DELAY + fi + retval run_virsh "$uri" start $bypass "$name" \ + >/dev/null && \ + gettext "done"; echo + fi + fi + done + done <"$LISTFILE" + + rm -f "$LISTFILE" + started +} + +# suspend_guest URI GUEST +# Do a managed save on a GUEST on URI. This function returns after the guest +# was saved. +suspend_guest() +{ + uri=$1 + guest=$2 + + name=$(guest_name "$uri" "$guest") + label=$(eval_gettext "Suspending \$name: ") + bypass= + slept=0 + test "x$BYPASS_CACHE" = x0 || bypass=--bypass-cache + printf '%s...\n' "$label" + run_virsh "$uri" managedsave $bypass "$guest" >/dev/null & + virsh_pid=$! + while true; do + sleep 1 + kill -0 "$virsh_pid" >/dev/null 2>&1 || break + + slept=$(($slept + 1)) + if [ $(($slept % 5)) -eq 0 ]; then + progress=$(run_virsh_c "$uri" domjobinfo "$guest" 2>/dev/null | \ + awk '/^Data processed:/{print $3, $4}') + if [ -n "$progress" ]; then + printf '%s%s\n' "$label" "$progress" + else + printf '%s%s\n' "$label" "..." + fi + fi + done + retval wait "$virsh_pid" && printf '%s%s\n' "$label" "$(gettext "done")" +} + +# shutdown_guest URI GUEST +# Start a ACPI shutdown of GUEST on URI. This function return after the quest +# was successfully shutdown or the timeout defined by $SHUTDOWN_TIMEOUT expires. +shutdown_guest() +{ + uri=$1 + guest=$2 + + name=$(guest_name "$uri" "$guest") + eval_gettext "Starting shutdown on guest: \$name" + echo + retval run_virsh "$uri" shutdown "$guest" >/dev/null || return + timeout=$SHUTDOWN_TIMEOUT + check_timeout=false + if [ $timeout -gt 0 ]; then + check_timeout=true + format=$(eval_gettext "Waiting for guest %s to shut down, %d seconds left\n") + else + slept=0 + format=$(eval_gettext "Waiting for guest %s to shut down\n") + fi + while ! $check_timeout || [ "$timeout" -gt 0 ]; do + sleep 1 + guest_is_on "$uri" "$guest" || return + "$guest_running" || break + + if $check_timeout; then + if [ $(($timeout % 5)) -eq 0 ]; then + printf "$format" "$name" "$timeout" + fi + timeout=$(($timeout - 1)) + else + slept=$(($slept + 1)) + if [ $(($slept % 5)) -eq 0 ]; then + printf "$format" "$name" + fi + fi + done + + if guest_is_on "$uri" "$guest"; then + if "$guest_running"; then + eval_gettext "Shutdown of guest \$name failed to complete in time." + else + eval_gettext "Shutdown of guest \$name complete." + fi + fi +} + +# shutdown_guest_async URI GUEST +# Start a ACPI shutdown of GUEST on URI. This function returns after the command +# was issued to libvirt to allow parallel shutdown. +shutdown_guest_async() +{ + uri=$1 + guest=$2 + + name=$(guest_name "$uri" "$guest") + eval_gettext "Starting shutdown on guest: \$name" + echo + retval run_virsh "$uri" shutdown "$guest" > /dev/null +} + +# guest_count GUEST_LIST +# Returns number of guests in GUEST_LIST +guest_count() +{ + set -- $1 + echo $# +} + +# check_guests_shutdown URI GUESTS +# check if shutdown is complete on guests in "GUESTS" and returns only +# guests that are still shutting down +check_guests_shutdown() +{ + uri=$1 + guests=$2 + + guests_up= + for guest in $guests; do + if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then + eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." + echo + continue + fi + if "$guest_running"; then + guests_up="$guests_up $guest" + fi + done + echo "$guests_up" +} + +# print_guests_shutdown URI BEFORE AFTER +# Checks for differences in the lists BEFORE and AFTER and prints +# a shutdown complete notice for guests that have finished +print_guests_shutdown() +{ + uri=$1 + before=$2 + after=$3 + + for guest in $before; do + case " $after " in + *" $guest "*) continue;; + esac + + name=$(guest_name "$uri" "$guest") + eval_gettext "Shutdown of guest \$name complete." + echo + done +} + +# shutdown_guests_parallel URI GUESTS +# Shutdown guests GUESTS on machine URI in parallel +shutdown_guests_parallel() +{ + uri=$1 + guests=$2 + + on_shutdown= + check_timeout=false + timeout=$SHUTDOWN_TIMEOUT + if [ $timeout -gt 0 ]; then + check_timeout=true + format=$(eval_gettext "Waiting for %d guests to shut down, %d seconds left\n") + else + slept=0 + format=$(eval_gettext "Waiting for %d guests to shut down\n") + fi + while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do + while [ -n "$guests" ] && + [ $(guest_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ]; do + set -- $guests + guest=$1 + shift + guests=$* + shutdown_guest_async "$uri" "$guest" + on_shutdown="$on_shutdown $guest" + done + sleep 1 + + set -- $guests + guestcount=$# + set -- $on_shutdown + shutdowncount=$# + + if $check_timeout; then + if [ $(($timeout % 5)) -eq 0 ]; then + printf "$format" $(($guestcount + $shutdowncount)) "$timeout" + fi + timeout=$(($timeout - 1)) + if [ $timeout -le 0 ]; then + eval_gettext "Timeout expired while shutting down domains"; echo + RETVAL=1 + return + fi + else + slept=$(($slept + 1)) + if [ $(($slept % 5)) -eq 0 ]; then + printf "$format" $(($guestcount + $shutdowncount)) + fi + fi + + on_shutdown_prev=$on_shutdown + on_shutdown=$(check_guests_shutdown "$uri" "$on_shutdown") + print_guests_shutdown "$uri" "$on_shutdown_prev" "$on_shutdown" + done +} + +# stop +# Shutdown or save guests on the configured uris +stop() { + # last stop was not followed by start + [ -f "$LISTFILE" ] && return 0 + + suspending=true + if [ "x$ON_SHUTDOWN" = xshutdown ]; then + suspending=false + if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then + gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" + echo + RETVAL=6 + return + fi + fi + + : >"$LISTFILE" + set -f + for uri in $URIS; do + set +f + + test_connect "$uri" || continue + + eval_gettext "Running guests on \$uri URI: " + + list=$(list_guests "$uri") + if [ $? -eq 0 ]; then + empty=true + for uuid in $list; do + "$empty" || printf ", " + printf %s "$(guest_name "$uri" "$uuid")" + empty=false + done + + if "$empty"; then + gettext "no running guests." + fi + echo + fi + + if "$suspending"; then + transient=$(list_guests "$uri" "--transient") + if [ $? -eq 0 ]; then + empty=true + for uuid in $transient; do + if "$empty"; then + eval_gettext "Not suspending transient guests on URI: \$uri: " + empty=false + else + printf ", " + fi + printf %s "$(guest_name "$uri" "$uuid")" + done + echo + # reload domain list to contain only persistent guests + list=$(list_guests "$uri" "--persistent") + if [ $? -ne 0 ]; then + eval_gettext "Failed to list persistent guests on \$uri" + echo + RETVAL=1 + set +f + return + fi + else + gettext "Failed to list transient guests" + echo + RETVAL=1 + set +f + return + fi + fi + + if [ -n "$list" ]; then + echo "$uri" "$list" >>"$LISTFILE" + fi + done + set +f + + if [ -s "$LISTFILE" ]; then + while read uri list; do + if "$suspending"; then + eval_gettext "Suspending guests on \$uri URI..."; echo + else + eval_gettext "Shutting down guests on \$uri URI..."; echo + fi + + if [ "$PARALLEL_SHUTDOWN" -gt 1 ] && + ! "$suspending"; then + shutdown_guests_parallel "$uri" "$list" + else + for guest in $list; do + if "$suspending"; then + suspend_guest "$uri" "$guest" + else + shutdown_guest "$uri" "$guest" + fi + done + fi + done <"$LISTFILE" + else + rm -f "$LISTFILE" + fi + + rm -f "$VAR_SUBSYS_LIBVIRT_GUESTS" +} + +# gueststatus +# List status of guests +gueststatus() { + set -f + for uri in $URIS; do + set +f + echo "* $uri URI:" + retval run_virsh "$uri" list || echo + done + set +f +} + +# rh_status +# Display current status: whether saved state exists, and whether start +# has been executed. We cannot use status() from the functions library, +# since there is no external daemon process matching this init script. +rh_status() { + if [ -f "$LISTFILE" ]; then + gettext "stopped, with saved guests"; echo + RETVAL=3 + else + if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then + gettext "started"; echo + else + gettext "stopped, with no saved guests"; echo + fi + RETVAL=0 + fi +} + +# usage [val] +# Display usage string, then exit with VAL (defaults to 2). +usage() { + program_name=$0 + eval_gettext "Usage: \$program_name {start|stop|status|restart|"\ +"condrestart|try-restart|reload|force-reload|gueststatus|shutdown}"; echo + exit ${1-2} +} + +# See how we were called. +if test $# != 1; then + usage +fi +case "$1" in + --help) + usage 0 + ;; + start|stop|gueststatus) + "$1" + ;; + restart) + stop && start + ;; + condrestart|try-restart) + [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ] && stop && start + ;; + reload|force-reload) + # Nothing to do; we reread configuration on each invocation + ;; + status) + rh_status + ;; + shutdown) + ON_SHUTDOWN=shutdown + stop + ;; + *) + usage + ;; +esac +exit $RETVAL -- 1.8.0.1

2 2

[libvirt] [PATCH] uml: Report error if inotify fails on driver startup
by Cole Robinson 12 Dec '12

12 Dec '12

--- Someone at KVM forum was actually hitting an error here, since their system had exceeded the max number of inotify watches somehow. src/uml/uml_driver.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 7eedaf1..887dca6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -509,7 +509,8 @@ umlStartup(bool privileged, if (virFileMakePath(uml_driver->monitorDir) < 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), - uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof(ebuf))); + uml_driver->monitorDir, + virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } @@ -517,6 +518,10 @@ umlStartup(bool privileged, if (inotify_add_watch(uml_driver->inotifyFD, uml_driver->monitorDir, IN_CREATE | IN_MODIFY | IN_DELETE) < 0) { + char ebuf[1024]; + VIR_ERROR(_("Failed to create inotify watch on %s: %s"), + uml_driver->monitorDir, + virStrerror(errno, ebuf, sizeof(ebuf))); goto error; } -- 1.8.0.1

2 2

[libvirt] ANNOUNCE: libvirt 0.10.2.2 maintenance release
by Cole Robinson 12 Dec '12

12 Dec '12

libvirt 0.10.2.2 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.2.tar.gz Changes in this version: * dnsmasq: Fix parsing of the version number * dnsmasq: Fix parsing of the version number * storage: Error out earlier if the volume target path already exists * remote: Avoid the thread race condition * qemu: Don't free PCI device if adding it to activePciHostdevs fails * build: fix incremental autogen.sh when no AUTHORS is present * conf: prevent crash with no uuid in cephx auth secret * Allow duration=0 for virsh nodesuspend * Quote client identity in SASL whitelist log message * Fix uninitialized variables * nwfilter: report an error on OOM * virsh: check the return value of virStoragePoolGetAutostart * conf: fix uninitialized variable in virDomainListSnapshots * rpc: don't destroy xdr before creating it in virNetMessageEncodeHeader * virsh: do timing even for unusable connections * virsh: use correct sizeof when allocating cpumap * util: fix virBitmap allocation in virProcessInfoGetAffinity * network: fix crash when portgroup has no name * Fix leak of virNetworkPtr in LXC startup failure path * Fix error reporting in virNetDevVethDelete * Ensure transient def is removed if LXC start fails * Ensure failure to create macvtap device aborts LXC start * Avoid crash when LXC start fails with no interface target * Specify name of target interface with macvlan error * Treat missing driver cgroup as fatal in LXC driver * Ensure LXC container exits if cgroups setup fails * lxc: Don't crash if no security driver is specified in libvirt_lxc * lxc: Avoid segfault of libvirt_lxc helper on early cleanup paths * storage: fix logical volume cloning * Skip deleted timers when calculting next timeout * Warn if requesting update to non-existent timer/handle watch * Fix virDiskNameToIndex to actually ignore partition numbers * conf: Report sensible error for invalid disk name * Use virNetServerRun instead of custom main loop * storage: Fix bug of fs pool destroying * conf: add support for booting from redirected USB devices * qemu: allow larger discrepency between memory & currentMemory in domain xml * nodeinfo: support kernels that lack socket information * virsh: save: report an error if XML file can't be read * Doug Goldstein gained commit capability (cherry picked from commit bf60b6b33fd8e989b56c5a5cd4ea9660cbd0e556) * build: rerun bootstrap if AUTHORS is missing * Fix uninitialized variable in virLXCControllerSetupDevPTS * qemu: Don't force port=0 for SPICE * Fix "virsh create" example * esx: Yet another connection fix for 5.1 * qemu: Add controllers in specified order * qemu: Wrap controllers code into dummy loop * spec: replace scriptlets with new systemd macros * iohelper: Don't report errors on special FDs * qemu: Fix possible race when pausing guest * net: Remove dnsmasq and radvd files also when destroying transient nets * net: Move creation of dnsmasq hosts file to function starting dnsmasq * conf: net: Fix deadlock if assignment of network def fails * conf: net: Fix helper for applying new network definition * Linux Containers are not allowed to create device nodes. * net-update docs: s/domain/network/ * iohelper: fdatasync() at the end * qemu: Fix EmulatorPinInfo without emulatorpin * bugfix: ip6tables rule removal * Create temporary dir for socket * util: do a better job of matching up pids with their binaries * qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly (cherry picked from commit 81af5336acf4c765ef1201e7762d003ae0b0011e) * qemu: Do not ignore address for USB disks (cherry picked from commit 8f708761c0d0e4eaf36bcb274d4f49fc3e0c3874) * esx: Fix connection to ESX 5.1 * conf: fix virDomainNetGetActualDirect*() and BridgeName() * network: use dnsmasq --bind-dynamic when available * util: new virSocketAddrIsPrivate function * util: capabilities detection for dnsmasq * add ppc64 and s390x to arches where qemu-kvm exists * qemu: Always format CPU topology * spec: don't enable cgconfig under systemd * qemu: Fix name comparison in qemuMonitorJSONBlockIoThrottleInfo() * qemu: Keep QEMU host drive prefix in BlkIoTune For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.9.11.8 maintenance release
by Cole Robinson 12 Dec '12

12 Dec '12

libvirt 0.9.11.8 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.8.tar.gz Changes in this version: * qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly (cherry picked from commit 81af5336acf4c765ef1201e7762d003ae0b0011e) * qemu: Do not ignore address for USB disks (cherry picked from commit 8f708761c0d0e4eaf36bcb274d4f49fc3e0c3874) * qemu: Fix name comparison in qemuMonitorJSONBlockIoThrottleInfo() * qemu: Keep QEMU host drive prefix in BlkIoTune * dnsmasq: Fix parsing of the version number * dnsmasq: Fix parsing of the version number * conf: fix virDomainNetGetActualDirect*() and BridgeName() * network: use dnsmasq --bind-dynamic when available * util: new virSocketAddrIsPrivate function * util: capabilities detection for dnsmasq * spec: don't enable cgconfig under systemd For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH 1/2] add security hook for permitting hugetlbfs access (v2)
by serge＠hallyn.com 11 Dec '12

11 Dec '12

From: Serge Hallyn <serge.hallyn(a)ubuntu.com> When a qemu domain is backed by huge pages, apparmor needs to grant the domain rw access to files under the hugetlbfs mount point. Add a hook, called in qemu_process.c, which ends up adding the read-write access through virt-aa-helper. Qemu will be creating a randomly named file under the mountpoint and unlinking it as soon as it has mmap()d it, therefore we cannot predict the full pathname, but for the same reason it is generally safe to provide access to $path/**. Changelog: v2: use virBuffer* in place of snprintf v2: add test to virt-aa-helper-tests for the virt-aa-helper -F command used. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 9 +++++++++ src/security/security_driver.h | 4 ++++ src/security/security_manager.c | 10 ++++++++++ src/security/security_manager.h | 3 +++ src/security/security_stack.c | 19 +++++++++++++++++++ tests/virt-aa-helper-test | 3 +++ 7 files changed, 49 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7d083e4..cd798a7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1074,6 +1074,7 @@ virSecurityManagerSetTapFDLabel; virSecurityManagerStackAddNested; virSecurityManagerVerify; virSecurityManagerGetMountOptions; +virSecurityManagerSetHugepages; # sexpr.h sexpr_append; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ab04599..4418f33 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3482,6 +3482,15 @@ int qemuProcessStart(virConnectPtr conn, } virDomainAuditSecurityLabel(vm, true); + if (driver->hugepage_path && vm->def->mem.hugepage_backed) { + if (virSecurityManagerSetHugepages(driver->securityManager, + vm->def, driver->hugepage_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to set huge path in security driver")); + goto cleanup; + } + } + /* Ensure no historical cgroup for this VM is lying around bogus * settings */ VIR_DEBUG("Ensuring no historical cgroup is lying around"); diff --git a/src/security/security_driver.h b/src/security/security_driver.h index d49b401..ad5097b 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -100,6 +100,9 @@ typedef int (*virSecurityDomainSetTapFDLabel) (virSecurityManagerPtr mgr, int fd); typedef char *(*virSecurityDomainGetMountOptions) (virSecurityManagerPtr mgr, virDomainDefPtr def); +typedef int (*virSecurityDomainSetHugepages) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); struct _virSecurityDriver { size_t privateDataLen; @@ -140,6 +143,7 @@ struct _virSecurityDriver { virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel; virSecurityDomainGetMountOptions domainGetSecurityMountOptions; + virSecurityDomainSetHugepages domainSetSecurityHugepages; }; virSecurityDriverPtr virSecurityDriverLookup(const char *name, diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 0ebd53b..690e4da 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -508,3 +508,13 @@ virSecurityManagerGetNested(virSecurityManagerPtr mgr) list[1] = NULL; return list; } + +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + if (mgr->drv->domainSetSecurityHugepages) + return mgr->drv->domainSetSecurityHugepages(mgr, vm, path); + + return 0; +} diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 1fdaf8e..2de4d30 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -112,5 +112,8 @@ char *virSecurityManagerGetMountOptions(virSecurityManagerPtr mgr, virDomainDefPtr vm); virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr); +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr sec, + const char *hugepages_path); #endif /* VIR_SECURITY_MANAGER_H__ */ diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 1094cbe..c2ccbd0 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -462,6 +462,23 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr, return rc; } +static int +virSecurityStackSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityStackItemPtr item = priv->itemsHead; + int rc = 0; + + for (; item; item = item->next) { + if (virSecurityManagerSetHugepages(item->securityManager, vm, path) < 0) + rc = -1; + } + + return rc; +} + static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr vm ATTRIBUTE_UNUSED) { return NULL; @@ -529,4 +546,6 @@ virSecurityDriver virSecurityDriverStack = { .domainSetSecurityTapFDLabel = virSecurityStackSetTapFDLabel, .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, + + .domainSetSecurityHugepages = virSecurityStackSetHugepages, }; diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index 21a2766..f14db8b 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -316,6 +316,9 @@ testme "0" "initrd is /initrd.img" "-r -u $valid_uuid" "$test_xml" sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,<graphics*,<graphics type='sdl' display=':0.0' xauth='/home/myself/.Xauthority'/>,g" "$template_xml" > "$test_xml" testme "0" "sdl Xauthority" "-r -u $valid_uuid" "$test_xml" +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" "$template_xml" > "$test_xml" +testme "0" "hugepages" "-r -u $valid_uuid -F /run/hugepages/kvm/\*\*" "$test_xml" + testme "0" "help" "-h" echo "" >$output -- 1.7.10.4

4 5

[libvirt] [PATCH v3 0/2] storage: allow metadata preallocation when creating qcow2 images
by Ján Tomko 11 Dec '12

11 Dec '12

Diff to v1: * A flag for virStorageVolCreateXML and virStorageVolCreateXMLFrom is used instead of guessing from the allocation element. * The flag is exposed and documented in virsh. Diff to v2: * merged first two patches to enable and implement the flag at the same time * more documentation * fixed spaces to pass syntax-check * !! for unsigned -> bool conversion * initialize flags in cmdVolCreateFrom and cmdVolClone Ján Tomko (2): storage: allow metadata preallocation when creating qcow2 images virsh: allow metadata preallocation when creating volumes include/libvirt/libvirt.h.in | 4 +++ src/libvirt.c | 16 ++++++++++-- src/storage/storage_backend.c | 46 ++++++++++++++++++++++++++----------- src/storage/storage_backend.h | 3 +- src/storage/storage_backend_fs.c | 16 ++++++++----- src/storage/storage_driver.c | 6 ++-- tools/virsh-volume.c | 25 +++++++++++++++++--- tools/virsh.pod | 23 ++++++++++++++++-- 8 files changed, 105 insertions(+), 34 deletions(-) -- 1.7.8.6

3 7

[libvirt] [PATCH] maint: mention when HACKING is rebuilt during make
by Eric Blake 11 Dec '12

11 Dec '12

I noticed that on Fedora 18, xlstproc decides to regenerate HACKING with additional whitespace. I haven't figured out why that is happening (although fixing it would probably be a task for xlstproc), but in the process of investigating, I noticed that 'make HACKING' was completely silent, for no good reason. * Makefile.am (gen-ChangeLog, gen-AUTHORS, NEWS) ($(top_srcdir)/HACKING): Mention which files we are generating. --- The F18 xsltproc is from libxslt-1.1.27; it is generating additional newlines in HACKING when compared against libxslt-1.1.26 of RHEL 6.3; any hints on making HACKING idempotent in spite of different libxslt versions would be appreciated. Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7b3a335..f8e669a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2011 Red Hat, Inc. +## Copyright (C) 2005-2012 Red Hat, Inc. ## See COPYING.LIB for the License of this software LCOV = lcov @@ -35,7 +35,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvirt.pc NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in - -@(if [ -x $(XSLTPROC) ] ; then \ + $(AM_V_GEN)(if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \ $(top_srcdir)/docs/news.html.in \ | perl -0777 -pe 's/\n\n+$$/\n/' \ @@ -44,7 +44,7 @@ NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in $(top_srcdir)/HACKING: $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking2.xsl \ $(top_srcdir)/docs/wrapstring.xsl $(top_srcdir)/docs/hacking.html.in - -@(if [ -x $(XSLTPROC) ] ; then \ + $(AM_V_GEN)(if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking1.xsl $(top_srcdir)/docs/hacking.html.in | \ $(XSLTPROC) --nonet $(top_srcdir)/docs/hacking2.xsl - \ | perl -0777 -pe 's/\n\n+$$/\n/' \ @@ -86,7 +86,7 @@ dist-hook: gen-ChangeLog gen-AUTHORS gen_start_date = 2009-07-04 .PHONY: gen-ChangeLog gen-ChangeLog: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ --since=$(gen_start_date) > $(distdir)/cl-t; \ rm -f $(distdir)/ChangeLog; \ @@ -95,7 +95,7 @@ gen-ChangeLog: .PHONY: gen-AUTHORS gen-AUTHORS: - if test -d .git; then \ + $(AM_V_GEN)if test -d .git; then \ out="`git log --pretty=format:'%aN <%aE>' | sort -u`" && \ cat $(srcdir)/AUTHORS.in | perl -p -e "s/#authorslist#/$$out/" > \ $(distdir)/AUTHORS-tmp && \ -- 1.8.0.1

1 1

[libvirt] [PATCH 1/N] qemu driver FreeBSD support: fix compilation
by Roman Bogorodskiy 11 Dec '12

11 Dec '12

Another round of the FreeBSD patches. Here's the first chunk to fix compilation. Roman Bogorodskiy

4 4

[libvirt] [PATCH] docs: Document offline migration
by Jiri Denemark 11 Dec '12

11 Dec '12

--- docs/migration.html.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/migration.html.in b/docs/migration.html.in index c6b62f7..f311655 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -136,6 +136,20 @@ facility should be used. </p> + <h2><a name="offline">Offline migration</a></h2> + + <p> + Offline migration transfers inactive definition of a domain (which + may or may not be active). After successful completion, the domain + remains in its current state on source host and is defined but + inactive on destination host. It's a bit more clever than + <code>virsh dumpxml</code> on source host followed by + <code>virsh define</code> on destination host, as offline migration + will run pre-migration hook to update the domain XML on destination + host. Currently, copying non-shared storage is not supported during + offline migration. + </p> + <h2><a name="uris">Migration URIs</a></h2> <p> -- 1.8.0

2 2

[libvirt] [PATCH 0/5] Fix async job type when doing external snapshots and improve error message handling
by Peter Krempa 11 Dec '12

11 Dec '12

This series adds error messages when trying to do a snapshot of a machine that has hostdevices assigned. Peter Krempa (5): qemu: Restart CPUs with valid async job type when doing external snapshots qemu: Make qemuMigrationIsAllowed more reusable qemu: snapshot: Report better error message if migration isn't allowed qemu: reuse qemuMigrationIsAllowed when doing save and managedsave [OPTIONAL] qemu: allow save and managedsave on guests marked as autodestroyable src/qemu/qemu_driver.c | 16 ++++++---------- src/qemu/qemu_migration.c | 45 ++++++++++++++++++++++++++------------------- src/qemu/qemu_migration.h | 2 ++ 3 files changed, 34 insertions(+), 29 deletions(-) -- 1.8.0

4 16

[libvirt] [PATCH] qemu: assume seccomp sandbox is supported since qemu 1.2
by Ján Tomko 11 Dec '12

11 Dec '12

Currently there is no way to detect it via QMP and requesting "-sandbox off" works correctly even if it was compiled out, so this will work unless someone both requests the sandbox in qemu.conf and builds QEMU without the support for it. --- Relevant discussion in qemu-devel: http://lists.nongnu.org/archive/html/qemu-devel/2012-12/msg00101.html --- src/qemu/qemu_capabilities.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 01a1b98..98e65f1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2283,6 +2283,7 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) qemuCapsSet(caps, QEMU_CAPS_WAKEUP); qemuCapsSet(caps, QEMU_CAPS_NO_USER_CONFIG); qemuCapsSet(caps, QEMU_CAPS_NETDEV_BRIDGE); + qemuCapsSet(caps, QEMU_CAPS_SECCOMP_SANDBOX); } -- 1.7.8.6

2 1

[libvirt] virDomainSetMetadata --> qemuDomainSetMetadata
by SHAH, Ronak (Ronak R) 11 Dec '12

11 Dec '12

Hi, I have requirement to add <metadata> tag into the libvirt XML from the application. While calling virDomainSetMetadata which internally call qemuDomainSetMetadata (correct me here if I am wrong), I am getting following error: qemuDomainSetMetdata:12623 : argument unsupported: QEMU driver does not support<metadata> element Support for setting and getting <metadata> with special namespace is deliberately added in 0.9.10 of libvirt and I am using 0.9.13. I am surprise that the internal qemu driver is still cribbing out it. I am passing following in my call: Type : VIR_DOMAIN_METADATA_ELEMENT Metadata: "<desc> Some Desc </desc>" Key: "Ronak" uri: "Ronak.com/Ronak/libvirt" Flags: 0 Can someone please help? Thanks, Ronak

3 3

[libvirt] [PATCH v3 0/8] Allow minimal bandwidth guarantee
by Michal Privoznik 11 Dec '12

11 Dec '12

This is a rework of my one year old patchset [1]. If you are brave enough and start reviewing it, you may want to read the last patch first. The whole magic hidden behind the scene is documented there. For now, the only supported combination where this works is virtual interface connected to virtual network. This network MUST have an inbound average set, at least. This tells how much bandwidth do we have, and how much can we guarantee. If we would miss this info, then we cannot guarantee anything. On the other hand, this is just a very small part of whole problem. Users MUST configure all other devices on traffic path to follow up their setting in libvirt. But that's out of our scope. 1: http://www.redhat.com/archives/libvir-list/2011-December/msg00486.html diff to v1: -Laine's suggestions worked in diff to v2: -again Laine's suggestions worked in (drop libvirt_network.syms, don't check for floor twice, etc.) Michal Privoznik (8): bandwidth: Attach sfq to leaf node bandwidth: add new 'floor' attribute bandwidth: Create hierarchical shaping classes bandwidth: Create (un)plug functions bandwidth: Create rate update function bandwidth: Create network bandwidth (un)plug functions network: Create real network status files domain: Keep assigned class_id in domstatus XML docs/formatdomain.html.in | 23 +++- docs/schemas/networkcommon.rng | 5 + po/POTFILES.in | 1 + src/conf/domain_conf.c | 19 ++- src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 67 +++++++-- src/conf/netdev_bandwidth_conf.h | 3 +- src/conf/network_conf.c | 229 +++++++++++++++++++++----- src/conf/network_conf.h | 6 + src/libvirt_private.syms | 4 + src/lxc/lxc_process.c | 3 +- src/network/bridge_driver.c | 242 +++++++++++++++++++++++++++- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 2 +- src/util/virnetdevbandwidth.c | 331 +++++++++++++++++++++++++++++++++++++- src/util/virnetdevbandwidth.h | 25 +++- src/util/virnetdevmacvlan.c | 2 +- 17 files changed, 886 insertions(+), 80 deletions(-) -- 1.7.8.6

2 17

[libvirt] [PATCH v0] qemu driver FreeBSD support
by Roman Bogorodskiy 11 Dec '12

11 Dec '12

Hello, Attached an initial version of the patch providing FreeBSD support for qemu driver. Initial discussion on the topic started here: https://www.redhat.com/archives/libvir-list/2012-November/msg00841.html Roman Bogorodskiy

4 4

[libvirt] [PATCH 0/8] parallels: add networking support
by Dmitry Guryanov 11 Dec '12

11 Dec '12

The goal of this patch series is to add initial support of networking to Parallels Cloud Server driver. Parallels driver will be able to show read-only list of virtual networks and manage network adapters of virtual machines (list, add, remove, change properties, switch to another virtual network). Dmitry Guryanov (8): parallels: parse information about network interfaces parallels: add support of network interfaces to parallelsDomainDefineXML parallels: move parallelsParseError to parallels_utils.h parallels: add network driver Use size_t for virNetworkIpDef structure parallels: parse virtual network properties parallels: add routed pseudo network parallels: handle network adapters of type 'routed' po/POTFILES.in | 2 + src/Makefile.am | 3 +- src/conf/network_conf.h | 4 +- src/parallels/parallels_driver.c | 314 ++++++++++++++++++- src/parallels/parallels_network.c | 639 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_utils.h | 9 + 6 files changed, 963 insertions(+), 8 deletions(-) create mode 100644 src/parallels/parallels_network.c -- 1.7.7.6

2 19

[libvirt] [PATCH v2 0/8] Allow minimal bandwidth guarantee
by Michal Privoznik 11 Dec '12

11 Dec '12

This is a rework of my one year old patchset [1]. If you are brave enough and start reviewing it, you may want to read the last patch first. The whole magic hidden behind the scene is documented there. For now, the only supported combination where this works is virtual interface connected to virtual network. This network MUST have an inbound average set, at least. This tells how much bandwidth do we have, and how much can we guarantee. If we would miss this info, then we cannot guarantee anything. On the other hand, this is just a very small part of whole problem. Users MUST configure all other devices on traffic path to follow up their setting in libvirt. But that's out of our scope. 1: http://www.redhat.com/archives/libvir-list/2011-December/msg00486.html diff to v1: -Laine's suggestions worked in Michal Privoznik (8): bandwidth: Attach sfq to leaf node bandwidth: add new 'floor' attribute bandwidth: Create hierarchical shaping classes bandwidth: Create (un)plug functions bandwidth: Create rate update function bandwidth: Create network bandwidth (un)plug functions network: Create real network status files domain: Keep assigned class_id in domstatus XML docs/formatdomain.html.in | 23 ++- docs/schemas/networkcommon.rng | 5 + po/POTFILES.in | 1 + src/Makefile.am | 7 +- src/conf/domain_conf.c | 19 ++- src/conf/domain_conf.h | 1 + src/conf/netdev_bandwidth_conf.c | 67 +++++++- src/conf/netdev_bandwidth_conf.h | 3 +- src/conf/network_conf.c | 230 +++++++++++++++++++++----- src/conf/network_conf.h | 6 + src/libvirt_network.syms | 13 ++ src/libvirt_private.syms | 9 +- src/lxc/lxc_process.c | 3 +- src/network/bridge_driver.c | 253 +++++++++++++++++++++++++++- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 2 +- src/util/virnetdevbandwidth.c | 337 +++++++++++++++++++++++++++++++++++++- src/util/virnetdevbandwidth.h | 24 +++- src/util/virnetdevmacvlan.c | 2 +- 19 files changed, 920 insertions(+), 88 deletions(-) create mode 100644 src/libvirt_network.syms -- 1.7.8.6

2 21

[libvirt] [PATCH] qemu: fix uninitialized variable warning in doPeer2PeerMigrate
by Ján Tomko 11 Dec '12

11 Dec '12

False positive, but it breaks the build with gcc-4.6.3. qemu/qemu_migration.c:2931:37: error: 'offline' may be used uninitialized in this function [-Werror=uninitialized] qemu/qemu_migration.c:2887:10: note: 'offline' was declared here --- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0ca7dd4..8796eb6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2884,7 +2884,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, virConnectPtr dconn = NULL; bool p2p; virErrorPtr orig_err = NULL; - bool offline; + bool offline = false; VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, flags=%lx, dname=%s, resource=%lu", -- 1.7.8.6

2 2

[libvirt] [PATCH 0/2] Another set of fixes for snapshots
by Peter Krempa 11 Dec '12

11 Dec '12

This series contains two small patches for a few nits in the snapshot code. Peter Krempa (2): qemu: snapshot: Don't leak XML definition if restarting of CPUs fails qemu: snapshot: Remove memory image if external checkpoint fails src/qemu/qemu_driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 1.8.0

2 4

[libvirt] [PATCH] examples: Fix balloon event callback
by Jiri Denemark 11 Dec '12

11 Dec '12

--- examples/domain-events/events-python/event-test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 3fb046e..3095e94 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -490,7 +490,7 @@ def myDomainEventPMWakeupCallback(conn, dom, reason, opaque): def myDomainEventPMSuspendCallback(conn, dom, reason, opaque): print "myDomainEventPMSuspendCallback: Domain %s(%s) system pmsuspend" % ( dom.name(), dom.ID()) -def myDomainEventBalloonChangeCallback(conn, dom, utcoffset, actual): +def myDomainEventBalloonChangeCallback(conn, dom, actual, opaque): print "myDomainEventBalloonChangeCallback: Domain %s(%s) %d" % (dom.name(), dom.ID(), actual) def myDomainEventPMSuspendDiskCallback(conn, dom, reason, opaque): print "myDomainEventPMSuspendDiskCallback: Domain %s(%s) system pmsuspend_disk" % ( -- 1.8.0

2 2

[libvirt] [PATCHv4 0/2] DHCPv6; put dnsmasq parameters in conf-file
by Gene Czarcinski 11 Dec '12

11 Dec '12

Updated based on Laine Stump review and rebased 6 December 2012 Note to Laine: I "ignored" one of your comments involving moving the order of some dnsmasq parameters in the spirit of "what is done is done." Changing that would have required more changes to test files as well as the conf-file patch file. These two patch files are packaged together because they serially depend on each other. The DHCPv6 support checks dnsmasq's version and requires a minimum of 2.64. Also, using dnsmasq for providing the RA service is checked against the dnsmasq version and is currently 2.64. There are separate checks for DHCPv6 and Router Advertising support by dnsmasq. Dnsmasq version 2.64 final is not released and staged for both Fedora 18 and Fedora 17. As with IPv4, IPv6 DHCP is only one subnetwork on an interface. Additionally, if other IPv6 addresses are defined, a warning message is issued since the Router Advertisement service will support only state-full (DHCP) or state-less (SLAAC) addressing on a network interface (not both). Thus, the additional subnetworks will need to be manually configured to properly function. If dnsmasq provides the RA service, it also points to itself as a RDNSS (Recursive DNS Server) as part of the information is supplies. If IPv6 DHCP is not being run, then SLAAC addressing is supported for any IPv6 addresses specified. Gene Czarcinski (2): v8.3 add support for DHCPv6 v8.0: put dnsmasq parameters into conf-file docs/formatnetwork.html.in | 108 +++- docs/schemas/network.rng | 12 +- src/conf/network_conf.c | 96 ++-- src/network/bridge_driver.c | 556 ++++++++++++++------- src/network/bridge_driver.h | 13 +- src/util/dnsmasq.c | 29 +- src/util/dnsmasq.h | 17 +- tests/networkxml2argvdata/dhcp6-nat-network.conf | 19 + tests/networkxml2argvdata/dhcp6-nat-network.xml | 24 + tests/networkxml2argvdata/dhcp6-network.conf | 19 + tests/networkxml2argvdata/dhcp6-network.xml | 14 + .../dhcp6host-routed-network.conf | 17 + .../dhcp6host-routed-network.xml | 19 + tests/networkxml2argvdata/isolated-network.argv | 10 - tests/networkxml2argvdata/isolated-network.conf | 20 + .../networkxml2argvdata/nat-network-dns-hosts.argv | 5 - .../networkxml2argvdata/nat-network-dns-hosts.conf | 14 + .../nat-network-dns-srv-record-minimal.argv | 16 - .../nat-network-dns-srv-record-minimal.conf | 23 + .../nat-network-dns-srv-record.argv | 11 - .../nat-network-dns-srv-record.conf | 18 + .../nat-network-dns-txt-record.argv | 9 - .../nat-network-dns-txt-record.conf | 18 + tests/networkxml2argvdata/nat-network.argv | 8 - tests/networkxml2argvdata/nat-network.conf | 19 + tests/networkxml2argvdata/netboot-network.argv | 10 - tests/networkxml2argvdata/netboot-network.conf | 23 + .../networkxml2argvdata/netboot-proxy-network.argv | 10 - .../networkxml2argvdata/netboot-proxy-network.conf | 21 + tests/networkxml2argvdata/routed-network.argv | 4 - tests/networkxml2argvdata/routed-network.conf | 12 + tests/networkxml2argvtest.c | 49 +- 32 files changed, 865 insertions(+), 378 deletions(-) create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.conf create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6-network.conf create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.conf create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.xml delete mode 100644 tests/networkxml2argvdata/isolated-network.argv create mode 100644 tests/networkxml2argvdata/isolated-network.conf delete mode 100644 tests/networkxml2argvdata/nat-network-dns-hosts.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-hosts.conf delete mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.conf delete mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-srv-record.conf delete mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.argv create mode 100644 tests/networkxml2argvdata/nat-network-dns-txt-record.conf delete mode 100644 tests/networkxml2argvdata/nat-network.argv create mode 100644 tests/networkxml2argvdata/nat-network.conf delete mode 100644 tests/networkxml2argvdata/netboot-network.argv create mode 100644 tests/networkxml2argvdata/netboot-network.conf delete mode 100644 tests/networkxml2argvdata/netboot-proxy-network.argv create mode 100644 tests/networkxml2argvdata/netboot-proxy-network.conf delete mode 100644 tests/networkxml2argvdata/routed-network.argv create mode 100644 tests/networkxml2argvdata/routed-network.conf -- 1.7.11.7

2 4

[libvirt] [PATCHv4 00/17] new VIR_(APPEND|INSERT|DELETE)_ELEMENT macros
by Laine Stump 11 Dec '12

11 Dec '12

DO NOT BE SCARED OFF BY THE PATCH COUNT!! Most of these are very short, and they all follow the same pattern; beyond that, 01/17 and 02/17 are the only ones that I really want to push now; the others are so far only for informational purposes (although you can apply them locally if you want :-) The first patch in this series adds new macros to insert/append/delete elements from the arrays of variously-sized structs that are commonly used in libvirt. The intent is to eliminate the arithmetic mistakes associated with calling memmove() directly, and shorten application code. A full description of the added macros and their functions is included in 01/17. Patches 02..17 convert various bits of hand-coded array manipulation in libvirt to use the new macros. They can be taken now, later, or never (although I'd like to have at least 02/17 taken now, since other similar functions will be added in an upcoming patch series, and I want them to all use the same logic). Mostly I went through all of those conversions to see just how useful/usable the new macros were (and they led to a couple of rewrites). Changes from V3 - fixed things in 01/17 according to Eric's comments on V3 (including changing from passing &newelem to passing newelem, which we separately discussed on IRC). 02-17 just have their calling sequences adjusted to replace all "&item" with "item" to account for the change. I will be (re)posting another series momentarily that has a dependency on 01/17. Laine Stump (17): util: add VIR_(APPEND|INSERT|DELETE)_ELEMENT conf: use VIR_(INSERT|DELETE)_ELEMENT in virNetworkUpdate backend conf: use VIR_DELETE_ELEMENT for conf object lists conf: use VIR_(APPEND|DELETE)_ELEMENT for domain device lists conf: use VIR_(APPEND|DELETE)_ELEMENT for domain event lists conf: use VIR_(APPEND|DELETE)_ELEMENT for vcpupin list xen: Use VIR_DELETE_ELEMENT for disk/net devices xen: use VIR_DELETE_ELEMENT for xen domain and watch lists util: use VIR_(APPEND|DELETE)_ELEMENT for pci/usb device lists util: use VIR_(APPEND|DELETE)_ELEMENT for win32 waiting events list rpc: use VIR_DELETE_ELEMENT for list of netclient streams rpc: use VIR_(APPEND|DELETE)_ELEMENT for netserver client lists test: use VIR_(APPEND|DELETE)_ELEMENT for qemuMonitorTest list nwfilter: use VIR_(APPEND|DELETE)_ELEMENT for lists util: eliminate leak in ebtables util: use VIR_(APPEND|DELETE)_ELEMENT for ebtables rule lists util: use VIR_(APPEND|DELETE)_ELEMENT for lock owners lists cfg.mk | 2 +- src/conf/domain_conf.c | 152 ++++++------------------------ src/conf/domain_conf.h | 12 +-- src/conf/domain_event.c | 51 ++-------- src/conf/interface_conf.c | 13 +-- src/conf/interface_conf.h | 4 +- src/conf/network_conf.c | 102 +++++--------------- src/conf/network_conf.h | 6 +- src/conf/node_device_conf.c | 11 +-- src/conf/node_device_conf.h | 4 +- src/conf/nwfilter_conf.c | 46 +++------ src/conf/nwfilter_conf.h | 8 +- src/conf/nwfilter_params.c | 8 +- src/conf/storage_conf.c | 11 +-- src/conf/storage_conf.h | 4 +- src/libvirt_private.syms | 2 + src/nwfilter/nwfilter_gentech_driver.c | 15 ++- src/parallels/parallels_storage.c | 14 +-- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_driver.c | 4 +- src/rpc/virnetclient.c | 21 +---- src/rpc/virnetserver.c | 14 +-- src/storage/storage_backend_rbd.c | 2 +- src/storage/storage_driver.c | 12 +-- src/test/test_driver.c | 14 +-- src/util/ebtables.c | 29 ++---- src/util/ebtables.h | 4 +- src/util/hostusb.c | 26 ++--- src/util/memory.c | 106 ++++++++++++++++++++- src/util/memory.h | 167 ++++++++++++++++++++++++++++++++- src/util/pci.c | 18 +--- src/util/threads-win32.c | 15 +-- src/util/virlockspace.c | 20 +--- src/xen/xen_driver.c | 14 +-- src/xen/xen_driver.h | 4 +- src/xen/xen_inotify.c | 16 +--- src/xen/xm_internal.c | 14 +-- src/xen/xs_internal.c | 13 +-- src/xen/xs_internal.h | 2 +- tests/qemumonitortestutils.c | 23 +---- 42 files changed, 437 insertions(+), 576 deletions(-) -- 1.7.11.7

3 23

[libvirt] [PATCHv2 0/7] refactoring network xml parsing + net-update additions
by Laine Stump 11 Dec '12

11 Dec '12

Patches 1,2, and 4-7 refactor the network XML parsing functions to have a more uniform calling sequence for different subelements of <network>. This makes it simpler to write new virNetworkUpdate*() backend functions for those bits (because they're then more similar to existing functions.) Patch 3 actually adds some new backends for updating subelements that weren't previously implemented - <dns> host/srv/txt records. The intent is to followup on patched 4-7 with backends for updating <ip>, <forward>, and <bridge>; while I haven't gotten to those yet, I'd rather get these changes in sooner than later, both for more testing, and to make future backports simpler. Difference from V1: simply rebased and modified for change in calling sequence of VIR_INSERT_ELEMENT. No other changes. Laine Stump (7): conf: rename network dns host/srv/txt arrays conf: clear and parse functions for dns host/srv/txt records network: backend functions for updating network dns host/srv/txt conf: rename some labels and functions in network_conf conf: make virNetworkIpDefClear consistent with other functions conf: put data for network <forward> element into its own struct conf: split <forward> parser/clear into separate functions src/conf/network_conf.c | 1382 ++++++++++++++++++++++++++---------------- src/conf/network_conf.h | 74 ++- src/esx/esx_network_driver.c | 30 +- src/network/bridge_driver.c | 283 +++++---- src/vbox/vbox_tmpl.c | 4 +- 5 files changed, 1056 insertions(+), 717 deletions(-) -- 1.7.11.7

2 15

[libvirt] [PATCH v4 00/13] parallels: implement operations with hard disks
by Dmitry Guryanov 11 Dec '12

11 Dec '12

This patch series adds ability to list existing disk images, create a new ones and add or remove hard disk devices to the VM. Changes in v2: rebased to current sources Changes in v3: fixed errors in make syntax-check Changes in v4: fixed rebase errors Dmitry Guryanov (13): parallels: add info about hard disk devices parallels: handle disk devices in parallelsDomainDefineXML parallels: split parallelsStorageOpen function parallels: remove unused code from storage driver parallels: create storage pools by VM list parallels: fix leaks in parallelsFindVolumes parallels: add info about volumes parallels: fill volumes capacity parameter parallels: split parallelsStorageVolumeDelete function parallels: add function parallelsGetDiskBusName parallels: add support of disks creation parallels: apply config after VM creation parallels: add support of removing disks src/parallels/parallels_driver.c | 346 +++++++++++++++++++++++++-- src/parallels/parallels_storage.c | 479 +++++++++++++++++++++++++++++++------ src/parallels/parallels_utils.h | 3 + 3 files changed, 731 insertions(+), 97 deletions(-) -- 1.7.7.6

2 32

[libvirt] [PATCH 0/4] Add new APIs and virsh commands to get/set cpu mode
by Ichikawa, Ken 11 Dec '12

11 Dec '12

Hello. This patchset adds new APIs virDomainGetCPUMode and virDomainSetCPUMode, and adds new virsh commands cpu-getmode and cpu-setmode by using these APIs. virDomainGetCPUMode allows to get cpu mode of a running or persistent domain. virDomainSetCPUMode allows to set cpu mode of a persistent domain. These APIs and virsh commands are useful because: - No longer need to mess around with XML for changing cpu mode. - People who want more performance can change cpu mode easily. - If there is a person who has a trouble with host-mode and host-passthrough, we can help easily by one-liner like "# virsh cpu-setmode <domain> custom" Then, default cpu is used after next boot. Ken ICHIKAWA (4): API: Introduce new public APIs virDomainGetCPUMode and virDomainSetCPUMode qemu: Add support for virDomainGetCPUMode and virDomainSetCPUMode remote: Add support for virDomainGetCPUMode and virDomainSetCPUMode virsh: Add cpu-getmode and cpu-setmode command include/libvirt/libvirt.h.in | 9 +++ src/driver.h | 11 ++++ src/libvirt.c | 112 +++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 129 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 19 ++++++- src/remote_protocol-structs | 14 +++++ tools/virsh-domain.c | 109 ++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 19 +++++++ 11 files changed, 426 insertions(+), 1 deletion(-) -- 1.7.11.7

5 4

[libvirt] [PATCH v16] support offline migration
by Jiri Denemark 10 Dec '12

10 Dec '12

From: liguang <lig.fnst(a)cn.fujitsu.com> original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE must not combined with VIR_MIGRATE_NON_SHARED_*. and you must do a persistent migration at same time, do "virsh migrate --offline --persistent ...". Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- This patch is a combination of v15 from liguang and my changes I sent as review comments to that v15. Since I had to do quite a few changes, I didn't push the result right away even though this has my ACK now. I'll wait until next week and if no comments appear, I'll push this patch at the beginning of next week. include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 51 +++++++++++++ src/libvirt_internal.h | 5 ++ src/qemu/qemu_driver.c | 15 ++-- src/qemu/qemu_migration.c | 170 +++++++++++++++++++++++++++++++++---------- src/qemu/qemu_migration.h | 9 ++- tools/virsh-domain.c | 5 ++ tools/virsh.pod | 5 +- 8 files changed, 209 insertions(+), 52 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 17804ca..c6739d7 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1092,6 +1092,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/libvirt.c b/src/libvirt.c index 6a7a817..4215971 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4829,6 +4829,14 @@ virDomainMigrateVersion3(virDomainPtr domain, if (uri_out) uri = uri_out; /* Did domainMigratePrepare3 change URI? */ + if (flags & VIR_MIGRATE_OFFLINE) { + VIR_DEBUG("Offline migration, skipping Perform phase"); + VIR_FREE(cookieout); + cookieoutlen = 0; + cancelled = 0; + goto finish; + } + /* Perform the migration. The driver isn't supposed to return * until the migration is complete. The src VM should remain * running, but in paused state until the destination can @@ -5199,6 +5207,23 @@ virDomainMigrate(virDomainPtr domain, goto error; } + if (flags & VIR_MIGRATE_OFFLINE) { + if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virLibConnError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the source host")); + goto error; + } + if (!VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virLibConnError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the destination host")); + goto error; + } + } + if (flags & VIR_MIGRATE_PEER2PEER) { if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_P2P)) { @@ -5404,6 +5429,23 @@ virDomainMigrate2(virDomainPtr domain, goto error; } + if (flags & VIR_MIGRATE_OFFLINE) { + if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virLibConnError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the source host")); + goto error; + } + if (!VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virLibConnError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the destination host")); + goto error; + } + } + if (flags & VIR_MIGRATE_PEER2PEER) { if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_P2P)) { @@ -5581,6 +5623,15 @@ virDomainMigrateToURI(virDomainPtr domain, virCheckNonNullArgGoto(duri, error); + if (flags & VIR_MIGRATE_OFFLINE && + !VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virLibConnError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the source host")); + goto error; + } + if (flags & VIR_MIGRATE_PEER2PEER) { if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, VIR_DRV_FEATURE_MIGRATION_P2P)) { diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 2eda156..595d2db 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -105,6 +105,11 @@ enum { * Support for VIR_DOMAIN_XML_MIGRATABLE flag in domainGetXMLDesc */ VIR_DRV_FEATURE_XML_MIGRATABLE = 11, + + /* + * Support for offline migration. + */ + VIR_DRV_FEATURE_MIGRATION_OFFLINE = 12, }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e099c5c..d449579 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1208,6 +1208,7 @@ qemuSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) case VIR_DRV_FEATURE_FD_PASSING: case VIR_DRV_FEATURE_TYPED_PARAM_STRING: case VIR_DRV_FEATURE_XML_MIGRATABLE: + case VIR_DRV_FEATURE_MIGRATION_OFFLINE: return 1; default: return 0; @@ -9698,7 +9699,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, dname, dom_xml); + st, dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9758,7 +9759,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9900,7 +9901,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, asyncJob = QEMU_ASYNC_JOB_NONE; } - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9909,8 +9910,8 @@ qemuDomainMigrateBegin3(virDomainPtr domain, /* Check if there is any ejected media. * We don't want to require them on the destination. */ - - if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) + if (!(flags & VIR_MIGRATE_OFFLINE) && + qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, @@ -9995,7 +9996,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -10040,7 +10041,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, dname, dom_xml); + st, dname, dom_xml, flags); qemuDriverUnlock(driver); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 86060dc..0ca7dd4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1442,6 +1442,28 @@ char *qemuMigrationBegin(virQEMUDriverPtr driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("offline migration cannot handle " + "non-shared storage")); + goto cleanup; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("offline migration must be specified with " + "the persistent flag set")); + goto cleanup; + } + if (flags & VIR_MIGRATE_TUNNELLED) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("tunnelled offline migration does not " + "make sense")); + goto cleanup; + } + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1499,7 +1521,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *dname, const char *dom_xml, const char *migrateFrom, - virStreamPtr st) + virStreamPtr st, + unsigned long flags) { virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; @@ -1512,10 +1535,33 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, bool tunnel = !!st; char *origname = NULL; char *xmlout = NULL; + unsigned int cookieFlags; if (virTimeMillisNow(&now) < 0) return -1; + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("offline migration cannot handle " + "non-shared storage")); + goto cleanup; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("offline migration must be specified with " + "the persistent flag set")); + goto cleanup; + } + if (tunnel) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("tunnelled offline migration does not " + "make sense")); + goto cleanup; + } + } + if (!(def = virDomainDefParseString(driver->caps, dom_xml, QEMU_EXPECTED_VIRT_TYPES, VIR_DOMAIN_XML_INACTIVE))) @@ -1599,6 +1645,9 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, /* Domain starts inactive, even if the domain XML had an id field. */ vm->def->id = -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto done; + if (tunnel && (pipe(dataFD) < 0 || virSetCloseExec(dataFD[1]) < 0)) { virReportSystemError(errno, "%s", @@ -1640,8 +1689,14 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_DEBUG("Received no lockstate"); } +done: + if (flags & VIR_MIGRATE_OFFLINE) + cookieFlags = 0; + else + cookieFlags = QEMU_MIGRATION_COOKIE_GRAPHICS; + if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, - QEMU_MIGRATION_COOKIE_GRAPHICS) < 0) { + cookieFlags) < 0) { /* We could tear down the whole guest here, but * cookie data is (so far) non-critical, so that * seems a little harsh. We'll just warn for now. @@ -1652,10 +1707,12 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (qemuDomainCleanupAdd(vm, qemuMigrationPrepareCleanup) < 0) goto endjob; - virDomainAuditStart(vm, "migrated", true); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STARTED, - VIR_DOMAIN_EVENT_STARTED_MIGRATED); + if (!(flags & VIR_MIGRATE_OFFLINE)) { + virDomainAuditStart(vm, "migrated", true); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STARTED, + VIR_DOMAIN_EVENT_STARTED_MIGRATED); + } /* We keep the job active across API calls until the finish() call. * This prevents any other APIs being invoked while incoming @@ -1708,7 +1765,8 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { int ret; @@ -1722,7 +1780,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st); + "stdio", st, flags); return ret; } @@ -1737,7 +1795,8 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { static int port = 0; int this_port; @@ -1833,7 +1892,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL); + migrateFrom, NULL, flags); cleanup: VIR_FREE(hostname); if (ret != 0) @@ -2679,6 +2738,14 @@ static int doPeer2PeerMigrate3(virQEMUDriverPtr driver, if (ret == -1) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + VIR_DEBUG("Offline migration, skipping Perform phase"); + VIR_FREE(cookieout); + cookieoutlen = 0; + cancelled = 0; + goto finish; + } + if (!(flags & VIR_MIGRATE_TUNNELLED) && (uri_out == NULL)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -2817,6 +2884,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, virConnectPtr dconn = NULL; bool p2p; virErrorPtr orig_err = NULL; + bool offline; VIR_DEBUG("driver=%p, sconn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, flags=%lx, dname=%s, resource=%lu", @@ -2849,6 +2917,9 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, */ *v3proto = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, VIR_DRV_FEATURE_MIGRATION_V3); + if (flags & VIR_MIGRATE_OFFLINE) + offline = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE); qemuDomainObjExitRemoteWithDriver(driver, vm); if (!p2p) { @@ -2857,8 +2928,15 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE && !offline) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the destination host")); + goto cleanup; + } + /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2921,7 +2999,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -3245,26 +3323,27 @@ qemuMigrationFinish(virQEMUDriverPtr driver, * object, but if no, clean up the empty qemu process. */ if (retcode == 0) { - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; } - if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, - VIR_QEMU_PROCESS_STOP_MIGRATED); - virDomainAuditStop(vm, "failed"); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FAILED); - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + VIR_QEMU_PROCESS_STOP_MIGRATED); + virDomainAuditStop(vm, "failed"); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + goto endjob; + } + if (mig->network) + if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + VIR_WARN("unable to provide network data for relocation"); } - if (mig->network) - if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) - VIR_WARN("unable to provide network data for relocation"); - if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3290,9 +3369,11 @@ qemuMigrationFinish(virQEMUDriverPtr driver, * to restart during confirm() step, so we kill it off now. */ if (v3proto) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, - VIR_QEMU_PROCESS_STOP_MIGRATED); - virDomainAuditStop(vm, "failed"); + if (!(flags & VIR_MIGRATE_OFFLINE)) { + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + VIR_QEMU_PROCESS_STOP_MIGRATED); + virDomainAuditStop(vm, "failed"); + } if (newVM) vm->persistent = 0; } @@ -3312,7 +3393,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3350,25 +3431,30 @@ qemuMigrationFinish(virQEMUDriverPtr driver, dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_RESUMED, - VIR_DOMAIN_EVENT_RESUMED_MIGRATED); - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); - if (event) - qemuDomainEventQueue(driver, event); + if (!(flags & VIR_MIGRATE_OFFLINE)) { event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_USER); + if (event) + qemuDomainEventQueue(driver, event); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } } - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + + if (virDomainObjIsActive(vm) && + virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { VIR_WARN("Failed to save status on vm %s", vm->def->name); goto endjob; } /* Guest is successfully running, so cancel previous auto destroy */ qemuProcessAutoDestroyRemove(driver, vm); - } else { + } else if (!(flags & VIR_MIGRATE_OFFLINE)) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, VIR_QEMU_PROCESS_STOP_MIGRATED); virDomainAuditStop(vm, "failed"); @@ -3430,6 +3516,9 @@ int qemuMigrationConfirm(virQEMUDriverPtr driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto done; + /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ @@ -3465,6 +3554,7 @@ int qemuMigrationConfirm(virQEMUDriverPtr driver, } } +done: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 62e39a0..eb30f06 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, @@ -97,7 +98,8 @@ int qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, virConnectPtr dconn, @@ -108,7 +110,8 @@ int qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPerform(virQEMUDriverPtr driver, virConnectPtr conn, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 96e62fc..39ac9b5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6803,6 +6803,7 @@ static const vshCmdInfo info_migrate[] = { static const vshCmdOptDef opts_migrate[] = { {"live", VSH_OT_BOOL, 0, N_("live migration")}, + {"offline", VSH_OT_BOOL, 0, N_("offline (domain's inactive) migration")}, {"p2p", VSH_OT_BOOL, 0, N_("peer-2-peer migration")}, {"direct", VSH_OT_BOOL, 0, N_("direct migration")}, {"tunneled", VSH_OT_ALIAS, 0, "tunnelled"}, @@ -6888,6 +6889,10 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); diff --git a/tools/virsh.pod b/tools/virsh.pod index b0e7064..0ada19a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1040,13 +1040,14 @@ I<--total> for only the total stats, I<start> for only the per-cpu stats of the CPUs from I<start>, I<count> for only I<count> CPUs' stats. -=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] +=item B<migrate> [I<--live>] [I<--offline>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] I<domain> I<desturi> [I<migrateuri>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -Migrate domain to another host. Add I<--live> for live migration; I<--p2p> +Migrate domain to another host. Add I<--live> for live migration; +I<--offline> for offline (domain's inactive) migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> for tunnelled migration. I<--persistent> leaves the domain persistent on destination host, I<--undefinesource> undefines the domain on the source host, -- 1.8.0

5 6

[libvirt] [PATCH] qemu: eliminate bogus error log when changing netdev's bridge
by Laine Stump 10 Dec '12

10 Dec '12

This fixes a problem that showed up during testing of: https://bugzilla.redhat.com/show_bug.cgi?id=881480 Due to a logic error in the function that gets the name of the bridge an interface connects to, any time a bridge was specified directly (type='bridge') rather than indirectly (type='network'), An error would be logged (although the operation would then complete successfully): Network type 6 is not supported The final virReportError() in the function qemuDomainNetGetBridgeName() was apparently avoided in the past with a "goto cleanup" at the end of each case, but the case of bridge somehow no longer has that final goto cleanup. The proper solution is anyway to not rely on goto's, but put the error log inside an else {} clause, so that it's executed only if the type is neither bridge nor network (in reality, this function should only ever be called for those two types, that's why this is an internal error). While making this change, the error message was also tuned to be more correct (since it's not really the type of the network, but the type of the interface, and it *is* otherwise supported, it's just that the interface type in question doesn't *have* a bridge device associated with it, or at least we don't know how to get it). --- src/qemu/qemu_hotplug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fbd60de..3dfdb65 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1268,13 +1268,13 @@ qemuDomainNetGetBridgeName(virConnectPtr conn, virDomainNetDefPtr net) virNetworkFree(network); virSetError(errobj); virFreeError(errobj); - goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Interface type %d has no bridge name"), + virDomainNetGetActualType(net)); } - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Network type %d is not supported"), - virDomainNetGetActualType(net)); cleanup: return brname; } -- 1.7.11.7

2 1

[libvirt] [PATCH RESEND] S390: Assign default model "virtio" for network interfaces
by Viktor Mihajlovski 10 Dec '12

10 Dec '12

If a network interface model is not specified, libvirt will run into an unchecked NULL pointer coredump. On the other hand if the empty model is ignored, a PCI bus address would be generated, which is not supported by S390. Since the only valid network type model for S390 is virtio, we use this as the default value, which is the same for QEMU. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5335dcf..9009bd2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -810,9 +810,14 @@ qemuDomainPrimeS390VirtioDevices(virDomainDefPtr def, } for (i = 0; i < def->nnets ; i++) { + if (STRPREFIX(def->os.arch, "s390") && + def->nets[i]->model == NULL) { + def->nets[i]->model = strdup("virtio"); + } if (STREQ(def->nets[i]->model,"virtio") && - def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + def->nets[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { def->nets[i]->info.type = type; + } } for (i = 0; i < def->ncontrollers ; i++) { -- 1.7.0.4

2 2

[libvirt] Entering freeze for 1.0.1 tomorrow
by Daniel Veillard 10 Dec '12

10 Dec '12

I'm just back from vacations without any internet access, and didn't really had time to go though the list mail yet. Is there any serious reson to not enter freeze for 1.0.1 tomorrow ? If not I will make the rc1 candidate tomorrow, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.1.1
by Daniel P. Berrange 10 Dec '12

10 Dec '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.1.1, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. This release has focused entirely on improving the virt-sandbox-service tool Changed in this release: - Fix typos in POD docs for some classes - Only depend on libvirt-daemon-{kvm,qemu,lxc}, not full libvirt RPM. - Switch to YUM for extracting package file list - Bind mount whole of /var rather than only some subdirs - Validate unit files exist before creating sandbox - Fixes to population of files in /etc and /var - Finish 'clone' command for copying sandboxes - Populate /etc/machine-id file - Fix systemd dependancies for bulk start/stop of containers - Symlink container journal directory into host filesystem - Rename sandbox.target to multi-user.target - Fix attachment to running containers Thanks to Dan Walsh for basically doing all the work in this release Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH 0/4]use newer video device by -device in qemu commandline
by Guannan Ren 10 Dec '12

10 Dec '12

This patch set aims to use qemu VGA device with -device option to replace -vga option. The mapping is as follows. '-device VGA' maps to '-vga std' '-device cirrus-vga' maps to '-vga cirrus' '-device qxl-vga' maps to '-vga qxl' (there is also '-device qxl' for secondary devices) '-device vmware-svga' maps to '-vga vmware' Through this change, guests will be able to use any available PCI slot number rather than fixed 0x2 slot for primary video device. For backwards compatibility, if a certain qemu version does not support one of the above video device arguments to -device or even -device itself, the -vga will still be used. Guannan Ren(4) [PATCH 1/4] qemu: add qemu various VGA devices Caps flag [PATCH 2/4] conf: add optional attribte primary to video <model> [PATCH 3/4] qemu: use newer -device video device in qemu commandline [PATCH 4/4] doc: add attribute primary doc to video model element docs/formatdomain.html.in | 6 +- src/conf/domain_conf.c | 27 +++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 183 +++++++++++++++++++--------- tests/qemuhelptest.c | 48 ++++++-- .../qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args | 5 +- tests/qemuxml2argvtest.c | 12 +- 9 files changed, 220 insertions(+), 76 deletions(-)

2 7

[libvirt] [PATCHv3 0/2] S390: Adding support for SCLP Console
by Viktor Mihajlovski 10 Dec '12

10 Dec '12

The S390 architecture comes with a native console type (SCLP console) which is now also supported by current QEMU. This series is enabling libvirt to configure S390 domains with SCLP consoles. The domain XML has to be extended for the new console target types 'sclp' and 'sclplm' (line mode = dumb). As usual the QEMU driver must do capability probing in order to find out whether SCLP is supported and format the QEMU command line for the new console type. V2/V3 Changes: Rebased to current master, resolving conflicts. J.B. Joret (2): S390: Add SCLP console front end support S390: Enable SCLP Console in QEMU driver docs/formatdomain.html.in | 19 ++++++- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 ++++++++++++++++++++++ .../qemuxml2argv-console-sclp.args | 8 +++ .../qemuxml2argvdata/qemuxml2argv-console-sclp.xml | 24 +++++++++ tests/qemuxml2argvtest.c | 3 ++ 10 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-sclp.xml -- 1.7.12.4

1 2

[libvirt] [PATCH 4/4] virsh: Add cpu-getmode and cpu-setmode command
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds new virsh commands 'cpu-getmode' and 'cpu-setmode' using virDomainGetCPUMode and virDomainSetCPUMode. 'cpu-getmode' allows to get cpu mode of a running domain or persistent configuration. 'cpu-setmode' allows to change cpu mode of a domain but affects only persistent configuration. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- tools/virsh-domain.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 19 +++++++++ 2 files changed, 128 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 96e62fc..b4ea137 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5371,6 +5371,113 @@ no_memory: } /* + * "cpu-getmode" command + */ +static const vshCmdInfo info_cpu_getmode[] = { + {"help", N_("show domain cpu mode")}, + {"desc", N_("Show cpu mode of a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_cpu_getmode[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"live", VSH_OT_BOOL, 0, N_("get running state")}, + {"config", VSH_OT_BOOL, 0, N_("get persistent configuration")}, + {"current", VSH_OT_BOOL, 0, N_("get current state configuration")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdCPUGetMode(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + char *mode = NULL; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; + bool ret = false; + + if (current + config + live > 1) { + vshError(ctl, "%s", + _("--config, --live, and --current are mutually exclusive")); + return false; + } + + if (config) + flags = VIR_DOMAIN_AFFECT_CONFIG; + if (live) + flags = VIR_DOMAIN_AFFECT_LIVE; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (!(mode = virDomainGetCPUMode(dom, flags))) { + vshError(ctl, _("Unable to get cpu mode")); + goto cleanup; + } + + vshPrint(ctl, "%s\n", mode); + + VIR_FREE(mode); + ret = true; + + cleanup: + virDomainFree(dom); + return ret; +} + +/* + * "cpu-setmode" command + */ +static const vshCmdInfo info_cpu_setmode[] = { + {"help", N_("set domain cpu mode")}, + {"desc", N_("Modify cpu mode of a domain")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_cpu_setmode[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {"mode", VSH_OT_DATA, VSH_OFLAG_REQ, + N_("cpu mode, one of custom, host-model and host-passthrough")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdCPUSetMode(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom; + const char *mode = NULL; + bool ret = false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (vshCommandOptString(cmd, "mode", &mode) < 0) { + vshError(ctl, _("Unable to parse mode.")); + goto cleanup; + } + + if (!mode) { + vshError(ctl, _("CPU mode is not specified.")); + goto cleanup; + } + + if (virDomainSetCPUMode(dom, mode, 0) < 0) { + vshError(ctl, _("Unable to change cpu mode")); + goto cleanup; + } + + vshPrint(ctl, _("CPU mode updated successfully\n")); + + ret = true; + + cleanup: + virDomainFree(dom); + return ret; +} + +/* * "cpu-stats" command */ static const vshCmdInfo info_cpu_stats[] = { @@ -8507,6 +8614,8 @@ const vshCmdDef domManagementCmds[] = { #endif {"cpu-baseline", cmdCPUBaseline, opts_cpu_baseline, info_cpu_baseline, 0}, {"cpu-compare", cmdCPUCompare, opts_cpu_compare, info_cpu_compare, 0}, + {"cpu-getmode", cmdCPUGetMode, opts_cpu_getmode, info_cpu_getmode, 0}, + {"cpu-setmode", cmdCPUSetMode, opts_cpu_setmode, info_cpu_setmode, 0}, {"cpu-stats", cmdCPUStats, opts_cpu_stats, info_cpu_stats, 0}, {"create", cmdCreate, opts_create, info_create, 0}, {"define", cmdDefine, opts_define, info_define, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index b0e7064..109e256 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -999,6 +999,25 @@ 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<cpu-getmode> I<domain> [[I<--config>] | [I<--live>] | [I<--current>]] + +Get a domain's cpu mode, corresponding to the B<mode> attribute of B<cpu> +element of the domain XML. If cpu mode is not specified in the domain XML, +'custom' is displayed as a default. + +If I<--live> is specified, affect a running guest. +If I<--config> is specified, affect the next boot of a persistent guest. +If I<--current> is specified, affect the current guest state. +All flags are exclusive. If no flag is specified, behavior is the same as +I<--current>. + +=item B<cpu-setmode> I<domain> I<mode> + +Set a domain's cpu mode, corresponding to the B<mode> attribute of B<cpu> +element of the domain XML. I<mode> can be one of 'custom', 'host-model' +and 'host-passthrough'. Modification affects the next boot of a persistent +guest. + =item B<managedsave> I<domain> [I<--bypass-cache>] [{I<--running> | I<--paused>}] [I<--verbose>] -- 1.7.11.7

1 0

[libvirt] [PATCH 3/4] remote: Add support for virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds support for new APIs virDomainGetCPUMode and virDomainSetCPUMode into remote protocol driver. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/remote/remote_driver.c | 2 ++ src/remote/remote_protocol.x | 19 ++++++++++++++++++- src/remote_protocol-structs | 14 ++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 5cc7e32..b2e61b3 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -6153,6 +6153,8 @@ static virDriver remote_driver = { .nodeGetMemoryParameters = remoteNodeGetMemoryParameters, /* 0.10.2 */ .nodeGetCPUMap = remoteNodeGetCPUMap, /* 1.0.0 */ .domainFSTrim = remoteDomainFSTrim, /* 1.0.1 */ + .domainSetCPUMode = remoteDomainSetCPUMode, /* 1.0.1 */ + .domainGetCPUMode = remoteDomainGetCPUMode, /* 1.0.1 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index bdad9f0..943d9a0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2696,6 +2696,21 @@ struct remote_domain_fstrim_args { unsigned int flags; }; +struct remote_domain_set_cpu_mode_args { + remote_nonnull_domain dom; + remote_nonnull_string cpuMode; + unsigned int flags; +}; + +struct remote_domain_get_cpu_mode_args { + remote_nonnull_domain dom; + unsigned int flags; +}; + +struct remote_domain_get_cpu_mode_ret { + remote_nonnull_string cpuMode; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -3042,7 +3057,9 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_EVENT_PMSUSPEND_DISK = 292, /* autogen autogen */ REMOTE_PROC_NODE_GET_CPU_MAP = 293, /* skipgen skipgen */ REMOTE_PROC_DOMAIN_FSTRIM = 294, /* autogen autogen */ - REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295 /* autogen autogen */ + REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295, /* autogen autogen */ + REMOTE_PROC_DOMAIN_SET_CPU_MODE = 296, /* autogen autogen */ + REMOTE_PROC_DOMAIN_GET_CPU_MODE = 297 /* autogen autogen */ /* * Notice how the entries are grouped in sets of 10 ? diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index e7d05b8..08e6a18 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2151,6 +2151,18 @@ struct remote_domain_fstrim_args { uint64_t minimum; u_int flags; }; +struct remote_domain_set_cpu_mode_args { + remote_nonnull_domain dom; + remote_nonnull_string cpuMode; + u_int flags; +}; +struct remote_domain_get_cpu_mode_args { + remote_nonnull_domain dom; + u_int flags; +}; +struct remote_domain_get_cpu_mode_ret { + remote_nonnull_string cpuMode; +}; enum remote_procedure { REMOTE_PROC_OPEN = 1, REMOTE_PROC_CLOSE = 2, @@ -2447,4 +2459,6 @@ enum remote_procedure { REMOTE_PROC_NODE_GET_CPU_MAP = 293, REMOTE_PROC_DOMAIN_FSTRIM = 294, REMOTE_PROC_DOMAIN_SEND_PROCESS_SIGNAL = 295, + REMOTE_PROC_DOMAIN_SET_CPU_MODE = 296, + REMOTE_PROC_DOMAIN_GET_CPU_MODE = 297, }; -- 1.7.11.7

1 0

[libvirt] [PATCH 2/4] qemu: Add support for virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds support for virDomainGetCPUMode and virDomainSetCPUMode into qemu driver. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 499ab3b..8988efa 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -207,6 +207,7 @@ virCPUDefFormatBuf; virCPUDefFree; virCPUDefFreeModel; virCPUDefParseXML; +virCPUModeTypeFromString; virCPUModeTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e099c5c..f86ec1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14871,6 +14871,133 @@ cleanup: return ret; } +static int +qemuDomainSetCPUMode(virDomainPtr dom, + const char *cpuMode, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainDefPtr persistentDef = NULL; + int mode = -1; + int ret = -1; + + virCheckFlags(0, -1); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if ((mode = virCPUModeTypeFromString(cpuMode)) < 0){ + virReportError(VIR_ERR_OPERATION_FAILED, + _("Invalid cpu mode '%s'"), cpuMode); + goto cleanup; + } + + /* get persistent configuration */ + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot change persistent config of a " + "transient domain")); + goto cleanup; + } + if (!(persistentDef = virDomainObjGetPersistentDef(driver->caps, vm))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Get persistent config failed")); + goto cleanup; + } + + if (!persistentDef->cpu) { + if (VIR_ALLOC(persistentDef->cpu) < 0) + goto no_memory; + persistentDef->cpu->type = VIR_CPU_TYPE_GUEST; + } + + persistentDef->cpu->mode = mode; + + if (virDomainSaveConfig(driver->configDir, persistentDef) < 0) + goto cleanup; + + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +no_memory: + virReportOOMError(); + goto cleanup; +} + +static char * +qemuDomainGetCPUMode(virDomainPtr dom, unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + const char *cpuMode = NULL; + char *ret = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, NULL); + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (virDomainLiveConfigHelperMethod(driver->caps, vm, &flags, &def) < 0) + goto cleanup; + + /* use correct domain definition according to flags */ + if (flags & VIR_DOMAIN_AFFECT_LIVE) + def = vm->def; + + /* If there is no cpu element, return default cpu mode. */ + if (!def->cpu) { + if (!(cpuMode = virCPUModeTypeToString(VIR_CPU_MODE_CUSTOM))){ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown cpu mode in domain definition '%d'"), + VIR_CPU_MODE_CUSTOM); + goto cleanup; + } + if (!(ret = strdup(cpuMode))) + goto no_memory; + goto cleanup; + } + + if (!(cpuMode = virCPUModeTypeToString(def->cpu->mode))){ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown cpu mode in domain definition '%d'"), + def->cpu->mode); + goto cleanup; + } + if (!(ret = strdup(cpuMode))) + goto no_memory; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +no_memory: + virReportOOMError(); + goto cleanup; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -15045,6 +15172,8 @@ static virDriver qemuDriver = { .nodeSetMemoryParameters = nodeSetMemoryParameters, /* 0.10.2 */ .nodeGetCPUMap = nodeGetCPUMap, /* 1.0.0 */ .domainFSTrim = qemuDomainFSTrim, /* 1.0.1 */ + .domainSetCPUMode = qemuDomainSetCPUMode, /* 1.0.1 */ + .domainGetCPUMode = qemuDomainGetCPUMode, /* 1.0.1 */ }; -- 1.7.11.7

1 0

[libvirt] [PATCH 1/4] API: Introduce new public APIs virDomainGetCPUMode and virDomainSetCPUMode
by Ichikawa, Ken 10 Dec '12

10 Dec '12

This patch adds new public APIs virDomainGetCPUMode and virDomainSetCPUMode to get/set cpu mode of a domain. These APIs are useful for users who want to get/set cpu mode easily without messing around with domain XML by themselves. Signed-off-by: Ken ICHIKAWA <ichikawa.ken(a)jp.fujitsu.com> --- include/libvirt/libvirt.h.in | 9 ++++ src/driver.h | 11 +++++ src/libvirt.c | 112 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 2 + 4 files changed, 134 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 17804ca..3e5fbc3 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1739,6 +1739,15 @@ virDomainGetMetadata(virDomainPtr domain, const char *uri, unsigned int flags); +int +virDomainSetCPUMode(virDomainPtr domain, + const char *cpuMode, + unsigned int flags); + +char * +virDomainGetCPUMode(virDomainPtr domain, + unsigned int flags); + /* * XML domain description */ diff --git a/src/driver.h b/src/driver.h index 64d652f..1fc8668 100644 --- a/src/driver.h +++ b/src/driver.h @@ -915,6 +915,15 @@ typedef int unsigned long long minimum, unsigned int flags); +typedef int + (*virDrvDomainSetCPUMode)(virDomainPtr dom, + const char *cpuMode, + unsigned int flags); + +typedef char * + (*virDrvDomainGetCPUMode)(virDomainPtr dom, + unsigned int flags); + /** * _virDriver: * @@ -1107,6 +1116,8 @@ struct _virDriver { virDrvNodeGetCPUMap nodeGetCPUMap; virDrvDomainFSTrim domainFSTrim; virDrvDomainSendProcessSignal domainSendProcessSignal; + virDrvDomainSetCPUMode domainSetCPUMode; + virDrvDomainGetCPUMode domainGetCPUMode; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index 6a7a817..9545f36 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9616,6 +9616,118 @@ error: } /** + * virDomainSetCPUMode: + * @domain: a domain object + * @cpuMode: cpu mode, one of 'custom', 'host-model' and 'host-passthrough' + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Change cpu mode of a domain to @cpuMode. + * @cpuMode means mode attribute of cpu element of the domain XML. + * This function does not affect a running domain state but affects + * the next boot of a persistent domain. + * + * Returns 0 on success, -1 in case of failure. + */ +int +virDomainSetCPUMode(virDomainPtr domain, + const char *cpuMode, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "cpuMode=%s, flags=%x", cpuMode, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (conn->driver->domainSetCPUMode) { + int ret; + ret = conn->driver->domainSetCPUMode(domain, cpuMode, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** + * virDomainGetCPUMode: + * @domain: a domain object + * @flags: bitwise-OR of virDomainModificationImpact + * + * Get cpu mode of a domain. The cpu mode is specified in mode + * attribute of cpu element of the domain XML. + * If there is no cpu element or mode attribute, this function + * returns 'custom' because 'custom' mode is default. + * + * @flags controls whether the live domain or persistent + * configuration will be queried. If VIR_AFFECT_LIVE is set, this + * will query a running domain state. If VIR_AFFECT_CONFIG is set, + * this will query a persistent configuration. + * If neither flag is specified or VIR_AFFECT_CURRENT is set, this + * will query a running domain state for active domains or a persistent + * configuration for inactive domains. + * These flags are mutually exclusive. + * + * Returns cpu mode string on success (caller must free), + * or NULL in case of failure. + */ +char * +virDomainGetCPUMode(virDomainPtr domain, unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + goto error; + } + + if ((flags & VIR_DOMAIN_AFFECT_LIVE) && + (flags & VIR_DOMAIN_AFFECT_CONFIG)) { + virReportInvalidArg(flags, + _("flags 'affect live' and 'affect config' in %s are mutually exclusive"), + __FUNCTION__); + goto error; + } + + conn = domain->conn; + + if (conn->driver->domainGetCPUMode) { + char *ret; + ret = conn->driver->domainGetCPUMode(domain, flags); + if (!ret) + goto error; + return ret; + } + + virLibConnError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return NULL; +} + +/** * virNodeGetSecurityModel: * @conn: a connection object * @secmodel: pointer to a virSecurityModel structure diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index e3d63d3..8fc407d 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -578,6 +578,8 @@ LIBVIRT_1.0.1 { global: virDomainFSTrim; virDomainSendProcessSignal; + virDomainSetCPUMode; + virDomainGetCPUMode; } LIBVIRT_1.0.0; # .... define new API here using predicted next version number .... -- 1.7.11.7

1 0

[libvirt] [PATCH v15] support offline migration
by liguang 10 Dec '12

10 Dec '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE must not combined with VIR_MIGRATE_NON_SHARED_*. and you must do a persistent migration at same time, do "virsh migrate --offline --persistent ...". Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 4 + src/qemu/qemu_driver.c | 16 +++--- src/qemu/qemu_migration.c | 140 +++++++++++++++++++++++++++--------------- src/qemu/qemu_migration.h | 9 ++- tools/virsh-domain.c | 5 ++ tools/virsh.pod | 5 +- 7 files changed, 117 insertions(+), 63 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 49a361a..ea625b3 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1092,6 +1092,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/libvirt.c b/src/libvirt.c index bdb1dc6..6d749d9 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4827,6 +4827,10 @@ virDomainMigrateVersion3(virDomainPtr domain, if (uri_out) uri = uri_out; /* Did domainMigratePrepare3 change URI? */ + if (flags & VIR_MIGRATE_OFFLINE) { + cancelled = 0; + goto finish; + } /* Perform the migration. The driver isn't supposed to return * until the migration is complete. The src VM should remain * running, but in paused state until the destination can diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 595c452..1ba1665 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9625,7 +9625,7 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, dname, dom_xml); + st, dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9685,7 +9685,7 @@ qemudDomainMigratePrepare2(virConnectPtr dconn, ret = qemuMigrationPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies */ uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9827,7 +9827,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, asyncJob = QEMU_ASYNC_JOB_NONE; } - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9836,9 +9836,9 @@ qemuDomainMigrateBegin3(virDomainPtr domain, /* Check if there is any ejected media. * We don't want to require them on the destination. */ - - if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE) && + qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) + goto endjob; if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, @@ -9922,7 +9922,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, - dname, dom_xml); + dname, dom_xml, flags); cleanup: qemuDriverUnlock(driver); @@ -9967,7 +9967,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, ret = qemuMigrationPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, - st, dname, dom_xml); + st, dname, dom_xml, flags); qemuDriverUnlock(driver); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d52ec59..53171df 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1442,6 +1442,24 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", + _("offline migration cannot handle " + "non-shared storage")); + goto cleanup; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", + _("offline migration must be specified with " + "the persistent flag set")); + goto cleanup; + } + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1499,7 +1517,8 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, const char *dname, const char *dom_xml, const char *migrateFrom, - virStreamPtr st) + virStreamPtr st, + unsigned long flags) { virDomainDefPtr def = NULL; virDomainObjPtr vm = NULL; @@ -1609,15 +1628,18 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ - if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], NULL, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, - VIR_QEMU_PROCESS_START_PAUSED | - VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { - virDomainAuditStart(vm, "migrated", false); - /* Note that we don't set an error here because qemuProcessStart - * should have already done that. - */ - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuProcessStart(dconn, driver, vm, migrateFrom, dataFD[0], + NULL, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, + VIR_QEMU_PROCESS_START_PAUSED | + VIR_QEMU_PROCESS_START_AUTODESROY) < 0) { + virDomainAuditStart(vm, "migrated", false); + /* Note that we don't set an error here because qemuProcessStart + * should have already done that. + */ + goto endjob; + } } if (tunnel) { @@ -1625,7 +1647,8 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, virReportSystemError(errno, "%s", _("cannot pass pipe for tunnelled migration")); virDomainAuditStart(vm, "migrated", false); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); + if (!(flags & VIR_MIGRATE_OFFLINE)) + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); goto endjob; } dataFD[1] = -1; /* 'st' owns the FD now & will close it */ @@ -1640,13 +1663,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, VIR_DEBUG("Received no lockstate"); } - if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, - QEMU_MIGRATION_COOKIE_GRAPHICS) < 0) { - /* We could tear down the whole guest here, but - * cookie data is (so far) non-critical, so that - * seems a little harsh. We'll just warn for now. - */ - VIR_WARN("Unable to encode migration cookie"); + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_GRAPHICS) < 0) { + /* We could tear down the whole guest here, but + * cookie data is (so far) non-critical, so that + * seems a little harsh. We'll just warn for now. + */ + VIR_WARN("Unable to encode migration cookie"); + } } if (qemuDomainCleanupAdd(vm, qemuMigrationPrepareCleanup) < 0) @@ -1708,7 +1733,8 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { int ret; @@ -1722,7 +1748,7 @@ qemuMigrationPrepareTunnel(struct qemud_driver *driver, */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st); + "stdio", st, flags); return ret; } @@ -1737,7 +1763,8 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml) + const char *dom_xml, + unsigned long flags) { static int port = 0; int this_port; @@ -1833,7 +1860,7 @@ qemuMigrationPrepareDirect(struct qemud_driver *driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL); + migrateFrom, NULL, flags); cleanup: VIR_FREE(hostname); if (ret != 0) @@ -2675,7 +2702,9 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, uri, &uri_out, flags, dname, resource, dom_xml); qemuDomainObjExitRemoteWithDriver(driver, vm); } + VIR_FREE(dom_xml); + if (ret == -1) goto cleanup; @@ -2858,7 +2887,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2921,7 +2950,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -3245,26 +3274,27 @@ qemuMigrationFinish(struct qemud_driver *driver, * object, but if no, clean up the empty qemu process. */ if (retcode == 0) { - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; } - if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, - VIR_QEMU_PROCESS_STOP_MIGRATED); - virDomainAuditStop(vm, "failed"); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_STOPPED, - VIR_DOMAIN_EVENT_STOPPED_FAILED); - goto endjob; + if (!(flags & VIR_MIGRATE_OFFLINE)) { + if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) { + qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + VIR_QEMU_PROCESS_STOP_MIGRATED); + virDomainAuditStop(vm, "failed"); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + goto endjob; + } + if (mig->network) + if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + VIR_WARN("unable to provide network data for relocation"); } - if (mig->network) - if (qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) - VIR_WARN("unable to provide network data for relocation"); - if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3312,7 +3342,7 @@ qemuMigrationFinish(struct qemud_driver *driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3350,20 +3380,26 @@ qemuMigrationFinish(struct qemud_driver *driver, dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); - event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_RESUMED, - VIR_DOMAIN_EVENT_RESUMED_MIGRATED); - if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); - if (event) - qemuDomainEventQueue(driver, event); + if (!(flags & VIR_MIGRATE_OFFLINE)) { event = virDomainEventNewFromObj(vm, - VIR_DOMAIN_EVENT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_USER); + if (event) + qemuDomainEventQueue(driver, event); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } } - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { - VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto endjob; + + if (virDomainObjIsActive(vm)) { + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Failed to save status on vm %s", vm->def->name); + goto endjob; + } } /* Guest is successfully running, so cancel previous auto destroy */ @@ -3430,6 +3466,9 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto done; + /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ @@ -3465,6 +3504,7 @@ int qemuMigrationConfirm(struct qemud_driver *driver, } } +done: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..f2dc5aa 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, @@ -97,7 +98,8 @@ int qemuMigrationPrepareTunnel(struct qemud_driver *driver, int *cookieoutlen, virStreamPtr st, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPrepareDirect(struct qemud_driver *driver, virConnectPtr dconn, @@ -108,7 +110,8 @@ int qemuMigrationPrepareDirect(struct qemud_driver *driver, const char *uri_in, char **uri_out, const char *dname, - const char *dom_xml); + const char *dom_xml, + unsigned long flags); int qemuMigrationPerform(struct qemud_driver *driver, virConnectPtr conn, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cc47383..5d18bdf 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6661,6 +6661,7 @@ static const vshCmdInfo info_migrate[] = { static const vshCmdOptDef opts_migrate[] = { {"live", VSH_OT_BOOL, 0, N_("live migration")}, + {"offline", VSH_OT_BOOL, 0, N_("offline (domain's inactive) migration")}, {"p2p", VSH_OT_BOOL, 0, N_("peer-2-peer migration")}, {"direct", VSH_OT_BOOL, 0, N_("direct migration")}, {"tunneled", VSH_OT_ALIAS, 0, "tunnelled"}, @@ -6746,6 +6747,10 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); diff --git a/tools/virsh.pod b/tools/virsh.pod index 29be39e..b3ef64e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1026,13 +1026,14 @@ I<--total> for only the total stats, I<start> for only the per-cpu stats of the CPUs from I<start>, I<count> for only I<count> CPUs' stats. -=item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] +=item B<migrate> [I<--live>] [I<--offline>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] I<domain> I<desturi> [I<migrateuri>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] -Migrate domain to another host. Add I<--live> for live migration; I<--p2p> +Migrate domain to another host. Add I<--live> for live migration; +I<--offline> for offline (domain's inactive) migration; <--p2p> for peer-2-peer migration; I<--direct> for direct migration; or I<--tunnelled> for tunnelled migration. I<--persistent> leaves the domain persistent on destination host, I<--undefinesource> undefines the domain on the source host, -- 1.7.1

3 6

[libvirt] [PATCHv3 00/17] new VIR_(APPEND|INSERT|DELETE)_ELEMENT macros
by Laine Stump 07 Dec '12

07 Dec '12

DO NOT BE SCARED OFF BY THE PATCH COUNT!! Most of these are very short, and they all follow the same pattern; beyond that, 01/17 and 02/17 are the only ones that are really time-sensitive. The first patch in this series adds new macros to insert/append/delete elements from the arrays of variously-sized structs that are commonly used in libvirt. The intent is to eliminate the arithmetic mistakes associated with calling memmove() directly, and shorten application code. A full description of the added macros and their functions is included in 01/17. Patches 02..17 convert various bits of hand-coded array manipulation in libvirt to use the new macros. They can be taken now, later, or never (although I'd like to have at least 02/17 taken now, since other similar functions will be added in an upcoming patch series, and I want them to all use the same logic). Mostly I went through all of those conversions to see just how useful/usable the new macros were (and they led to a couple of rewrites). I will be posting another series momentarily that has a dependency on 01/17.

2 21

[libvirt] [PATCH 0/7] refactoring network xml parsing + net-update additions
by Laine Stump 07 Dec '12

07 Dec '12

Patches 1,2, and 4-7 refactor the network XML parsing functions to have a more uniform calling sequence for different subelements of <network>. This makes it simpler to write new virNetworkUpdate*() backend functions for those bits (because they're then more similar to existing functions.) Patch 3 actually adds some new backends for updating subelements that weren't previously implemented - <dns> host/srv/txt records. The intent is to followup on patched 4-7 with backends for updating <ip>, <forward>, and <bridge>; while I haven't gotten to those yet, I'd rather get these changes in sooner than later, both for more testing, and to make future backports simpler.

2 9

[libvirt] [PATCH] util: refactor iptables command construction into multiple steps
by Natanael Copa 07 Dec '12

07 Dec '12

Instead of creating an iptables command in one shot, do it in steps so we can add conditional options like physdev and protocol. This removes code duplication while keeping existing behaviour. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- This started with me wanting to add support for setting the public ip source address when network mode='nat' and there are multiple public ip addresses on the external interface. On IRC we talked about adding an option in the xml like this: <network> <forward mode='nat' publicaddr='n.n.n.n'/> </network> Which would make iptables use '-j SNAT --to-source n.n.n.n' instead of '-j MASQUERADE'. However with the current approach we would need to construct 8 different iptables command combinations, hence the need for refactoring. Thanks! src/util/iptables.c | 130 +++++++++++++++++++++++----------------------------- 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/src/util/iptables.c b/src/util/iptables.c index 00a1c29..407ca3a 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -127,15 +127,10 @@ iptRulesNew(const char *table, return NULL; } -static int ATTRIBUTE_SENTINEL -iptablesAddRemoveRule(iptRules *rules, int family, int action, - const char *arg, ...) +static virCommandPtr +iptablesCommandNew(iptRules *rules, int family, int action) { - va_list args; - int ret; virCommandPtr cmd = NULL; - const char *s; - #if HAVE_FIREWALLD virIpTablesInitialize(); if (firewall_cmd_path) { @@ -152,16 +147,36 @@ iptablesAddRemoveRule(iptRules *rules, int family, int action, virCommandAddArgList(cmd, "--table", rules->table, action == ADD ? "--insert" : "--delete", - rules->chain, arg, NULL); + rules->chain, NULL); + return cmd; +} + +static int +iptablesCommandRunAndFree(virCommandPtr cmd) +{ + int ret; + ret = virCommandRun(cmd, NULL); + virCommandFree(cmd); + return ret; +} + +static int ATTRIBUTE_SENTINEL +iptablesAddRemoveRule(iptRules *rules, int family, int action, + const char *arg, ...) +{ + va_list args; + virCommandPtr cmd = NULL; + const char *s; + + cmd = iptablesCommandNew(rules, family, action); + virCommandAddArg(cmd, arg); va_start(args, arg); while ((s = va_arg(args, const char *))) virCommandAddArg(cmd, s); va_end(args); - ret = virCommandRun(cmd, NULL); - virCommandFree(cmd); - return ret; + return iptablesCommandRunAndFree(cmd); } /** @@ -370,28 +385,24 @@ iptablesForwardAllowOut(iptablesContext *ctx, { int ret; char *networkstr; + virCommandPtr cmd = NULL; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) return -1; - if (physdev && physdev[0]) { - ret = iptablesAddRemoveRule(ctx->forward_filter, - VIR_SOCKET_ADDR_FAMILY(netaddr), - action, - "--source", networkstr, - "--in-interface", iface, - "--out-interface", physdev, - "--jump", "ACCEPT", - NULL); - } else { - ret = iptablesAddRemoveRule(ctx->forward_filter, - VIR_SOCKET_ADDR_FAMILY(netaddr), - action, - "--source", networkstr, - "--in-interface", iface, - "--jump", "ACCEPT", - NULL); - } + cmd = iptablesCommandNew(ctx->forward_filter, + VIR_SOCKET_ADDR_FAMILY(netaddr), + action); + virCommandAddArgList(cmd, + "--source", networkstr, + "--in-interface", iface, NULL); + + if (physdev && physdev[0]) + virCommandAddArgList(cmd, "--out-interface", physdev, NULL); + + virCommandAddArgList(cmd, "--jump", "ACCEPT", NULL); + + ret = iptablesCommandRunAndFree(cmd); VIR_FREE(networkstr); return ret; } @@ -797,6 +808,7 @@ iptablesForwardMasquerade(iptablesContext *ctx, { int ret; char *networkstr; + virCommandPtr cmd = NULL; if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) return -1; @@ -810,49 +822,23 @@ iptablesForwardMasquerade(iptablesContext *ctx, return -1; } - if (protocol && protocol[0]) { - if (physdev && physdev[0]) { - ret = iptablesAddRemoveRule(ctx->nat_postrouting, - AF_INET, - action, - "--source", networkstr, - "-p", protocol, - "!", "--destination", networkstr, - "--out-interface", physdev, - "--jump", "MASQUERADE", - "--to-ports", "1024-65535", - NULL); - } else { - ret = iptablesAddRemoveRule(ctx->nat_postrouting, - AF_INET, - action, - "--source", networkstr, - "-p", protocol, - "!", "--destination", networkstr, - "--jump", "MASQUERADE", - "--to-ports", "1024-65535", - NULL); - } - } else { - if (physdev && physdev[0]) { - ret = iptablesAddRemoveRule(ctx->nat_postrouting, - AF_INET, - action, - "--source", networkstr, - "!", "--destination", networkstr, - "--out-interface", physdev, - "--jump", "MASQUERADE", - NULL); - } else { - ret = iptablesAddRemoveRule(ctx->nat_postrouting, - AF_INET, - action, - "--source", networkstr, - "!", "--destination", networkstr, - "--jump", "MASQUERADE", - NULL); - } - } + cmd = iptablesCommandNew(ctx->nat_postrouting, AF_INET, action); + virCommandAddArgList(cmd, "--source", networkstr, NULL); + + if (protocol && protocol[0]) + virCommandAddArgList(cmd, "-p", protocol, NULL); + + virCommandAddArgList(cmd, "!", "--destination", networkstr, NULL); + + if (physdev && physdev[0]) + virCommandAddArgList(cmd, "--out-interface", physdev, NULL); + + virCommandAddArgList(cmd, "--jump", "MASQUERADE", NULL); + + if (protocol && protocol[0]) + virCommandAddArgList(cmd, "--to-ports", "1024-65535", NULL); + + ret = iptablesCommandRunAndFree(cmd); VIR_FREE(networkstr); return ret; } -- 1.8.0

2 4

[libvirt] [PATCH] qemu: capabilities: fix machine name/canonical swappage
by Cole Robinson 07 Dec '12

07 Dec '12

Things are supposed to look like: <machine canonical='pc-0.12'>pc</machine> But are currently swapped. This can cause many VMs to revert to having machine type='pc' which will affect save/restore across qemu upgrades. --- src/qemu/qemu_capabilities.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 668935e..01a1b98 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2046,20 +2046,15 @@ qemuCapsProbeQMPMachineTypes(qemuCapsPtr caps, for (i = 0 ; i < nmachines ; i++) { if (machines[i]->alias) { - if (!(caps->machineAliases[i] = strdup(machines[i]->name))) { - virReportOOMError(); - goto cleanup; - } - if (!(caps->machineTypes[i] = strdup(machines[i]->alias))) { - virReportOOMError(); - goto cleanup; - } - } else { - if (!(caps->machineTypes[i] = strdup(machines[i]->name))) { + if (!(caps->machineAliases[i] = strdup(machines[i]->alias))) { virReportOOMError(); goto cleanup; } } + if (!(caps->machineTypes[i] = strdup(machines[i]->name))) { + virReportOOMError(); + goto cleanup; + } if (machines[i]->isDefault) defIdx = i; } -- 1.8.0

2 2

[libvirt] Fix virGet{User, Group}IDByName when the user/group cannot be found
by Christophe Fergeau 07 Dec '12

07 Dec '12

Hey, I've been having issues recently after upgrading to a newer libvirt on a RHEL6 box. 'virsh start vmname' fails with 'error :internal error Failed to get user record for name '107': No such file or directory ' Looking deeper into this, this comes from 'user not found' errors from getpwnam_r/getgrnam_r not being correctly handled. This patch series attempts to improve that, but I'm not that happy with the seemingly random values of errno being checked there. Christophe

4 13

[libvirt] [PATCH] virsh: Fix usage of header termios.h
by Peter Krempa 07 Dec '12

07 Dec '12

The termios struct exported by the termios.h header is used as an argument for vshMakeStdinRaw(). The header isn't used anywhere in tools/virsh-domain.c. This patch adds the header to the header declaring vshMakeStdinRaw() and removes other places in virsh. --- tools/console.h | 4 +++- tools/virsh-domain.c | 1 - tools/virsh.c | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/console.h b/tools/console.h index 962594c..46255b8 100644 --- a/tools/console.h +++ b/tools/console.h @@ -1,7 +1,7 @@ /* * console.c: A dumb serial console client * - * Copyright (C) 2007, 2010 Red Hat, Inc. + * Copyright (C) 2007, 2010, 2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,6 +25,8 @@ # ifndef WIN32 +# include <termios.h> + int vshRunConsole(virDomainPtr dom, const char *dev_name, const char *escape_seq, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1f7aff7..96e62fc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -30,7 +30,6 @@ #include <poll.h> #include <signal.h> #include <sys/time.h> -#include <termios.h> #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/tools/virsh.c b/tools/virsh.c index 322f778..b4829a3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -42,7 +42,6 @@ #include <sys/stat.h> #include <inttypes.h> #include <strings.h> -#include <termios.h> #include <libxml/parser.h> #include <libxml/tree.h> -- 1.8.0

2 2

[libvirt] [PATCH 00/15 v5] Unprivileged SG_IO support
by Osier Yang 07 Dec '12

07 Dec '12

Hi, As a result of RFC [1], this implements the unprivleged SG_IO support. Testing is not that enough, but I'd like see the reviewing earlier, and meanwhile I'm not going to give up the further testing. v4 - v5 (5 new patches): * Set sysfs unpriv_sgio when attaching disk * Restore sysfs unpriv_sgio when detaching disk * Error out when attaching disk if it's shared by other (domains), and the disk conf conflicts. * Do not restore sysfs unpriv_sgio when detaching disk if the disk is still being used by other domain(s) * Dump the original unpriv_sgio state in status XML, so that it won't be lost after restarting or reloading libvirtd. v3 - v4: * Rebase on the top * More testing v2 - v3: * Change the XML tag name to "cdbfilter" * Maintain an internal list of shared disks for QEMU driver. Patches 1/10 ~ 4/10 are to introduce the internal list for shared disks. Osier Yang (15): qemu: Introduce a list to maintain the shared disks between domains qemu: Init/Free the list with the driver's lifecyle qemu: Add/remove the shared disk entry during domain's lifecyle qemu: Add/Remove the entry of sharedDisks when live attaching/detaching docs: Add docs and rng schema for new XML cdbfilter conf: Parse and format the new XML tag cdbfilter util: Prepare helpers for unpriv_sgio setting qemu: Manage disk's cdbfilter in domain's lifecycle qemu: Do not restore the sysfs unpriv_sgio if the disk is being shared qemu: Error out when domain starting if the cdbfilter setting conflicts qemu: Set unpriv_sgio when attaching disk qemu: Restore unpriv_sgio when detaching disk qemu: Error out if the shared disk conf conflicts with others when attaching qemu: Do not restore unpriv_sgio if the disk is shared by other domain conf: Save disk's original unpriv_sgio state into status XML docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 106 ++++++++++-- src/conf/domain_conf.h | 13 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_conf.c | 170 ++++++++++++++++++++ src/qemu/qemu_conf.h | 30 ++++ src/qemu/qemu_driver.c | 78 +++++++++ src/qemu/qemu_process.c | 141 ++++++++++++++++- src/qemu/qemu_process.h | 4 + src/util/util.c | 145 +++++++++++++++++ src/util/util.h | 7 + ...ml2argv-disk-scsi-lun-passthrough-cdbfilter.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 761 insertions(+), 36 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-cdbfilter.xml Regards, Osier

5 26

[libvirt] [PATCH v5] qemu: Allow the user to specify vendor and product for disk
by Osier Yang 07 Dec '12

07 Dec '12

QEMU supports setting vendor and product strings for disk since 1.2.0 (only scsi-disk, scsi-hd, scsi-cd support it), this patch exposes it with new XML elements <vendor> and <product> of disk device. v4 - v5: * Just rebasing v3 - v4: * Per Paolo's feedback, allows all printable chars. --- I think it's pretty straightforward to ACK now, any one can review it? --- docs/formatdomain.html.in | 11 +++++ docs/schemas/domaincommon.rng | 14 ++++++ src/conf/domain_conf.c | 44 ++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 29 +++++++++++++ src/util/util.c | 12 +++++ src/util/util.h | 1 + ...qemuxml2argv-disk-scsi-disk-vpd-build-error.xml | 35 ++++++++++++++++ .../qemuxml2argv-disk-scsi-disk-vpd.args | 13 ++++++ .../qemuxml2argv-disk-scsi-disk-vpd.xml | 38 +++++++++++++++++ tests/qemuxml2argvtest.c | 8 ++++ tests/qemuxml2xmltest.c | 2 + 13 files changed, 210 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0574e68..30fb021 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1657,6 +1657,17 @@ of 16 hexadecimal digits. <span class='since'>Since 0.10.1</span> </dd> + <dt><code>vendor</code></dt> + <dd>If present, this element specifies the vendor of a virtual hard + disk or CD-ROM device. It must not be longer than 8 printable + characters. + <span class='since'>Since 1.0.1</span> + </dd> + <dt><code>product</code></dt> + <dd>If present, this element specifies the product of a virtual hard + disk or CD-ROM device. It must not be longer than 16 printable + <span class='since'>Since 1.0.1</span> + </dd> <dt><code>host</code></dt> <dd>The <code>host</code> element supports 4 attributes, viz. "name", "port", "transport" and "socket", which specify the hostname, the port diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 0e85739..14344e2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -905,6 +905,20 @@ <ref name="wwn"/> </element> </optional> + <optional> + <element name="vendor"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,8}</param> + </data> + </element> + </optional> + <optional> + <element name="product"> + <data type="string"> + <param name="pattern">[x20-x7E]{0,16}</param> + </data> + </element> + </optional> </interleave> </define> <define name="snapshot"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4ffb39d..6aa5f79 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -985,6 +985,8 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def) VIR_FREE(def->mirror); VIR_FREE(def->auth.username); VIR_FREE(def->wwn); + VIR_FREE(def->vendor); + VIR_FREE(def->product); if (def->auth.secretType == VIR_DOMAIN_DISK_SECRET_TYPE_USAGE) VIR_FREE(def->auth.secret.usage); virStorageEncryptionFree(def->encryption); @@ -3505,6 +3507,8 @@ cleanup: goto cleanup; } +#define VENDOR_LEN 8 +#define PRODUCT_LEN 16 /* Parse the XML definition for a disk * @param node XML nodeset to parse for disk definition @@ -3558,6 +3562,8 @@ virDomainDiskDefParseXML(virCapsPtr caps, char *logical_block_size = NULL; char *physical_block_size = NULL; char *wwn = NULL; + char *vendor = NULL; + char *product = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3926,6 +3932,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (!virValidateWWN(wwn)) goto error; + } else if (!vendor && + xmlStrEqual(cur->name, BAD_CAST "vendor")) { + vendor = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > VENDOR_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is more than 8 characters")); + goto error; + } + + if (!virStrIsPrint(vendor)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk vendor is not printable string")); + goto error; + } + } else if (!product && + xmlStrEqual(cur->name, BAD_CAST "product")) { + product = (char *)xmlNodeGetContent(cur); + + if (strlen(vendor) > PRODUCT_LEN) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is more than 16 characters")); + goto error; + } + + if (!virStrIsPrint(product)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("disk product is not printable string")); + goto error; + } } else if (xmlStrEqual(cur->name, BAD_CAST "boot")) { /* boot is parsed as part of virDomainDeviceInfoParseXML */ } @@ -4222,6 +4258,10 @@ virDomainDiskDefParseXML(virCapsPtr caps, serial = NULL; def->wwn = wwn; wwn = NULL; + def->vendor = vendor; + vendor = NULL; + def->product = product; + product = NULL; if (driverType) { def->format = virStorageFileFormatTypeFromString(driverType); @@ -4296,6 +4336,8 @@ cleanup: VIR_FREE(logical_block_size); VIR_FREE(physical_block_size); VIR_FREE(wwn); + VIR_FREE(vendor); + VIR_FREE(product); ctxt->node = save_ctxt; return def; @@ -12144,6 +12186,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <transient/>\n"); virBufferEscapeString(buf, " <serial>%s</serial>\n", def->serial); virBufferEscapeString(buf, " <wwn>%s</wwn>\n", def->wwn); + virBufferEscapeString(buf, " <vendor>%s</vendor>\n", def->vendor); + virBufferEscapeString(buf, " <product>%s</product>\n", def->product); if (def->encryption) { virBufferAdjustIndent(buf, 6); if (virStorageEncryptionFormat(buf, def->encryption) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ab15e9..7ad5377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -602,6 +602,8 @@ struct _virDomainDiskDef { char *serial; char *wwn; + char *vendor; + char *product; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bc01fe5..499ab3b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1298,6 +1298,7 @@ virSetUIDGID; virSkipSpaces; virSkipSpacesAndBackslash; virSkipSpacesBackwards; +virStrIsPrint; virStrToDouble; virStrToLong_i; virStrToLong_l; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1805625..826086c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2576,6 +2576,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, } } + if ((disk->vendor || disk->product) && + disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Only scsi disk supports vendor and product")); + goto error; + } + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { /* make sure that both the bus and the qemu binary support * type='lun' (SG_IO). @@ -2603,6 +2610,11 @@ qemuBuildDriveDevStr(virDomainDefPtr def, _("Setting wwn is not supported for lun device")); goto error; } + if (disk->vendor || disk->product) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product is not supported for lun device")); + goto error; + } } switch (disk->bus) { @@ -2652,6 +2664,17 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } + /* Properties wwn, vendor and product were introduced in the + * same QEMU release (1.2.0). + */ + if ((disk->vendor || disk->product) && + !qemuCapsGet(caps, QEMU_CAPS_SCSI_DISK_WWN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Setting vendor or product for scsi disk is not " + "supported by this QEMU")); + goto error; + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2797,6 +2820,12 @@ qemuBuildDriveDevStr(virDomainDefPtr def, if (disk->wwn) virBufferAsprintf(&opt, ",wwn=%s", disk->wwn); + if (disk->vendor) + virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + + if (disk->product) + virBufferAsprintf(&opt, ",product=%s", disk->product); + if (virBufferError(&opt)) { virReportOOMError(); goto error; diff --git a/src/util/util.c b/src/util/util.c index 2fd0f2c..95b0a06 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -3113,3 +3113,15 @@ virValidateWWN(const char *wwn) { return true; } + +bool +virStrIsPrint(const char *str) +{ + int i; + + for (i = 0; str[i]; i++) + if (!c_isprint(str[i])) + return false; + + return true; +} diff --git a/src/util/util.h b/src/util/util.h index 4316ab1..6d5dd03 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -280,4 +280,5 @@ bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1); bool virValidateWWN(const char *wwn); +bool virStrIsPrint(const char *str); #endif /* __VIR_UTIL_H__ */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml new file mode 100644 index 0000000..ca68275 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd-build-error.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='virtio'/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args new file mode 100644 index 0000000..f5c1999 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args @@ -0,0 +1,13 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-cd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,\ +id=scsi0-0-0-0,vendor=SEAGATE,product=ST3146707LC \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi1-0-0 \ +-device scsi-hd,bus=scsi1.0,scsi-id=0,drive=drive-scsi1-0-0,\ +id=scsi1-0-0,vendor=SEAGATE,product=ST3567807GD \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml new file mode 100644 index 0000000..96786e3 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='cdrom'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sda' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3146707LC</product> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='sdb' bus='scsi'/> + <readonly/> + <vendor>SEAGATE</vendor> + <product>ST3567807GD</product> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5822cae..bb233ed 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -507,6 +507,14 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST("disk-scsi-disk-vpd", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); + DO_TEST_FAILURE("disk-scsi-disk-vpd-build-error", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI, + QEMU_CAPS_SCSI_DISK_WWN); DO_TEST("disk-scsi-vscsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-scsi-virtio-scsi", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3d8176c..c2d3dd3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -239,6 +239,8 @@ mymain(void) DO_TEST("seclabel-none"); DO_TEST("numad-static-vcpu-no-numatune"); + DO_TEST("disk-scsi-disk-vpd"); + /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); DO_TEST_DIFFERENT("channel-virtio-auto"); -- 1.7.7.6

2 3

[libvirt] virsh list --all not showing domain
by Andy Howell 07 Dec '12

07 Dec '12

I'm running libvirt 0.9.13 on Ubuntu 12.10. I created a qemu VM from an existing image. I able to start and stop it, but networing was not working. After a reboot of my laptop, I can not long see the machine. virsh list --all Id Name State ---------------------------------------------------- The config file exists for the machine in /etc/libvirt/qemu/suse10.xml How do I get virsh to see it again? Thanks, Andy

4 5

[libvirt] [PATCH 0/5] Add API to allow TCP connection tunelling using virStreams
by Peter Krempa 07 Dec '12

07 Dec '12

This series adds ability for the qemu driver to tunnel connections to TCP ports from the host. This is useful for enabling remote VNC/SPICE sessions without the need to configure SSH tunnels or portforwards and without the need to open the ports for public. There's also an advantage for tools such as virt-viewer that have to guess the remote connection parameters and you have to hope that nothing is in your way. With spice/VNC clients that have support for read/write callbacks, this would allow also direct connection without an intermediate socket. The API and tunelling works but there's no (stable and good working) client for this API. I hacked up a dirty netcat-like terminal into virsh for testing purposes (see patch 5/5) but that isn't what I'd like to see. The client should be able to open a listening socket and when a client connects to it, it opens a stream and connects it to the remote host. For the client there are two options: 1) do all the stuff in virsh: + one tool to rule them all - i'd like to daemonize it and I don't know if that's okay in virsh 2) add a new tool "virtunnel": + less virsh pollution - separate tool ... I'd like to hear your opinion on this question. (note: this is my personal effort, I'm annoyed of opening ssh tunnels to remote displays on my server and I don't want to open the ports to public. ) After this it would be great to add support for this to virt-viewer. Peter Krempa (5): api: Add API to allow TCP tunneling through streams to the host fdstream: Add support for TCP connections of streams qemu: Add configuration options to enable TCP tunelling qemu: Implement virNodeTunnelTcp for the qemu driver NOT_TO_BE_APPLIED_UPSTREAM: quick and dirty virsh client to test the stuff include/libvirt/libvirt.h.in | 11 +++++++ src/driver.h | 8 +++++ src/fdstream.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ src/fdstream.h | 5 +++ src/libvirt.c | 67 ++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu.conf | 16 ++++++++++ src/qemu/qemu_conf.c | 26 ++++++++++++++++ src/qemu/qemu_conf.h | 13 ++++++++ src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 9 +++++- src/remote_protocol-structs | 6 ++++ src/rpc/gendispatch.pl | 1 + tools/console.c | 66 +++++++++++++++++++++------------------ tools/console.h | 11 +++---- tools/virsh-domain.c | 18 ++++++++--- tools/virsh-host.c | 60 ++++++++++++++++++++++++++++++++++++ 19 files changed, 396 insertions(+), 42 deletions(-) -- 1.8.0

2 7

[libvirt] [test-API][PATCH] Add 2 vcpupin cases cover config and live flags
by Wayne Sun 07 Dec '12

07 Dec '12

* use pinVcpuFlags to pin domain vcpu to host cpu * 2 cases cover config and live flags * cpulist with '^', '-' and ',' is supported to give multiple host cpus * vcpus and vcpuPinInfo are used as part of the checking * a sample conf is added Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/vcpupin.conf | 67 +++++++++++++++ repos/setVcpus/vcpupin_config.py | 174 ++++++++++++++++++++++++++++++++++++++ repos/setVcpus/vcpupin_live.py | 166 ++++++++++++++++++++++++++++++++++++ 3 files changed, 407 insertions(+), 0 deletions(-) create mode 100644 cases/vcpupin.conf create mode 100644 repos/setVcpus/vcpupin_config.py create mode 100644 repos/setVcpus/vcpupin_live.py diff --git a/cases/vcpupin.conf b/cases/vcpupin.conf new file mode 100644 index 0000000..880247f --- /dev/null +++ b/cases/vcpupin.conf @@ -0,0 +1,67 @@ +domain:install_linux_cdrom + guestname + $defaultname + guestos + $defaultos + guestarch + $defaultarch + vcpu + 4 + memory + $defaultmem + hddriver + $defaulthd + nicdriver + $defaultnic + imageformat + qcow2 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 0 + cpulist + 2,4-6,^4 + +setVcpus:vcpupin_live + guestname + $defaultname + vcpu + 1 + cpulist + 3 + +domain:destroy + guestname + $defaultname + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 2 + cpulist + 0-8,^1 + +setVcpus:vcpupin_config + guestname + $defaultname + vcpu + 3 + cpulist + ^2,0-8 + +domain:start + guestname + $defaultname + +domain:destroy + guestname + $defaultname + +domain:undefine + guestname + $defaultname + +options cleanup=enable diff --git a/repos/setVcpus/vcpupin_config.py b/repos/setVcpus/vcpupin_config.py new file mode 100644 index 0000000..12d9598 --- /dev/null +++ b/repos/setVcpus/vcpupin_config.py @@ -0,0 +1,174 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_CONFIG, check +# domain config xml with vcpupin configuration. + +import re +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(domobj, vcpu, cpumap): + """check domain config xml with vcpupin element + """ + guestxml = domobj.XMLDesc(2) + logger.debug("domain %s xml :\n%s" %(domobj.name(), guestxml)) + + doc = minidom.parseString(guestxml) + vcpupin = doc.getElementsByTagName('vcpupin') + if not vcpupin: + logger.error("no vcpupin element in domain xml") + return 1 + + for i in range(len(vcpupin)): + if vcpupin[i].hasAttribute('vcpu') and \ + vcpupin[i].hasAttribute('cpuset'): + vcpu_attr = vcpupin[i].getAttributeNode('vcpu') + cpu_attr = vcpupin[i].getAttributeNode('cpuset') + if int(vcpu_attr.nodeValue) == vcpu: + cpulist = cpu_attr.nodeValue + if cpulist == '': + cpumap_tmp = () + for i in range(maxcpu): + cpumap_tmp += (False,) + else: + cpumap_tmp = get_cpumap(cpulist) + + if cpumap_tmp == cpumap: + logger.info("cpuset is as expected in domain xml") + return 0 + else: + logger.error("cpuset is not as expected in domain xml") + return 1 + + if i == len(vcpupin) - 1: + logger.error("the vcpupin element with given vcpu is not found") + return 1 + +def format_cpumap(cpulist, cpumap_test): + """ format cpumap base on cpulist + """ + cpumap = () + + try: + if re.match('\^', cpulist): + unuse = int(re.split('\^', cpulist)[1]) + for i in range(maxcpu): + if i == unuse: + cpumap += (False,) + else: + cpumap += (cpumap_test[i],) + + elif '-' in cpulist: + cpu_list = re.split('-', cpulist) + if not len(cpu_list) == 2: + return False + if not int(cpu_list[1]) < maxcpu: + logger.error("cpulist: out of host cpu range") + return False + if int(cpu_list[1]) < int(cpu_list[0]): + return False + + for i in range(maxcpu): + if i in range(int(cpu_list[0]), int(cpu_list[1])+1): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + else: + for i in range(maxcpu): + if i == int(cpulist): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + return cpumap + except ValueError, e: + logger.error("ValueError: " + str(e)) + return False + +def get_cpumap(cpulist): + """get cpumap base on given cpulist + """ + cpumap_test = () + for i in range(maxcpu): + cpumap_test += (False,) + + if ',' in cpulist: + cpu_list = re.split(',', cpulist) + for i in range(len(cpu_list)): + cpumap = format_cpumap(cpu_list[i], cpumap_test) + if cpumap: + cpumap_test = cpumap + else: + return False + return cpumap + + else: + cpumap = format_cpumap(cpulist, cpumap_test) + if cpumap: + return cpumap + else: + return False + +def vcpupin_config(params): + """pin domain vcpu to host cpu with config flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = get_cpumap(cpulist) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpulist %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_CONFIG)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + logger.info("check vcpu pin info") + ret = domobj.vcpuPinInfo(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + logger.debug("vcpu pin info is:") + logger.debug(ret) + if ret[vcpu] == cpumap: + logger.info("vcpu pin info is expected") + else: + logger.error("vcpu pin info is not expected") + return 1 + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check domain vcpupin configuration in xml") + ret = vcpupin_check(domobj, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin check failed") + return 1 + else: + logger.info("domain vcpu pin check succeed") + return 0 diff --git a/repos/setVcpus/vcpupin_live.py b/repos/setVcpus/vcpupin_live.py new file mode 100644 index 0000000..09744a5 --- /dev/null +++ b/repos/setVcpus/vcpupin_live.py @@ -0,0 +1,166 @@ +#!/usr/bin/env python +# Test domain vcpu pin with flag VIR_DOMAIN_AFFECT_LIVE, check +# vcpu subprocess status under domain task list on host. + +import re + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('guestname', 'vcpu', 'cpulist',) +optional_params = {} + +def vcpupin_check(guestname, vcpu, cpumap): + """check vcpu subprocess status of the running virtual machine + grep Cpus_allowed_list /proc/PID/task/*/status + """ + tmp_str = '' + cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname + status, pid = utils.exec_cmd(cmd, shell=True) + if status: + logger.error("failed to get the pid of domain %s" % guestname) + return 1 + + cmd = "grep Cpus_allowed_list /proc/%s/task/*/status" % pid[0] + status, output = utils.exec_cmd(cmd, shell=True) + logger.debug("command '%s' output is:" % cmd) + for i in range(len(output)): + tmp_str += ''.join(output[i]) + '\n' + logger.debug(tmp_str) + + task_list = output[1:] + vcpu_task = task_list[int(vcpu)] + cpulist = vcpu_task.split('\t')[1] + ret = get_cpumap(cpulist) + if ret == cpumap: + logger.info("vcpu process cpus allowed list is expected") + return 0 + else: + logger.error("vcpu process cpus allowed list is not expected") + return 1 + +def format_cpumap(cpulist, cpumap_test): + """ format cpumap base on cpulist + """ + cpumap = () + + try: + if re.match('\^', cpulist): + unuse = int(re.split('\^', cpulist)[1]) + for i in range(maxcpu): + if i == unuse: + cpumap += (False,) + else: + cpumap += (cpumap_test[i],) + + elif '-' in cpulist: + cpu_list = re.split('-', cpulist) + if not len(cpu_list) == 2: + return False + if not int(cpu_list[1]) < maxcpu: + logger.error("cpulist: out of host cpu range") + return False + if int(cpu_list[1]) < int(cpu_list[0]): + return False + + for i in range(maxcpu): + if i in range(int(cpu_list[0]), int(cpu_list[1])+1): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + else: + for i in range(maxcpu): + if i == int(cpulist): + cpumap += (True,) + else: + cpumap += (cpumap_test[i],) + + return cpumap + except ValueError, e: + logger.error("ValueError: " + str(e)) + return False + +def get_cpumap(cpulist): + """get cpumap base on given cpulist + """ + cpumap_test = () + for i in range(maxcpu): + cpumap_test += (False,) + + if ',' in cpulist: + cpu_list = re.split(',', cpulist) + for i in range(len(cpu_list)): + cpumap = format_cpumap(cpu_list[i], cpumap_test) + if cpumap: + cpumap_test = cpumap + else: + return False + return cpumap + + else: + cpumap = format_cpumap(cpulist, cpumap_test) + if cpumap: + return cpumap + else: + return False + +def vcpupin_live(params): + """pin domain vcpu to host cpu with live flag + """ + global logger + logger = params['logger'] + params.pop('logger') + guestname = params['guestname'] + vcpu = int(params['vcpu']) + cpulist = params['cpulist'] + + logger.info("the name of virtual machine is %s" % guestname) + logger.info("the given vcpu is %s" % vcpu) + logger.info("the given cpulist is %s" % cpulist) + + global maxcpu + maxcpu = utils.get_host_cpus() + logger.info("%s physical cpu on host" % maxcpu) + + conn = sharedmod.libvirtobj['conn'] + + try: + domobj = conn.lookupByName(guestname) + cpumap = get_cpumap(cpulist) + if not cpumap: + logger.error("cpulist: Invalid format") + return 1 + + logger.debug("cpumap for vcpu pin is:") + logger.debug(cpumap) + + logger.info("pin domain vcpu %s to host cpu %s with flag: %s" % + (vcpu, cpulist, libvirt.VIR_DOMAIN_AFFECT_LIVE)) + domobj.pinVcpuFlags(vcpu, cpumap, libvirt.VIR_DOMAIN_AFFECT_LIVE) + + logger.info("check vcpus info") + ret = domobj.vcpus() + logger.debug("vcpus info is:") + logger.debug(ret) + if ret[1][vcpu] == cpumap: + logger.info("vcpus info is expected") + else: + logger.error("vcpus info is not expected") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("check vcpu pin status on host") + ret = vcpupin_check(guestname, vcpu, cpumap) + if ret: + logger.error("domain vcpu pin failed") + return 1 + else: + logger.info("domain vcpu pin succeed") + return 0 -- 1.7.1

1 0

[libvirt] RFC: Enable Libvirt to handle OVA installation
by Ata Bohra 07 Dec '12

07 Dec '12

This is a proposal to enhance Libvirt library to handle OVA package installation. OVA: OVA is one of the widely accepted and consortium defined/maintained format for Virtual Machine distros. Technically it is a tar file with three main components: 1. VMX descriptor (XML file defining virtual machine specifics such as: virtual hardware etc. 2. VMDKs in a compressed format. 3. Manifest file. Proposal: 1. Expose a public API method to allow an application to invoke OVA installation with a file pointer to OVA file. 2. OVA util file: This file understands the OVA formats and rips out the given package to extract specific information: 2.1. int get_vmx(char *vmx): method can return VMX descriptor associated with a given OVA file. 2.2. int get_vmdks(struct ova_type *ova): method that seek the OVA file and populate ova_type struct which may look like; typedef struct disk_list_tag { char *file_name; off_t file_size; off_t file_offset; struct disk_list_tag *next; }; typedef struct ova_type { int num_vmdks; ova_list *head; } 2. Hypervisor specific changes: It can be done in more than one way: 2.1: Enhance hypervisor driver function to implement hypervisor specific routines to perform OVA installations. 2.2.: Append a new driver to handle OVA installation such as virOvaDriver, main routines can be: open() : parse OVA using util functions. close() list_disk(): may display disk names install() (Please suggest if there can be more routines to this driver, it can be enhanced later as well). It is possible to design this driver to handle OVA parsing as well, but I think keeping it in 'util' may make that code available for all hypervisors given OVA format does not change per hypervisor. I'm inclined more towards 2.2 design as it is more generic and provides room for furture extensions. Looking forward for comments/suggestions. Thanks!Ata

4 6

[libvirt] [PATCHv2] util: Fix virGet{User, Group}IDByName when the user/group cannot be found
by Christophe Fergeau 06 Dec '12

06 Dec '12

Here is the v2 of this patch series. Changes since v1: - return an error only for documented error values returnef from getpwnam_r/getgrnam_r instead of trying to guess what error values mean 'entry not found' - this addresses the indenting comment raised by Osier

3 6

[libvirt] libvirt current git & F18
by Gene Czarcinski 06 Dec '12

06 Dec '12

Anyone know of problems with the libvirt based on today's git and Fedora 18. Trying to rebuild some rpms which build fine on Fedora 17 fail on Fedora 18. It appears that it may be related to xen-devel. Gene

3 3

[libvirt] [PATCHv3 0/3] IPv6 enhancements; put dnsmasq parameters in conf-file
by Gene Czarcinski 06 Dec '12

06 Dec '12

Rebased 3 December 2012 These three patch files are packaged together because they serially depend on each other. This version includes updates to add the ipv6='yes' for enabling the guest-to-guest communications. The DHCPv6 support checks dnsmasq's version and requires a minimum of 2.64. Also, using dnsmasq for providing the RA service is checked against the dnsmasq version and is currently 2.64. There are separate checks for DHCPv6 and Router Advertising support by dnsmasq. As with IPv4, IPv6 DHCP is only one subnetwork on an interface. Additionally, if other IPv6 addresses are defined, a warning message is issued since the Router Advertisement service will support only state-full (DHCP) or state-less (SLAAC) addressing on a network interface (not both). Thus, the additional subnetworks will need to be manually configured to properly function. If dnsmasq provides the RA service, it also points to itself as a RDNSS (Recursive DNS Server) as part of the information is supplies. If IPv6 DHCP is not being run, then SLAAC addressing is supported for any IPv6 addresses specified. Gene Czarcinski (3): v2.0: allow guest to guest IPv6 without gateway definition v8.2 add support for DHCPv6 v7.9: put dnsmasq parameters into conf-file docs/formatnetwork.html.in | 136 ++++- docs/schemas/network.rng | 22 +- src/conf/network_conf.c | 108 ++-- src/conf/network_conf.h | 5 + src/network/bridge_driver.c | 594 ++++++++++++++------- src/network/bridge_driver.h | 7 +- src/util/dnsmasq.c | 9 +- tests/networkxml2argvdata/dhcp6-nat-network.argv | 14 + tests/networkxml2argvdata/dhcp6-nat-network.xml | 24 + tests/networkxml2argvdata/dhcp6-network.argv | 14 + tests/networkxml2argvdata/dhcp6-network.xml | 14 + .../dhcp6host-routed-network.argv | 12 + .../dhcp6host-routed-network.xml | 19 + tests/networkxml2argvdata/isolated-network.argv | 25 +- .../networkxml2argvdata/nat-network-dns-hosts.argv | 14 +- .../nat-network-dns-srv-record-minimal.argv | 34 +- .../nat-network-dns-srv-record.argv | 24 +- .../nat-network-dns-txt-record.argv | 22 +- tests/networkxml2argvdata/nat-network.argv | 22 +- tests/networkxml2argvdata/netboot-network.argv | 28 +- .../networkxml2argvdata/netboot-proxy-network.argv | 26 +- tests/networkxml2argvdata/routed-network.argv | 11 +- tests/networkxml2argvtest.c | 47 +- 23 files changed, 876 insertions(+), 355 deletions(-) create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-nat-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6-network.xml create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.argv create mode 100644 tests/networkxml2argvdata/dhcp6host-routed-network.xml -- 1.7.11.7

3 18

[libvirt] [jenkins@libvirt.sigxcpu.org: Build failed in Jenkins: libvirt-tck-debian-wheezy-qemu-session #227]
by Guido Günther 06 Dec '12

06 Dec '12

Hi, this commit ae2163f852448fafce3bfcb2814e823d18e394ea Only let VM drivers block libvirtd timed shutdown broke the libvirt-tck integration build with qemu:///session: http://honk.sigxcpu.org:8001/job/libvirt-tck-debian-wheezy-qemu-session/227… I won't have a chance to look into this in detail the near future but I thought I'd at least send out a notice. Cheers, -- Guido

3 6

[libvirt] [PATCH] dnsmasq: Fix parsing of the version number
by Michal Privoznik 06 Dec '12

06 Dec '12

If the debugging is enabled, the virCommand subsystem catches debug messages in the command output as well. In that case, we can't assume the string corresponding to command's stdout will start with specific prefix. But the prefix can be moved deeper in the string. This bug shows itself when parsing dnsmasq output: 2012-12-06 11:18:11.445+0000: 18491: error : dnsmasqCapsSetFromBuffer:664 : internal error cannot parse /usr/sbin/dnsmasq version number in '2012-12-06 11:11:02.232+0000: 18492: debug : virFileClose:72 : Closed fd 22' We can clearly see that the output of dnsmasq --version doesn't start with expected "Dnsmasq version " string but a libvirt debug output. --- src/util/dnsmasq.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index 4f210d2..de0293a 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -641,9 +641,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf) caps->noRefresh = true; - p = STRSKIP(buf, DNSMASQ_VERSION_STR); - if (!p) + if (!(p = strstr(buf, DNSMASQ_VERSION_STR))) goto fail; + p += sizeof(DNSMASQ_VERSION_STR) - 1; virSkipSpaces(&p); if (virParseVersionString(p, &caps->version, true) < 0) goto fail; -- 1.7.8.6

3 6

[libvirt] [PATCH 1/1] add vnc unix sockets to apparmor policy
by Serge Hallyn 06 Dec '12

06 Dec '12

When using vnc gaphics over a unix socket, virt-aa-helper needs to provide access for the qemu domain to access the sockfile. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index e480b30..c6b9903 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1003,6 +1003,13 @@ get_files(vahControl * ctl) if (vah_add_file(&buf, ctl->def->os.loader, "r") != 0) goto clean; + for (i = 0; i < ctl->def->ngraphics; i++) { + if (ctl->def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && + ctl->def->graphics[i]->data.vnc.socket && + vah_add_file(&buf, ctl->def->graphics[i]->data.vnc.socket, "rw")) + goto clean; + } + if (ctl->def->ngraphics == 1 && ctl->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) if (vah_add_file(&buf, ctl->def->graphics[0]->data.sdl.xauth, -- 1.7.10.4

1 0

[libvirt] add security hook for permitting hugetlbfs access (v2)
by Serge Hallyn 06 Dec '12

06 Dec '12

When a qemu domain is backed by huge pages, apparmor needs to grant the domain rw access to files under the hugetlbfs mount point. Add a hook, called in qemu_process.c, which ends up adding the read-write access through virt-aa-helper. Qemu will be creating a randomly named file under the mountpoint and unlinking it as soon as it has mmap()d it, therefore we cannot predict the full pathname, but for the same reason it is generally safe to provide access to $path/**. Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/646468 Changelog: (v2) use virBuffer in place of snprintf. Index: libvirt/src/qemu/qemu_process.c =================================================================== --- libvirt.orig/src/qemu/qemu_process.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/qemu/qemu_process.c 2012-12-06 11:57:58.234773649 -0600 @@ -3475,6 +3475,15 @@ } virDomainAuditSecurityLabel(vm, true); + if (driver->hugepage_path && vm->def->mem.hugepage_backed) { + if (virSecurityManagerSetHugepages(driver->securityManager, + vm->def, driver->hugepage_path) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Unable to set huge path in security driver")); + goto cleanup; + } + } + /* Ensure no historical cgroup for this VM is lying around bogus * settings */ VIR_DEBUG("Ensuring no historical cgroup is lying around"); Index: libvirt/src/security/security_apparmor.c =================================================================== --- libvirt.orig/src/security/security_apparmor.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_apparmor.c 2012-12-06 11:58:23.286774213 -0600 @@ -840,6 +840,31 @@ } static int +ApparmorSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path) +{ + const virSecurityLabelDefPtr secdef = + virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME); + int ret = -1; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *newpath; + + if (!secdef) + return -1; + + if (secdef->imagelabel == NULL) + return 0; + + virBufferAsprintf(&buf, "%s/**", path); + newpath = virBufferCurrentContent(&buf); + if (newpath) + ret = reload_profile(mgr, def, newpath, true); + virBufferFreeAndReset(&buf); + return ret; +} + +static int AppArmorSetFDLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, int fd) @@ -908,4 +933,6 @@ .domainSetSecurityImageFDLabel = AppArmorSetFDLabel, .domainSetSecurityTapFDLabel = AppArmorSetFDLabel, + + .domainSetSecurityHugepages = ApparmorSetHugepages, }; Index: libvirt/src/security/security_manager.c =================================================================== --- libvirt.orig/src/security/security_manager.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_manager.c 2012-12-06 11:57:58.238773649 -0600 @@ -511,3 +511,13 @@ list[1] = NULL; return list; } + +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + if (mgr->drv->domainSetSecurityHugepages) + return mgr->drv->domainSetSecurityHugepages(mgr, vm, path); + + return 0; +} Index: libvirt/src/security/security_manager.h =================================================================== --- libvirt.orig/src/security/security_manager.h 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_manager.h 2012-12-06 11:57:58.238773649 -0600 @@ -112,5 +112,8 @@ virDomainDefPtr vm); virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr); +int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr sec, + const char *hugepages_path); #endif /* VIR_SECURITY_MANAGER_H__ */ Index: libvirt/src/security/security_driver.h =================================================================== --- libvirt.orig/src/security/security_driver.h 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_driver.h 2012-12-06 11:57:58.238773649 -0600 @@ -100,6 +100,9 @@ int fd); typedef char *(*virSecurityDomainGetMountOptions) (virSecurityManagerPtr mgr, virDomainDefPtr def); +typedef int (*virSecurityDomainSetHugepages) (virSecurityManagerPtr mgr, + virDomainDefPtr def, + const char *path); struct _virSecurityDriver { size_t privateDataLen; @@ -140,6 +143,7 @@ virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel; virSecurityDomainGetMountOptions domainGetSecurityMountOptions; + virSecurityDomainSetHugepages domainSetSecurityHugepages; }; virSecurityDriverPtr virSecurityDriverLookup(const char *name, Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/libvirt_private.syms 2012-12-06 11:57:58.238773649 -0600 @@ -1052,6 +1052,7 @@ virSecurityManagerStackAddNested; virSecurityManagerVerify; virSecurityManagerGetMountOptions; +virSecurityManagerSetHugepages; # sexpr.h sexpr_append; Index: libvirt/src/security/security_stack.c =================================================================== --- libvirt.orig/src/security/security_stack.c 2012-12-06 11:50:48.354763986 -0600 +++ libvirt/src/security/security_stack.c 2012-12-06 11:57:58.238773649 -0600 @@ -462,6 +462,23 @@ return rc; } +static int +virSecurityStackSetHugepages(virSecurityManagerPtr mgr, + virDomainDefPtr vm, + const char *path) +{ + virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); + virSecurityStackItemPtr item = priv->itemsHead; + int rc = 0; + + for (; item; item = item->next) { + if (virSecurityManagerSetHugepages(item->securityManager, vm, path) < 0) + rc = -1; + } + + return rc; +} + static char *virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr vm ATTRIBUTE_UNUSED) { return NULL; @@ -529,4 +546,6 @@ .domainSetSecurityTapFDLabel = virSecurityStackSetTapFDLabel, .domainGetSecurityMountOptions = virSecurityStackGetMountOptions, + + .domainSetSecurityHugepages = virSecurityStackSetHugepages, };

1 0

[libvirt] [PATCH] network: prevent a few invalid configuration combinations
by Laine Stump 06 Dec '12

06 Dec '12

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=767057 It was possible to define a network with <forward mode='bridge'> that had both a bridge device and a forward device defined. These two are mutually exclusive by definition (if you are using a bridge device, then this is a host bridge, and if you have a forward dev defined, this is using macvtap). It was also possible to put <ip>, <dns>, and <domain> elements in this definition, although those aren't supported by the current driver (although it's conceivable that some other driver might support that). The items that are invalid by definition, are now checked in the XML parser (since they will definitely *always* be wrong), and the others are checked in networkValidate() in the network driver (since, as mentioned, it's possible that some other network driver, or even this one, could some day support setting those). --- src/conf/network_conf.c | 9 +++++++++ src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 6ce2e63..06932d8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1577,6 +1577,15 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) def->name); goto error; } + if (def->bridge && (def->nForwardIfs || nForwardPfs)) { + virReportError(VIR_ERR_XML_ERROR, + _("A network with forward mode='%s' can specify " + "a bridge name or a forward dev, but not " + "both (network '%s')"), + virNetworkForwardTypeToString(def->forwardType), + def->name); + goto error; + } break; } } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 946bb20..bc01fe5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -857,6 +857,7 @@ virNetworkDefParseString; virNetworkDeleteConfig; virNetworkFindByName; virNetworkFindByUUID; +virNetworkForwardTypeToString; virNetworkIpDefNetmask; virNetworkIpDefPrefix; virNetworkList; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e8be00a..0893e9b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2733,6 +2733,35 @@ networkValidate(struct network_driver *driver, return -1; virNetworkSetBridgeMacAddr(def); + } else { + /* They are also the only types that currently support setting + * an IP address for the host-side device (bridge) + */ + if (virNetworkDefGetIpByIndex(def, AF_UNSPEC, 0)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <ip> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } + if (def->dns && + (def->dns->ntxtrecords || def->dns->nhosts || def->dns->nsrvrecords)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <dns> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } + if (def->domain) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported <domain> element in network %s " + "with forward mode='%s'"), + def->name, + virNetworkForwardTypeToString(def->forwardType)); + return -1; + } } /* We only support dhcp on one IPv4 address per defined network */ -- 1.7.11.7

3 3

[libvirt] [PATCH] maint: Sort util source file definitions in makefile
by Peter Krempa 06 Dec '12

06 Dec '12

--- src/Makefile.am | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1a2f94f..9aff77a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -54,44 +54,37 @@ augeastest_DATA = UTIL_SOURCES = \ util/bitmap.c util/bitmap.h \ util/buf.c util/buf.h \ + util/cgroup.c util/cgroup.h \ util/command.c util/command.h \ util/conf.c util/conf.h \ - util/cgroup.c util/cgroup.h \ + util/dnsmasq.c util/dnsmasq.h \ + util/ebtables.c util/ebtables.h \ util/event.c util/event.h \ util/event_poll.c util/event_poll.h \ util/hooks.c util/hooks.h \ + util/hostusb.c util/hostusb.h \ util/iptables.c util/iptables.h \ - util/ebtables.c util/ebtables.h \ - util/dnsmasq.c util/dnsmasq.h \ util/json.c util/json.h \ util/logging.c util/logging.h \ util/memory.c util/memory.h \ util/pci.c util/pci.h \ util/processinfo.c util/processinfo.h \ - util/hostusb.c util/hostusb.h \ util/sexpr.c util/sexpr.h \ util/stats_linux.c util/stats_linux.h \ util/storage_file.c util/storage_file.h \ util/sysinfo.c util/sysinfo.h \ - util/threads.c util/threads.h \ + util/threadpool.c util/threadpool.h \ util/threads-pthread.h \ util/threads-win32.h \ - util/threadpool.c util/threadpool.h \ - util/uuid.c util/uuid.h \ + util/threads.c util/threads.h \ util/util.c util/util.h \ + util/uuid.c util/uuid.h \ util/viratomic.h util/viratomic.c \ util/viraudit.c util/viraudit.h \ util/virauth.c util/virauth.h \ util/virauthconfig.c util/virauthconfig.h \ - util/virfile.c util/virfile.h \ - util/virnodesuspend.c util/virnodesuspend.h \ - util/virobject.c util/virobject.h \ - util/virpidfile.c util/virpidfile.h \ - util/virprocess.c util/virprocess.h \ - util/virtypedparam.c util/virtypedparam.h \ - util/xml.c util/xml.h \ - util/virterror.c util/virterror_internal.h \ util/virdbus.c util/virdbus.h \ + util/virfile.c util/virfile.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ util/virinitctl.c util/virinitctl.h \ @@ -110,11 +103,18 @@ UTIL_SOURCES = \ util/virnetdevvlan.h util/virnetdevvlan.c \ util/virnetdevvportprofile.h util/virnetdevvportprofile.c \ util/virnetlink.c util/virnetlink.h \ + util/virnodesuspend.c util/virnodesuspend.h \ + util/virobject.c util/virobject.h \ + util/virpidfile.c util/virpidfile.h \ + util/virprocess.c util/virprocess.h \ util/virrandom.h util/virrandom.c \ util/virsocketaddr.h util/virsocketaddr.c \ util/virstring.h util/virstring.c \ + util/virterror.c util/virterror_internal.h \ util/virtime.h util/virtime.c \ - util/viruri.h util/viruri.c + util/virtypedparam.c util/virtypedparam.h \ + util/viruri.h util/viruri.c \ + util/xml.c util/xml.h EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py -- 1.8.0

2 2

[libvirt] [PATCH] dnsmasq: Fix parsing of the version number
by Michal Privoznik 06 Dec '12

06 Dec '12

If debugging is enabled, the debug messages are sent to stderr. Moreover, if a command has catching of stderr set, the messages gets mixed with stdout output (assuming both outputs are stored in the same variable). The resulting string then doesn't necessarily have to start with desired prefix then. This bug exposes itself when parsing dnsmasq output: 2012-12-06 11:18:11.445+0000: 18491: error : dnsmasqCapsSetFromBuffer:664 : internal error cannot parse /usr/sbin/dnsmasq version number in '2012-12-06 11:11:02.232+0000: 18492: debug : virFileClose:72 : Closed fd 22' We can clearly see that the output of dnsmasq --version doesn't start with expected "Dnsmasq version " string but a libvirt debug output. --- src/util/dnsmasq.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index de0293a..a627ed2 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -715,7 +715,6 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) cmd = virCommandNewArgList(caps->binaryPath, "--version", NULL); virCommandSetOutputBuffer(cmd, &version); - virCommandSetErrorBuffer(cmd, &version); virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); if (virCommandRun(cmd, NULL) < 0) { @@ -727,7 +726,6 @@ dnsmasqCapsRefreshInternal(dnsmasqCapsPtr caps, bool force) cmd = virCommandNewArgList(caps->binaryPath, "--help", NULL); virCommandSetOutputBuffer(cmd, &help); - virCommandSetErrorBuffer(cmd, &help); virCommandAddEnvPassCommon(cmd); virCommandClearCaps(cmd); if (virCommandRun(cmd, NULL) < 0) { -- 1.7.8.6

2 1

[libvirt] [PATCH 0/4] qemu: Fix leaks in handling PCI devices
by Jiri Denemark 06 Dec '12

06 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=877095 Patch 1/4 fixes a possible double free on error path and the other patches deal with memory and file descriptor leaks in PCI device attachment code. Jiri Denemark (4): qemu: Don't free PCI device if adding it to activePciHostdevs fails util: Slightly refactor PCI list functions qemu: Fix memory (and FD) leak on PCI device detach qemu: Do not keep PCI device config file open src/libvirt_private.syms | 3 +++ src/qemu/qemu_hostdev.c | 22 ++++++++-------- src/util/pci.c | 66 ++++++++++++++++++++++++++++-------------------- src/util/pci.h | 5 ++++ 4 files changed, 58 insertions(+), 38 deletions(-) -- 1.8.0

7 20

[libvirt] virSecurity hook for hugepages?
by Serge Hallyn 05 Dec '12

05 Dec '12

Hi, Currently the hugepages support can automatically detect the hugepages mount, but it doesn't update the security information. At least for apparmor we need to be able to add permission for the domain to access the hugetlbfs mount path. There are a few ways this could be done, 1. add a virSecuritySetSecurityHugepages or virSecuritySetSecurityHugepagesFD hook which is called perhaps at qemudStartup 2. optionally add the qemu_driver->hugepage_path to the xml output, at least for the internal format (which is passed to virt-aa-helper). The concern I have with this is that it brings up the issue of what to do when defining a domain which has such an entry. 3. reproduce the logic in virt-aa-helper for detecting the hugepages mount path. Not preferred obviously. My guess would be that (1) would be preferred, but I wanted to ask here first and see if there are other suggestions. thanks, -serge

1 1

[libvirt] [PATCH] storage: Error out earlier if the volume target path already exists
by Osier Yang 05 Dec '12

05 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=832302 It's odd to fall through to buildVol, and the existed file is removed when buildVol fails. This checks if the volume target path already exists in createVol. The reason for not using error like "Volume already exists" is that there isn't volume maintained by libvirt for the path until a operation like pool-refresh, using error like that will just cause confusion. --- BTW, It inspires me again that perhaps we should integrate things like inotify to storage. --- src/storage/storage_backend_fs.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 4e6ebbf..6cddad0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1000,6 +1000,13 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, return -1; } + if (virFileExists(vol->target.path)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume target path '%s' already exists"), + vol->target.path); + return -1; + } + VIR_FREE(vol->key); vol->key = strdup(vol->target.path); if (vol->key == NULL) { -- 1.7.7.6

2 4

[libvirt] [PATCH 0/2] Avoid the thread race condition
by Osier Yang 05 Dec '12

05 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=866524 The two patches are to fix the same bug in different method, 1/2 is suggested by Daniel in the bug. 2/2 is an alternative way to fix it by locking the whole virConnect object. The reason to post 2/2 is that I think 1/2 doesn't fix the root problem, though I believe it must fix the bug. A thread can get the lock before/during doRemoteClose, and it might drop into the similar situation, though it's not the case now because remoteClientCloseFunc doesn't do changes which can cause race for the later doRemoteClose. However, I'm not sure if locking the whole object will cause some unexpected result. Osier Yang (2): remote: Avoid the thread race condition Lock the whole virConnect Object when disposing to avoid the thread race src/datatypes.c | 4 ++-- src/remote/remote_driver.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) Regards, Osier

2 5

Re: [libvirt] [libvirt-users] NWFilter and IPv6
by Laine Stump 05 Dec '12

05 Dec '12

(No extra content from me, but I'm setting Followup-To: libvir-list(a)redhat.com for this (and setting To: to the same), since this is talking about new development, so we want to make sure as many developers as possible see it...) On 12/05/2012 09:23 AM, Guido Winkelmann wrote: > Am Dienstag, 4. Dezember 2012, 19:18:01 schrieb Stefan Berger: >> On 12/04/2012 09:39 AM, Guido Winkelmann wrote: >>> Am Montag, 26. November 2012, 12:24:11 schrieb Stefan Berger: >>>> On 11/26/2012 10:41 AM, Laine Stump wrote: > [...] >>>> One problem I want to mention, though: A bigger problem would be if a >>>> machine wanted to use IPv4 and IPv6 (dual stack) and use DHCP for both , >>>> which in effect would result in two variables that need to have values >>>> detected which in turn would require partial instantiation of filters >>>> (since one variable may not have a value assigned while the other has), >>>> which does not currently work... >>> Hm, how do you even do it with one variable? Do you leave the firewall >>> undefined until you could detect the dhcp-answer package and then pull it >>> up? >> We assume that DHCP is being used and for example put a filter in that >> only allows DHCP traffic to pass and once we grab the IP address we >> instantiate the user-provided filter. For that we use $IP. The variable >> is set once the IP address has been detected. For IPv6 we should >> probably use $IPV6 (reserved variable). > How do you control this behavior? Can you just set the $IP to a value in the > filterref instantiation to disable it? Like so: > > <filterref filter='clean-traffic-with-v6'>" > <parameter name='MAC' value='11:11:11:11:11:11'/>"; > <parameter name='IP' value='192.168.0.10'/>"; > <parameter name='IP' value='192.168.0.11'/>"; > </filterref>" > > Anyway, I think combining DHCP and DHCPv6 is going to be a minor problem in > practice, because most people will probably use stateless autoconfiguration to > set the IPv6 address on a device and use DHCPv6 only for additional > information, like DNS servers or NTP servers. > > How about this approach instead for combining DHCP and DHCPv6: > > - Instead of putting up a special network filter for the detection phase, we > put up the actual user-requested filter, but with $IP and $IPV6 unset. (except > of course when these variables are specifically set by the user as above...) > - The default-shipped filters like clean-traffic should let DHCP(v6) through > in this configuration. If the user-requested filters don't, that's just a > configuration error. > - As soon as we detect an incoming DHCP or DHCPv6 packet for the guest, we add > that address to the filter parameters, reinitialize the filter with the new > parameters and stop detecting addresses for this particular L3 protocol. > >>>> Also as I recall for IPv4 the ARP-equivalent is NDP (Neighbor Discovery >>>> Protocol based on ICMPv6), which may need support in ebtables. At least >>>> a while ago there was no support for filtering that NDP subset of ICMPv6 >>>> in ebtables. >>> According to the ebtables man-page, you've got --ip6-icmp-type, which >>> should be enough for this. Router advertisements have ICMPv6 type 134 and >>> multicast router advertisements are 153. AFAICT, you can just filter by >>> those... >> I am not the expert on IPv6, but from reading on this page here >> >> http://www.tcpipguide.com/free/t_ICMPv6NeighborAdvertisementandNeighborSolic >> itation-2.htm > BTW, I wouldn't recommend this particular guide. Not only is it cluttered with > advertisements to the point of a major annoyance, there's at least one part > where it has simply plain wrong information: On > > http://www.tcpipguide.com/free/t_IPv6InterfaceIdentifiersandPhysicalAddress… > > Bit 7 of the EUI-64 address needs to be flipped, not just set to 1. (It took > me a while to figure out why my code would arrvive at different autoconfigured > addresses than the linux kernel for virtualized machines...) > >> I get the impression that for example the target address should be >> verified for possible 'abuse'. > That's only for neighbor advertisements. Router advertisements can simply be > blocked wholesale. Normal network nodes have no business sending those under > any circumstances, and your actual routers are hopefully trusted enough to not > need their router advertisements checked for sanity... > > Then again, for neighbor advertisements, you're right. I was under the > impression that, for those, it was enough to check the source address in the > ipv6 header. Apparently I was wrong. > >> I don't think one can grab that field >> with ebtables and compare against allowed values. > No, but ip6tables has --u32, which possibly could be abused for that... > > Guido > >

1 0

[libvirt] Sophie's choice: corrupt user data (on USB disk) or cancel migration?
by David Jaša 05 Dec '12

05 Dec '12

Hi, I've encountered an interesting problem: I did a live migration through libvirt (virsh migrate --live <domain> <dst_libvirt_uri> [<dst_qemu_uri>]) with usb transfer ongoing from qemu guest through usbredir over spice to usb device plugged to the client. The spice client failed to connect to the destination qemu/spice but the migration was conducted anyway, so the data transfer was abruptly terminated. Background ---------- When performing migration with client connected, two monitor commands are issued to the qemu: (qemu) client_migrate_info spice <client connection details> main_channel_client_handle_migrate_connected: client <ID> connected: 1 seamless: 1 (qemu) migrate -d tcp:<dst_qemu_address>:<port> The first command instructs spice client to reconnect to the new machine and the reply says that if connection is successful and if it is seamless (required for migration with USB redirection active). Problem ------- The behaviour should follow "least harm" principle: 1) In "severe" scenarios when the choice is between VM migration causing potential data corruption on redirected USB and stopping of the VM, current behavior is perfectly fine 2) In "regular" scenarios (automatic load balancing, manual migration requests by administrator), refuse to migrate (unless some "I really know what I'm doing" button is pressed) is better thing to do Possible solutions? ------------------- Just one possible way to fix this occured to me: 1. libvirt gets new switch to migrate command to force migration even when client can not connect 2. if this switch is not set and client won't connect after client_migrate_info qemu command is issued, cance migration 3. management application (ovirt-engine through vdsm) or administrator sets the switch to force migration in cases like 1) above I'll file the necessary bugs but it should be IMO first agreed what the correct approach is in such situations. David -- David Jaša, RHCE SPICE QE based in Brno GPG Key: 22C33E24 Fingerprint: 513A 060B D1B4 2A72 7F0D 0278 B125 CD00 22C3 3E24

1 0

[libvirt] [PATCH] pci: Fix building of 32bit PCI command array
by Peter Krempa 05 Dec '12

05 Dec '12

The pciWrite32 function assembled the array of data to be written to the fd with a bad offset on the last byte. This issue was probably caused by a typo (14, 24). --- src/util/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/pci.c b/src/util/pci.c index cf7722d..418c83d 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -268,7 +268,7 @@ pciWrite16(pciDevice *dev, int cfgfd, unsigned pos, uint16_t val) static void pciWrite32(pciDevice *dev, int cfgfd, unsigned pos, uint32_t val) { - uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 14) }; + uint8_t buf[4] = { (val >> 0), (val >> 8), (val >> 16), (val >> 24) }; pciWrite(dev, cfgfd, pos, &buf[0], sizeof(buf)); } -- 1.8.0

2 2

[libvirt] [PATCH] qemu: Fix error code when attaching existing device
by Jiri Denemark 05 Dec '12

05 Dec '12

An attempt to attach device that is already attached to a domain results in the following error: virsh # attach-device rhel6 pci2 --persistent error: Failed to attach device from pci2 error: invalid argument: device is already in the domain configuration The "invalid argument" error code looks wrong, we usually use "operation invalid" when the action cannot be done in current state. --- src/qemu/qemu_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e838cd..6170ded 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6249,8 +6249,8 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, - _("target %s already exists."), disk->dst); + virReportError(VIR_ERR_OPERATION_INVALID, + _("target %s already exists"), disk->dst); return -1; } if (virDomainDiskInsert(vmdef, disk)) { @@ -6280,7 +6280,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_HOSTDEV: hostdev = dev->data.hostdev; if (virDomainHostdevFind(vmdef, hostdev, NULL) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("device is already in the domain configuration")); return -1; } @@ -6296,7 +6296,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, case VIR_DOMAIN_DEVICE_LEASE: lease = dev->data.lease; if (virDomainLeaseIndex(vmdef, lease) >= 0) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_OPERATION_INVALID, _("Lease %s in lockspace %s already exists"), lease->key, NULLSTR(lease->lockspace)); return -1; @@ -6312,7 +6312,7 @@ qemuDomainAttachDeviceConfig(qemuCapsPtr caps, controller = dev->data.controller; if (virDomainControllerFind(vmdef, controller->type, controller->idx) > 0) { - virReportError(VIR_ERR_INVALID_ARG, "%s", + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Target already exists")); return -1; } -- 1.8.0

2 2

[libvirt] Set python include dir when cross-compiling
by Prica, Mihai 05 Dec '12

05 Dec '12

Hi, I've done some work on libvirt integration in the yocto project. The problem is there is no way to tell the configure script which include_dir to use for the python bindings when cross-compiling. It automatically takes the include_dir from the host system, and if there is a difference in architecture between the target and host system, the build will fail. Is there any easy way of doing this? I saw for example that rpm has two extra options in the configure file, --with-python-inc-dir and -with-python-lib-dir exactly for this. Thanks, Mihai

1 0

[libvirt] [PATCH 00/15 v5] Unprivileged SG_IO support
by Osier Yang 05 Dec '12

05 Dec '12

Hi, As a result of RFC [1], this implements the unprivleged SG_IO support. Testing is not that enough, but I'd like see the reviewing earlier, and meanwhile I'm not going to give up the further testing. v4 - v5 (5 new patches): * Set sysfs unpriv_sgio when attaching disk * Restore sysfs unpriv_sgio when detaching disk * Error out when attaching disk if it's shared by other (domains), and the disk conf conflicts. * Do not restore sysfs unpriv_sgio when detaching disk if the disk is still being used by other domain(s) * Dump the original unpriv_sgio state in status XML, so that it won't be lost after restarting or reloading libvirtd. v3 - v4: * Rebase on the top * More testing v2 - v3: * Change the XML tag name to "cdbfilter" * Maintain an internal list of shared disks for QEMU driver. Patches 1/10 ~ 4/10 are to introduce the internal list for shared disks. Osier Yang (15): qemu: Introduce a list to maintain the shared disks between domains qemu: Init/Free the list with the driver's lifecyle qemu: Add/remove the shared disk entry during domain's lifecyle qemu: Add/Remove the entry of sharedDisks when live attaching/detaching docs: Add docs and rng schema for new XML cdbfilter conf: Parse and format the new XML tag cdbfilter util: Prepare helpers for unpriv_sgio setting qemu: Manage disk's cdbfilter in domain's lifecycle qemu: Do not restore the sysfs unpriv_sgio if the disk is being shared qemu: Error out when domain starting if the cdbfilter setting conflicts qemu: Set unpriv_sgio when attaching disk qemu: Restore unpriv_sgio when detaching disk qemu: Error out if the shared disk conf conflicts with others when attaching qemu: Do not restore unpriv_sgio if the disk is shared by other domain conf: Save disk's original unpriv_sgio state into status XML docs/formatdomain.html.in | 13 ++- docs/schemas/domaincommon.rng | 52 ++++-- src/conf/domain_conf.c | 106 ++++++++++-- src/conf/domain_conf.h | 13 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_conf.c | 170 ++++++++++++++++++++ src/qemu/qemu_conf.h | 30 ++++ src/qemu/qemu_driver.c | 78 +++++++++ src/qemu/qemu_process.c | 141 ++++++++++++++++- src/qemu/qemu_process.h | 4 + src/util/util.c | 145 +++++++++++++++++ src/util/util.h | 7 + ...ml2argv-disk-scsi-lun-passthrough-cdbfilter.xml | 32 ++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 761 insertions(+), 36 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough-cdbfilter.xml Regards, Osier

1 16

[libvirt] [PATCH 0/2] require dbus on Fedora-based systems
by Eric Blake 05 Dec '12

05 Dec '12

https://bugzilla.redhat.com/show_bug.cgi?id=830201 Ultimately, I want to figure out if it is possible to configure --without-dbus, and still get libvirtd to boot. However, that is less urgent than fixing things so that on Fedora and RHEL, the dbus package is installed up front, since we have the situation where libvirtd behaves poorly if dbus is not available. Eric Blake (2): systemd: require dbus service spec: require dbus-daemon when using libvirtd in Fedora

2 8

[libvirt] Reg: Libvirt multiple sessions
by Varun Bhatnagar 05 Dec '12

05 Dec '12

Hi, I am working on a requirement where in I need to implement "multiple session management" and "multiple workspaces". I trying to implement it using libvirt. So is it possible to do these two things using libvirt. Does libvirt support "multiple session management" and "multiple workspaces"? If yes, how can I achieve that, I din't find anything on internet regarding this. Can you please help me out with this one. Thanks & Regards, Varun Bhatnagar =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[libvirt] [PATCH] qemu: Simplify the codes
by Osier Yang 05 Dec '12

05 Dec '12

"disk" is initialized to "dev->data.disk" in the beginning of the function. --- src/qemu/qemu_driver.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2c36935..a7ef4a2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6154,9 +6154,8 @@ qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver, case VIR_DOMAIN_DISK_DEVICE_LUN: if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) ret = qemuDomainDetachPciDiskDevice(driver, vm, dev); - else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) - ret = qemuDomainDetachDiskDevice(driver, vm, dev); - else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) + else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI || + disk->bus == VIR_DOMAIN_DISK_BUS_USB) ret = qemuDomainDetachDiskDevice(driver, vm, dev); else virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 1.7.7.6

2 2

[libvirt] [PATCH] storage: Remove the redundant white lines
by Osier Yang 05 Dec '12

05 Dec '12

Pushed under trivial rule. --- src/storage/storage_backend.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 41a19a1..83c4755 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -337,7 +337,6 @@ createRawFile(int fd, virStorageVolDefPtr vol, if (remain) { if (track_allocation_progress) { - while (remain) { /* Allocate in chunks of 512MiB: big-enough chunk * size and takes approx. 9s on ext3. A progress @@ -363,7 +362,6 @@ createRawFile(int fd, virStorageVolDefPtr vol, goto cleanup; } } - } if (fsync(fd) < 0) { -- 1.7.7.6

1 0

[libvirt] ivshmem server
by Andrew Jones 05 Dec '12

05 Dec '12

This mail is meant to get a discussion started. Please keep me on cc for the discussion, as I'm not subscribed to libvir-list. ivshmem is an implementation of an inter-VM communication channel. Support for this has been in qemu since v0.14.0 and libvirt patches have been recently posted[1]. What's still missing is the ivshmem server. The ivshmem server is needed when one would like to use interrupts with ivshmem. The server manages a set of eventfds to send/recv those interrupts. There is currently only one implementation of this server that I'm aware of, which is available from this git repo [2] in the ivshmem-server directory. My suggestion for libvirt is that this code be integrated into libvirt, rather than managed by libvirt, for the following reasons 1. libvirt should keep track of the socket path in order to build ivshmem's command line anyway. 2. the current ivshmem server code is ~300 lines, so it shouldn't be a large integration effort. 3. keeping ivhsmem server separate increases the package management that distributions need to do. afaik, it isn't currently packaged for any distribution. One concern I have with the git repo [2] is that I don't see any license for ivshmem-server. I've cc'ed Cam for his input. Drew [1] http://www.redhat.com/archives/libvir-list/2012-November/msg00731.html [2] git://gitorious.org/nahanni/guest-code.git

4 5

[libvirt] [PATCH] qemu: improve error for failed JSON commands
by Eric Blake 04 Dec '12

04 Dec '12

Only one error in qemu_monitor was already using the relatively new OPERATION_UNSUPPORTED error, even though it is a better fit for all of the messages related to options that are unsupported due to the version of qemu in use rather than due to a user's XML or .conf file choice. Suggested by Osier Yang. * src/qemu/qemu_monitor.c (qemuMonitorSendFileHandle) (qemuMonitorAddHostNetwork, qemuMonitorRemoveHostNetwork) (qemuMonitorAttachDrive, qemuMonitorDiskSnapshot) (qemuMonitorDriveMirror, qemuMonitorTransaction) (qemuMonitorBlockCommit, qemuMonitorDrivePivot) (qemuMonitorBlockJob, qemuMonitorSystemWakeup) (qemuMonitorGetVersion, qemuMonitorGetMachines) (qemuMonitorGetCPUDefinitions, qemuMonitorGetCommands) (qemuMonitorGetEvents, qemuMonitorGetKVMState) (qemuMonitorGetObjectTypes, qemuMonitorGetObjectProps) (qemuMonitorGetTargetArch): Use better error category. --- src/qemu/qemu_monitor.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 066e420..5ad6c15 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2316,7 +2316,7 @@ int qemuMonitorSendFileHandle(qemuMonitorPtr mon, } if (!mon->hasSendFD) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("qemu is not using a unix socket monitor, " "cannot send fd %s"), fdname); return -1; @@ -2387,7 +2387,7 @@ int qemuMonitorAddHostNetwork(qemuMonitorPtr mon, } if (mon->json) - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor should be using AddNetdev")); else ret = qemuMonitorTextAddHostNetwork(mon, netstr); @@ -2419,7 +2419,7 @@ int qemuMonitorRemoveHostNetwork(qemuMonitorPtr mon, } if (mon->json) - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor should be using RemoveNetdev")); else ret = qemuMonitorTextRemoveHostNetwork(mon, vlan, netname); @@ -2550,7 +2550,7 @@ int qemuMonitorAttachDrive(qemuMonitorPtr mon, } if (mon->json) - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor should be using AddDrive")); else ret = qemuMonitorTextAttachDrive(mon, drivestr, controllerAddr, driveAddr); @@ -2773,7 +2773,7 @@ qemuMonitorDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, ret = qemuMonitorJSONDiskSnapshot(mon, actions, device, file, format, reuse); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("disk snapshot requires JSON monitor")); return ret; } @@ -2806,7 +2806,7 @@ qemuMonitorDriveMirror(qemuMonitorPtr mon, ret = qemuMonitorJSONDriveMirror(mon, device, file, format, speed, flags); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("drive-mirror requires JSON monitor")); return ret; } @@ -2822,7 +2822,7 @@ qemuMonitorTransaction(qemuMonitorPtr mon, virJSONValuePtr actions) if (mon->json) ret = qemuMonitorJSONTransaction(mon, actions); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("transaction requires JSON monitor")); return ret; } @@ -2852,7 +2852,7 @@ qemuMonitorBlockCommit(qemuMonitorPtr mon, const char *device, if (mon->json) ret = qemuMonitorJSONBlockCommit(mon, device, top, base, speed); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("block-commit requires JSON monitor")); return ret; } @@ -2871,7 +2871,7 @@ qemuMonitorDrivePivot(qemuMonitorPtr mon, const char *device, if (mon->json) ret = qemuMonitorJSONDrivePivot(mon, device, file, format); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("drive pivot requires JSON monitor")); return ret; } @@ -2973,7 +2973,7 @@ int qemuMonitorBlockJob(qemuMonitorPtr mon, ret = qemuMonitorJSONBlockJob(mon, device, base, speed, info, mode, modern); else - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("block jobs require JSON monitor")); return ret; } @@ -3105,7 +3105,7 @@ int qemuMonitorSystemWakeup(qemuMonitorPtr mon) } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3129,7 +3129,7 @@ int qemuMonitorGetVersion(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3150,7 +3150,7 @@ int qemuMonitorGetMachines(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3180,7 +3180,7 @@ int qemuMonitorGetCPUDefinitions(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3202,7 +3202,7 @@ int qemuMonitorGetCommands(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3224,7 +3224,7 @@ int qemuMonitorGetEvents(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3247,7 +3247,7 @@ int qemuMonitorGetKVMState(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3269,7 +3269,7 @@ int qemuMonitorGetObjectTypes(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3292,7 +3292,7 @@ int qemuMonitorGetObjectProps(qemuMonitorPtr mon, } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return -1; } @@ -3313,7 +3313,7 @@ char *qemuMonitorGetTargetArch(qemuMonitorPtr mon) } if (!mon->json) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("JSON monitor is required")); return NULL; } -- 1.7.1

2 2

[libvirt] [PATCH] rpc: fix build failure with older dbus
by Eric Blake 04 Dec '12

04 Dec '12

RHEL 6.3 uses dbus-devel-1.2.24, which lacked support for the DBUS_TYPE_UNIX_FD define (contrast with Fedora 18 using 1.6.8). But since it is an older dbus, it also lacks support for shutdown inhibitions as provided by newer systemd. Compilation failure introduced in commit 31330926. * src/rpc/virnetserver.c (virNetServerAddShutdownInhibition): Compile out if dbus is too old. --- Pushing under the build-breaker rule. src/rpc/virnetserver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index ae1dfa2..6a5a53a 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -720,7 +720,7 @@ void virNetServerAutoShutdown(virNetServerPtr srv, } -#ifdef HAVE_DBUS +#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD) static void virNetServerGotInhibitReply(DBusPendingCall *pending, void *opaque) { @@ -809,7 +809,7 @@ void virNetServerAddShutdownInhibition(virNetServerPtr srv) VIR_DEBUG("srv=%p inhibitions=%zu", srv, srv->autoShutdownInhibitions); -#ifdef HAVE_DBUS +#if defined(HAVE_DBUS) && defined(DBUS_TYPE_UNIX_FD) if (srv->autoShutdownInhibitions == 1) virNetServerCallInhibit(srv, "shutdown", -- 1.7.1

1 0

[libvirt] [PATCH] qemu: nicer error message if live disk snapshot unsupported
by Eric Blake 04 Dec '12

04 Dec '12

Without this patch, attempts to create a disk snapshot when qemu is too old results in a cryptic message: virsh # snapshot-create 23 --disk-only error: operation failed: Failed to take snapshot: unknown command: 'snapshot_blkdev' Now it reports: virsh # snapshot-create 23 --disk-only error: unsupported configuration: live disk snapshot not supported with this QEMU binary All versions of qemu that support live disk snapshot also support QMP (basically upstream qemu 1.1 and later, and backport to RHEL 6.2). * src/qemu/qemu_capabilities.h (QEMU_CAPS_DISK_SNAPSHOT): New capability. * src/qemu/qemu_capabilities.c (qemuCaps): Track it. (qemuCapsProbeQMPCommands): Set it. * src/qemu/qemu_driver.c (qemuDomainSnapshotCreateDiskActive): Use it. * src/qemu/qemu_monitor.c (qemuMonitorDiskSnapshot): Simplify. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskSnapshot): Likewise. * src/qemu/qemu_monitor_text.h (qemuMonitorTextDiskSnapshot): Delete. * src/qemu/qemu_monitor_text.c (qemuMonitorTextDiskSnapshot): Likewise. --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 5 +++++ src/qemu/qemu_monitor.c | 13 ++++--------- src/qemu/qemu_monitor_json.c | 6 ------ src/qemu/qemu_monitor_text.c | 37 ------------------------------------- src/qemu/qemu_monitor_text.h | 4 ---- 7 files changed, 13 insertions(+), 56 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6e34cdf..668935e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -193,6 +193,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "drive-mirror", /* 115 */ "usb-redir.bootindex", "usb-host.bootindex", + "blockdev-snapshot-sync", ); struct _qemuCaps { @@ -1948,6 +1949,8 @@ qemuCapsProbeQMPCommands(qemuCapsPtr caps, qemuCapsSet(caps, QEMU_CAPS_VNC); else if (STREQ(name, "drive-mirror")) qemuCapsSet(caps, QEMU_CAPS_DRIVE_MIRROR); + else if (STREQ(name, "blockdev-snapshot-sync")) + qemuCapsSet(caps, QEMU_CAPS_DISK_SNAPSHOT); VIR_FREE(name); } VIR_FREE(commands); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f420c43..3da8672 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -155,6 +155,7 @@ enum qemuCapsFlags { QEMU_CAPS_DRIVE_MIRROR = 115, /* drive-mirror monitor command */ QEMU_CAPS_USB_REDIR_BOOTINDEX = 116, /* usb-redir.bootindex */ QEMU_CAPS_USB_HOST_BOOTINDEX = 117, /* usb-host.bootindex */ + QEMU_CAPS_DISK_SNAPSHOT = 118, /* blockdev-snapshot-sync command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8e838cd..fbacd8b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11230,6 +11230,11 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, virReportOOMError(); goto cleanup; } + } else if (!qemuCapsGet(priv->caps, QEMU_CAPS_DISK_SNAPSHOT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("live disk snapshot not supported with this " + "QEMU binary")); + goto cleanup; } /* No way to roll back if first disk succeeds but later disks diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f85bb76..543f714 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2769,17 +2769,12 @@ qemuMonitorDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, return -1; } - if (mon->json) { + if (mon->json) ret = qemuMonitorJSONDiskSnapshot(mon, actions, device, file, format, reuse); - } else { - if (actions || STRNEQ(format, "qcow2") || reuse) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("text monitor lacks several snapshot features")); - return -1; - } - ret = qemuMonitorTextDiskSnapshot(mon, device, file); - } + else + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk snapshot requires JSON monitor")); return ret; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9b6702a..0cd66b6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2986,12 +2986,6 @@ qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, virJSONValuePtr actions, if ((ret = qemuMonitorJSONCommand(mon, cmd, &reply)) < 0) goto cleanup; - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) { - VIR_DEBUG("blockdev-snapshot-sync command not found, trying HMP"); - ret = qemuMonitorTextDiskSnapshot(mon, device, file); - goto cleanup; - } - ret = qemuMonitorJSONCheckError(cmd, reply); } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 43e5449..fa10600 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -2958,43 +2958,6 @@ cleanup: return ret; } -int -qemuMonitorTextDiskSnapshot(qemuMonitorPtr mon, const char *device, - const char *file) -{ - char *cmd = NULL; - char *reply = NULL; - int ret = -1; - char *safename; - - if (!(safename = qemuMonitorEscapeArg(file)) || - virAsprintf(&cmd, "snapshot_blkdev %s \"%s\"", device, safename) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (qemuMonitorHMPCommand(mon, cmd, &reply)) - goto cleanup; - - if (strstr(reply, "error while creating qcow2") != NULL || - strstr(reply, "unknown command:") != NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to take snapshot: %s"), reply); - goto cleanup; - } - - /* XXX Should we scrape 'info block' output for - * 'device:... file=name backing_file=oldname' to make sure the - * command succeeded? */ - - ret = 0; - -cleanup: - VIR_FREE(safename); - VIR_FREE(cmd); - VIR_FREE(reply); - return ret; -} int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, char **reply) diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 079fbdc..97abad6 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -217,10 +217,6 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name); -int qemuMonitorTextDiskSnapshot(qemuMonitorPtr mon, - const char *device, - const char *file); - int qemuMonitorTextArbitraryCommand(qemuMonitorPtr mon, const char *cmd, char **reply); -- 1.7.1

3 4

[libvirt] [PATCH] Fix memory leak introduced by commit 501bfad1
by Jim Fehlig 04 Dec '12

04 Dec '12

501bfad1 missed freeing priv->saveDir when opening the Xen unified driver failed. --- src/xen/xen_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 3786176..d2de141 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -432,6 +432,7 @@ clean: if (priv->opened[i]) drivers[i]->xenClose(conn); virMutexDestroy(&priv->lock); + VIR_FREE(priv->saveDir); VIR_FREE(priv); conn->privateData = NULL; return ret; -- 1.7.10.4

2 2