- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] doc: storage.html updates
by Philipp Hahn 27 Feb '13

27 Feb '13

Hello, some documentation updates for new storage pools and volumes. Philipp Hahn (4): doc: document new storage volume/pool types doc: add storage format entries doc: fix writing of QEMU doc: white space changes docs/storage.html.in | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) -- 1.7.10.4

2 8

[libvirt] [PATCH v2 0/2] QEMU: add -dtb option support
by Olivia Yin 27 Feb '13

27 Feb '13

Sometime qemu need load specific device tree binary image. These patches provides -dtb option support and update docs/tests. Olivia Yin (2): QEMU: add -dtb option support update documents and test cases for -dtb support src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 ++++++ docs/formatdomain.html.in | 5 ++++ docs/schemas/domaincommon.rng | 5 ++++ tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.xml | 28 ++++++++++++++++++++++

1 2

[libvirt] Problem about CPU index
by Li Zhang 27 Feb '13

27 Feb '13

Hi all, In this function qemuMonitorJSONExtractCPUInfo(), It assumes that cpu index is always contiguous. if (cpu != i) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected cpu index %d expecting %d"), i, cpu); goto cleanup; } For x86, in what kind of situation does this error happen? This assumption causes the problem for ppc64. For ppc64, it's quite different from x86. SMT is needed to be disabled because of hardware's limitation. So, only one thread per core is online. These threads are not contiguous. For example, smt=4, 64 CPUs and 16 Cores CPU information is as the following: Architecture: ppc64 Byte Order: Big Endian CPU(s): 64 On-line CPU(s) list: 0,4,8,12,16,20,24,28,32,36,40,44,48,52,56,60 Off-line CPU(s) list: 1-3,5-7,9-11,13-15,17-19,21-23,25-27,29-31,33-35,37-39,41-43,45-47,49-51,53-55,57-59,61-63 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 16 NUMA node(s): 2 All CPUs we get are only 0,4, ..., 60. If possible, can this assumption be removed? Thanks. -- Li Zhang IBM China Linux Technology Centre

3 2

[libvirt] How to trigger autoheader after configure.ac changes?
by TJ 27 Feb '13

27 Feb '13

I'm currently adding support for running a DHCP relay daemon instead of using dnsmasq for DHCP. Everything is looking good but I've stumbled on one issue. I've added a new variable to 'configure.a' (DHCPRELAY) but found that 'autogen.sh' doesn't call 'autoheader' to remake 'config.h.in' so it contains the definition of DHCPRELAY for the compiler. Reading 'autogen.sh' and 'bootstrap' I can see convoluted functionality but can't figure out what the recommended best practice would be in terms of generating the new 'config.h.in'. If I call 'autoheader' manually the definition is added correctly. Should I just do that and then add the changed 'config.h.in' to the commit that introduces the new definition?

1 1

[libvirt] [PATCH] schema: Restrict mode to ocal
by Philipp Hahn 27 Feb '13

27 Feb '13

virStrToLong(..., 8, ...) already requires the mode to be octal. Change the relax-ng schema to check for octal as well. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- docs/schemas/basictypes.rng | 6 ++++++ docs/schemas/storagepool.rng | 2 +- docs/schemas/storagevol.rng | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index ec1d940..e6cf907 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -20,6 +20,12 @@ </data> </define> + <define name='octalMode'> + <data type="unsignedInt"> + <param name='pattern'>[0-7]+</param> + </data> + </define> + <define name="uint8range"> <choice> <data type="string"> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 165e276..2b1f08d 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -175,7 +175,7 @@ <optional> <element name='permissions'> <element name='mode'> - <ref name='unsignedInt'/> + <ref name='octalMode'/> </element> <element name='owner'> <choice> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 10b7847..d4a29c7 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -46,7 +46,7 @@ <optional> <element name='permissions'> <element name='mode'> - <ref name='unsignedInt'/> + <ref name='octalMode'/> </element> <element name='owner'> <ref name='unsignedInt'/> -- 1.7.10.4

2 1

[libvirt] [PATCH] tests: skip virstoragetest on RHEL 5
by Eric Blake 27 Feb '13

27 Feb '13

