- Devel - libvirt List Archives

[libvirt] [PATCH v2 00/15] Firmware auto selection
by Michal Privoznik 12 Mar '19

12 Mar '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-February/msg01503.html As usual, you can find my patches at my github: https://github.com/zippy2/libvirt/commits/firmware_v2 diff to v1: - Hopefully all Lazlo's comment are worked in (fixing the logic that chooses suitable firmware for secboot/SMM domains, commit message adjustements, sanity check for parsed FW descriptions, etc.) - Added more debug messages around FW selection code, i.e. it'll be visible from the logs why given FS is not suitable (or that it is). Michal Prívozník (15): virmock: Initialize both symbols in VIR_MOCK_REAL_INIT_ALT qemu_domain: Separate NVRAM VAR store file name generation qemu_capabilities: Expose qemu <-> libvirt arch translators virDomainLoaderDefParseXML: Allow loader path to be NULL conf: Introduce VIR_DOMAIN_LOADER_TYPE_NONE conf: Introduce firmware attribute to <os/> qemu: Introduce basic skeleton for parsing firmware description test: Introduce qemufirmwaretest qemu_firmware: Introduce qemuFirmwareFetchConfigs qemufirmwaretest: Test qemuFirmwareFetchConfigs() qemu_firmware: Introduce qemuFirmwareFillDomain() qemu_process: Call qemuFirmwareFillDomain qemuDomainDefValidate: Don't require SMM if automatic firmware selection enabled qemu: Enable firmware autoselection qemuxml2argvtest: Test os.firmware autoselection docs/formatdomain.html.in | 22 +- docs/schemas/domaincommon.rng | 12 +- src/conf/domain_conf.c | 113 +- src/conf/domain_conf.h | 15 +- src/libvirt_private.syms | 2 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 34 +- src/qemu/qemu_domain.h | 4 + src/qemu/qemu_firmware.c | 1364 +++++++++++++++++ src/qemu/qemu_firmware.h | 50 + src/qemu/qemu_process.c | 5 + tests/Makefile.am | 14 +- tests/domaincapsschemadata/full.xml | 1 + .../etc/qemu/firmware/40-ovmf-sb-keys.json | 1 + .../etc/qemu/firmware/60-ovmf-sb.json | 0 .../user/.config/qemu/firmware/10-bios.json | 0 .../usr/share/qemu/firmware/40-bios.json | 35 + .../share/qemu/firmware/50-ovmf-sb-keys.json | 36 + .../usr/share/qemu/firmware/60-ovmf-sb.json | 35 + .../usr/share/qemu/firmware/61-ovmf.json | 33 + .../usr/share/qemu/firmware/70-aavmf.json | 35 + tests/qemufirmwaretest.c | 135 ++ ...arch64-os-firmware-efi.aarch64-latest.args | 37 + .../aarch64-os-firmware-efi.xml | 30 + .../os-firmware-bios.x86_64-latest.args | 39 + tests/qemuxml2argvdata/os-firmware-bios.xml | 68 + ...os-firmware-efi-secboot.x86_64-latest.args | 43 + .../os-firmware-efi-secboot.xml | 68 + .../os-firmware-efi.x86_64-latest.args | 42 + tests/qemuxml2argvdata/os-firmware-efi.xml | 68 + tests/qemuxml2argvtest.c | 17 + .../aarch64-os-firmware-efi.xml | 1 + tests/qemuxml2xmloutdata/os-firmware-bios.xml | 1 + .../os-firmware-efi-secboot.xml | 1 + tests/qemuxml2xmloutdata/os-firmware-efi.xml | 1 + tests/qemuxml2xmltest.c | 27 + tests/virmock.h | 5 +- 40 files changed, 2374 insertions(+), 30 deletions(-) create mode 100644 src/qemu/qemu_firmware.c create mode 100644 src/qemu/qemu_firmware.h create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb-keys.json create mode 100644 tests/qemufirmwaredata/etc/qemu/firmware/60-ovmf-sb.json create mode 100644 tests/qemufirmwaredata/home/user/.config/qemu/firmware/10-bios.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/40-bios.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/50-ovmf-sb-keys.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/60-ovmf-sb.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/61-ovmf.json create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/70-aavmf.json create mode 100644 tests/qemufirmwaretest.c create mode 100644 tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-os-firmware-efi.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-bios.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-efi-secboot.xml create mode 100644 tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/os-firmware-efi.xml create mode 120000 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-bios.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml create mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi.xml -- 2.19.2

3 46

