- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] tests: qemumonitorjson: Improve testing of block-related APIs
by Peter Krempa 28 Aug '18

28 Aug '18

Peter Krempa (3): tests: qemumonitorjson: Add test for 'block-stream' command tests: qemumonitorjson: Change values which would be omitted tests: qemumonitorjson: Add test case for 'blockdev-mirror' tests/qemumonitorjsontest.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH v2] docs: api_extension: Update paths in the examples
by Peter Krempa 28 Aug '18

28 Aug '18

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- v2: - switched from '$SECTION' to '$MODULE' as a hint for the split files - changed 'domain.rng' to 'domaincommon.rng' which contains the defs - added the '$MODULE' to virsh path Note some still may be wrong as I did not chec all paths rigorously. docs/api_extension.html.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 33d82e6ac6..d7fbbd6e90 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -96,7 +96,7 @@ schema and document the new elements or attributes: <code> - docs/schemas/domain.rng + docs/schemas/domaincommon.rng docs/formatdomain.html.in </code> @@ -106,7 +106,7 @@ libvirt library and call the new function: <code> - include/libvirt/libvirt.h.in + include/libvirt/libvirt-$MODULE.h.in src/libvirt_public.syms </code> @@ -137,7 +137,7 @@ The driver structs are defined in: - <code>src/driver.h</code> + <code>src/driver-$MODULE.h</code> To define the internal API, first typedef the driver function @@ -177,7 +177,7 @@ The public API calls are implemented in: - <code>src/libvirt.c</code> + <code>src/libvirt-$MODULE.c</code> <h2><a name='remoteproto'>Implementing the remote protocol</a></h2> @@ -219,9 +219,9 @@ <code> - daemon/remote_dispatch_args.h - daemon/remote_dispatch_prototypes.h - daemon/remote_dispatch_table.h + src/remote/remote_daemon_dispatch_stubs.h + src/remote/remote_daemon_dispatch.h + src/remote/remote_daemon_dispatch.c src/remote/remote_protocol.c src/remote/remote_protocol.h </code> @@ -233,7 +233,7 @@ method calls go in: - <code>src/remote/remote_internal.c</code> + <code>src/remote/remote_driver.c</code> Each remote method invocation does the following: @@ -256,7 +256,7 @@ The server side dispatchers are implemented in: - <code>daemon/remote.c</code> + <code>src/remote/daemon_dispatch.c</code> Again, this step uses the .h files generated by make rpcgen. @@ -309,7 +309,7 @@ <code> - tools/virsh.c + tools/virsh-$MODULE.c tools/virsh.pod </code> -- 2.16.2

2 1

[libvirt] [PATCH v5 0/3] vsh: Introduce new API for printing tables
by Simon Kobyda 28 Aug '18

28 Aug '18

Created new API for priting tables, mainly to solve alignment problems. Implemented these test to virsh list. In the future, API may be everywhere in virsh and virt-admin. Also wrote basic tests for the new API, and corrected tests in virshtest which are influenced by implementation of the API in virsh list. Changes in v5: - cleanup and merged code for calculating zero-width, nonprintable and combined character. - replaced virBufferAddStr with virBufferAddChar in some places - in tests moved code for setting correct locale - fixed few leaks and unitialized values Changes in v4: - fixed width calculation for zero-width, nonprintable and combined character. (pulled some code from linux-util) - added tests for cases mentioned above - changed usage of vshControl variables. From now on PrintToStdout calls PrintToString and then prints returned string to stdout Changes in v3: - changed encoding of 3/3 patch, otherwise it cannot be applied Changes in v2: - added tests - fixed alignment for unicode character which span more spaces - moved ncolumns check to vshTableRowAppend - changed arguments for functions vshTablePrint, vshTablePrintToStdout, vshTablePrintToString Simon Kobyda (3): vsh: Add API for printing tables. virsh: Implement new table API for virsh list vsh: Added tests tests/Makefile.am | 8 + tests/virshtest.c | 14 +- tests/vshtabletest.c | 377 +++++++++++++++++++++++++++++ tools/Makefile.am | 4 +- tools/virsh-domain-monitor.c | 43 ++-- tools/vsh-table.c | 449 +++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++ 7 files changed, 910 insertions(+), 27 deletions(-) create mode 100644 tests/vshtabletest.c create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h -- 2.17.1

6 24

[libvirt] [PATCH v4] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 28 Aug '18

28 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v4: - missed dot comment, fix it with s/./,/ (Andrew Jones <drjones(a)redhat.com>) v3: - more spelling fixes (Andrew Jones <drjones(a)redhat.com>) - place deprecation check after (sockets * cores * threads > max_cpus) check (Eduardo Habkost <ehabkost(a)redhat.com>) v2: - spelling&&co fixes (Andrew Jones <drjones(a)redhat.com>) --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..094b4ca 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs, but historically it was possible to start QEMU with +an incorrect topology where + sockets * cores * threads >= X && X < maxcpus +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies will be removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. + sockets * cores * threads == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..7fd700e 100644 --- a/vl.c +++ b/vl.c @@ -1246,6 +1246,13 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPU topology deprecated: " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } + smp_cpus = cpus; smp_cores = cores; smp_threads = threads; -- 2.7.4

2 1

[libvirt] [PATCH v3] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 28 Aug '18