virstoragetest was failing on RHEL 5, but with no good error message: TEST: virstoragetest 0 FAIL It turns out that qemu-img was so old, that it lacked support for -o backing_file. It didn't help that the test was also using qemu-img from PATH, even after first probing for kvm-img. * tests/virstoragetest.c (testPrepImages): Consistently use discovered binary. Skip instead of fail if qemu-img fails during setup. --- Pushing under the build-breaker rule; this gets RHEL 5 from 5 test failures down to 4. tests/virstoragetest.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 6ca7b9a..d495e6a 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -89,10 +89,8 @@ testPrepImages(void) qemuimg = virFindFileInPath("kvm-img"); if (!qemuimg) qemuimg = virFindFileInPath("qemu-img"); - if (!qemuimg) { - fputs("qemu-img missing or too old; skipping this test\n", stderr); - return EXIT_AM_SKIP; - } + if (!qemuimg) + goto skip; if (virAsprintf(&absraw, "%s/raw", datadir) < 0 || virAsprintf(&absqcow2, "%s/qcow2", datadir) < 0 || @@ -116,8 +114,10 @@ testPrepImages(void) /* I'm lazy enough to use a shell one-liner instead of open/write/close */ virCommandFree(cmd); cmd = virCommandNewArgList("sh", "-c", "printf %1024d 0 > raw", NULL); - if (virCommandRun(cmd, NULL) < 0) + if (virCommandRun(cmd, NULL) < 0) { + fprintf(stderr, "unable to create raw file\n"); goto cleanup; + } if (!(canonraw = canonicalize_file_name(absraw))) { virReportOOMError(); goto cleanup; @@ -126,20 +126,17 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ virCommandFree(cmd); - cmd = virCommandNewArgList("qemu-img", "create", "-f", "qcow2", + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", "-obacking_file=raw,backing_fmt=raw", "qcow2", NULL); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + goto skip; /* Make sure our later uses of 'qemu-img rebase' will work */ virCommandFree(cmd); - cmd = virCommandNewArgList("qemu-img", "rebase", "-u", "-f", "qcow2", + cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2", "-F", "raw", "-b", "raw", "qcow2", NULL); - if (virCommandRun(cmd, NULL) < 0) { - fputs("qemu-img is too old; skipping this test\n", stderr); - ret = EXIT_AM_SKIP; - goto cleanup; - } + if (virCommandRun(cmd, NULL) < 0) + goto skip; if (!(canonqcow2 = canonicalize_file_name(absqcow2))) { virReportOOMError(); goto cleanup; @@ -148,21 +145,21 @@ testPrepImages(void) /* Create a second qcow2 wrapping the first, to be sure that we * can correctly avoid insecure probing. */ virCommandFree(cmd); - cmd = virCommandNewArgList("qemu-img", "create", "-f", "qcow2", NULL); + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=qcow2", absqcow2); virCommandAddArg(cmd, "wrap"); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + goto skip; /* Create a qed file. */ virCommandFree(cmd); - cmd = virCommandNewArgList("qemu-img", "create", "-f", "qed", NULL); + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qed", NULL); virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=raw", absraw); virCommandAddArg(cmd, "qed"); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + goto skip; /* Create some symlinks in a sub-directory. */ if (symlink("../qcow2", datadir "/sub/link1") < 0 || @@ -177,6 +174,11 @@ cleanup: if (ret) testCleanupImages(); return ret; + +skip: + fputs("qemu-img is too old; skipping this test\n", stderr); + ret = EXIT_AM_SKIP; + goto cleanup; } typedef struct _testFileData testFileData; -- 1.8.1.2

1 0

[libvirt] [PATCH] interface: udev backend coverity NULL deref
by Doug Goldstein 27 Feb '13

27 Feb '13

This fixes a potential NULL deref identified by John Ferlan <jferlan(a)redhat.com> if scandir() didn't return an expected value. --- src/interface/interface_backend_udev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index dca85b3..1034429 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -779,6 +779,13 @@ udevIfaceGetIfaceDefBond(struct udev *udev, * so we use the part after the _ */ tmp_str = strchr(slave_list[i]->d_name, '_'); + if (!tmp_str || strlen(tmp_str) < 2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid enslaved interface name '%s' seen for " + "bond '%s'", slave_list[i]->d_name, name)); + goto cleanup; + } + /* go past the _ */ tmp_str++; ifacedef->data.bond.itf[i] = -- 1.7.12.4

3 2

[libvirt] [PATCH] Remove some C99 variable decls in parallels driver
by Daniel P. Berrange 27 Feb '13

27 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The parallels storage driver declared some loop variables inside the for(;;). This is not allowed by libvirt coding standards Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed under build breaker rule - RHEL-5 gcc chokes on them --- src/parallels/parallels_storage.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index f696fcb..ac65a1d 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -129,9 +129,11 @@ static char *parallelsMakePoolName(virConnectPtr conn, const char *path) { parallelsConnPtr privconn = conn->privateData; char *name; + unsigned int i; - for (unsigned int i = 0; i < UINT_MAX; i++) { + for (i = 0; i < UINT_MAX; i++) { bool found = false; + int j; if (!(name = strdup(path))) { virReportOOMError(); @@ -148,11 +150,11 @@ static char *parallelsMakePoolName(virConnectPtr conn, const char *path) return 0; } - for (int j = 0; j < strlen(name); j++) + for (j = 0; j < strlen(name); j++) if (name[j] == '/') name[j] = '-'; - for (int j = 0; j < privconn->pools.count; j++) { + for (j = 0; j < privconn->pools.count; j++) { if (STREQ(name, privconn->pools.objs[j]->def->name)) { found = true; break; @@ -226,6 +228,7 @@ parallelsPoolAddByDomain(virConnectPtr conn, virDomainObjPtr dom) virStoragePoolObjListPtr pools = &privconn->pools; char *poolPath; virStoragePoolObjPtr pool = NULL; + int j; if (!(poolPath = strdup(pdom->home))) { virReportOOMError(); @@ -234,7 +237,7 @@ parallelsPoolAddByDomain(virConnectPtr conn, virDomainObjPtr dom) poolPath = dirname(poolPath); - for (int j = 0; j < pools->count; j++) { + for (j = 0; j < pools->count; j++) { if (STREQ(poolPath, pools->objs[j]->def->target.path)) { pool = pools->objs[j]; break; -- 1.8.1.2

1 0

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.0.1
by Daniel P. Berrange 27 Feb '13

27 Feb '13

I am pleased to announce that release 1.0.1 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.0.1.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 1.0.1 - Fix typo preventing listing of NWFilters - Add more testing of object list APIs - Fix some incorrect error handling tests in binding - Remove bogus compare < 0 for size_t variables - Fix const-ness of functions for populating constants - Add option to turn on more GCC warning flags - Fix typos in POD docs Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ 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/2] fix some RHEL 5 test failures
by Eric Blake 27 Feb '13

27 Feb '13

A couple of patches that I noticed while testing the release candidate on a RHEL 5 VM. Eric Blake (2): tests: consistent skip messages tests: old automake lacks abs_builddir tests/Makefile.am | 25 ++----------------------- tests/qemumonitorjsontest.c | 2 +- tests/virstoragetest.c | 4 ++-- 3 files changed, 5 insertions(+), 26 deletions(-) -- 1.8.1.2

2 3

[libvirt] [PATCH 0/4] Virtio-RNG followup
by Peter Krempa 26 Feb '13

26 Feb '13

This series adds rate limiting and multiple device support and fixes docs and adds test for XML entities and multiple RNG devices. Peter Krempa (4): virtio-rng: allow multiple RNG devices docs: Fix attribute name for virtio-rng backend virtio-rng: Add rate limiting options for virtio-RNG tests: Test multiple RNG devices and support for XML entities in paths docs/formatdomain.html.in | 14 +++- docs/schemas/domaincommon.rng | 18 ++++- src/conf/domain_conf.c | 78 +++++++++++++--------- src/conf/domain_conf.h | 6 +- src/qemu/qemu_command.c | 28 +++++--- .../qemuxml2argv-virtio-rng-random.args | 2 +- .../qemuxml2argv-virtio-rng-random.xml | 4 ++ 7 files changed, 106 insertions(+), 44 deletions(-) -- 1.8.1.1

2 8

[libvirt] [PATCH] vl.c: Support multiple CPU ranges on -numa option
by Eduardo Habkost 26 Feb '13

26 Feb '13

This allows "," to be used a separator between each CPU range. Note that commas inside key=value command-line options have to be escaped using ",,", so the command-line will look like: -numa node,cpus=A,,B,,C,,D Note that the following format, currently used by libvirt: -numa nodes,cpus=A,B,C,D will _not_ work yet, as "," is the option separator for the command-line option parser, and it will require changing the -numa option parsing code to handle "cpus" as a special case. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- vl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 955d2ff..cd247be 100644 --- a/vl.c +++ b/vl.c @@ -1244,7 +1244,7 @@ char *get_boot_devices_list(size_t *size) return list; } -static void numa_node_parse_cpus(int nodenr, const char *cpus) +static void numa_node_parse_cpu_range(int nodenr, const char *cpus) { char *endptr; unsigned long long value, endvalue; @@ -1288,6 +1288,18 @@ error: exit(1); } +static void numa_node_parse_cpus(int nodenr, const char *option) +{ + char **parts; + int i; + + parts = g_strsplit(option, ",", 0); + for (i = 0; parts[i]; i++) { + numa_node_parse_cpu_range(nodenr, parts[i]); + } + g_strfreev(parts); +} + static void numa_add(const char *optarg) { char option[128]; -- 1.8.1

6 12

[libvirt] [PATCH] qemu: fix graphics port allocation
by Ján Tomko 26 Feb '13

26 Feb '13

Right now, we allocate a port or a TLS port for SPICE if it's set to -1, even if autoport is off. But we only free them if autoport is on. With autoport on, we only allocate TLS port if cfg->spiceTLS is set, but we free it even if it's not, leading to an error message. This patch separates the autoport=yes|no XML option into autoport and tlsAutoport in virDomainGraphicsDef: if autoport is yes, we set them both to 1 (and vice versa) if either of the port numbers is -1, the corresponding autoport is set to 1 and it's used as a condition for acquiring/releasing the port. For TLS ports, cfg->spiceTLS is checked before releasing the port as well. Also check the port number before trying to release it - the vnc port will be 0, the spice port will be -1 or 0 if it hasn't been allocated yet (if qemuProcessStart fails before port allocation). --- src/conf/domain_conf.c | 17 +++++++++++------ src/conf/domain_conf.h | 1 + src/qemu/qemu_hotplug.c | 3 ++- src/qemu/qemu_process.c | 26 ++++++++++++++------------ 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b65e52a..cb27f82 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7083,8 +7083,10 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((autoport = virXMLPropString(node, "autoport")) != NULL) { - if (STREQ(autoport, "yes")) + if (STREQ(autoport, "yes")) { def->data.spice.autoport = 1; + def->data.spice.tlsAutoport = 1; + } VIR_FREE(autoport); } @@ -7102,12 +7104,14 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, VIR_FREE(defaultMode); } - if (def->data.spice.port == -1 && def->data.spice.tlsPort == -1) { - /* Legacy compat syntax, used -1 for auto-port */ + /* Legacy compat syntax, used -1 for auto-port */ + if (def->data.spice.port == -1) def->data.spice.autoport = 1; - } + if (def->data.spice.tlsPort == -1) + def->data.spice.tlsAutoport = 1; - if (def->data.spice.autoport && (flags & VIR_DOMAIN_XML_INACTIVE)) { + if (def->data.spice.autoport && def->data.spice.tlsAutoport && + (flags & VIR_DOMAIN_XML_INACTIVE)) { def->data.spice.port = 0; def->data.spice.tlsPort = 0; } @@ -14201,7 +14205,8 @@ virDomainGraphicsDefFormat(virBufferPtr buf, def->data.spice.tlsPort); virBufferAsprintf(buf, " autoport='%s'", - def->data.spice.autoport ? "yes" : "no"); + (def->data.spice.autoport && + def->data.spice.tlsAutoport) ? "yes" : "no"); if (listenAddr) virBufferAsprintf(buf, " listen='%s'", listenAddr); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0828954..cc67716 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1356,6 +1356,7 @@ struct _virDomainGraphicsDef { char *keymap; virDomainGraphicsAuthDef auth; unsigned int autoport :1; + unsigned int tlsAutoport :1; int channels[VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST]; int defaultMode; /* enum virDomainGraphicsSpiceChannelMode */ int image; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 78961a7..d8f9007 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1879,9 +1879,10 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: if ((olddev->data.spice.autoport != dev->data.spice.autoport) || + (olddev->data.spice.tlsAutoport != dev->data.spice.tlsAutoport) || (!dev->data.spice.autoport && (olddev->data.spice.port != dev->data.spice.port)) || - (!dev->data.spice.autoport && + (!dev->data.spice.tlsAutoport && (olddev->data.spice.tlsPort != dev->data.spice.tlsPort))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change port settings on spice graphics")); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 732964f..7c2a54e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3622,8 +3622,7 @@ int qemuProcessStart(virConnectPtr conn, graphics->data.vnc.port = port; } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { unsigned short port = 0; - if (graphics->data.spice.autoport || - graphics->data.spice.port == -1) { + if (graphics->data.spice.autoport) { if (virPortAllocatorAcquire(driver->remotePorts, &port) < 0) goto cleanup; @@ -3635,9 +3634,7 @@ int qemuProcessStart(virConnectPtr conn, graphics->data.spice.port = port; } - if (cfg->spiceTLS && - (graphics->data.spice.autoport || - graphics->data.spice.tlsPort == -1)) { + if (cfg->spiceTLS && graphics->data.spice.tlsAutoport) { unsigned short tlsPort; if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) goto cleanup; @@ -4318,16 +4315,21 @@ retry: for (i = 0 ; i < vm->def->ngraphics; ++i) { virDomainGraphicsDefPtr graphics = vm->def->graphics[i]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - graphics->data.vnc.autoport) { + graphics->data.vnc.autoport && graphics->data.vnc.port) { ignore_value(virPortAllocatorRelease(driver->remotePorts, graphics->data.vnc.port)); } - if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && - graphics->data.spice.autoport) { - ignore_value(virPortAllocatorRelease(driver->remotePorts, - graphics->data.spice.port)); - ignore_value(virPortAllocatorRelease(driver->remotePorts, - graphics->data.spice.tlsPort)); + if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + if (graphics->data.spice.autoport && + graphics->data.spice.port > 0) { + ignore_value(virPortAllocatorRelease(driver->remotePorts, + graphics->data.spice.port)); + } + if (cfg->spiceTLS && graphics->data.spice.tlsAutoport && + graphics->data.spice.tlsPort > 0) { + ignore_value(virPortAllocatorRelease(driver->remotePorts, + graphics->data.spice.tlsPort)); + } } } -- 1.7.12.4

2 1

[libvirt] [PATCH] libvirt: fix error message when connection can't be opened
by Ján Tomko 26 Feb '13

26 Feb '13

VIR_ERR_NO_CONNECT already contains "no connection driver available". This patch changes: no connection driver available for No connection for URI hello to: no connection driver available for hello Bug: https://bugzilla.redhat.com/show_bug.cgi?id=851413 --- src/libvirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index 934997a..8a28e4a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1216,7 +1216,7 @@ do_open(const char *name, if (!ret->driver) { /* If we reach here, then all drivers declined the connection. */ virLibConnError(VIR_ERR_NO_CONNECT, - _("No connection for URI %s"), + "%s", NULLSTR(name)); goto failed; } -- 1.7.12.4

2 2

[libvirt] [PATCH 0/4] uid_t|gid_t fixes for 32 bit Linux
by Philipp Hahn 26 Feb '13

26 Feb '13

Hello, on 2012-11-23 I already reported a problem with running libvirt on 32 Bit Linuxes (libvirt 0.9.12 on Debian Squeeze in my case) on this ML: [BUG] storage.xml: owner|group=-1 → 2^32-1 on 32 Bit Due to multiple castings the initial -1 gets casted to (unsigned int)4294967295, which failes to be cased to an (signed int) on read-back. Thus the default storage pool is not launched: 2013-02-22 16:50:10.182+0000: 28550: info : libvirt version: 0.9.12 2013-02-22 16:50:10.182+0000: 28550: error : virStorageDefParsePerms:635 : XML error: malformed owner element This is caused by uid_t and gid_t being opaque types: their exact type ranges from s32 to u32 to u64. (Solaris until 2007, Linux, Windows64) The following patch series fixes several issues, which I found while investigating the storage pool startup problem: - mismatch between printf format and types - implicit casts of -1 to uid_t and gid_t - missing casts of uid_t and gid_t for printing - virXPathLong() failing on +(2^32-1) @Guido: for Debian only the 4th patch is relevant, which applies with some re-indention. Additional issues: - UID and GID 4294967295 happens to be the same as -1, so hopefully nobody uses it. Should this be documented somewhere? - Some regression test? Philipp Hahn (4): util: Fix printf format for uid_t|gid_t storage: Cast uid_t|gid_t to unsigned int storage: cast -1 for uid_t|gid_t storage: fix uid_t|gid_t handling on 32 bit Linux src/conf/storage_conf.c | 82 ++++++++++++++++++++++++++++++++--------- src/storage/storage_backend.c | 22 ++++++----- src/util/virutil.c | 10 ++--- 3 files changed, 81 insertions(+), 33 deletions(-) -- 1.7.10.4

4 11

[libvirt] [PATCH] qemu: do not set unpriv_sgio if neither supported nor requested
by Paolo Bonzini 26 Feb '13

26 Feb '13

Currently we call virSetDeviceUnprivSGIO with val == 0 if a block device has an sgio attribute. But for sgio='filtered', we know that a kernel with no unpriv_sgio support will always behave as the user wanted. In this case, there is no need to call the function and report a (bogus) error. Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- src/qemu/qemu_process.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b560d2e..4c152b2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3455,36 +3455,35 @@ qemuProcessReconnectAll(virConnectPtr conn, virQEMUDriverPtr driver) int qemuSetUnprivSGIO(virDomainDiskDefPtr disk) { + char *sysfs_path = NULL; int val = -1; + int ret = 0; /* "sgio" is only valid for block disk; cdrom * and floopy disk can have empty source. */ if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK || + disk->device != VIR_DOMAIN_DISK_DEVICE_LUN || !disk->src) return 0; - if (disk->sgio) - val = (disk->sgio == VIR_DOMAIN_DISK_SGIO_UNFILTERED); - - /* Ignore the setting if unpriv_sgio is not supported by the - * kernel, otherwise defaults to filter the SG_IO commands, - * I.E. Set unpriv_sgio to 0. - */ - if (disk->sgio == VIR_DOMAIN_DISK_SGIO_DEFAULT && - disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { - char *sysfs_path = NULL; + sysfs_path = virGetUnprivSGIOSysfsPath(disk->src, NULL); + if (sysfs_path == NULL) + return -1; - if ((sysfs_path = virGetUnprivSGIOSysfsPath(disk->src, NULL)) && - virFileExists(sysfs_path)) - val = 0; - VIR_FREE(sysfs_path); - } + /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */ + val = (disk->sgio == VIR_DOMAIN_DISK_SGIO_UNFILTERED); - if (val >= 0 && virSetDeviceUnprivSGIO(disk->src, NULL, val) < 0) - return -1; + /* Do not do anything if unpriv_sgio is not supported by the kernel and the + * whitelist is enabled. But if requesting unfiltered access, always call + * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio. + */ + if ((virFileExists(sysfs_path) || val == 1) && + virSetDeviceUnprivSGIO(disk->src, NULL, val) < 0) + ret = -1; - return 0; + VIR_FREE(sysfs_path); + return ret; } int qemuProcessStart(virConnectPtr conn, -- 1.8.1.2

2 1

[libvirt] RFC: APIs for managing resource groups
by Daniel P. Berrange 26 Feb '13

26 Feb '13

Historically for the QEMU/LXC drivers we've simply put each virtual instance in a dedicated cgroup, under the path $LIBVIRT_CGROUP_LOCATION | +- libvirt | +- qemu | | | +- vm1 | +- vm2 | +- vm3 | +- lxc | +- cont1 +- cont2 +- cont3 for a variety of reasons this nesting sucks. It is too deep causing kernel performance problems, its structure does not easily allow for calculating fixed % shares, it does not allow for grouping of VMs. We need to simplify our layout and also introduce some APIs for the grouping of VMs. I won't go into specifics of a new cgroups layout here, just focus on the question of defining a set of APIs that are generic to any hypervisor, for the purpose of setting up VM resource groups. I'm calling the resource cgroup a "partition", since this is all about partitioning workloads. I anticipate a new top level object and APIs for creating/defining it in the usual manner: typedef struct _virPartition virPartition; typedef virPartition *virPartitionPtr; int virConnectListAllPartitions(virConnectPtr conn, virPartitionPtr **partitions, unsigned int flags); virPartitionPtr virPartitionDefineXML(virConnectPtr conn, const char *xml, unsigned int flags); int virPartitionCreate(virPartitionPtr partition, unsigned int flags); int virPartitionCreateXML(virPartitionPtr partition, const char *xml, unsigned int flags); int virPartitionDestroy(virPartitionPtr partition, unsigned int flags); int virPartitionUndefine(virPartitionPtr partition, unsigned int flags); Then I think we'll duplicate all the APIs for setting resource tunables from virDomainPtr against the new object, so we get int virPartitionGetSchedulerParameters(virPartitionPtr partition, virTypedParameterPtr params, int *nparams, unsigned int flags); int virPartitionSetSchedulerParameters(virPartitionPtr partition, virTypedParameterPtr params, int nparams, unsigned int flags) int virDomainSetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags); int virDomainGetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, int *nparams, unsigned int flags); int virDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags); int virDomainGetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, int *nparams, unsigned int flags); int virDomainSetNumaParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags); int virDomainGetNumaParameters(virDomainPtr domain, virTypedParameterPtr params, int *nparams, unsigned int flags); Finally we need a way to associate a domain with a partition virPartitionPtr virDomainGetPartition(virDomainPtr dom, unsigned int flags); void virDomainSetPartition(virDomainPtr dom, unsigned int flags); There'd also likely be a new VM XML element <partition name="..partition name..."/> which is what the Get/SetPartition methods would be touching. 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 :|

3 3

[libvirt] [PATCH] qemu: Don't fail to shutdown domains with unresponsive agent
by Michal Privoznik 26 Feb '13

26 Feb '13

Currently, qemuDomainShutdownFlags() chooses the agent method of shutdown whenever the agent is configured. However, this assumption is not enough as the guest agent may be unresponsive at the moment. So unless guest agent method has been explicitly requested, we should fall back to the ACPI method. --- src/qemu/qemu_driver.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 435c37c..06b14ae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1702,7 +1702,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { virDomainObjPtr vm; int ret = -1; qemuDomainObjPrivatePtr priv; - bool useAgent = false; + bool useAgent = false, agentRequested; virCheckFlags(VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN | VIR_DOMAIN_SHUTDOWN_GUEST_AGENT, -1); @@ -1719,23 +1719,32 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { goto cleanup; priv = vm->privateData; + agentRequested = flags & VIR_DOMAIN_SHUTDOWN_GUEST_AGENT; - if ((flags & VIR_DOMAIN_SHUTDOWN_GUEST_AGENT) || + if (agentRequested || (!(flags & VIR_DOMAIN_SHUTDOWN_ACPI_POWER_BTN) && priv->agent)) useAgent = true; if (useAgent) { if (priv->agentError) { - virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", - _("QEMU guest agent is not " - "available due to an error")); - goto cleanup; + if (agentRequested) { + virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", + _("QEMU guest agent is not " + "available due to an error")); + goto cleanup; + } else { + useAgent = false; + } } if (!priv->agent) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("QEMU guest agent is not configured")); - goto cleanup; + if (agentRequested) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } else { + useAgent = false; + } } } @@ -1752,7 +1761,12 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, QEMU_AGENT_SHUTDOWN_POWERDOWN); qemuDomainObjExitAgent(vm); - } else { + } + + /* If we are not enforced to use just an agent, try ACPI + * shutdown as well in case agent did not succeed */ + if (!useAgent || + ((ret < 0) && !agentRequested)) { qemuDomainSetFakeReboot(driver, vm, false); qemuDomainObjEnterMonitor(driver, vm); -- 1.8.1.4

2 2

[libvirt] The problem of CPU index
by Li Zhang 26 Feb '13

26 Feb '13

Hi all, In the function qemuMonitorJSONExtractCPUInfo(), it assumes that CPU indexes should be contiguous. As the following: if (cpu != i) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected cpu index %d expecting %d"), i, cpu); goto cleanup; } For x86, in what kind of situation will cause this error? Actually, on ppc64, the CPU indexes always are not contiguous, because smt is always disabled because of hardware's limitation for KVM. For example, smt=4, CPUs=64, cores=16. If with SMT enabled, 0~3 will run on core 0, 4~7 will run on core 1, .... If SMT is disabled, only one thread is active. It should be 0, 4, 8,.... CPU information on my machine is as the following: Architecture: ppc64 Byte Order: Big Endian CPU(s): 64 On-line CPU(s) list: 0,4,8,12,16,20,24,28,32,36,40,44,48,52,56,60 Off-line CPU(s) list: 1-3,5-7,9-11,13-15,17-19,21-23,25-27,29-31,33-35,37-39,41-43,45-47,49-51,53-55,57-59,61-63 Thread(s) per core: 1 Core(s) per socket: 1 Socket(s): 16 NUMA node(s): 2 Model: 8246-L2C L1d cache: 32K L1i cache: 32K L2 cache: 256K L3 cache: 4096K L4 cache: 4096K NUMA node0 CPU(s): 0,36,40,44,48,52,56,60 NUMA node1 CPU(s): 4,8,12,16,20,24,28,32 Actually, only 16 CPUs are online. All we get CPUs are 0,4,8,...,60. If possible, could this assumption be removed? Thanks --Li

1 0

[libvirt] [PATCH 1/1] Add NVRAM device
by Li Zhang 26 Feb '13

26 Feb '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_command.c | 31 ++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ 4 files changed, 125 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10f361c..8c1e8ae 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -175,7 +175,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "redirdev", "smartcard", "chr", - "memballoon") + "memballoon", + "nvram") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -1442,6 +1443,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1602,6 +1613,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1791,6 +1803,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2342,6 +2355,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->memballoon->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -7461,6 +7480,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -10572,6 +10608,32 @@ virDomainDefParseXML(virCapsPtr caps, } } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } else { + virDomainNVRAMDefPtr nvram; + if (VIR_ALLOC(nvram) < 0) + goto no_memory; + nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; + def->nvram = nvram; + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -13547,6 +13609,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -14787,6 +14864,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->memballoon) virDomainMemballoonDefFormat(buf, def->memballoon, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16061,6 +16141,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ffa4aa..8e5f1d8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -133,6 +136,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -158,6 +162,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; } data; }; @@ -1418,6 +1423,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE, @@ -1849,6 +1857,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -1951,6 +1960,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dee493f..6e1e0e6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -941,6 +941,13 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, goto cleanup; } + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) + def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, + 0x3000ul) < 0) + goto cleanup; + /* No other devices are currently supported on spapr-vio */ ret = 0; @@ -3406,6 +3413,17 @@ error: return NULL; } +char * +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + dev->info.addr.spaprvio.has_reg) + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + dev->info.addr.spaprvio.reg); + + return virBufferContentAndReset(&buf); +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -7006,6 +7024,19 @@ qemuBuildCommandLine(virConnectPtr conn, } } + if (def->nvram && + def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) { + char *optstr; + virCommandAddArg(cmd, "-global"); + optstr = qemuBuildNVRAMDevStr(def->nvram); + if (!optstr) + goto error; + if (optstr) + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } + if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e4db000..7a0fe17 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virQEMUCapsPtr qemuCaps); +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps); -- 1.7.10.1

1 4

[libvirt] [PATCH v2 1/1] Add NVRAM device
by Li Zhang 26 Feb '13

26 Feb '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For pSeries guest in QEMU, NVRAM is one kind of spapr-vio device. Users are allowed to specify spapr-vio devices'address. But NVRAM is not supported in libvirt. So this patch is to add NVRAM device to allow users to specify its address. In QEMU, NVRAM device's address is specified by "-global spapr-nvram.reg=xxxxx". In libvirt, XML file is defined as the following: <nvram> <address type='spapr-vio' reg='0x3000'/> </nvram> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- * v2 -> v1: Add NVRAM parameters parsing in qemuParseCommandLine. src/conf/domain_conf.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/qemu/qemu_command.c | 48 +++++++++++++++++++++++++++ src/qemu/qemu_command.h | 2 ++ 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10f361c..8c1e8ae 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -175,7 +175,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "redirdev", "smartcard", "chr", - "memballoon") + "memballoon", + "nvram") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -1442,6 +1443,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1602,6 +1613,7 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: break; } @@ -1791,6 +1803,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainWatchdogDefFree(def->watchdog); virDomainMemballoonDefFree(def->memballoon); + virDomainNVRAMDefFree(def->nvram); for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); @@ -2342,6 +2355,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->memballoon->info, opaque) < 0) return -1; } + if (def->nvram) { + device.type = VIR_DOMAIN_DEVICE_NVRAM; + device.data.nvram = def->nvram; + if (cb(def, &device, &def->nvram->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -7461,6 +7480,23 @@ error: goto cleanup; } +static virDomainNVRAMDefPtr +virDomainNVRAMDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + virDomainNVRAMDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + if ( virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0 ) + return NULL; + + return def; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -10572,6 +10608,32 @@ virDomainDefParseXML(virCapsPtr caps, } } + def->nvram = NULL; + if ((n = virXPathNodeSet("./devices/nvram", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 1) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("only a single nvram device is supported")); + goto error; + } + + if (n > 0) { + virDomainNVRAMDefPtr nvram = + virDomainNVRAMDefParseXML(nodes[0], flags); + if (!nvram) + goto error; + def->nvram = nvram; + VIR_FREE(nodes); + } else { + virDomainNVRAMDefPtr nvram; + if (VIR_ALLOC(nvram) < 0) + goto no_memory; + nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; + def->nvram = nvram; + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -13547,6 +13609,21 @@ virDomainMemballoonDefFormat(virBufferPtr buf, } static int +virDomainNVRAMDefFormat(virBufferPtr buf, + virDomainNVRAMDefPtr def, + unsigned int flags) +{ + virBufferAsprintf(buf, " <nvram>\n"); + if (virDomainDeviceInfoIsSet(&def->info, flags)) + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + + virBufferAddLit(buf, " </nvram>\n"); + + return 0; +} + +static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) { @@ -14787,6 +14864,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->memballoon) virDomainMemballoonDefFormat(buf, def->memballoon, flags); + if (def->nvram) + virDomainNVRAMDefFormat(buf, def->nvram, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); @@ -16061,6 +16141,7 @@ virDomainDeviceDefCopy(virCapsPtr caps, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_CHR: case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4ffa4aa..8e5f1d8 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -108,6 +108,9 @@ typedef virDomainChrDef *virDomainChrDefPtr; typedef struct _virDomainMemballoonDef virDomainMemballoonDef; typedef virDomainMemballoonDef *virDomainMemballoonDefPtr; +typedef struct _virDomainNVRAMDef virDomainNVRAMDef; +typedef virDomainNVRAMDef *virDomainNVRAMDefPtr; + typedef struct _virDomainSnapshotObj virDomainSnapshotObj; typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; @@ -133,6 +136,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_NVRAM, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -158,6 +162,7 @@ struct _virDomainDeviceDef { virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; } data; }; @@ -1418,6 +1423,9 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainNVRAMDef { + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE, @@ -1849,6 +1857,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainNVRAMDefPtr nvram; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -1951,6 +1960,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dee493f..30694d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -941,6 +941,13 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def, goto cleanup; } + if (def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) + def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO; + if (qemuAssignSpaprVIOAddress(def, &def->nvram->info, + 0x3000ul) < 0) + goto cleanup; + /* No other devices are currently supported on spapr-vio */ ret = 0; @@ -3406,6 +3413,17 @@ error: return NULL; } +char * +qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && + dev->info.addr.spaprvio.has_reg) + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + dev->info.addr.spaprvio.reg); + + return virBufferContentAndReset(&buf); +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -7006,6 +7024,19 @@ qemuBuildCommandLine(virConnectPtr conn, } } + if (def->nvram && + def->os.arch == VIR_ARCH_PPC64 && + STREQ(def->os.machine, "pseries")) { + char *optstr; + virCommandAddArg(cmd, "-global"); + optstr = qemuBuildNVRAMDevStr(def->nvram); + if (!optstr) + goto error; + if (optstr) + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } + if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); @@ -9139,6 +9170,23 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps, goto error; } + } else if (STREQ(arg, "-global") && + STRPREFIX(progargv[i + 1], "spapr-nvram.reg=")) { + + WANT_VALUE(); + + if (VIR_ALLOC(def->nvram) < 0) + goto no_memory; + + val += strlen("spapr-nvram.reg="); + if (virStrToLong_ull(val, NULL, 16, + &def->nvram->info.addr.spaprvio.reg) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid value for spapr-nvram.reg :" + "'%s'"), val); + goto error; + } + } else if (STREQ(arg, "-S")) { /* ignore, always added by libvirt */ } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index e4db000..7a0fe17 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,8 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, virQEMUCapsPtr qemuCaps); +char * qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, virQEMUCapsPtr qemuCaps); -- 1.7.10.1

1 1

[libvirt] [PATCH] wrap some long lines
by liguang 26 Feb '13

26 Feb '13

Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_command.c | 71 ++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9ad3c77..ad62120 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -611,7 +611,8 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx) } if ((thisidx = qemuDomainDeviceAliasIndex(&def->nets[i]->info, "net")) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine device index for network device")); + _("Unable to determine device index for " + "network device")); return -1; } if (thisidx >= idx) @@ -638,7 +639,8 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev int thisidx; if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info, "hostdev")) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine device index for hostdev device")); + _("Unable to determine device index for " + "hostdev device")); return -1; } if (thisidx >= idx) @@ -665,7 +667,8 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redir int thisidx; if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info, "redir")) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine device index for redirected device")); + _("Unable to determine device index for" + " redirected device")); return -1; } if (thisidx >= idx) @@ -1001,8 +1004,8 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (info->addr.pci.function != 0) { virReportError(VIR_ERR_XML_ERROR, _("Attempted double use of PCI Address '%s' " - "(may need \"multifunction='on'\" for device on function 0)"), - addr); + "(may need \"multifunction='on'\" for " + "device on function 0)"), addr); } else { virReportError(VIR_ERR_XML_ERROR, _("Attempted double use of PCI Address '%s'"), addr); @@ -1036,7 +1039,8 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, goto cleanup; } - VIR_DEBUG("Remembering PCI addr %s (multifunction=off for function 0)", addr); + VIR_DEBUG("Remembering PCI addr %s (multifunction=off" + " for function 0)", addr); if (virHashAddEntry(addrs->used, addr, addr)) goto cleanup; addr = NULL; @@ -1468,7 +1472,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, def->controllers[i]->info.addr.pci.slot != 1 || def->controllers[i]->info.addr.pci.function != 2) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("PIIX3 USB controller must have PCI address 0:0:1.2")); + _("PIIX3 USB controller must have" + " PCI address 0:0:1.2")); goto error; } reservedUSB = true; @@ -1524,7 +1529,8 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, primaryVideo->info.addr.pci.slot != 2 || primaryVideo->info.addr.pci.function != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Primary video card must have PCI address 0:0:2.0")); + _("Primary video card must have " + "PCI address 0:0:2.0")); goto error; } /* If TYPE==PCI, then qemuCollectPCIAddress() function @@ -1814,12 +1820,14 @@ qemuBuildRomStr(virBufferPtr buf, if (info->rombar || info->romfile) { if (info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("rombar and romfile are supported only for PCI devices")); + "%s", _("rombar and romfile are supported " + "only for PCI devices")); return -1; } if (!qemuCapsGet(caps, QEMU_CAPS_PCI_ROMBAR)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("rombar and romfile not supported in this QEMU binary")); + "%s", _("rombar and romfile not supported " + "in this QEMU binary")); return -1; } @@ -1900,8 +1908,8 @@ qemuBuildRBDString(virConnectPtr conn, VIR_SECRET_GET_VALUE_INTERNAL_CALL); if (secret == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("could not get the value of the secret for username %s"), - disk->auth.username); + _("could not get the value of the secret for " + "username %s"), disk->auth.username); goto error; } /* qemu/librbd wants it base64 encoded */ @@ -2330,7 +2338,8 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED, } if (!disk->readonly) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot create virtual FAT disks in read-write mode")); + _("cannot create virtual FAT disks " + "in read-write mode")); goto error; } if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) @@ -3231,7 +3240,8 @@ qemuBuildNicDevStr(virDomainNetDefPtr net, } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-net-pci 'tx' option not supported in this QEMU binary")); + _("virtio-net-pci 'tx' option not supported " + "in this QEMU binary")); goto error; } } @@ -3538,7 +3548,8 @@ qemuBuildSoundCodecStr(virDomainSoundDefPtr sound, } virBufferAsprintf(&buf, "%s,id=%s-codec%d,bus=%s.0,cad=%d", - stype, sound->info.alias, codec->cad, sound->info.alias, codec->cad); + stype, sound->info.alias, codec->cad, + sound->info.alias, codec->cad); return virBufferContentAndReset(&buf); @@ -4978,7 +4989,9 @@ qemuBuildGraphicsCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: if (!driver->spiceTLS) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("spice secure channels set in XML configuration, but TLS is disabled in qemu.conf")); + _("spice secure channels set in XML " + "configuration, but TLS is disabled " + "in qemu.conf")); goto error; } virBufferAsprintf(&opt, ",tls-channel=%s", @@ -5218,7 +5231,8 @@ qemuBuildCommandLine(virConnectPtr conn, } if (!driver->hugepage_path) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("hugepages are disabled by administrator config")); + "%s", _("hugepages are disabled by " + "administrator config")); goto error; } if (!qemuCapsGet(caps, QEMU_CAPS_MEM_PATH)) { @@ -5268,7 +5282,8 @@ qemuBuildCommandLine(virConnectPtr conn, if (!qemuCapsGet(caps, QEMU_CAPS_SMBIOS_TYPE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("the QEMU binary %s does not support smbios settings"), + _("the QEMU binary %s does not support " + "smbios settings"), emulator); goto error; } @@ -6386,7 +6401,8 @@ qemuBuildCommandLine(virConnectPtr conn, if (!qemuCapsGet(caps, QEMU_CAPS_CHARDEV) || !qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("guestfwd requires QEMU to support -chardev & -device")); + "%s", _("guestfwd requires QEMU to support " + "-chardev & -device")); goto error; } @@ -6405,8 +6421,9 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-netdev"); virCommandAddArgFormat(cmd, - "user,guestfwd=tcp:%s:%i,chardev=char%s,id=user-%s", - addr, port, channel->info.alias, + "user,guestfwd=tcp:%s:%i,chardev=char%s, " + "id=user-%s", addr, port, + channel->info.alias, channel->info.alias); VIR_FREE(addr); break; @@ -6414,7 +6431,8 @@ qemuBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO: if (!qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio channel requires QEMU to support -device")); + _("virtio channel requires QEMU to support " + "-device")); goto error; } @@ -6643,7 +6661,8 @@ qemuBuildCommandLine(virConnectPtr conn, char *str; if (def->videos[i]->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("video type %s is only valid as primary video card"), + _("video type %s is only valid as " + "primary video card"), virDomainVideoTypeToString(def->videos[0]->type)); goto error; } @@ -6930,7 +6949,8 @@ qemuBuildCommandLine(virConnectPtr conn, VIR_FREE(devstr); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("PCI device assignment is not supported by this version of qemu")); + _("PCI device assignment is not supported by " + "this version of qemu")); goto error; } } @@ -7010,7 +7030,8 @@ qemuBuildCommandLine(virConnectPtr conn, def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) { if (def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Memory balloon device type '%s' is not supported by this version of qemu"), + _("Memory balloon device type '%s' is not supported " + "by this version of qemu"), virDomainMemballoonModelTypeToString(def->memballoon->model)); goto error; } -- 1.7.2.5