[libvirt] [PATCH] conf: Add a function virDomainDefCputuneValidate
by Suyang Chen 12 Mar '19

12 Mar '19

Solve the bitsizedtask: "Move validation checks out of domain XML parsing" Resolves: https://wiki.libvirt.org/page/BiteSizedTasks#Move_validation_checks_out_of_… Signed-off-by: Suyang Chen <dawson0xff(a)gmail.com> --- src/conf/domain_conf.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 995f87bcbe..eb63800b9a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6589,6 +6589,46 @@ virDomainDefMemtuneValidate(const virDomainDef *def) return 0; } +static int +virDomainDefCputuneValidate(const virDomainDef *def) +{ + if (def->cputune.global_period > 0 && + (def->cputune.global_period < 1000 || def->cputune.global_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune global period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.emulator_period > 0 && + (def->cputune.emulator_period < 1000 || + def->cputune.emulator_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.emulator_period > 0 && + (def->cputune.emulator_period < 1000 || + def->cputune.emulator_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_period must be in range " + "[1000, 1000000]")); + return -1; + } + + if (def->cputune.iothread_period > 0 && + (def->cputune.iothread_period < 1000 || + def->cputune.iothread_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune iothread_period must be in range " + "[1000, 1000000]")); + return -1; + } + + return 0; +} static int virDomainDefValidateInternal(const virDomainDef *def) @@ -6628,6 +6668,9 @@ virDomainDefValidateInternal(const virDomainDef *def) if (virDomainDefMemtuneValidate(def) < 0) return -1; + if (virDomainDefCputuneValidate(def) < 0) + return -1; + return 0; } -- 2.20.1

2 1

[libvirt] [PATCH 0/5] snapshots: topological sorting (incremental backup saga)
by Eric Blake 12 Mar '19

12 Mar '19

While working to add new API for bulk dumpxml/redefine, and turn virDomainSnapshotObjList into a base class for sharing with checkpoints, I realized how trivial it would be to take advantage of information already present on the server, instead of using a lot of CPU time with 'virsh snapshot-list --tree' to reconstruct a DAG on the client side. Eric Blake (5): snapshots: Add flag to guarantee topological sort snapshots: Support topological visits test: Support topological visits qemu: Support topological visits virsh: Add snapshot-list --topological include/libvirt/libvirt-domain-snapshot.h | 4 +++ src/conf/snapshot_conf.c | 15 +++++--- src/libvirt-domain-snapshot.c | 42 ++++++++++++++++++++++- src/qemu/qemu_driver.c | 6 ++++ src/test/test_driver.c | 6 ++++ tools/virsh-snapshot.c | 16 +++++++-- tools/virsh.pod | 7 +++- 7 files changed, 86 insertions(+), 10 deletions(-) -- 2.20.1

3 19

[libvirt] [PATCH] tools: vsh: Don't use assert()
by Peter Krempa 12 Mar '19

12 Mar '19

It's meant for testing, not for production builds. Also we have a helper for reporting OOM errors. Introduced by 23e0bf1c4eb6 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tools/vsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 5e483a5d26..5903f129c1 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -385,7 +385,7 @@ vshCmddefCheckInternals(vshControl *ctl, } if ((p = strchr(name, '=')) && VIR_STRNDUP(name, name, p - name) < 0) - assert(false); /* Allocation failure during self-test is bad */ + vshErrorOOM(); for (j = i + 1; cmd->opts[j].name; j++) { if (STREQ(name, cmd->opts[j].name) && cmd->opts[j].type != VSH_OT_ALIAS) -- 2.20.1

2 2

[libvirt] [PATCH 0/6] lxc: Add suport to virConnectGetAllDomainStats().
by Julio Faracco 12 Mar '19

12 Mar '19

This series has a collection of new methods to enable support for virConnectGetAllDomainStats() to LXC driver. The only difference is Disk Stats. It needs to consider only the host file system operations or any other block device as a external disk or partition. Julio Faracco (6): lxc: Introduce method lxcConnectGetAllDomainStats(). lxc: Introduce method lxcDomainGetStats(). lxc: Introduce method lxcDomainGetStatsCpu(). lxc: Introduce method lxcDomainGetStatsState(). lxc: Introduce method lxcDomainGetBlockStats(). lxc: Introduce method lxcDomainGetBalloonStats(). src/lxc/lxc_driver.c | 357 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) -- 2.19.1

3 12

[libvirt] [PATCH v2 0/2] Add function for XML yes|no string handling
by Shotaro Gotanda 12 Mar '19

12 Mar '19