28 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v3: - more spelling fixes (Andrew Jones <drjones(a)redhat.com>) - place deprecation check after (sockets * cores * threads > max_cpus) check (Eduardo Habkost <ehabkost(a)redhat.com>) v2: - spelling&&co fixes (Andrew Jones <drjones(a)redhat.com>) --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..dc9d9ee 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs. but historically it was possible to start QEMU with +an incorrect topology where + sockets * cores * threads >= X && X < maxcpus +which could lead to an incorrect topology enumeration by the guest. +Support for invalid topologies will be removed, the user must ensure +topologies described with -smp include all possible cpus, i.e. + sockets * cores * threads == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..7fd700e 100644 --- a/vl.c +++ b/vl.c @@ -1246,6 +1246,13 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPU topology deprecated: " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } + smp_cpus = cpus; smp_cores = cores; smp_threads = threads; -- 2.7.4

2 1

[libvirt] [PATCH] qemuargv2xmltest: Fix caps loading in VPATH build
by Jiri Denemark 28 Aug '18

28 Aug '18

Broken by v4.7.0-rc1-9-g6700062fb0. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> Pushed as build-breaker fix. --- tests/qemuargv2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 966e75ef5f..7e250b7b9d 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -159,7 +159,7 @@ mymain(void) do { \ virQEMUCapsPtr qemuCaps; \ qemuCaps = qemuTestParseCapabilitiesArch(VIR_ARCH_X86_64, \ - "qemucapabilitiesdata/caps_2.12.0." arch ".xml"); \ + abs_srcdir "/qemucapabilitiesdata/caps_2.12.0." arch ".xml"); \ if (virFileCacheInsertData(driver.qemuCapsCache, \ "/usr/bin/qemu-system-" arch, \ qemuCaps) < 0) \ -- 2.18.0

1 0

[libvirt] question about job handling across migration protocol phases
by Jim Fehlig 28 Aug '18

28 Aug '18

While investigating a bug [1] found by Xen's osstest I realized I don't quite understand how to handle modify jobs (e.g. BeginJob/EndJob) on virDomainObj across the various phases of V3 migration protocol. E.g. on the src host the Begin, Perform, and Confirm phases are performed. Should a modify job start (BeginJob) in the Begin phase and stop (EndJob) in the Confirm phase? Or should each phase, if necessary, do BeginJob/EndJob? Same question for dst host. IMO the job should be held across the phases on each host, preventing any modifications during the overall migration process. Although I do worry about orphaned jobs, e.g. a missed EndJob caused by some obscure error in the migration machinery. Regards, Jim [1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg01945.html

2 1

[libvirt] [PATCH] util: json: Allow converting a virTristate(Bool|Switch) into JSON
by Peter Krempa 28 Aug '18

28 Aug '18

Add a new modifier letter for virJSONValueObjectAddVArgs which will add a boolean value with our tristate semantics. The value is omitted when the _ABSENT value is used. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/util/virjson.c b/src/util/virjson.c index 29530dcb15..e45f1fab06 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -142,6 +142,8 @@ virJSONValueGetType(const virJSONValue *value) * * b: boolean value * B: boolean value, omitted if false + * T: boolean value specified by a virTristate(Bool|Switch) value, omitted on + * the _ABSENT value * * d: double precision floating point number * n: json null value @@ -266,12 +268,23 @@ virJSONValueObjectAddVArgs(virJSONValuePtr obj, } break; case 'B': + case 'T': case 'b': { int val = va_arg(args, int); if (!val && type == 'B') continue; + if (type == 'T') { + if (val == VIR_TRISTATE_SWITCH_ABSENT) + continue; + + if (val == VIR_TRISTATE_BOOL_NO) + val = 0; + else + val = 1; + } + rc = virJSONValueObjectAppendBoolean(obj, key, val); } break; -- 2.16.2

2 2

[libvirt] [PATCH] qemu: initialize variables in qemuParseCommandLine
by Ján Tomko 28 Aug '18

28 Aug '18

Commit 6700062 introduced a jump to error which skipped the initialization of def: qemu/qemu_parse_command.c:1870:9: error: variable 'def' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!(qemuCaps = virQEMUCapsCacheLookup(capsCache, progargv[0]))) Initialize def to fix this warning and qemuCaps, to prevent a future error like this. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build breaker fix. src/qemu/qemu_parse_command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index c0bf27f800..5b4a378a18 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1838,7 +1838,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, virDomainChrSourceDefPtr *monConfig, bool *monJSON) { - virDomainDefPtr def; + virDomainDefPtr def = NULL; size_t i; bool nographics = false; bool fullscreen = false; @@ -1852,7 +1852,7 @@ qemuParseCommandLine(virFileCachePtr capsCache, virDomainDiskDefPtr disk = NULL; const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS"); bool have_sdl = false; - virQEMUCapsPtr qemuCaps; + virQEMUCapsPtr qemuCaps = NULL; if (pidfile) *pidfile = NULL; -- 2.16.4

1 0

[libvirt] [PATCH] conf: report enum errors in virDomainInputDefValidate
by Ján Tomko 28 Aug '18

28 Aug '18

Commit deb057f added a switch without a default case. Add it and call virReportEnumRangeError for _LAST too. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/domain_conf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bde9fef914..8cb28a0880 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5760,7 +5760,6 @@ virDomainInputDefValidate(const virDomainInputDef *input) case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: if (input->source.evdev) { virReportError(VIR_ERR_XML_ERROR, "%s", _("setting source evdev path only supported for " @@ -5771,6 +5770,11 @@ virDomainInputDefValidate(const virDomainInputDef *input) case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: break; + + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportEnumRangeError(virDomainInputType, input->type); + return -1; } return 0; -- 2.16.4

2 1