2 1

[libvirt] [PATCH 0/5] fix qemumonitorjsontest
by Eric Blake 26 Feb '13

26 Feb '13

I hit a segv in qemumonitorjsontest on a new machine, and traced it to through several layers of issues, including not having yajl-devel installed on my end. This series fixes the test failure, and several incidental things that I found along the way. Eric Blake (5): qemu: don't override earlier json error qemu: minor monitor lock cleanups tests: avoid segfault if json monitor not present tests: don't test json when not compiled in tests: uniformly report test failures cfg.mk | 7 +++++++ src/qemu/qemu_agent.c | 13 ++++++------- src/qemu/qemu_monitor.c | 12 ++++-------- src/qemu/qemu_monitor_json.c | 8 +++----- tests/commandhelper.c | 7 +++---- tests/qemumonitorjsontest.c | 14 ++++++++------ tests/qemumonitortestutils.c | 4 ++++ tests/seclabeltest.c | 8 ++++---- tests/securityselinuxlabeltest.c | 6 +++--- tests/securityselinuxtest.c | 6 +++--- tests/testutils.c | 8 ++++---- tests/testutils.h | 4 ++-- 12 files changed, 51 insertions(+), 46 deletions(-) -- 1.8.1.2

2 11

[libvirt] [PATCH] ESX: Add AnyType_Serialize routine to esx_vi_types.c
by Ata E Husain Bohra 26 Feb '13