Changes since v1: - remove NULL check of string in virStringParseYesNo - remove error handling in virStringParseYesNo. - remove temporary variable. Shotaro Gotanda (2): util: add virStringParseYesNo() conf: Use virStringParseYesNo() src/conf/domain_conf.c | 30 +++++------------------------- src/conf/secret_conf.c | 12 ++---------- src/util/virstring.c | 23 +++++++++++++++++++++++ src/util/virstring.h | 3 +++ 4 files changed, 33 insertions(+), 35 deletions(-) -- 2.19.1

2 6

[libvirt] [PATCH] tests: Drop unnecessary variables
by Andrea Bolognani 12 Mar '19

12 Mar '19

In qemuxml2xmltest, both activeVcpus and blockjobs members of the testInfo struct have been entirely unused ever since commit d1a7fc8bb303. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. tests/qemuxml2xmltest.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e08d30c676..3efa498114 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -30,9 +30,6 @@ struct testInfo { char *outActiveName; char *outInactiveName; - virBitmapPtr activeVcpus; - bool blockjobs; - virQEMUCapsPtr qemuCaps; }; @@ -108,9 +105,6 @@ testInfoClear(struct testInfo *info) VIR_FREE(info->outActiveName); VIR_FREE(info->outInactiveName); - virBitmapFree(info->activeVcpus); - info->activeVcpus = NULL; - virObjectUnref(info->qemuCaps); } -- 2.20.1

1 0

[libvirt] [jenkins-ci PATCH 0/3] lcitool: tweaks to exception handling
by Daniel P. Berrangé 12 Mar '19

12 Mar '19

A few tweaks to exception handling identified in previous discussions about the use of Exception. Daniel P. Berrangé (3): lcitool: remove Error class for exception handling lcitool: push exception catching down into run method lcitool: add support for --debug / -d argument guests/lcitool | 72 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) -- 2.20.1

2 7

[libvirt] [PATCH] virsh: Make self-test failures noisy
by Eric Blake 12 Mar '19

12 Mar '19