26 Feb '13

Add esxVI_AnyType_Serialize routine to allow serialization of objects containing variables of type "AnyType". The routine attempts to determine the type of the object that covers: boolean, long, int, string, short, byte. If variables does not fall under any above mentioned types then it is added as "anyType". --- src/esx/esx_vi_types.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_vi_types.h | 3 ++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index d1f91ff..2076ce4 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1130,6 +1130,54 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType) +int +esxVI_AnyType_Serialize(esxVI_AnyType *anyType, const char *element, + virBufferPtr output) +{ + if (element == NULL || output == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Invalid argument")); + return -1; + } + + if (anyType == NULL || anyType->value == NULL) { + return 0; + } + + switch (anyType->type) { + case esxVI_Type_Boolean: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:boolean"); + break; + case esxVI_Type_String: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:string"); + break; + case esxVI_Type_Short: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:short"); + break; + case esxVI_Type_Byte: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:byte"); + break; + case esxVI_Type_Int: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:int"); + break; + case esxVI_Type_Long: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:long"); + break; + case esxVI_Type_Undefined: + case esxVI_Type_Other: + default: + ESV_VI__XML_TAG__OPEN(output, element, "xsd:anyType"); + break; + } + + virBufferAdd(output, anyType->value, -1); + + ESV_VI__XML_TAG__CLOSE(output, element); + + return 0; +} + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * XSD: String */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 92dc16f..5150377 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -161,7 +161,8 @@ const char *esxVI_AnyType_TypeToString(esxVI_AnyType *anyType); int esxVI_AnyType_ExpectType(esxVI_AnyType *anyType, esxVI_Type type); int esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src); int esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType); - +int esxVI_AnyType_Serialize(esxVI_AnyType *anyType, const char *element, + virBufferPtr output); /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -- 1.7.9.5

3 3

[libvirt] [PATCHv2 0/8] VirtIO RNG device support
by Peter Krempa 26 Feb '13

26 Feb '13

Version 2 fixes comments by John and several improvements I noticed. There's 1 new patch in this series. See patch notes for more info. Peter Krempa (8): conf: Add fake switch statement to warn for new device types doc: schema: Add basic documentation for the virtual RNG device support conf: Add support for RNG device configuration in XML conf: Add RNG device ABI compatibility check qemu: Implement support for default 'random' backend for virtio-rng qemu: Implement support for EGD backend for virtio-rng tests: Add tests for virtio-rng device handling virtio-rng: Add rate limiting options for virtio-RNG docs/formatdomain.html.in | 78 ++++++ docs/schemas/domaincommon.rng | 48 ++++ src/conf/domain_conf.c | 293 ++++++++++++++++++++- src/conf/domain_conf.h | 39 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 123 +++++++++ .../qemuxml2argv-virtio-rng-egd.args | 1 + .../qemuxml2argv-virtio-rng-egd.xml | 26 ++ .../qemuxml2argv-virtio-rng-random.args | 1 + .../qemuxml2argv-virtio-rng-random.xml | 24 ++ tests/qemuxml2argvtest.c | 5 + tests/qemuxml2xmltest.c | 3 + 14 files changed, 652 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml -- 1.8.1.1

3 25

[libvirt] [PATCH] conf: Avoid leaking of RNG device definition
by Peter Krempa 26 Feb '13

26 Feb '13

--- Yet another place not guarded by the compiler :( This should qualify as trivial, so I'm pushing it directly. src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3cb780d..b65e52a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1775,6 +1775,8 @@ void virDomainDefFree(virDomainDefPtr def) virDomainRedirdevDefFree(def->redirdevs[i]); VIR_FREE(def->redirdevs); + virDomainRNGDefFree(def->rng); + VIR_FREE(def->os.type); VIR_FREE(def->os.machine); VIR_FREE(def->os.init); -- 1.8.1.1

1 0

[libvirt] [PATCH] qemu: enable direct migration over IPv6
by Ján Tomko 26 Feb '13

26 Feb '13

Use virURIParse in qemuMigrationPrepareDirect to allow parsing IPv6 addresses, which would cause an 'incorrect :port' error message before. To be able to migrate over IPv6, QEMU needs to listen on [::] instead of 0.0.0.0. This patch adds a call to getaddrinfo and sets the listen address based on the result. It also uses the same listen address for the NBD server. This will break migration if a hostname does not resolve to the same address family on both sides. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=846013 --- Diff to V1: * initialize uri_str * reuse STRSKIP("tcp:") result instead of doing strlen on it * print a warning instead of failing when the hostname can't be resolved Diff to V2: * freeaddrinfo * separate the listen address to allow reuse in qemuMigrationStartNBDServer src/qemu/qemu_migration.c | 77 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 59 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index cae58fa..ff9b959 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -22,7 +22,10 @@ #include <config.h> +#include <netdb.h> +#include <sys/socket.h> #include <sys/time.h> +#include <sys/types.h> #ifdef WITH_GNUTLS # include <gnutls/gnutls.h> # include <gnutls/x509.h> @@ -1103,12 +1106,12 @@ error: */ static int qemuMigrationStartNBDServer(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + const char *listenAddr) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; unsigned short port = 0; - const char *listenAddr = "0.0.0.0"; char *diskAlias = NULL; size_t i; @@ -1981,6 +1984,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, const char *dom_xml, const char *migrateFrom, virStreamPtr st, + const char *listenAddr, unsigned long flags) { virDomainDefPtr def = NULL; @@ -2168,7 +2172,7 @@ done: if (flags & VIR_MIGRATE_TUNNELLED) VIR_DEBUG("NBD in tunnelled migration is currently not supported"); else { - if (qemuMigrationStartNBDServer(driver, vm) < 0) { + if (qemuMigrationStartNBDServer(driver, vm, listenAddr) < 0) { /* error already reported */ goto endjob; } @@ -2271,7 +2275,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st, flags); + "stdio", st, NULL, flags); return ret; } @@ -2292,9 +2296,14 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, static int port = 0; int this_port; char *hostname = NULL; + char listenAddr[8]; char migrateFrom [64]; const char *p; + char *uri_str = NULL; int ret = -1; + bool ipv6 = false; + struct addrinfo *info; + virURIPtr uri; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2343,16 +2352,39 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * URI when passing it to the qemu monitor, so bad * characters in hostname part don't matter. */ - if (!STRPREFIX(uri_in, "tcp:")) { + if (!(p = STRSKIP(uri_in, "tcp:"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("only tcp URIs are supported for KVM/QEMU" " migrations")); goto cleanup; } - /* Get the port number. */ - p = strrchr(uri_in, ':'); - if (p == strchr(uri_in, ':')) { + /* Convert uri_in to well-formed URI with // after tcp: */ + if (!(STRPREFIX(uri_in, "tcp://"))) { + if (virAsprintf(&uri_str, "tcp://%s", p) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + uri = virURIParse(uri_str ? uri_str : uri_in); + VIR_FREE(uri_str); + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("missing host in migration" + " URI: %s"), uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { /* Generate a port */ this_port = QEMUD_MIGRATION_FIRST_PORT + port++; if (port == QEMUD_MIGRATION_NUM_PORTS) @@ -2365,25 +2397,34 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, } } else { - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber(&p); - if (this_port == -1 || p-uri_in != strlen(uri_in)) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("URI ended with incorrect ':port'")); - goto cleanup; - } + this_port = uri->port; } } + if (getaddrinfo(hostname, NULL, NULL, &info)) { + VIR_WARN("unable to get address info for %s, defaulting to IPv4", + hostname); + } else { + ipv6 = info->ai_family == AF_INET6; + freeaddrinfo(info); + } + if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); - /* QEMU will be started with -incoming tcp:0.0.0.0:port */ - snprintf(migrateFrom, sizeof(migrateFrom), "tcp:0.0.0.0:%d", this_port); + /* QEMU will be started with -incoming tcp:0.0.0.0:port + * or -incoming tcp:[::]:port for IPv6 */ + if (ipv6) + snprintf(listenAddr, sizeof(listenAddr), "[::]"); + else + snprintf(listenAddr, sizeof(listenAddr), "0.0.0.0"); + + snprintf(migrateFrom, sizeof(migrateFrom), + "tcp:%s:%d", listenAddr, this_port); ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL, flags); + migrateFrom, NULL, listenAddr, flags); cleanup: VIR_FREE(hostname); if (ret != 0) -- 1.7.12.4

2 1

[libvirt] [PATCH 0/2] network: add force attribute for dhcp options
by Laine Stump 26 Feb '13

26 Feb '13

The firs patch just fixes unexpected behavior in virNetworkDHCPOptionDefParseXML found when testing the second patch. The second patch adds the "force" attribute I mentioned in the review of the patch that added support for specifying dhcp options in network config. While documenting this new attribute, I noticed that I'd neglected to see that original patch didn't include documentation, so I added full documentation for <option> in order to have a place to add the documentation for "force='yes'". I'm also working on a way to allow specification of option names rather than numbers, but didn't know if I could get it in before the freeze, so I'm sending this patch now. Laine Stump (2): conf: use VIR_EXPAND instead of VIR_REALLOC in virNetworkDHCPDefParseXML network: add force attribute for dhcp options docs/formatnetwork.html.in | 21 ++++++++++++++++++++ src/conf/network_conf.c | 32 +++++++++++++++++++++--------- src/conf/network_conf.h | 3 ++- src/network/bridge_driver.c | 3 ++- tests/networkxml2confdata/nat-network.conf | 2 +- tests/networkxml2confdata/nat-network.xml | 2 +- 6 files changed, 50 insertions(+), 13 deletions(-) -- 1.7.11.7

3 5

[libvirt] [PATCH tck] Avoid multicast MAC addrs in tests
by Daniel P. Berrange 26 Feb '13

26 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Certain MAC addrs are used for multicast and recent libvirt will refuse to start VMs using those addrs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- scripts/domain/215-nic-hotplug-many.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/domain/215-nic-hotplug-many.t b/scripts/domain/215-nic-hotplug-many.t index 5b935cc..8b4afbd 100644 --- a/scripts/domain/215-nic-hotplug-many.t +++ b/scripts/domain/215-nic-hotplug-many.t @@ -47,9 +47,9 @@ diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); -my $mac1 = "01:11:22:33:44:55"; -my $mac2 = "02:11:22:33:44:55"; -my $mac3 = "03:11:22:33:44:55"; +my $mac1 = "02:11:22:33:44:51"; +my $mac2 = "02:11:22:33:44:52"; +my $mac3 = "02:11:22:33:44:53"; my $model = "virtio"; my $netxml1 = <<EOF; -- 1.8.1.2

2 1

[libvirt] [PATCH] Fix crash changing CDROM media
by Daniel P. Berrange 26 Feb '13

26 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This change tried to fix a crash with changing CDROM media but failed to actually do so commit d0172d2b1b5d865aaa042070d7c2d00effb2ff8c Author: Osier Yang <jyang(a)redhat.com> Date: Tue Feb 19 20:27:45 2013 +0800 qemu: Remove the shared disk entry if the operation is ejecting or updating It was still accessing disk->src, when the entire 'disk' object has been free'd already. Even if it weren't free'd, accessing the 'src' value of virDomainDiskDef is not allowed without first validating disk->type is file or block. Just remove the broken code entirely. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1e96915..8dae8f9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5778,13 +5778,14 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, dev->data.disk = tmp; ret = qemuDomainChangeEjectableMedia(driver, vm, disk, orig_disk, false); + /* 'disk' must not be accessed now - it has been free'd. + * 'orig_disk' now points to the new disk, while 'dev_copy' + * now points to the old disk */ /* Need to remove the shared disk entry for the original disk src * if the operation is either ejecting or updating. */ - if (ret == 0 && - orig_disk->src && - STRNEQ_NULLABLE(orig_disk->src, disk->src)) + if (ret == 0) ignore_value(qemuRemoveSharedDisk(driver, dev_copy->data.disk, vm->def->name)); break; -- 1.8.1.2

2 1

[libvirt] [PATCH] qemu: Refactor qemuDomainSetMemoryParameters
by Peter Krempa 26 Feb '13

26 Feb '13

The new TypedParam helper APIs allow to simplify this function significantly. This patch integrates the fix in 75e5bec97b3045e4f926248d5c742f8a50d0f9 by correctly ordering the setting functions instead of reordering the parameters. --- src/qemu/qemu_driver.c | 149 ++++++++++++++++++------------------------------- 1 file changed, 54 insertions(+), 95 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 23499ef..f2f5872 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7140,15 +7140,15 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - int i; virDomainDefPtr persistentDef = NULL; virCgroupPtr group = NULL; virDomainObjPtr vm = NULL; - virTypedParameterPtr hard_limit = NULL; - virTypedParameterPtr swap_hard_limit = NULL; - int hard_limit_index = 0; - int swap_hard_limit_index = 0; - unsigned long long val = 0; + unsigned long long swap_hard_limit; + unsigned long long memory_hard_limit; + unsigned long long memory_soft_limit; + bool set_swap_hard_limit = false; + bool set_memory_hard_limit = false; + bool set_memory_soft_limit = false; virQEMUDriverConfigPtr cfg = NULL; int ret = -1; int rc; @@ -7167,13 +7167,9 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, NULL) < 0) return -1; - vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); - if (vm == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No such domain %s"), dom->uuid); - goto cleanup; - } + if (!(vm = qemuDomObjFromDomain(dom))) + return -1; cfg = virQEMUDriverGetConfig(driver); @@ -7198,110 +7194,73 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } } - for (i = 0; i < nparams; i++) { - if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { - hard_limit = &params[i]; - hard_limit_index = i; - } else if (STREQ(params[i].field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { - swap_hard_limit = &params[i]; - swap_hard_limit_index = i; - } - } +#define VIR_GET_LIMIT_PARAMETER(PARAM, VALUE) \ + if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE) < 0)) \ + goto cleanup; \ + \ + if (rc == 1) \ + set_ ## VALUE = true; + + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, memory_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, memory_soft_limit) + +#undef VIR_GET_LIMIT_PARAMETER + /* It will fail if hard limit greater than swap hard limit anyway */ - if (swap_hard_limit && - hard_limit && - (hard_limit->value.ul > swap_hard_limit->value.ul)) { + if (set_swap_hard_limit && set_memory_hard_limit && + (memory_hard_limit > swap_hard_limit)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("hard limit must be lower than swap hard limit")); goto cleanup; } - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - /* Get current swap hard limit */ - rc = virCgroupGetMemSwapHardLimit(group, &val); - if (rc != 0) { + if (set_swap_hard_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemSwapHardLimit(group, swap_hard_limit)) < 0) { virReportSystemError(-rc, "%s", - _("unable to get swap hard limit")); + _("unable to set memory swap_hard_limit tunable")); goto cleanup; } - /* Swap hard_limit and swap_hard_limit to ensure the setting - * could succeed if both of them are provided. - */ - if (swap_hard_limit && hard_limit) { - virTypedParameter param; - - if (swap_hard_limit->value.ul > val) { - if (hard_limit_index < swap_hard_limit_index) { - param = params[hard_limit_index]; - params[hard_limit_index] = params[swap_hard_limit_index]; - params[swap_hard_limit_index] = param; - } - } else { - if (hard_limit_index > swap_hard_limit_index) { - param = params[hard_limit_index]; - params[hard_limit_index] = params[swap_hard_limit_index]; - params[swap_hard_limit_index] = param; - } - } - } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.swap_hard_limit = swap_hard_limit; } - ret = 0; - for (i = 0; i < nparams; i++) { - virTypedParameterPtr param = &params[i]; - - if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemoryHardLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory hard_limit tunable")); - ret = -1; - } - } + if (set_memory_hard_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemoryHardLimit(group, memory_hard_limit)) < 0) { + virReportSystemError(-rc, "%s", + _("unable to set memory hard_limit tunable")); + goto cleanup; + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.hard_limit = param->value.ul; - } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemorySoftLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set memory soft_limit tunable")); - ret = -1; - } - } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.hard_limit = memory_hard_limit; + } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.soft_limit = param->value.ul; - } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { - if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemSwapHardLimit(group, param->value.ul); - if (rc != 0) { - virReportSystemError(-rc, "%s", - _("unable to set swap_hard_limit tunable")); - ret = -1; - } - } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.swap_hard_limit = param->value.ul; - } + if (set_memory_soft_limit) { + if (flags & VIR_DOMAIN_AFFECT_LIVE && + (rc = virCgroupSetMemorySoftLimit(group, memory_soft_limit)) < 0) { + virReportSystemError(-rc, "%s", + _("unable to set memory soft_limit tunable")); + goto cleanup; } - } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - if (virDomainSaveConfig(cfg->configDir, persistentDef) < 0) - ret = -1; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + persistentDef->mem.soft_limit = memory_soft_limit; } + if (flags & VIR_DOMAIN_AFFECT_CONFIG && + virDomainSaveConfig(cfg->configDir, persistentDef) < 0) + goto cleanup; + + ret = 0; + cleanup: virCgroupFree(&group); - if (vm) - virObjectUnlock(vm); + virObjectUnlock(vm); virObjectUnref(caps); virObjectUnref(cfg); return ret; -- 1.8.1.1