In local testing, I accidentally introduced a self-test failure, and spent way too much time debugging it. Make sure the testsuite log includes some hint as to why command option validation failed. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/vsh.c | 56 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 2fd1564d15..1d30019c2c 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -331,21 +331,26 @@ vshCmddefGetInfo(const vshCmdDef * cmd, const char *name) /* Check if the internal command definitions are correct */ static int -vshCmddefCheckInternals(const vshCmdDef *cmd) +vshCmddefCheckInternals(vshControl *ctl, + const vshCmdDef *cmd) { size_t i; const char *help = NULL; /* in order to perform the validation resolve the alias first */ if (cmd->flags & VSH_CMD_FLAG_ALIAS) { - if (!cmd->alias) + if (!cmd->alias) { + vshError(ctl, _("command '%s' has inconsistent alias"), cmd->name); return -1; + } cmd = vshCmddefSearch(cmd->alias); } /* Each command has to provide a non-empty help string. */ - if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) + if (!(help = vshCmddefGetInfo(cmd, "help")) || !*help) { + vshError(ctl, _("command '%s' lacks help"), cmd->name); return -1; + } if (!cmd->opts) return 0; @@ -353,14 +358,19 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) for (i = 0; cmd->opts[i].name; i++) { const vshCmdOptDef *opt = &cmd->opts[i]; - if (i > 63) + if (i > 63) { + vshError(ctl, _("command '%s' has too many options"), cmd->name); return -1; /* too many options */ + } switch (opt->type) { case VSH_OT_STRING: case VSH_OT_BOOL: - if (opt->flags & VSH_OFLAG_REQ) - return -1; /* nor bool nor string options can't be mandatory */ + if (opt->flags & VSH_OFLAG_REQ) { + vshError(ctl, _("command '%s' misused VSH_OFLAG_REQ"), + cmd->name); + return -1; /* neither bool nor string options can be mandatory */ + } break; case VSH_OT_ALIAS: { @@ -368,11 +378,17 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) char *name = (char *)opt->help; /* cast away const */ char *p; - if (opt->flags || !opt->help) + if (opt->flags || !opt->help) { + vshError(ctl, _("command '%s' has incorrect alias option"), + cmd->name); return -1; /* alias options are tracked by the original name */ + } if ((p = strchr(name, '=')) && - VIR_STRNDUP(name, name, p - name) < 0) + VIR_STRNDUP(name, name, p - name) < 0) { + vshError(ctl, _("allocation failure while checking command '%s'"), + cmd->name); return -1; + } for (j = i + 1; cmd->opts[j].name; j++) { if (STREQ(name, cmd->opts[j].name) && cmd->opts[j].type != VSH_OT_ALIAS) @@ -381,21 +397,33 @@ vshCmddefCheckInternals(const vshCmdDef *cmd) if (name != opt->help) { VIR_FREE(name); /* If alias comes with value, replacement must not be bool */ - if (cmd->opts[j].type == VSH_OT_BOOL) + if (cmd->opts[j].type == VSH_OT_BOOL) { + vshError(ctl, _("command '%s' has mismatched alias type"), + cmd->name); return -1; + } } - if (!cmd->opts[j].name) + if (!cmd->opts[j].name) { + vshError(ctl, _("command '%s' has missing alias option"), + cmd->name); return -1; /* alias option must map to a later option name */ + } } break; case VSH_OT_ARGV: - if (cmd->opts[i + 1].name) + if (cmd->opts[i + 1].name) { + vshError(ctl, _("command '%s' has option after argv"), + cmd->name); return -1; /* argv option must be listed last */ + } break; case VSH_OT_DATA: - if (!(opt->flags & VSH_OFLAG_REQ)) + if (!(opt->flags & VSH_OFLAG_REQ)) { + vshError(ctl, _("command '%s' has non-required VSH_OT_DATA"), + cmd->name); return -1; /* OT_DATA should always be required. */ + } break; case VSH_OT_INT: @@ -3405,7 +3433,7 @@ const vshCmdInfo info_selftest[] = { * That runs vshCmddefOptParse which validates * the per-command options structure. */ bool -cmdSelfTest(vshControl *ctl ATTRIBUTE_UNUSED, +cmdSelfTest(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { const vshCmdGrp *grp; @@ -3413,7 +3441,7 @@ cmdSelfTest(vshControl *ctl ATTRIBUTE_UNUSED, for (grp = cmdGroups; grp->name; grp++) { for (def = grp->commands; def->name; def++) { - if (vshCmddefCheckInternals(def) < 0) + if (vshCmddefCheckInternals(ctl, def) < 0) return false; } } -- 2.20.1

3 4

[libvirt] [libvirt-go PATCH] connect: Add the new libvirt API virConnectGetStoragePoolCapabilities
by Erik Skultety 12 Mar '19

12 Mar '19

Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- connect.go | 17 +++++++++++++++++ connect_wrapper.go | 13 +++++++++++++ connect_wrapper.h | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/connect.go b/connect.go index 0d5118c..04badfc 100644 --- a/connect.go +++ b/connect.go @@ -2985,3 +2985,20 @@ func (c *Connect) NWFilterBindingCreateXML(xmlConfig string, flags uint32) (*NWF } return &NWFilterBinding{ptr: ptr}, nil } + +// See also https://libvirt.org/html/libvirt-libvirt-storage.html#virConnectGetStorageP… +func (c *Connect) GetStoragePoolCapabilities(flags uint32) (string, error) { + if C.LIBVIR_VERSION_NUMBER < 5002000 { + return "", makeNotImplementedError("virConnectGetStoragePoolCapabilities") + } + + var err C.virError + ret := C.virConnectGetStoragePoolCapabilitiesWrapper(c.ptr, C.uint(flags), &err) + if ret == nil { + return "", makeError(&err) + } + + defer C.free(unsafe.Pointer(ret)) + + return C.GoString(ret), nil +} diff --git a/connect_wrapper.go b/connect_wrapper.go index 89727d0..7be3361 100644 --- a/connect_wrapper.go +++ b/connect_wrapper.go @@ -1761,6 +1761,19 @@ virStreamNewWrapper(virConnectPtr conn, } +char * +virConnectGetStoragePoolCapabilitiesWrapper(virConnectPtr conn, + unsigned int flags, + virErrorPtr err) +{ + char * ret = virConnectGetStoragePoolCapabilities(conn, flags); + if (!ret) { + virCopyLastError(err); + } + return ret; +} + + //////////////////////////////////////////////// */ import "C" diff --git a/connect_wrapper.h b/connect_wrapper.h index 5c282d2..2e57ebd 100644 --- a/connect_wrapper.h +++ b/connect_wrapper.h @@ -726,5 +726,9 @@ virStreamNewWrapper(virConnectPtr conn, unsigned int flags, virErrorPtr err); +char * +virConnectGetStoragePoolCapabilitiesWrapper(virConnectPtr conn, + unsigned int flags, + virErrorPtr err); #endif /* LIBVIRT_GO_CONNECT_WRAPPER_H__ */ -- 2.20.1

2 3