2 2

[libvirt] [PATCHv2 0/5] Add API to allow TCP connection tunelling
by Peter Krempa 25 Feb '13

25 Feb '13

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 ... As nobody responded, I'd like to re-ask for someones opinion on this. (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. I will have a look at that later. ---- Diff to v1: - fixed error reporting in 2/5 - documented limitation to "localhost" in 3/5 - fixed possible segfault in 4/5 --- 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 | 48 +++++++++++++++++++++++++++++ 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 | 9 ++---- tools/virsh-domain.c | 17 +++++++++-- tools/virsh-host.c | 60 ++++++++++++++++++++++++++++++++++++ 19 files changed, 397 insertions(+), 41 deletions(-) -- 1.8.0

2 7

[libvirt] [PATCH 0/2] Using client-id for DHCPv6 host identification
by Gene Czarcinski 25 Feb '13

25 Feb '13

The first patch is a trivial fix to the network schema since the name in dhcp-host is really optional. The second patch adds the capability to use the client id to improve the reliability of having a system use a fixed IPv6 address. Gene Czarcinski (2): Trivial fix: in dhcp-host the name is optional use client id for IPv6 DHCP host definition docs/formatnetwork.html.in | 18 ++++++- docs/schemas/basictypes.rng | 59 ++++++++++++++++++++++ docs/schemas/network.rng | 7 ++- src/conf/network_conf.c | 29 +++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 3 +- src/util/virdnsmasq.c | 20 ++++++-- src/util/virdnsmasq.h | 1 + tests/networkxml2confdata/dhcp6-nat-network.xml | 5 +- tests/networkxml2confdata/dhcp6-network.xml | 5 +- .../dhcp6host-routed-network.xml | 5 +- 11 files changed, 138 insertions(+), 15 deletions(-) -- 1.8.1.2

3 11

[libvirt] Versioning/Compatibility in the XML schemas
by Pieter Hollants 25 Feb '13

25 Feb '13

Out of curiosity, seeing that we doing modifications to the XML schema all the time, there does not seem to be some sort of version identifier in the XML schemas. If I take the recently merged patch for DHCP options, for instance, suppose virt-manager would add support for it in its GUI. How would such a network XML definition be interpreted by older libvirt versions? Is it supposed to ignore elements it doesn't know or do we have an implicit requirement of "always use the latest versions together"? -- Pieter Hollants <pieter(a)hollants.com>

2 1

[libvirt] [PATCH v2 resend 0/4]use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 25 Feb '13

25 Feb '13

v1 to v2 *removed i8* NIC models support for QEMU/KVM *updated docs *rebased This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise of the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/4, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any other idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(4) [PATCH v2 resend 1/4] add domain NIC model enum macro [PATCH v2 resend 2/4] net: use virDomainNICModelType{From|To}String functions [PATCH v2 resend 3/4] qemu: add NIC model checking for qemu hypervisor [PATCH v2 resend 4/4] qemu: add usb-net support docs/formatdomain.html.in | 29 +++++++++++------------------ src/conf/domain_conf.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------ src/conf/domain_conf.h | 32 +++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 21 +++++++++++---------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 208 insertions(+), 137 deletions(-)

1 4

[libvirt] [PATCH] interface: Fix udev backend bridge device display
by Doug Goldstein 25 Feb '13

25 Feb '13

The bridge device was showing the vnet devices created for the domains as connected to the bridge. libvirt should only show host devices when trying to get the interface definition rather than the domain devices as well. --- Honestly this method sucks. But it makes the code path work and doesn't result in brokenness. I was really thinking of sscanf() but I don't really care to store the values. Suggestions? --- src/interface/interface_backend_udev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index bd83545..dca85b3 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -24,7 +24,9 @@ #include <libudev.h> #include "virerror.h" +#include "c-ctype.h" #include "datatypes.h" +#include "domain_conf.h" #include "interface_driver.h" #include "interface_conf.h" #include "viralloc.h" @@ -527,6 +529,16 @@ udevIfaceBridgeScanDirFilter(const struct dirent *entry) if (STREQ(entry->d_name, ".") || STREQ(entry->d_name, "..")) return 0; + /* Omit the domain interfaces from the list of bridge attached + * devices. All we can do is check for the device name matching + * vnet%d. Improvements to this check are welcome. + */ + if (strlen(entry->d_name) >= 5) { + if (STRPREFIX(entry->d_name, VIR_NET_GENERATED_PREFIX) && + c_isdigit(entry->d_name[4])) + return 0; + } + return 1; } -- 1.7.12.4

2 1

[libvirt] [PATCH] docs: add forward mode='hostdev' example
by Laine Stump 25 Feb '13

25 Feb '13

Also rearrange examples so that all "managed" networks (those with bridges created by libvirt) are together. --- docs/formatnetwork.html.in | 52 +++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 15 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4b4c47b..46b7270 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -332,7 +332,7 @@ </p> <pre> ... - <forward mode='passthrough'> + <forward mode='passthrough' managed='yes'> <pf dev='eth0'/> </forward> ... @@ -863,6 +863,27 @@ </ip> </network></pre> + <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> + + <p> + A valid network definition can contain no IPv4 or IPv6 addresses. + Such a definition can be used for a "very private" or "very + isolated" network since it will not be possible to communicate + with the virtualization host via this network. However, this + virtual network interface can be used for communication between + virtual guest systems. This works for IPv4 + and <span class="since">(Since 1.0.1)</span> IPv6. However, + the <code>ipv6</code> attribute must be set to "yes" for + functional guest-to-guest IPv6 communication. + </p> + + <pre> + <network ipv6='yes'> + <name>nogw</name> + <bridge name="virbr2" stp="on" delay="0"/> + </network> + </pre> + <h3><a name="examplesBridge">Using an existing host bridge</a></h3> <p> @@ -916,25 +937,26 @@ </forward> </network></pre> - <h3><a name="examplesNoGateway">Network config with no gateway addresses</a></h3> + <h3><a name="examplesPCIPassthrough">Assigning SR-IOV Virtual Functions via PCI Passthrough</a></h3> <p> - A valid network definition can contain no IPv4 or IPv6 addresses. Such a definition - can be used for a "very private" or "very isolated" network since it will not be - possible to communicate with the virtualization host via this network. However, - this virtual network interface can be used for communication between virtual guest - systems. This works for IPv4 and <span class="since">(Since 1.0.1)</span> IPv6. - However, the new ipv6='yes' must be added for guest-to-guest IPv6 - communication. + <span class="since">Since 0.9.10, requires a host with working + IOMMU</span> This example shows how to use a libvirt network to + assign individual SR-IOV Virtual Functions (VF) to guests using + PCI passthrough. Only the Physical Function (PF) of the SR-IOV + network adapter needs to be listed in the network definition; a + list of all VFs will be automatically derived from that, and VFs + will be allocated to guest domains as requested. </p> <pre> - <network ipv6='yes'> - <name>nogw</name> - <uuid>7a3b7497-1ec7-8aef-6d5c-38dff9109e93</uuid> - <bridge name="virbr2" stp="on" delay="0" /> - <mac address='00:16:3E:5D:C7:9E'/> - </network></pre> + <network> + <name>passthrough</name> + <forward mode='hostdev' managed='yes'> + <pf dev='eth3'/> + </forward> + </network> + </pre> </body> </html> -- 1.7.11.7

1 0

[libvirt] [PATCH] virsh: add --start option to the define command
by Doug Goldstein 25 Feb '13

25 Feb '13

Adds the --start option to the define command to simplify the often used case of virsh "define dom.xml; start dom" or virsh define dom.xml && virsh start dom. This is just a rebased version of: https://www.redhat.com/archives/libvir-list/2013-January/msg00490.html There's a competing patchset available at: https://www.redhat.com/archives/libvir-list/2013-February/msg01298.html --- tools/virsh-domain.c | 23 +++++++++++++++++++++-- tools/virsh.pod | 5 +++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 96dd4fa..6d62197 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6602,6 +6602,10 @@ static const vshCmdOptDef opts_define[] = { .flags = VSH_OFLAG_REQ, .help = N_("file containing an XML domain description") }, + {.name = "start", + .type = VSH_OT_BOOL, + .help = N("start the domain after definition") + }, {.name = NULL} }; @@ -6612,6 +6616,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) const char *from = NULL; bool ret = true; char *buffer; + bool start = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) return false; @@ -6619,17 +6624,31 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + start = vshCommandOptBool(cmd, "start"); + dom = virDomainDefineXML(ctl->conn, buffer); VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), virDomainGetName(dom), from); - virDomainFree(dom); } else { vshError(ctl, _("Failed to define domain from %s"), from); - ret = false; + return false; } + + /* Start the domain if the user requested it and it was defined */ + if (start) { + if (virDomainCreate(dom) < 0) { + vshError(ctl, _("Failed to start domain %s, which was " + "successfully defined."), virDomainGetName(dom)); + ret = false; + } else { + vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); + } + } + + virDomainFree(dom); return ret; } diff --git a/tools/virsh.pod b/tools/virsh.pod index a5d8fe6..660331c 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -555,11 +555,12 @@ B<Example> vi domain.xml (or make changes with your other text editor) virsh create domain.xml -=item B<define> I<FILE> +=item B<define> I<FILE> [I<--start>] Define a domain from an XML <file>. The domain definition is registered but not started. If domain is already running, the changes will take -effect on the next boot. +effect on the next boot. If I<--start> is requested, start the domain +after defining it. =item B<desc> I<domain> [[I<--live>] [I<--config>] | [I<--current>]] [I<--title>] [I<--edit>] [I<--new-desc> -- 1.7.12.4

1 0

[libvirt] [PATCH 0/5] storage: add tests for qemu-img command line
by Ján Tomko 25 Feb '13

25 Feb '13

This series adds tests to check for changes in the generated qemu-img command line and moves the options in front of positional arguments. Ján Tomko (5): storage: move flag setting after declarations storage: separate qemu-img command generation and execution storage: add test for qemu-img command line generation storage: move qemu-img options before positional arguments storage: qemu-img: change INFO to DEBUG src/storage/storage_backend.c | 131 ++++++++------ src/storage/storage_backend.h | 8 + tests/Makefile.am | 9 + tests/storagevolxml2argvdata/pool-dir.xml | 18 ++ tests/storagevolxml2argvdata/qcow2-flag.argv | 1 + .../qcow2-nobacking-convert-flag.argv | 1 + .../qcow2-nobacking-convert-none.argv | 1 + .../qcow2-nobacking-convert-prealloc.argv | 1 + .../qcow2-nobacking-flag.argv | 1 + .../qcow2-nobacking-none.argv | 1 + .../qcow2-nobacking-prealloc.argv | 1 + tests/storagevolxml2argvdata/qcow2-none.argv | 1 + tests/storagevolxml2argvdata/qcow2.argv | 1 + tests/storagevolxml2argvdata/vol-file.xml | 20 +++ .../storagevolxml2argvdata/vol-qcow2-nobacking.xml | 21 +++ tests/storagevolxml2argvdata/vol-qcow2.xml | 31 ++++ tests/storagevolxml2argvtest.c | 189 +++++++++++++++++++++ 17 files changed, 380 insertions(+), 56 deletions(-) create mode 100644 tests/storagevolxml2argvdata/pool-dir.xml create mode 100644 tests/storagevolxml2argvdata/qcow2-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-convert-prealloc.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-flag.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-nobacking-prealloc.argv create mode 100644 tests/storagevolxml2argvdata/qcow2-none.argv create mode 100644 tests/storagevolxml2argvdata/qcow2.argv create mode 100644 tests/storagevolxml2argvdata/vol-file.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2-nobacking.xml create mode 100644 tests/storagevolxml2argvdata/vol-qcow2.xml create mode 100644 tests/storagevolxml2argvtest.c -- 1.7.12.4

2 11

[libvirt] [PATCH 0/2] Support PCI passthrough in libxl driver
by Chunyan Liu 24 Feb '13

24 Feb '13

This patch series is to add PCI passthrough support to libxenlight driver so that it can create VM with managed/non-managed host pci device defined. Chunyan Liu (2): libxl: add APIs to prepare/release host pci device libxl: support pci passthrough po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libxl/libxl_conf.c | 44 ++++ src/libxl/libxl_conf.h | 5 +- src/libxl/libxl_driver.c | 16 ++ src/libxl/libxl_hostdev.c | 600 +++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_hostdev.h | 44 ++++ 7 files changed, 710 insertions(+), 1 deletions(-) create mode 100644 src/libxl/libxl_hostdev.c create mode 100644 src/libxl/libxl_hostdev.h -- 1.7.3.4

6 7

[libvirt] [PATCH] run: license as LGPL
by Eric Blake 24 Feb '13

24 Feb '13

It makes no sense to prohibit reuse of the wrapper in other LGPL projects, since most of libvirt is designed to be LGPL. Of course, when using the wrapper to wrap a GPL program, the combined result is still effectively GPL, but that shouldn't force us to license the wrapper as GPL in isolation. * run.in: Relicense to LGPLv2+. --- Any objections to this? run.in | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/run.in b/run.in index 5063522..5d4a04c 100644 --- a/run.in +++ b/run.in @@ -2,18 +2,19 @@ # libvirt 'run' programs locally script # Copyright (C) 2012-2013 Red Hat, Inc. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. # -# This program is distributed in the hope that it will be useful, +# This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. +# You should have received a copy of the GNU Lesser General Public +# License along with this library; If not, see +# <http://www.gnu.org/licenses/>. #---------------------------------------------------------------------- # -- 1.8.1.2

2 3

[libvirt] [PATCH v4 0/9] Rework storage migration
by Michal Privoznik 23 Feb '13

23 Feb '13

Since there are many hidden problems with auto-creating storage for the domain in here, as previous rounds of reviewing the series has shown, I've decided to not do anything about it for now and the auto allocation is dropped completely. So we are back to the assumption we already have - users need to make sure files already exists and have the right size. Hawk. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to v2.1: -nbd cookie reworked -don't rely on disk ordering in the cookie, but use disk target for that -adapt to virPortAllocator -unlink pre-created storage on migration fail -other of Jirka's suggestions worked in "diff" to v3: -just rebase & adapt to new qemu code after dropping QDL (Qemu Driver Lock) diff to v4: -drop storage auto-allocation -include John's and Jirka's reviews Note, that most of the patches has been ACKed already. Michal Privoznik (9): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer() qemu_migration: Introduce qemuMigrationDriveMirror qemu_migration: Stop NBD server at Finish phase qemu_migration: Cancel running jobs on failed migration src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_migration.c | 458 +++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_monitor.c | 63 ++++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 102 ++++++++++ src/qemu/qemu_monitor_json.h | 7 + src/qemu/qemu_process.c | 5 + 9 files changed, 631 insertions(+), 17 deletions(-) -- 1.8.1.2

3 21

[libvirt] [PATCH] run: use portable shell
by Eric Blake 23 Feb '13

23 Feb '13

Nothing in run required bash, except for the shebang. On systems where /bin/bash doesn't exist (I hit it on FreeBSD), using /bin/sh instead fixes a 'make check' failure: gmake[3]: Entering directory `/usr/home/dummy/libvirt/python' GEN check-local /usr/local/bin/bash: ../run: /bin/bash: bad interpreter: No such file or directory * run.in: Use /bin/sh, not bash. --- Pushing under the build-breaker rule. run.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.in b/run.in index 845eef5..5063522 100644 --- a/run.in +++ b/run.in @@ -1,6 +1,6 @@ -#!/bin/bash - +#!/bin/sh # libvirt 'run' programs locally script -# Copyright (C) 2012 Red Hat, Inc. +# Copyright (C) 2012-2013 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 1.8.1.2

1 0

[libvirt] [PATCH] storage: use f_frsize, not f_bsize, for calculating available space
by Sage Weil 23 Feb '13

23 Feb '13

The bfree and blocks fields are supposed to be in units of frsize. We were calculating capacity correctly using those units, but the available calculation was using bsize instead. Most file systems report these as the same value specifically because many programs are buggy, but that is no reason to rely on that behavior, or to behave inconsistently. This bug has been present since e266ded (2008) and aa296e6c, when the code was originally introduced (the latter via cut and paste). Signed-off-by: Sage Weil <sage(a)newdream.net> --- src/parallels/parallels_storage.c | 2 +- src/storage/storage_backend_fs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index 1186296..f696fcb 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -709,7 +709,7 @@ parallelsStoragePoolGetAlloc(virStoragePoolDefPtr def) def->capacity = ((unsigned long long)sb.f_frsize * (unsigned long long)sb.f_blocks); def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_bsize); + (unsigned long long)sb.f_frsize); def->allocation = def->capacity - def->available; return 0; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index a582804..c1684f7 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -910,7 +910,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, pool->def->capacity = ((unsigned long long)sb.f_frsize * (unsigned long long)sb.f_blocks); pool->def->available = ((unsigned long long)sb.f_bfree * - (unsigned long long)sb.f_bsize); + (unsigned long long)sb.f_frsize); pool->def->allocation = pool->def->capacity - pool->def->available; return 0; -- 1.7.2.5

2 1

[libvirt] [PATCH] maint: check all symfiles for sorting
by Eric Blake 23 Feb '13

23 Feb '13

On FreeBSD, I got a 'make check' failure: GEN check-symsorting Symbol block at ./libvirt_atomic.syms:4: viratomic.h not found * src/Makefile.am (SYM_FILES): New define. (check-symsorting): Check on all symfiles, even when not used. * src/libvirt_atomic.syms: Fix offender. --- Pushing under the build-breaker rule. src/Makefile.am | 23 ++++++++++++++++++++++- src/libvirt_atomic.syms | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3ef9a9c..c1659a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -389,7 +389,7 @@ check-symfile: endif check-symsorting: $(AM_V_GEN)$(PERL) $(srcdir)/check-symsorting.pl \ - $(srcdir) $(USED_SYM_FILES) + $(srcdir) $(SYM_FILES) EXTRA_DIST += check-symfile.pl check-symsorting.pl PROTOCOL_STRUCTS = \ @@ -809,6 +809,7 @@ libvirt_driver_la_CFLAGS = \ libvirt_driver_la_LIBADD = \ $(NUMACTL_LIBS) $(GNUTLS_LIBS) $(CURL_LIBS) $(DLOPEN_LIBS) +SYM_FILES = $(USED_SYM_FILES) USED_SYM_FILES = $(srcdir)/libvirt_private.syms if WITH_TEST @@ -1410,42 +1411,62 @@ check-augeas-lockd: test_libvirt_lockd.aug if WITH_DRIVER_MODULES USED_SYM_FILES += $(srcdir)/libvirt_driver_modules.syms +else +SYM_FILES += $(srcdir)/libvirt_driver_modules.syms endif if WITH_LINUX USED_SYM_FILES += $(srcdir)/libvirt_linux.syms +else +SYM_FILES += $(srcdir)/libvirt_linux.syms endif if WITH_ESX USED_SYM_FILES += $(srcdir)/libvirt_esx.syms +else +SYM_FILES += $(srcdir)/libvirt_esx.syms endif if WITH_LIBVIRTD USED_SYM_FILES += $(srcdir)/libvirt_daemon.syms +else +SYM_FILES += $(srcdir)/libvirt_daemon.syms endif if WITH_OPENVZ USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms +else +SYM_FILES += $(srcdir)/libvirt_openvz.syms endif if WITH_VMX USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms +else +SYM_FILES += $(srcdir)/libvirt_vmx.syms endif if WITH_XENXS USED_SYM_FILES += $(srcdir)/libvirt_xenxs.syms +else +SYM_FILES += $(srcdir)/libvirt_xenxs.syms endif if WITH_SASL USED_SYM_FILES += $(srcdir)/libvirt_sasl.syms +else +SYM_FILES += $(srcdir)/libvirt_sasl.syms endif if WITH_SSH2 USED_SYM_FILES += $(srcdir)/libvirt_libssh2.syms +else +SYM_FILES += $(srcdir)/libvirt_libssh2.syms endif if WITH_ATOMIC_OPS_PTHREAD USED_SYM_FILES += $(srcdir)/libvirt_atomic.syms +else +SYM_FILES += $(srcdir)/libvirt_atomic.syms endif EXTRA_DIST += \ diff --git a/src/libvirt_atomic.syms b/src/libvirt_atomic.syms index db80ce8..e2c2363 100644 --- a/src/libvirt_atomic.syms +++ b/src/libvirt_atomic.syms @@ -2,7 +2,7 @@ # These symbols are dependent upon !VIR_ATOMIC_OPS_GCC. # -# viratomic.h +# util/viratomic.h virAtomicLock; # Let emacs know we want case-insensitive sorting -- 1.8.1.2

1 0

[libvirt] [RFC PATCH 1/4] libvirt: add VIR_DOMAIN_START_PERSISTENT flag
by Doug Goldstein 23 Feb '13

23 Feb '13

Added a VIR_DOMAIN_START_PERSISTENT flag for virDomainCreateXML() so that the guest remains defined after it is destroyed. The result of using this flag is equivilent to calling virDomainDefineXML() followed by virDomainCreate() or virDomainCreateWithFlags(). --- Not sure if this is the correct place to add "Since 1.0.3 (likely 1.0.4)" --- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index ad30cd0..e119215 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -336,6 +336,7 @@ typedef enum { VIR_DOMAIN_START_AUTODESTROY = 1 << 1, /* Automatically kill guest when virConnectPtr is closed */ VIR_DOMAIN_START_BYPASS_CACHE = 1 << 2, /* Avoid file system cache pollution */ VIR_DOMAIN_START_FORCE_BOOT = 1 << 3, /* Boot, discarding any managed save */ + VIR_DOMAIN_START_PERSISTENT = 1 << 4, /* Define guest to exist after it is destroyed */ } virDomainCreateFlags; diff --git a/src/libvirt.c b/src/libvirt.c index 1e78500..abe59cd 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1951,6 +1951,10 @@ virDomainGetConnect(virDomainPtr dom) * is destroyed, or if the host is restarted (see virDomainDefineXML() to * define persistent domains). * + * If the VIR_DOMAIN_START_PERSISTENT flag is set, the guest domain + * will remain defined even after the guest is destroyed. This is + * similar to if you had called virDomainDefineXML() and virDomainCreate(). + * * If the VIR_DOMAIN_START_PAUSED flag is set, the guest domain * will be started, but its CPUs will remain paused. The CPUs * can later be manually started using virDomainResume. -- 1.7.12.4

2 6

[libvirt] [PATCH] Add support for qxl.revision in domain XML
by Christophe Fergeau 23 Feb '13

23 Feb '13

QXL devices have an associated 'revision' which is raised when new features have been introduced which would break migration to older versions. This commit makes it possible to set this revision as QEMU sometimes support newer QXL revisions than what it defaults to. --- docs/formatdomain.html.in | 5 ++++- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 8 ++++++++ .../qemuxml2argv-graphics-spice-compression.args | 3 ++- .../qemuxml2argv-graphics-spice-compression.xml | 4 ++-- .../qemuxml2argv-graphics-spice-qxl-vga.args | 3 ++- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 ++-- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml | 4 ++-- 11 files changed, 47 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7ad8aea..4b269c8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3569,7 +3569,10 @@ qemu-kvm -net nic,model=? /dev/null attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies the size of the primary bar, while <code>vram</code> specifies the - secondary bar size. If "ram" is not supplied a default value is used. + secondary bar size. If "ram" or "vram" are not supplied a default + value is used. The optional attribute <code>revision</code> (<span + class="since">since 1.0.3</span>) specifies the revision of + the QXL device, newer revisions provides more functionality. </dd> <dt><code>model</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 049f232..fc78e2d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2280,6 +2280,11 @@ <ref name="unsignedInt"/> </attribute> </optional> + <optional> + <attribute name="revision"> + <ref name="unsignedInt"/> + </attribute> + </optional> </group> </choice> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5782abb..83be711 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7391,6 +7391,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, char *vram = NULL; char *ram = NULL; char *primary = NULL; + char *revision = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -7406,6 +7407,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, ram = virXMLPropString(cur, "ram"); vram = virXMLPropString(cur, "vram"); heads = virXMLPropString(cur, "heads"); + revision = virXMLPropString(cur, "revision"); if ((primary = virXMLPropString(cur, "primary")) != NULL) if (STREQ(primary, "yes")) @@ -7456,6 +7458,19 @@ virDomainVideoDefParseXML(const xmlNodePtr node, def->vram = virDomainVideoDefaultRAM(dom, def->type); } + if (revision) { + if (def->type != VIR_DOMAIN_VIDEO_TYPE_QXL) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("revision attribute only supported for type of qxl")); + goto error; + } + if (virStrToLong_ui(revision, NULL, 10, &def->revision) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("cannot parse video revision '%s'"), revision); + goto error; + } + } + if (heads) { if (virStrToLong_ui(heads, NULL, 10, &def->heads) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -13406,6 +13421,8 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " heads='%u'", def->heads); if (def->primary) virBufferAddLit(buf, " primary='yes'"); + if (def->revision) + virBufferAsprintf(buf, " revision='%u'", def->revision); if (def->accel) { virBufferAddLit(buf, ">\n"); virDomainVideoAccelDefFormat(buf, def->accel); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9a9e0b1..81925b1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1160,6 +1160,7 @@ struct _virDomainVideoDef { unsigned int ram; /* kibibytes (multiples of 1024) */ unsigned int vram; /* kibibytes (multiples of 1024) */ unsigned int heads; + unsigned int revision; bool primary; virDomainVideoAccelDefPtr accel; virDomainDeviceInfo info; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f6273c1..e45c808 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3598,6 +3598,9 @@ qemuBuildDeviceVideoStr(virDomainVideoDefPtr video, /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); + + if (video->revision != 0) + virBufferAsprintf(&buf, ",revision=%u", video->revision); } if (qemuBuildDeviceAddressStr(&buf, &video->info, caps) < 0) @@ -6631,6 +6634,11 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgFormat(cmd, "%s.vram_size=%u", dev, vram * 1024); } + if (def->videos[0]->revision) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.revision=%u", + dev, def->videos[0]->revision); + } } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 59f064b..05f5579 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -7,5 +7,6 @@ image-compression=auto_glz,jpeg-wan-compression=auto,\ zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter -vga \ qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index a8c4ad8..2dc5776 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -31,10 +31,10 @@ <streaming mode='filter'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index ef499e6..0b08038 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -4,5 +4,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ --device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-global qxl-vga.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 563d371..3cd0c42 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -28,10 +28,10 @@ <channel name='inputs' mode='insecure'/> </graphics> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='65536' heads='1'/> + <model type='qxl' ram='65536' vram='65536' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index d7cfae0..082eaf7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -6,5 +6,6 @@ x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-c image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter,disable-copy-paste -vga \ qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ --device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-global qxl.revision=4 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,revision=4,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 9a36660..e99dbc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -34,10 +34,10 @@ <clipboard copypaste='no'/> </graphics> <video> - <model type='qxl' ram='65536' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1' revision='4'/> </video> <video> - <model type='qxl' ram='65536' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1' revision='4'/> </video> <memballoon model='virtio'/> </devices> -- 1.8.1

3 6

[libvirt] [PATCHv2] storage: fix uid_t|gid_t handling on 32 bit Linux
by Philipp Hahn 23 Feb '13

23 Feb '13

uid_t and gid_t are opaque types, ranging from s32 to u32 to u64. Unfortunately libvirt uses the value -1 to mean "current process", which on Linux32 gets converted to UINT_MAX := +(2^32-1) = 4294967295. Different libvirt versions used different formatting in the past, which break one or the other parsing function: virXPathLong(): (signed long)-1 != (double)UINT_MAX virXPathULong(): (unsigned long)-1 != (double)-1 Roll our own version of virXPathULong(), which also accepts -1, which is silently converted to UINT_MAX. For output: do the reverse and print -1 instead of UINT_MAX. Allow -1 for owner and group in schema for storage volumes. Change UINT_MAX in one test case to -1 to follow the changes from above. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- [v2] - change schema for storage volume to accept -1 for owner and group - Use UINT_MAX instead of ALLONE - Windows64 uses s64, mention s16 and u16 as well - Fix Sheepdog test case to use -1 instead of UINT_MAX --- docs/schemas/storagevol.rng | 10 +++- src/conf/storage_conf.c | 76 ++++++++++++++++++++++----- tests/storagevolxml2xmlout/vol-sheepdog.xml | 4 +- 3 files changed, 72 insertions(+), 18 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index d4a29c7..ba95c55 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -49,10 +49,16 @@ <ref name='octalMode'/> </element> <element name='owner'> - <ref name='unsignedInt'/> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> </element> <element name='group'> - <ref name='unsignedInt'/> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> </element> <optional> <element name='label'> diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9134a22..617b19f 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -659,13 +659,14 @@ cleanup: return ret; } + static int virStorageDefParsePerms(xmlXPathContextPtr ctxt, virStoragePermsPtr perms, const char *permxpath, int defaultmode) { char *mode; - long v; + double d; int ret = -1; xmlNodePtr relnode; xmlNodePtr node; @@ -699,26 +700,58 @@ virStorageDefParsePerms(xmlXPathContextPtr ctxt, VIR_FREE(mode); } + /* uid_t and gid_t are *opaque* types: on Linux they're u32, on Windows64 + * they're s64, on Solaris they were s32 in the past, and u16 and s16 have + * been used as well. + * + * Unfortunately libvirt uses the value -1 to mean "current process", which + * on Linux32 gets converted to UINT_MAX := +(2^32-1). + * + * Different libvirt versions used different formatting in the past, which + * break one or the other parsing function: + * virXPathLong(): (signed long)-1 != (double)UINT_MAX + * virXPathULong(): (unsigned long)-1 != (double)-1 + */ if (virXPathNode("./owner", ctxt) == NULL) { perms->uid = (uid_t) -1; } else { - if (virXPathLong("number(./owner)", ctxt, &v) < 0) { + ret = virXPathNumber("number(./owner)", ctxt, &d); + if (ret == 0) { + if (d == (double) -1) { + perms->uid = (uid_t) -1; + } else { + perms->uid = (uid_t) (unsigned long) d; + if (perms->uid != d) { + ret = -2; + } + } + } + if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed owner element")); goto error; } - perms->uid = (int)v; } if (virXPathNode("./group", ctxt) == NULL) { perms->gid = (gid_t) -1; } else { - if (virXPathLong("number(./group)", ctxt, &v) < 0) { + ret = virXPathNumber("number(./group)", ctxt, &d); + if (ret == 0) { + if (d == (double) -1) { + perms->gid = (gid_t)-1; + } else { + perms->gid = (gid_t) (unsigned long) d; + if (perms->gid != d) { + ret = -2; + } + } + } + if (ret < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("malformed group element")); goto error; } - perms->gid = (int)v; } /* NB, we're ignoring missing labels here - they'll simply inherit */ @@ -1060,10 +1093,18 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virBufferAddLit(&buf," <permissions>\n"); virBufferAsprintf(&buf," <mode>0%o</mode>\n", def->target.perms.mode); - virBufferAsprintf(&buf," <owner>%d</owner>\n", - (int) def->target.perms.uid); - virBufferAsprintf(&buf," <group>%d</group>\n", - (int) def->target.perms.gid); + if (def->target.perms.uid == (uid_t) -1) { + virBufferAddLit(&buf, " <owner>-1</owner>\n"); + } else { + virBufferAsprintf(&buf, " <owner>%u</owner>\n", + (unsigned int) def->target.perms.uid); + } + if (def->target.perms.gid == (gid_t) -1) { + virBufferAddLit(&buf, " <group>-1</group>\n"); + } else { + virBufferAsprintf(&buf, " <group>%u</group>\n", + (unsigned int) def->target.perms.gid); + } if (def->target.perms.label) virBufferAsprintf(&buf," <label>%s</label>\n", @@ -1313,11 +1354,18 @@ virStorageVolTargetDefFormat(virStorageVolOptionsPtr options, virBufferAddLit(buf," <permissions>\n"); virBufferAsprintf(buf," <mode>0%o</mode>\n", def->perms.mode); - virBufferAsprintf(buf," <owner>%u</owner>\n", - (unsigned int) def->perms.uid); - virBufferAsprintf(buf," <group>%u</group>\n", - (unsigned int) def->perms.gid); - + if (def->perms.uid == (uid_t) -1) { + virBufferAddLit(buf, " <owner>-1</owner>\n"); + } else { + virBufferAsprintf(buf, " <owner>%u</owner>\n", + (unsigned int) def->perms.uid); + } + if (def->perms.gid == (gid_t) -1) { + virBufferAddLit(buf, " <group>-1</group>\n"); + } else { + virBufferAsprintf(buf, " <group>%u</group>\n", + (unsigned int) def->perms.gid); + } if (def->perms.label) virBufferAsprintf(buf," <label>%s</label>\n", diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml index 2f19af8..fc04f19 100644 --- a/tests/storagevolxml2xmlout/vol-sheepdog.xml +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -10,8 +10,8 @@ <format type='unknown'/> <permissions> <mode>0600</mode> - <owner>4294967295</owner> - <group>4294967295</group> + <owner>-1</owner> + <group>-1</group> </permissions> </target> </volume> -- 1.7.10.4

1 0

[libvirt] [PATCH 00/14] Add support for XBZRLE migration compression
by Jiri Denemark 23 Feb '13

23 Feb '13

QEMU supports XBZRLE compression of repeatedly transferred pages during live migration and this series makes it usable through libvirt. The first two patches add support for VIR_MIGRATE_COMPRESSED flag that enables XBZRLE compression. Patches 3--9 add an enhanced and extensible version of virDomainGetJobInfo and make various migration statistics available through it. The rest of the patches (10--14) add APIs for querying and changing XBZRLE compression cache size. Jiri Denemark (14): Introduce VIR_MIGRATE_COMPRESSED flag qemu: Add support for compressed migration Introduce virDomainGetJobStats API python: Implement virDomainGetJobStats wrapper remote: Auto-allocate params in remoteDeserializeTypedParameters remote: Implement virDomainGetJobStats virsh: Use virDomainGetJobStats in domjobinfo if available qemu: Parse more fields from query-migrate QMP command qemu: Implement virDomainGetJobStats Introduce virDomainMigrate*CompressionCache APIs python: Implement virDomainMigrateGetCompressionCache wrapper remote: Implement virDomainMigrate*CompressionCache virsh: Add migrate-compcache command qemu: Implement virDomainMigrate*CompressionCache daemon/remote.c | 44 ++++++ include/libvirt/libvirt.h.in | 213 ++++++++++++++++++++++++++ python/generator.py | 2 + python/libvirt-override-api.xml | 13 ++ python/libvirt-override.c | 70 +++++++++ src/driver.h | 18 +++ src/libvirt.c | 158 +++++++++++++++++++ src/libvirt_public.syms | 3 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 235 ++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 103 ++++++++++--- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 101 ++++++++++-- src/qemu/qemu_monitor.h | 52 ++++++- src/qemu/qemu_monitor_json.c | 331 ++++++++++++++++++++++++++++++++++------ src/qemu/qemu_monitor_json.h | 15 +- src/qemu/qemu_monitor_text.c | 47 +++--- src/qemu/qemu_monitor_text.h | 5 +- src/remote/remote_driver.c | 138 ++++++++++++----- src/remote/remote_protocol.x | 31 +++- src/remote_protocol-structs | 26 ++++ src/rpc/gendispatch.pl | 2 +- tools/virsh-domain.c | 291 +++++++++++++++++++++++++++++------ tools/virsh.pod | 18 ++- 25 files changed, 1718 insertions(+), 205 deletions(-) -- 1.8.1.2

4 36

[libvirt] [PATCH] qemu: only release SPICE TLS port if it has been allocated
by Ján Tomko 23 Feb '13

23 Feb '13

Silence the error message that happens during shutdown of a domain with spice graphics, autoport enabled if spice_tls is disabled in qemu.conf: error : virPortAllocatorRelease:174 : port 0 must be in range (5900, 65534) --- src/qemu/qemu_process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b560d2e..1e2bcae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4321,8 +4321,10 @@ retry: graphics->data.spice.autoport) { ignore_value(virPortAllocatorRelease(driver->remotePorts, graphics->data.spice.port)); - ignore_value(virPortAllocatorRelease(driver->remotePorts, - graphics->data.spice.tlsPort)); + if (cfg->spiceTLS) { + ignore_value(virPortAllocatorRelease(driver->remotePorts, + graphics->data.spice.tlsPort)); + } } } -- 1.7.12.4

2 1