- Devel - libvirt List Archives

[libvirt] [PATCH v2] test_driver: implement virDomainGetMemoryParameters
by Ilias Stamatis 02 Jul '19

02 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- Things changed since v1: - virDomainObjGetOneDef is used in order to get the appropriate def - the TEST_ASSIGN_MEM_PARAM macro got removed src/test/test_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..01b3ed88f3 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2514,6 +2514,57 @@ testDomainGetMaxVcpus(virDomainPtr domain) VIR_DOMAIN_VCPU_MAXIMUM)); } + +static int +testDomainGetMemoryParameters(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + int ret = -1; + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 3; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (*nparams > 0 && + virTypedParameterAssign(&params[0], VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, def->mem.hard_limit) < 0) + goto cleanup; + + if (*nparams > 1 && + virTypedParameterAssign(&params[1], VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, def->mem.soft_limit) < 0) + goto cleanup; + + if (*nparams > 2 && + virTypedParameterAssign(&params[2], VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, def->mem.swap_hard_limit) < 0) + goto cleanup; + + if (*nparams > 3) + *nparams = 3; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, unsigned int flags) @@ -7275,6 +7326,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ + .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ -- 2.22.0

2 4

[libvirt] [PATCH v2] test_driver: implement virDomainGetInterfaceParameters
by Ilias Stamatis 02 Jul '19

02 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- The only thing changed since v1 is calling virDomainObjGetOneDef to get the appropriate def pointer. src/test/test_driver.c | 104 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..dd756ed8bd 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1964,6 +1964,109 @@ static int testDomainGetInfo(virDomainPtr domain, return ret; } + +static int +testDomainGetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + size_t i; + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainNetDefPtr net = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 7; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (!(net = virDomainNetFind(def, device))) + goto cleanup; + + for (i = 0; i < *nparams && i < 7; i++) { + switch (i) { + case 0: /* inbound.average */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->average; + break; + case 1: /* inbound.peak */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_PEAK, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->peak; + break; + case 2: /* inbound.burst */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_BURST, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->burst; + break; + case 3: /* inbound.floor */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_FLOOR, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->floor; + break; + case 4: /* outbound.average */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->average; + break; + case 5: /* outbound.peak */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_PEAK, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->peak; + break; + case 6: /* outbound.burst */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_BURST, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->burst; + break; + } + } + + if (*nparams > 7) + *nparams = 7; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetState(virDomainPtr domain, int *state, @@ -7258,6 +7361,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ .domainGetHostname = testDomainGetHostname, /* 5.5.0 */ .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ + .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ .domainGetState = testDomainGetState, /* 0.9.2 */ .domainGetTime = testDomainGetTime, /* 5.4.0 */ .domainSave = testDomainSave, /* 0.3.2 */ -- 2.22.0

2 3

[libvirt] [PATCH 0/2] Couple of test_driver fixes
by Michal Privoznik 02 Jul '19

02 Jul '19

I was too eager to minimize patch 89320788ac4 and did some mistakes. Here are the fixes. Michal Prívozník (2): test_driver: Don't access @vm after it was set to NULL test_driver: Don't report VIR_DOMAIN_DISK_ERROR_NONE src/test/test_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH v2 8/9] docs: Deprecate CPU model runnability guarantees
by Eduardo Habkost 02 Jul '19

02 Jul '19

Document that CPU model runnability guarantees won't apply to unversioned CPU models anymore. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- Changes v1 -> v2: * (none) Cc: libvir-list(a)redhat.com --- qemu-deprecated.texi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9cba82d5ec..18f85f70e1 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -276,3 +276,22 @@ Note that if you are exposing the export via /dev/nbd0, it is easier to just export the entire image and then mount only /dev/nbd0p1 than it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a subset of the image. + +@section Backwards compatibility + +@subsection Runnability guarantee of CPU models (since 4.1.0) + +Previous versions of QEMU never changed existing CPU models in +ways that introduced additional host software or hardware +requirements to the VM. This allowed management software to +safely change the machine type of an existing VM without +introducing new requirements ("runnability guarantee"). This +prevented CPU models from being updated to include CPU +vulnerability mitigations, leaving guests vulnerable in the +default configuration. + +The CPU model runnability guarantee won't apply anymore to +existing CPU models. Management software that needs runnability +guarantees must resolve the CPU model aliases using te +``alias-of'' field returned by the ``query-cpu-definitions'' QMP +command. -- 2.18.0.rc1.1.g3f1ff2140

2 1

[libvirt] [PATCH] qemu: remove a redundant call from qemuDomainGetPerfEvents
by Ilias Stamatis 02 Jul '19

02 Jul '19

Calling virDomainObjUpdateModificationImpact directly inside the function body is redundant, since the same function call is embedded into virDomainObjGetOneDef. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/qemu/qemu_driver.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ef2e980216..6bfbc31c1c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10339,9 +10339,6 @@ qemuDomainGetPerfEvents(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; - if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) - goto endjob; - if (!(def = virDomainObjGetOneDef(vm, flags))) goto endjob; -- 2.22.0

2 1

[libvirt] mdevctl: A shoestring mediated device management and persistence utility
by Alex Williamson 01 Jul '19

01 Jul '19

Hi, Currently mediated device management, much like SR-IOV VF management, is largely left as an exercise for the user. This is an attempt to provide something and see where it goes. I doubt we'll solve everyone's needs on the first pass, but maybe we'll solve enough and provide helpers for the rest. Without further ado, I'll point to what I have so far: https://github.com/awilliam/mdevctl This is inspired by driverctl, which is also a bash utility. mdevctl uses udev and systemd to record and recreate mdev devices for persistence and provides a command line utility for querying, listing, starting, stopping, adding, and removing mdev devices. Currently, for better or worse, it considers anything created to be persistent. I can imagine a global configuration option that might disable this and perhaps an autostart flag per mdev device, such that mdevctl might simply "know" about some mdevs but not attempt to create them automatically. Clearly command line usage help, man pages, and packaging are lacking as well, release early, release often, plus this is a discussion starter to see if perhaps this is sufficient to meet some needs. Originally I thought about making a utility to manage both mdev and SR-IOV VFs all in one, but it seemed more natural to start here (besides, I couldn't think of a good name for the combined utility). If this seems useful, maybe I'll start on a vfctl for SR-IOV and we'll see whether they have enough synergy to become one. It would be really useful if s390 folks could help me understand whether it's possible to glean all the information necessary to recreate a ccw or ap mdev device from sysfs. I expect the file where we currently only store the mdev_type to evolve into something that includes more information to facilitate more complicated devices. For now I make no claims to maintaining compatibility of recorded mdev devices, it will absolutely change, but I didn't want to get bogged down in making sure I don't accidentally source a root kit hidden in an mdev config file. I'm also curious how or if libvirt or openstack might use this. If nothing else, it makes libvirt hook scripts easier to write, especially if we add an option not to autostart mdevs, or if users don't mind persistent mdevs, maybe there's nothing more to do. BTW, feel free to clean up by bash, I'm a brute force and ignorance shell coder ;) Thanks, Alex

7 50

[libvirt] [PATCH] rpc: Fix build error for virNetServerNew ATTRIBUTE_NONNULL values
by John Ferlan 01 Jul '19

01 Jul '19

Commit 5a148ce84 altered the virNetServerNew to remove a parameter but neglected to update the ATTRIBUTE_NONNULL's which causes a build failure for when checking is enabled such as when lv_cv_static_analysis is enabled. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing as build breaker/trivial src/rpc/virnetserver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index b47b71b4b2..6b2541588c 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -42,7 +42,7 @@ virNetServerPtr virNetServerNew(const char *name, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, virFreeCallback clientPrivFree, void *clientPrivOpaque) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11) ATTRIBUTE_NONNULL(13); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(10) ATTRIBUTE_NONNULL(12); virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, const char *name, -- 2.20.1

1 0

[libvirt] [PATCH] tools: Fix permissions for virt-pki-validate.in
by Andrea Bolognani 01 Jul '19

01 Jul '19

While the script ultimately needs to be executable, the source file really shouldn't be. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. tools/virt-pki-validate.in | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tools/virt-pki-validate.in diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in old mode 100755 new mode 100644 -- 2.21.0

1 0

[libvirt] [PATCH] test_driver: Fix permissions for test_driver.c
by Andrea Bolognani 01 Jul '19

01 Jul '19

Introduced in commit 4a6ee53581b3. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/test/test_driver.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/test/test_driver.c diff --git a/src/test/test_driver.c b/src/test/test_driver.c old mode 100755 new mode 100644 -- 2.21.0

1 0

[libvirt] [PATCH v2] test_driver: implement virDomainGetNumaParameters
by Ilias Stamatis 01 Jul '19

01 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..dc6d3b078c 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2405,6 +2405,57 @@ testDomainCoreDump(virDomainPtr domain, } +static int +testDomainGetNumaParameters(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virDomainNumatuneMemMode mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + VIR_AUTOFREE(char *) nodeset = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 2; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + ignore_value(virDomainNumatuneGetMode(def->numa, -1, &mode)); + if (*nparams > 0 && + virTypedParameterAssign(&params[0], VIR_DOMAIN_NUMA_MODE, VIR_TYPED_PARAM_INT, mode) < 0) + goto cleanup; + + nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1); + if (*nparams > 1 && (!nodeset || + virTypedParameterAssign(&params[1], + VIR_DOMAIN_NUMA_NODESET, + VIR_TYPED_PARAM_STRING, + nodeset) < 0)) + goto cleanup; + nodeset = NULL; + + if (*nparams > 2) + *nparams = 2; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static char * testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { @@ -7251,6 +7302,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ + .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetLaunchSecurityInfo = testDomainGetLaunchSecurityInfo, /* 5.5.0 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ -- 2.22.0

2 1

[libvirt] [PATCH] docs: fix acl permission docs
by Ján Tomko 01 Jul '19

01 Jul '19

We have been grouping network-port and nwfilter-binding permissions under virNetworkPtr and virNWFilterPtr respectively. Add the two missing classes that were matched because they contain a substring of others. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/genaclperms.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/genaclperms.pl b/docs/genaclperms.pl index d878321a90..34c526021c 100755 --- a/docs/genaclperms.pl +++ b/docs/genaclperms.pl @@ -22,7 +22,8 @@ use warnings; my @objects = ( "CONNECT", "DOMAIN", "INTERFACE", - "NETWORK","NODE_DEVICE", "NWFILTER", + "NETWORK_PORT", "NETWORK", "NODE_DEVICE", + "NWFILTER_BINDING", "NWFILTER", "SECRET", "STORAGE_POOL", "STORAGE_VOL", ); -- 2.20.1

2 2

[libvirt] [PATCH] test_driver: virDomainGetPerfEvents
by Ilias Stamatis 01 Jul '19

01 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..215171839c 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3293,6 +3293,53 @@ static int testDomainGetDiskErrors(virDomainPtr dom, return ret; } + +static int +testDomainGetPerfEvents(virDomainPtr dom, + virTypedParameterPtr *params, + int *nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + virTypedParameterPtr par = NULL; + size_t i; + int maxpar = 0; + int npar = 0; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) + goto cleanup; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + for (i = 0; i < VIR_PERF_EVENT_LAST; i++) { + if (virTypedParamsAddBoolean(&par, &npar, &maxpar, + virPerfEventTypeToString(i), + def->perf.events[i] == VIR_TRISTATE_BOOL_YES) < 0) + goto cleanup; + } + + VIR_STEAL_PTR(*params, par); + *nparams = npar; + npar = 0; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + virTypedParamsFree(par, npar); + return ret; +} + + static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *nparams) { @@ -7287,6 +7334,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetAutostart = testDomainGetAutostart, /* 0.3.2 */ .domainSetAutostart = testDomainSetAutostart, /* 0.3.2 */ .domainGetDiskErrors = testDomainGetDiskErrors, /* 5.4.0 */ + .domainGetPerfEvents = testDomainGetPerfEvents, /* 5.6.0 */ .domainGetSchedulerType = testDomainGetSchedulerType, /* 0.3.2 */ .domainGetSchedulerParameters = testDomainGetSchedulerParameters, /* 0.3.2 */ .domainGetSchedulerParametersFlags = testDomainGetSchedulerParametersFlags, /* 0.9.2 */ -- 2.22.0

2 3

[libvirt] [PATCH] docs: Document virDomainQemuAttach() removal
by Andrea Bolognani 01 Jul '19

01 Jul '19

It has been dropped in 215d9393bb60615f957f4, but not all of the documentation has been updated accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/drvqemu.html.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 9deb135b18..12b2c2bd2f 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -478,7 +478,8 @@ mount -t cgroup none /dev/cgroup -o devices qemu guest (<span class="since">Since 0.8.3</span>), and <code>virDomainQemuAttach</code>, for registering a qemu domain that was manually started so that it can then be managed - by libvirtd (<span class="since">Since 0.9.4</span>). + by libvirtd (<span class="since">Since 0.9.4</span>, + <span class="removed">removed as of 5.5.0</span>). </p> <p>Additionally, the following XML additions allow fine-tuning of the command line given to qemu when starting a domain -- 2.21.0

2 1

[libvirt] [PATCH] qemu: add bochs-display device
by Jonathon Jongsma 01 Jul '19

01 Jul '19

qemu provides the bochs-display video device since 3.0. This patch adds support for this device in libvirt. See Gerd's post for more details: https://www.kraxel.org/blog/2018/10/qemu-vga-emulation-and-bochs-display/ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1643404 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Note that the documentation may need to be changed depending on which version the patch makes it into. I suppose it'll miss 5.5.0 since we're in freeze right now. Note: depending on which distribution you're using, you may need to copy the vgabios into place in order to test. For example: $ sudo ln -s /path/to/qemu/pc-bios/vgabios-bochs-display.bin /usr/share/qemu/ docs/formatdomain.html.in | 5 +-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 2 ++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 4 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 18 +++++++---- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../video-bochs-display-device.args | 32 +++++++++++++++++++ .../video-bochs-display-device.xml | 29 +++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 22 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-bochs-display-device.args create mode 100644 tests/qemuxml2argvdata/video-bochs-display-device.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a7a6ec32a5..9298ee7b16 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6990,8 +6990,9 @@ qemu-kvm -net nic,model=? /dev/null attribute which takes the value "vga", "cirrus", "vmvga", "xen", "vbox", "qxl" (<span class="since">since 0.8.6</span>), "virtio" (<span class="since">since 1.3.0</span>), - "gop" (<span class="since">since 3.2.0</span>), or - "none" (<span class="since">since 4.6.0</span>) + "gop" (<span class="since">since 3.2.0</span>), + "none" (<span class="since">since 4.6.0</span>, or "bochs-display" + (<span class="since">since 5.5.0</span>) depending on the hypervisor features available. The purpose of the type <code>none</code> is to instruct libvirt not to add a default video device in the guest (see the paragraph above). diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 31db599ab9..2ccb393432 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3584,6 +3584,7 @@ <value>virtio</value> <value>gop</value> <value>none</value> + <value>bochs-display</value> </choice> </attribute> <group> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3323c9a5b1..f6da230c18 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -738,6 +738,7 @@ VIR_ENUM_IMPL(virDomainVideo, "virtio", "gop", "none", + "bochs-display", ); VIR_ENUM_IMPL(virDomainVideoVGAConf, @@ -15158,6 +15159,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, case VIR_DOMAIN_VIDEO_TYPE_VGA: case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: case VIR_DOMAIN_VIDEO_TYPE_VMVGA: + case VIR_DOMAIN_VIDEO_TYPE_BOCHS_DISPLAY: if (def->virtType == VIR_DOMAIN_VIRT_VBOX) return 8 * 1024; else if (def->virtType == VIR_DOMAIN_VIRT_VMWARE) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c1b5fc1337..e8e468426b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1385,6 +1385,7 @@ typedef enum { VIR_DOMAIN_VIDEO_TYPE_VIRTIO, VIR_DOMAIN_VIDEO_TYPE_GOP, VIR_DOMAIN_VIDEO_TYPE_NONE, + VIR_DOMAIN_VIDEO_TYPE_BOCHS_DISPLAY, VIR_DOMAIN_VIDEO_TYPE_LAST } virDomainVideoType; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 02e84edc15..ec68d05112 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -533,6 +533,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "x86-max-cpu", "cpu-unavailable-features", "canonical-cpu-features", + + /* 330 */ + "bochs-display", ); @@ -1121,6 +1124,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-serial-pci-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL }, { "virtio-serial-pci-non-transitional", QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL }, { "max-x86_64-cpu", QEMU_CAPS_X86_MAX_CPU }, + { "bochs-display", QEMU_CAPS_DEVICE_BOCHS_DISPLAY }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 915ba6cb2e..3cb56e63f4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -515,6 +515,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */ QEMU_CAPS_CANONICAL_CPU_FEATURES, /* avoid CPU feature aliases */ + /* 335 */ + QEMU_CAPS_DEVICE_BOCHS_DISPLAY, /* -device bochs-display */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 688dc324c6..5455b42f4a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -111,6 +111,7 @@ VIR_ENUM_IMPL(qemuVideo, "", /* no need for virtio */ "" /* don't support gop */, "" /* 'none' doesn't make sense here */, + "bochs-display", ); VIR_ENUM_DECL(qemuDeviceVideo); @@ -128,6 +129,7 @@ VIR_ENUM_IMPL(qemuDeviceVideo, "virtio-vga", "" /* don't support gop */, "" /* 'none' doesn't make sense here */, + "bochs-display", ); VIR_ENUM_DECL(qemuDeviceVideoSecondary); @@ -145,6 +147,7 @@ VIR_ENUM_IMPL(qemuDeviceVideoSecondary, "virtio-gpu", "" /* don't support gop */, "" /* 'none' doesn't make sense here */, + "bochs-display", ); VIR_ENUM_DECL(qemuSoundCodec); @@ -4748,13 +4751,16 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (video->heads) virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); } - } else if (video->vram && - ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || - (video->type == VIR_DOMAIN_VIDEO_TYPE_VMVGA && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VMWARE_SVGA_VGAMEM)))) { + } else if (video->vram) { + if ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || + (video->type == VIR_DOMAIN_VIDEO_TYPE_VMVGA && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_VMWARE_SVGA_VGAMEM))) { - virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vram / 1024); + virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vram / 1024); + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_BOCHS_DISPLAY) { + virBufferAsprintf(&buf, ",vgamem=%uk", video->vram); + } } if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d71d9b3273..4e7ed45ff9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4969,6 +4969,7 @@ qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video) case VIR_DOMAIN_VIDEO_TYPE_VMVGA: case VIR_DOMAIN_VIDEO_TYPE_QXL: case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: + case VIR_DOMAIN_VIDEO_TYPE_BOCHS_DISPLAY: case VIR_DOMAIN_VIDEO_TYPE_LAST: break; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 4b99e8ca93..677a3f0499 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -929,6 +929,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_VIDEO_TYPE_VBOX: case VIR_DOMAIN_VIDEO_TYPE_QXL: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: + case VIR_DOMAIN_VIDEO_TYPE_BOCHS_DISPLAY: return pciFlags; case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 40718981a8..61be1df782 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -151,6 +151,7 @@ <flag name='memory-backend-memfd.hugetlb'/> <flag name='iothread.poll-max-ns'/> <flag name='memory-backend-file.align'/> + <flag name='bochs-display'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900757</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index c6394db602..7a322030bd 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -198,6 +198,7 @@ <flag name='memory-backend-file.align'/> <flag name='nvdimm.unarmed'/> <flag name='x86-max-cpu'/> + <flag name='bochs-display'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100757</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index ee6921ff92..400dc45be4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -156,6 +156,7 @@ <flag name='memory-backend-file.align'/> <flag name='memory-backend-file.pmem'/> <flag name='overcommit'/> + <flag name='bochs-display'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900758</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index a8cb061bf3..434c644ad4 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -201,6 +201,7 @@ <flag name='nvdimm.unarmed'/> <flag name='overcommit'/> <flag name='x86-max-cpu'/> + <flag name='bochs-display'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100758</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 250b7edd52..8fe369f518 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -163,6 +163,7 @@ <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> + <flag name='bochs-display'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700758</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 24b55002a6..2df230c4f7 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -168,6 +168,7 @@ <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> + <flag name='bochs-display'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900758</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 230e1e7c99..f4acda457a 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -166,6 +166,7 @@ <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> + <flag name='bochs-display'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 4b2f4cf628..e71d83ee06 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -166,6 +166,7 @@ <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> + <flag name='bochs-display'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 716b756979..1d44a5a1ba 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -205,6 +205,7 @@ <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> + <flag name='bochs-display'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100758</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 9cbf65b405..f336aeb48c 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -207,6 +207,7 @@ <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> <flag name='canonical-cpu-features'/> + <flag name='bochs-display'/> <version>4000050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100759</microcodeVersion> diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.args b/tests/qemuxml2argvdata/video-bochs-display-device.args new file mode 100644 index 0000000000..f88e9ccb04 --- /dev/null +++ b/tests/qemuxml2argvdata/video-bochs-display-device.args @@ -0,0 +1,32 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 1024 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-usb \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ +id=drive-ide0-0-0,cache=none \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-device bochs-display,id=video0,vgamem=16384k,bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.xml b/tests/qemuxml2argvdata/video-bochs-display-device.xml new file mode 100644 index 0000000000..f64fed4c7e --- /dev/null +++ b/tests/qemuxml2argvdata/video-bochs-display-device.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='bochs-display' vram='16384' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 91ca35d469..07b3689776 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2006,6 +2006,9 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_VGA, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS); + DO_TEST("video-bochs-display-device", + QEMU_CAPS_DEVICE_BOCHS_DISPLAY, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_PARSE_ERROR("video-invalid-multiple-devices", NONE); -- 2.20.1

4 3

[libvirt] [PATCH] virDomainGetPerfEvents docstring: virTypedParameterFlags are also supported
by Ilias Stamatis 01 Jul '19

01 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/libvirt-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 50767a75ed..e2594a3392 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -9730,7 +9730,7 @@ virDomainOpenChannel(virDomainPtr dom, * @domain: a domain object * @params: where to store perf events setting * @nparams: number of items in @params - * @flags: bitwise-OR of virDomainModificationImpact + * @flags: bitwise-OR of virDomainModificationImpact and virTypedParameterFlags * * Get all Linux perf events setting. Possible fields returned in * @params are defined by VIR_PERF_EVENT_* macros and new fields -- 2.22.0

2 1

[libvirt] [PATCH] SpaprVio addresses are 32-bit, not 64-bit
by David Gibson 01 Jul '19

01 Jul '19

spapr-vio addresses are used on POWER platform qemu guests, which are based on the PAPR specification. PAPR specifies a number of virtual devices (but not virtio protocol) which are addressed in an abstract namespace. Currently, libvirt encodes these addresses as 64-bit values. This is not correct: spapr-vio addresses are, and always have been 32-bit. That's true both by the PAPR specification and the qemu implementation. Therefore, change this in libvirt. This looks like it would be a breaking change, but it actually isn't. Because these have always been 32-bit at the lower levels, any attempt to use a value here > 0xffffffff would always have failed in any case, this will just make it fail earlier and more clearly. Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au> --- src/conf/device_conf.c | 2 +- src/conf/device_conf.h | 2 +- src/conf/domain_conf.c | 2 +- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_parse_command.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 2f82bdc2a7..42f83b0344 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -582,7 +582,7 @@ virDomainDeviceSpaprVioAddressParseXML(xmlNodePtr node, reg = virXMLPropString(node, "reg"); if (reg) { - if (virStrToLong_ull(reg, NULL, 16, &addr->reg) < 0) { + if (virStrToLong_ul(reg, NULL, 16, &addr->reg) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot parse <address> 'reg' attribute")); ret = -1; diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index b3299ac69d..02cf8c70ad 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -101,7 +101,7 @@ struct _virDomainDeviceUSBAddress { typedef struct _virDomainDeviceSpaprVioAddress virDomainDeviceSpaprVioAddress; typedef virDomainDeviceSpaprVioAddress *virDomainDeviceSpaprVioAddressPtr; struct _virDomainDeviceSpaprVioAddress { - unsigned long long reg; + unsigned long reg; bool has_reg; }; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 97ba8bd53a..02e58dc54d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7135,7 +7135,7 @@ virDomainDeviceInfoFormat(virBufferPtr buf, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO: if (info->addr.spaprvio.has_reg) - virBufferAsprintf(&attrBuf, " reg='0x%llx'", info->addr.spaprvio.reg); + virBufferAsprintf(&attrBuf, " reg='0x%lx'", info->addr.spaprvio.reg); break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 59dc134785..fab622f533 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -395,7 +395,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, } } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { if (info->addr.spaprvio.has_reg) - virBufferAsprintf(buf, ",reg=0x%llx", info->addr.spaprvio.reg); + virBufferAsprintf(buf, ",reg=0x%lx", info->addr.spaprvio.reg); } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { if (info->addr.ccw.assigned) virBufferAsprintf(buf, ",devno=%x.%x.%04x", @@ -4332,7 +4332,7 @@ qemuBuildNVRAMDevStr(virDomainNVRAMDefPtr dev) if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO && dev->info.addr.spaprvio.has_reg) { - virBufferAsprintf(&buf, "spapr-nvram.reg=0x%llx", + virBufferAsprintf(&buf, "spapr-nvram.reg=0x%lx", dev->info.addr.spaprvio.reg); } else { virReportError(VIR_ERR_XML_ERROR, "%s", diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 4b99e8ca93..19562c9311 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -204,7 +204,7 @@ qemuDomainAssignSpaprVIOAddress(virDomainDefPtr def, while (ret != 0) { if (user_reg) { virReportError(VIR_ERR_XML_ERROR, - _("spapr-vio address %#llx already in use"), + _("spapr-vio address %#lx already in use"), info->addr.spaprvio.reg); return -EEXIST; } diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index fc3f70fcde..35d1df8ceb 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -2549,8 +2549,8 @@ qemuParseCommandLine(virFileCachePtr capsCache, def->nvram->info.addr.spaprvio.has_reg = true; val += strlen("spapr-nvram.reg="); - if (virStrToLong_ull(val, NULL, 16, - &def->nvram->info.addr.spaprvio.reg) < 0) { + if (virStrToLong_ul(val, NULL, 16, + &def->nvram->info.addr.spaprvio.reg) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot parse nvram's address '%s'"), val); goto error; -- 2.21.0

3 5

[libvirt] [PATCH] docs: Provide documentation for SEV launch security (DO NOT PUSH)
by Erik Skultety 01 Jul '19

01 Jul '19

--- I sent this as a patch to get a review on the contents itself, but I believe it should live as an article on our wiki page afterwards. docs/launch_security_sev.html.in | 536 +++++++++++++++++++++++++++++++ 1 file changed, 536 insertions(+) create mode 100644 docs/launch_security_sev.html.in diff --git a/docs/launch_security_sev.html.in b/docs/launch_security_sev.html.in new file mode 100644 index 0000000000..42db10b33a --- /dev/null +++ b/docs/launch_security_sev.html.in @@ -0,0 +1,536 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta charset="UTF-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1"/> + <link rel="stylesheet" type="text/css" href="main.css"/> + <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"/> + <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/> + <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/> + <link rel="manifest" href="/manifest.json"/> + <meta name="theme-color" content="#ffffff"/> + <title>libvirt: Launch security with AMD SEV</title> + <meta name="description" content="libvirt, virtualization, virtualization API"/> + <script type="text/javascript" src="js/main.js"> +  + </script> + </head> + <body onload="pageload()"> + <div id="body"> + <div id="content"> + <h1>Launch security with AMD SEV</h1> + <ul> + <li> + <a href="#Host">Enabling SEV on the host</a> + </li> + <li> + <a href="#Virt">Checking SEV support in the virt stack</a> + </li> + <li> + <a href="#Configuration">VM Configuration</a> + </li> + <li> + <a href="#Limitations">Limitations</a> + </li> + <li> + <a href="#Examples">Full domain XML examples</a> + </li> + </ul> + </div> + <p> + Storage encryption in modern public cloud computing is a common practice. + However, from the point of view of a user of these cloud workloads, a + significant amount of trust needs to be put in the cloud platform security as + well as integrity (was the hypervisor tampered?). For this reason there's ever + rising demand for securing data in use, i.e. memory encryption. + One of the solutions addressing this matter is AMD SEV. + </p> + <h2>AMD SEV</h2> + <p> + SEV (Secure Encrypted Virtualization) is a feature extension of AMD's SME (Secure + Memory Encryption) intended for KVM virtual machines which is supported + primarily on AMD's EPYC CPU line. In contrast to SME, SEV uses a unique memory encryption + key for each VM. The whole encryption of memory pages is completely transparent + to the hypervisor and happens in the AMD firmware. + For more details about the technology itself, you can visit + <a href="https://developer.amd.com/sev/">AMD's developer portal</a>. + </p> + <h3> + <a id="Host">Enabling SEV on the host</a> + <a class="headerlink" href="#Host" title="Permalink to this headline">¶</a> + </h3> + <p> + Before VMs can make use of the SEV feature you need to make sure your + AMD CPU does support SEV. You can check whether SEV is among the CPU + flags with: + </p> + + <pre> +$ cat /proc/cpuinfo | grep sev +... +sme ssbd sev ibpb</pre> + + <p> + Next step is to enable SEV in the kernel, because it is disabled by default. + This is done by putting the following onto the kernel command line: + </p> + <pre> +mem_encrypt=on kvm_amd.sev=1 + </pre> + + <p> + To make the changes persistent, append the above to the variable holding + parameters of the kernel command line in + <code>/etc/default/grub</code> to preserve SEV settings across reboots + </p> + + <pre> +$ cat /etc/default/grub +... +GRUB_CMDLINE_LINUX="... mem_encrypt=on kvm_amd.sev=1" +$ grub2-mkconfig -o /boot/efi/EFI/<distro>/grub.cfg</pre> + + <p> + <code>mem_encrypt=on</code> turns on the SME memory encryption feature on + the host which is required for SEV to work. The <code>kvm_amd.sev</code> + parameter actually enables SEV in the kvm module. It can be set on the + command line alongside <code>mem_encrypt</code> like shown above, or it + can be put into a module config under <code>/etc/modprobe.d/</code> + </p> + <pre> +$ cat /etc/modprobe.d/sev.conf +options kvm_amd sev=1 + </pre> + <p> + After rebooting the host, you should see SEV being enabled in the kernel: + </p> + <pre> +$ cat /sys/module/kvm_amd/parameters/sev +1 + </pre> + + <h2> + <a id="Virt">Checking SEV support in the virt stack</a> + <a class="headerlink" href="#Virt" title="Permalink to this headline">¶</a> + </h2> + <p> + <b>Note: All of the commands bellow need to be run with root privileges.</b> + </p> + <p> + First make sure you have the following packages in the specified versions: + </p> + <ul> + <li> + libvirt >= 4.5.0 (>5.1.0 recommended due to additional SEV bugfixes) + </li> + <li> + QEMU >= 2.12.0 + </li> + </ul> + <p> + To confirm that the virtualization stack supports SEV, run the following: + </p> + <pre> +# virsh domcapabilities +<domainCapabilities> +... + <features> + ... + <sev supported='yes'> + <cbitpos>47</cbitpos> + <reducedPhysBits>1</reducedPhysBits> + </sev> + ... + </features> +</domainCapabilities></pre> + <p> + Note that if libvirt was already installed and libvirtd running before enabling SEV in the kernel followed by the host reboot you need to force libvirtd + to re-probe both the host and QEMU capabilities. First stop libvirtd: + </p> + <pre> +# systemctl stop libvirtd.service + </pre> + <p> + Now you need to clean the capabilities cache: + </p> + <pre> +# rm -f /var/cache/libvirt/qemu/capabilities/* + </pre> + <p> + If you now restart libvirtd, it will re-probe the capabilities and if + you now run: + </p> + <pre> +# virsh domcapabilities + </pre> + <p> + SEV should be listed as supported. If you still see: + </p> + <pre> +<sev supported='no'/> + </pre> + <p> + it means one of two things: + <ol> + <li> + libvirt does support SEV, but either QEMU or the host does not + </li> + <li> + you have libvirt <=5.1.0 which suffered from getting a + <code>'Permission denied'</code> on <code>/dev/sev</code> because + of the default permissions on the character device which prevented + QEMU from opening it during capabilities probing - you can either + manually tweak the permissions so that QEMU has access to it or + preferably install libvirt 5.1.0 or higher + </li> + </ol> + </p> + <h2> + <a id="Configuration">VM Configuration</a> + <a class="headerlink" href="#Configuration" title="Permalink to this headline">¶</a> + </h2> + <p> + SEV is enabled in the XML by specifying the + <a href="https://libvirt.org/formatdomain.html#launchSecurity"><launchSecurity> </a> element. However, specifying <code>launchSecurity</code> isn't + enough to boot an SEV VM. Further configuration requirements are discussed + below. + </p> + + <h3>Machine type</h3> + <p> + Even though both Q35 and legacy PC machine types (for PC see also + "virtio") can be used with SEV, usage of the legacy PC machine type is + strongly discouraged, since depending on how your OVMF package was + built (e.g. including features like SecureBoot or SMM) Q35 may even be + required. + </p> + + <h5>Q35</h5> +<pre> +... +<os> + <type arch='x86_64' machine='pc-q35-3.0'>hvm</type> + ... +</os> +...</pre> + + <h5>i440fx (discouraged)</h5> + <pre> +... +<os> + <type arch='x86_64' machine='pc-i440fx-3.0'>hvm</type> + ... +</os> +... + </pre> + + <h3>Boot loader</h3> + <p> + SEV is only going to work with OVMF (UEFI), so you'll need to point libvirt to + the correct OVMF binary. + </p> + <pre> +... +<os> + <type arch='x86_64' machine='pc-q35-3.0'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader> +</os> +...</pre> + + <h3>Memory</h3> + <p> + Internally, SEV expects that the encrypted memory pages won't be swapped out or move + around so the VM memory needs to be pinned in physical RAM which will be + handled by QEMU. Apart from that, certain memory regions allocated by QEMU + itself (UEFI pflash, device ROMs, video RAM, etc.) have to be encrypted as + well. This causes a conflict in how libvirt tries to protect the host. + By default, libvirt enforces a memory hard limit on each VM's cgroup in order + to protect the host from malicious QEMU to allocate and lock all the available + memory. This limit corresponds to the total memory allocation for the VM given + by <code><currentMemory></code> element. However, trying to account for the additional + memory regions QEMU allocates when calculating the limit in an automated manner + is non-deterministic. One way to resolve this is to set the hard limit manually. + + <p> + Note: Figuring out the right number so that your guest boots and isn't killed is + challenging, but 256MiB extra memory over the total guest RAM should suffice for + most workloads and may serve as a good starting point. + + For example, a domain with 4GB memory with a 256MiB extra hard limit would look + like this: + </p> + </p> + <pre> +# virsh edit <domain> +<domain> + ... + <currentMemory unit='KiB'>4194304</currentMemory> + <memtune> + <hard_limit unit='KiB'>4456448</hard_limit> + </memtune> + ... +</domain></pre> + <p> + There's another, preferred method of taking care of the limits by + using the<code><memoryBacking></code> element along with the + <code><locked/></code> subelement: + </p> + <pre> +<domain> + ... + <memoryBacking> + <locked/> + </memoryBacking> + ... +</domain></pre> + <p> + What that does is that it tells libvirt not to force any hard limit (well, + unlimited) upon the VM cgroup. The obvious advantage is that one doesn't need + to determine the hard limit for every single SEV-enabled VM. However, there is + a significant security-related drawback to this approach. Since no hard limit + is applied, a malicious QEMU could perform a DoS attack by locking all of the + host's available memory. The way to avoid this issue and to protect the host is + to enforce a bigger hard limit on the master cgroup containing all of the VMs + - on systemd this is <code>machine.slice</code>. + </p> + <pre> +# systemctl set-property machine.slice MemoryHigh=<value></pre> + <p> + To put even stricter measures in place which would involve the OOM killer, use + <pre> +# systemctl set-property machine.slice MemoryMax=<value></pre> + instead. Alternatively, you can create a systemd config (don't forget + to reload systemd configuration in this case): + <pre> +# cat << EOF > /etc/systemd/system.control/machine.slice.d/90-MemoryMax.conf +MemoryMax=<value> +EOF</pre> + The trade-off to keep in mind with the second approach is that the VMs + can still perform DoS on each other. + </p> + <h3>Virtio</h3> + <p> + In order to make virtio devices work, we need to enable emulated IOMMU + on the devices so that virtual DMA can work. + </p> + <pre> +# virsh edit <domain> +<domain> + ... + <controller type='virtio-serial' index='0'> + <driver iommu='on'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver iommu='on'/> + </controller> + ... + <memballoon model='virtio'> + <driver iommu='on'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/urandom</backend> + <driver iommu='on'/> + </rng> + ... +<domain></pre> + <p> + If you for some reason want to use the legacy PC machine type, further changes + to the virtio + configuration is required, because SEV will not work with Virtio <1.0. In + libvirt, this is handled by using the virtio-non-transitional device model + (libvirt >= 5.2.0 required). + + <p> + Note: some devices like video devices don't + support non-transitional model, which means that virtio GPU cannot be used. + </p> + </p> + <pre> +<domain> + ... + <devices> + ... + <memballoon model='virtio-non-transitional'> + <driver iommu='on'/> + </memballoon> + </devices> + ... +</domain></pre> + + + <h2> + <a id="Limitations">Limitations</a> + <a class="headerlink" href="#Limitations" title="Permalink to this headline">¶</a> + </h2> + <p> + Currently, the boot disk cannot be of type virtio-blk, instead, virtio-scsi + needs to be used if virtio is desired. This limitation is expected to be lifted + with future releases of kernel (the kernel used at the time of writing the + article is 5.0.14). + If you still cannot start an SEV VM, it could be because of wrong SELinux label on the <code>/dev/sev</code> device with selinux-policy <3.14.2.40 which prevents QEMU from touching the device. This can be resolved by upgrading the package, tuning the selinux policy rules manually to allow svirt_t to access the device (see <code>audit2allow</code> on how to do that) or putting SELinux into permissive mode (discouraged). + </p> + <h2> + <a id="Examples">Full domain XML examples</a> + <a class="headerlink" href="#Examples" title="Permalink to this headline">¶</a> + </h2> + <h5>Q35 machine</h5> + <pre> +<domain type='kvm'> + <name>sev-dummy</name> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memoryBacking> + <locked/> + </memoryBacking> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-q35-3.0'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader> + <nvram>/var/lib/libvirt/qemu/nvram/sev-dummy_VARS.fd</nvram> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <cpu mode='host-model' check='partial'> + <model fallback='allow'/> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/sev-dummy.qcow2'/> + <target dev='sda' bus='scsi'/> + <boot order='1'/> + </disk> + <controller type='virtio-serial' index='0'> + <driver iommu='on'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <driver iommu='on'/> + </controller> + <interface type='network'> + <mac address='52:54:00:cc:56:90'/> + <source network='default'/> + <model type='virtio'/> + <driver iommu='on'/> + </interface> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <gl enable='no'/> + </graphics> + <video> + <model type='qxl'/> + </video> + <memballoon model='virtio'> + <driver iommu='on'/> + </memballoon> + <rng model='virtio'> + <driver iommu='on'/> + </rng> + </devices> + <launchSecurity type='sev'> + <cbitpos>47</cbitpos> + <reducedPhysBits>1</reducedPhysBits> + <policy>0x0003</policy> + </launchSecurity> +</domain></pre> + + <h5>PC-i440fx machine:</h5> + <pre> +<domain type='kvm'> + <name>sev-dummy-legacy</name> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <memtune> + <hard_limit unit='KiB'>5242880</hard_limit> + </memtune> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-3.0'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/edk2/ovmf/OVMF_CODE.fd</loader> + <nvram>/var/lib/libvirt/qemu/nvram/sev-dummy_VARS.fd</nvram> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <vmport state='off'/> + </features> + <cpu mode='host-model' check='partial'> + <model fallback='allow'/> + </cpu> + <clock offset='utc'> + <timer name='rtc' tickpolicy='catchup'/> + <timer name='pit' tickpolicy='delay'/> + <timer name='hpet' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <pm> + <suspend-to-mem enabled='no'/> + <suspend-to-disk enabled='no'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/sev-dummy-seabios.qcow2'/> + <target dev='sda' bus='sata'/> + </disk> + <interface type='network'> + <mac address='52:54:00:d8:96:c8'/> + <source network='default'/> + <model type='virtio-non-transitional'/> + </interface> + <serial type='pty'> + <target type='isa-serial' port='0'> + <model name='isa-serial'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <input type='tablet' bus='usb'> + <address type='usb' bus='0' port='1'/> + </input> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='spice' autoport='yes'> + <listen type='address'/> + <gl enable='no'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/> + </video> + <memballoon model='virtio-non-transitional'> + <driver iommu='on'/> + </memballoon> + <rng model='virtio-non-transitional'> + <driver iommu='on'/> + </rng> + </devices> + <launchSecurity type='sev'> + <cbitpos>47</cbitpos> + <reducedPhysBits>1</reducedPhysBits> + <policy>0x0003</policy> + </launchSecurity> +</domain></pre> + </div> +</body> +</html> -- 2.21.0

3 6

[libvirt] Entering freeze for libvirt-5.5.0
by Daniel Veillard 30 Jun '19

30 Jun '19

As planned I tagged RC1 in git and pushed signed tarball and source rpm to the usual place: https://libvirt.org/sources/ I'm on the road with even less testing capacity than usual, but https://ci.centos.org/view/libvirt/ looks rather green except for some go bindings so I assume we are in pretty good shape, i.e. it will hopefully compile and run for most of you :-) I hope to be back on Fraiday and make an evening release again, then if all goes fine we can push on Mon or Tuesday, please give it some testing, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] news: Update for 5.5.0 release
by Andrea Bolognani 28 Jun '19

28 Jun '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index cada389092..c6cc27faae 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -40,6 +40,18 @@ <libvirt> <release version="v5.5.0" date="unreleased"> + <section title="Security"> + <change> + <summary> + api: Prevent access to several APIs over read-only connections + </summary> + <description> + Certain APIs give root-equivalent access to the host, and as such + should be limited to privileged users. CVE-2019-10161, + CVE-2019-10166, CVE-2019-10167, CVE-2019-10168. + </description> + </change> + </section> <section title="New features"> <change> <summary> @@ -49,6 +61,16 @@ SMMUv3 is an IOMMU implementation for ARM virt guests. </description> </change> + <change> + <summary> + network: Introduce the network port API + </summary> + <description> + This new public API can be used by virtualization drivers to + manage network resources associated with guests, and is a further + step towards splitting libvirtd into multiple daemons. + </description> + </change> </section> <section title="Removed features"> <change> @@ -62,10 +84,72 @@ from libvirt or otherwise. </description> </change> + <change> + <summary> + Stop supporting migration of config files from pre-XDG layout + </summary> + <description> + The new layout was introduced with libvirt 0.9.13 (Jul 2012). + </description> + </change> + <change> + <summary> + Remove Avahi mDNS support + </summary> + <description> + This feature was never used outside of virt-manager, which has + itself stopped using it a while ago. + </description> + </change> </section> <section title="Improvements"> + <change> + <summary> + sysinfo: Report SMBIOS information on aarch64 + </summary> + <description> + While SMBIOS support has historically been limited to x86_64, modern + aarch64 machines often offer access to the same information as well, + and libvirt now exposes it to the user when that's the case. + </description> + </change> + <change> + <summary> + test driver: Expand API coverage + </summary> + <description> + Even more APIs that were missing from the test driver have now been + implemented. + </description> + </change> + <change> + <summary> + virt-xml-validate: Allow input to be read from stdin + </summary> + </change> + <change> + <summary> + qemu: Validate spapr-vio addresses as 32-bit + </summary> + <description> + libvirt has always considered these addresses (used for pSeries + guests) as 64-bit, but the sPAPR specification says that they're + 32-bit instead. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + qemu: Set process affinity correctly when using <numatune> + </summary> + <description> + libvirt would mistakenly interpret the <code>nodeset</code> + attribute as a list of CPUs instead of as a list of NUMA node, and + the process affinity would be set incorrectly as a result; this has + now been fixed. + </description> + </change> </section> </release> <release version="v5.4.0" date="2019-06-03"> -- 2.21.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainGetNumaParameters
by Ilias Stamatis 28 Jun '19

28 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..d0d4d9e270 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2405,6 +2405,53 @@ testDomainCoreDump(virDomainPtr domain, } +static int +testDomainGetNumaParameters(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainNumatuneMemMode mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + VIR_AUTOFREE(char *) nodeset = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_CURRENT | + VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 2; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + ignore_value(virDomainNumatuneGetMode(vm->def->numa, -1, &mode)); + if (0 < *nparams && virTypedParameterAssign(&params[0], VIR_DOMAIN_NUMA_MODE, + VIR_TYPED_PARAM_INT, mode) < 0) + goto cleanup; + + nodeset = virDomainNumatuneFormatNodeset(vm->def->numa, NULL, -1); + if (1 < *nparams && (!nodeset || virTypedParameterAssign(&params[1], + VIR_DOMAIN_NUMA_NODESET, + VIR_TYPED_PARAM_STRING, + nodeset) < 0)) + goto cleanup; + nodeset = NULL; + + if (*nparams > 2) + *nparams = 2; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static char * testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { @@ -7251,6 +7298,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ + .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetLaunchSecurityInfo = testDomainGetLaunchSecurityInfo, /* 5.5.0 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ -- 2.22.0

2 1

[libvirt] [BUG] virHostCPUGetInfoPopulateLinux statistics CPU socket inaccuracy
by Yuchen 28 Jun '19

28 Jun '19

only the last numa node /sys/devices/system/node/node*/cpu*/topology/physical_package_id nodeinfo 'CPU socket(s)' is not equal to lscpu 'Socket(s)' # virsh nodeinfo CPU model: x86_64 CPU(s): 32 CPU frequency: 2393 MHz CPU socket(s): 1 Core(s) per socket: 8 Thread(s) per core: 2 NUMA cell(s): 2 Memory size: 131150200 KiB # lscpu Architecture: x86_64 CPU op-mode(s): 32-bit, 64-bit Byte Order: Little Endian CPU(s): 32 On-line CPU(s) list: 0-31 Thread(s) per core: 2 Core(s) per socket: 8 Socket(s): 2 NUMA node(s): 2 Vendor ID: GenuineIntel CPU family: 6 Model: 85 Stepping: 4 CPU MHz: 820.151 BogoMIPS: 4201.57 Virtualization: VT-x L1d cache: 32K L1i cache: 32K L2 cache: 1024K L3 cache: 11264K NUMA node0 CPU(s): 0-7,16-23 NUMA node1 CPU(s): 8-15,24-31 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!

2 1

[libvirt] [PATCH 0/2] cgroups v2 fixes
by Pavel Hrdina 28 Jun '19

28 Jun '19

Pavel Hrdina (2): Revert "util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB" util: vircgroupv2: stop enabling missing controllers with systemd src/util/vircgroup.c | 4 ++-- src/util/vircgroupbackend.h | 6 ++++-- src/util/vircgroupv1.c | 3 +-- src/util/vircgroupv2.c | 22 +++++++++++----------- 4 files changed, 18 insertions(+), 17 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH] test_driver: call virCheckFlags on testDomainReboot
by Ilias Stamatis 28 Jun '19

28 Jun '19

Currently the flags argument is completely ignored, but it should be checked for any unsupported flags that might have been passed. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2a0ffbc6c5..6b1d53b06d 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1850,13 +1850,16 @@ static int testDomainShutdown(virDomainPtr domain) /* Similar behaviour as shutdown */ static int testDomainReboot(virDomainPtr domain, - unsigned int action ATTRIBUTE_UNUSED) + unsigned int flags) { testDriverPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_REBOOT_DEFAULT | VIR_DOMAIN_REBOOT_ACPI_POWER_BTN | + VIR_DOMAIN_REBOOT_GUEST_AGENT | VIR_DOMAIN_REBOOT_INITCTL | + VIR_DOMAIN_REBOOT_SIGNAL | VIR_DOMAIN_REBOOT_PARAVIRT, -1); if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; -- 2.22.0

2 2

[libvirt] [PATCH] qemu: Validate disk against domain def on coldplug
by Michal Privoznik 28 Jun '19

28 Jun '19

https://bugzilla.redhat.com/show_bug.cgi?id=1692296#c7 This is a counterpart for ddc72f99027 and implements the same check for coldplug. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d6ab134196..ed5f832f59 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8082,6 +8082,21 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, return ret; } + +static int +qemuCheckDiskConfigAgainstDomain(const virDomainDef *def, + const virDomainDiskDef *disk) +{ + if (virDomainSCSIDriveAddressIsUsed(def, &disk->info.addr.drive)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Domain already contains a disk with that address")); + return -1; + } + + return 0; +} + + static int qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev, @@ -8110,6 +8125,8 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, return -1; if (qemuCheckDiskConfig(disk, NULL) < 0) return -1; + if (qemuCheckDiskConfigAgainstDomain(vmdef, disk) < 0) + return -1; if (virDomainDiskInsert(vmdef, disk) < 0) return -1; /* vmdef has the pointer. Generic codes for vmdef will do all jobs */ -- 2.21.0

2 1

[libvirt] [PATCH] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 28 Jun '19

28 Jun '19

The snapshot-create operation of running guests saves the live XML and uses it to replace the active and inactive domain in case of revert. So, the config XML is ignored by the snapshot process. This commit changes it and adds the config XML in the snapshot XML as the <inactive/domain> entry. In case of offline guest, the behavior remains the same and the config XML is saved in the snapshot XML as <domain> entry. The behavior of older snapshots of running guests, that don't have the new <inactive/domain>, remains the same too. The revert, in this case, overrides both active and inactive domain with the <domain> entry. So, the <inactive/domain> in the snapshot XML is not required to snapshot work, but it's useful to preserve the config XML of running guests. Signed-off-by: Maxiwell S. Garcia <maxiwell(a)linux.ibm.com> --- src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 1 + src/conf/snapshot_conf.c | 42 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 29 ++++++++++++++++++++++----- 4 files changed, 68 insertions(+), 5 deletions(-) diff --git a/src/conf/moment_conf.c b/src/conf/moment_conf.c index fea13f0f97..f54a44b33e 100644 --- a/src/conf/moment_conf.c +++ b/src/conf/moment_conf.c @@ -66,6 +66,7 @@ virDomainMomentDefDispose(void *obj) VIR_FREE(def->description); VIR_FREE(def->parent_name); virDomainDefFree(def->dom); + virDomainDefFree(def->inactiveDom); } /* Provide defaults for creation time and moment name after parsing XML */ diff --git a/src/conf/moment_conf.h b/src/conf/moment_conf.h index 00ec1c1904..b8bec7e456 100644 --- a/src/conf/moment_conf.h +++ b/src/conf/moment_conf.h @@ -38,6 +38,7 @@ struct _virDomainMomentDef { long long creationTime; /* in seconds */ virDomainDefPtr dom; + virDomainDefPtr inactiveDom; }; virClassPtr virClassForDomainMomentDef(void); diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index c7f29360e7..c66ee997a4 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -294,6 +294,28 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, } else { VIR_WARN("parsing older snapshot that lacks domain"); } + + /* /inactive/domain entry saves the config XML present in a running + * VM. In case of absent, leave parent.inactiveDom NULL and use + * parent.dom for config and live XML. */ + if ((tmp = virXPathString("string(./inactive/domain/@type)", ctxt))) { + int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; + xmlNodePtr domainNode = virXPathNode("./inactive/domain", ctxt); + + VIR_FREE(tmp); + if (!domainNode) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("missing inactive domain in snapshot")); + + goto cleanup; + } + def->parent.inactiveDom = virDomainDefParseNode(ctxt->node->doc, domainNode, + caps, xmlopt, NULL, domainflags); + if (!def->parent.inactiveDom) + goto cleanup; + } + } else if (virDomainXMLOptionRunMomentPostParse(xmlopt, &def->parent) < 0) { goto cleanup; } @@ -511,6 +533,16 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDefPtr def, VIR_STEAL_PTR(def->parent.dom, otherdef->parent.dom); } } + if (otherdef->parent.inactiveDom) { + if (def->parent.inactiveDom) { + if (!virDomainDefCheckABIStability(otherdef->parent.inactiveDom, + def->parent.inactiveDom, xmlopt)) + return -1; + } else { + /* Transfer the inactive domain def */ + VIR_STEAL_PTR(def->parent.inactiveDom, otherdef->parent.inactiveDom); + } + } } if (def->parent.dom) { @@ -876,6 +908,16 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, virBufferAddLit(buf, "</domain>\n"); } + if (def->parent.inactiveDom) { + virBufferAddLit(buf, "<inactive>\n"); + virBufferAdjustIndent(buf, 2); + if (virDomainDefFormatInternal(def->parent.inactiveDom, caps, + domainflags, buf, xmlopt) < 0) + goto error; + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</inactive>\n"); + } + if (virSaveCookieFormatBuf(buf, def->cookie, virDomainXMLOptionGetSaveCookie(xmlopt)) < 0) goto error; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42b1ce2521..1ce7aa7b42 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15707,6 +15707,15 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto endjob; + if (vm->newDef) { + if (!(xml = qemuDomainDefFormatLive(driver, vm->newDef, priv->origCPU, + true, true)) || + !(def->parent.inactiveDom = virDomainDefParseString(xml, caps, driver->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + goto endjob; + } + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_match = false; @@ -16241,6 +16250,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; + virDomainDefPtr inactiveConfig = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; bool was_stopped = false; @@ -16341,17 +16351,22 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, * in the failure cases where we know there was no change? */ } - /* Prepare to copy the snapshot inactive xml as the config of this - * domain. - * - * XXX Should domain snapshots track live xml rather - * than inactive xml? */ + /* Prepare to copy the snapshot inactive domain as the config XML + * and the snapshot domain as the live XML. In case of inactive domain + * NULL, both config and live XML will be copied from snapshot domain. + */ if (snap->def->dom) { config = virDomainDefCopy(snap->def->dom, caps, driver->xmlopt, NULL, true); if (!config) goto endjob; } + if (snap->def->inactiveDom) { + inactiveConfig = virDomainDefCopy(snap->def->inactiveDom, caps, + driver->xmlopt, NULL, true); + if (!inactiveConfig) + goto endjob; + } cookie = (qemuDomainSaveCookiePtr) snapdef->cookie; @@ -16602,6 +16617,10 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } + if (inactiveConfig) { + virDomainDefFree(vm->newDef); + VIR_STEAL_PTR(vm->newDef, inactiveConfig); + } ret = 0; endjob: -- 2.20.1

2 1

[libvirt] Encrypted vTPM state
by Stefan Berger 27 Jun '19

27 Jun '19

Hello! Marc-André told me there was interest in encrypting the vTPM state. I do have some patches along these lines from a long time ago that I haven't upstreamed. I'd be curious about some feedback on some corner stones of the design to support this: - Encryption of the vTPM state must be added when a vTPM's XML is created. It's not possible to convert existing not-encrypted vTPM state to encrypted vTPM state. This is due to a limitation of 'swtpm.' - vTPM state encryption would be based on libvirt's Secret support. I assume the secrets can migrate along the domain XML. - The XML for vTPM state encryption is similar to XML used for 'luks': https://libvirt.org/formatstorageencryption.html#example - The XML for an encrypted vTPM state could look like this: <devices> [...] <tpm model='tpm-tis'> <backend type='emulator' version='2.0'> <encryption format='vtpm'> <secret type='passphrase' uuid='32ee7e76-2178-47a1-ab7b-269e6e348015'/> </encryption> </backend> </tpm> </devices> Here the user is referencing an already existing Secret. This secret would NOT be automatically undefined when a VM is undefined. - Another possibility may be this XML here: <devices> [...] <tpm model='tpm-tis'> <backend type='emulator' version='2.0'> <encryption format='default'/> </backend> </tpm> </devices> In this case the Secret would be automatically generated and this domain XML be rewritten to look like the one in the first example. The domain XML would then reference the created secret via usage=vtpm-<vmuuid>, which would be an indication that this secret can be deleted when the VM is undefined. - The Secret XML to be passed to virsh secret-define would look like this: <secret ephemeral='no' private='yes'> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> Regards, Stefan

2 2

[libvirt] [PATCH] test_driver: implement virDomainGetInterfaceParameters
by Ilias Stamatis 27 Jun '19

27 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- This is almost identical to the QEMU's driver implementation. I wonder if we can somehow avoid copying that much code. src/test/test_driver.c | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..37634dd771 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1964,6 +1964,105 @@ static int testDomainGetInfo(virDomainPtr domain, return ret; } + +static int +testDomainGetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + size_t i; + virDomainObjPtr vm = NULL; + virDomainNetDefPtr net = NULL; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 7; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(net = virDomainNetFind(vm->def, device))) + goto cleanup; + + for (i = 0; i < *nparams && i < 7; i++) { + switch (i) { + case 0: /* inbound.average */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->average; + break; + case 1: /* inbound.peak */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_PEAK, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->peak; + break; + case 2: /* inbound.burst */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_BURST, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->burst; + break; + case 3: /* inbound.floor */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_IN_FLOOR, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->in) + params[i].value.ui = net->bandwidth->in->floor; + break; + case 4: /* outbound.average */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->average; + break; + case 5: /* outbound.peak */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_PEAK, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->peak; + break; + case 6: /* outbound.burst */ + if (virTypedParameterAssign(&params[i], + VIR_DOMAIN_BANDWIDTH_OUT_BURST, + VIR_TYPED_PARAM_UINT, 0) < 0) + goto cleanup; + if (net->bandwidth && net->bandwidth->out) + params[i].value.ui = net->bandwidth->out->burst; + break; + } + } + + if (*nparams > 7) + *nparams = 7; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetState(virDomainPtr domain, int *state, @@ -7258,6 +7357,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ .domainGetHostname = testDomainGetHostname, /* 5.5.0 */ .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ + .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ .domainGetState = testDomainGetState, /* 0.9.2 */ .domainGetTime = testDomainGetTime, /* 5.4.0 */ .domainSave = testDomainSave, /* 0.3.2 */ -- 2.22.0

1 0

[libvirt] [PATCH] libvirt: support block device storage type in virshParseSnapshotDiskspec
by Liu Dayu 27 Jun '19

27 Jun '19

virsh snapshot-create-as supports 'file' storage type in --diskspec by default. It doesn't support 'block' storage type in the process of virshParseSnapshotDiskspec(). So if a snapshot on a block device (e.g. LV) was created, the type of current running storage source in dumpxml is inconsistent with the actual backend storage source. It will check file-system type mismatch failed and return an error message of 'Migration without shared storage is unsafe' when VM performs a live migration after this snapshot. Signed-off-by: Liu Dayu <liu.dayu(a)zte.com.cn> --- tools/virsh-snapshot.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index f6bb38b..f9c55e0 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -255,6 +255,8 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) char **array = NULL; int narray; size_t i; + struct stat st; + int stor_type = VIR_STORAGE_TYPE_NONE; narray = vshStringToArray(str, &array); if (narray <= 0) @@ -272,16 +274,29 @@ virshParseSnapshotDiskspec(vshControl *ctl, virBufferPtr buf, const char *str) goto cleanup; } + /* possibly update storage type */ + if (file && STRPREFIX(file, "/dev/") && stat(file, &st) == 0 && S_ISBLK(st.st_mode)) + stor_type = VIR_STORAGE_TYPE_BLOCK; + else + stor_type = VIR_STORAGE_TYPE_FILE; + virBufferEscapeString(buf, "<disk name='%s'", name); if (snapshot) virBufferAsprintf(buf, " snapshot='%s'", snapshot); + if (stor_type == VIR_STORAGE_TYPE_BLOCK) + virBufferAsprintf(buf, " type='%s'", virStorageTypeToString(stor_type)); + if (driver || file) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); if (driver) virBufferAsprintf(buf, "<driver type='%s'/>\n", driver); - if (file) - virBufferEscapeString(buf, "<source file='%s'/>\n", file); + if (file) { + if (stor_type == VIR_STORAGE_TYPE_BLOCK) + virBufferEscapeString(buf, "<source dev='%s'/>\n", file); + else + virBufferEscapeString(buf, "<source file='%s'/>\n", file); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</disk>\n"); } else { -- 1.8.3.1

3 2

[libvirt] [PATCH v2 0/4] Remove VIR_ERR_DEPRECATED & associated pieces
by Daniel P. Berrangé 27 Jun '19

27 Jun '19

A deprecation is inherantly a warning, not an error, so adding an error with this name makes no conceptual sense. Features in drivers may come & go at any time and we've always use the VIR_ERR_NO_SUPPORT to indicate when a hypervisor driver does not support a particular API. Changed in v2: - Don't remove the driver API entry point entirely - leave it set to NULL, so we can document version number range. Daniel P. Berrangé (4): qemu: delete methods which are no longer supported docs: update QEMU driver docs to replace deprecated with deleted Revert "news: Mention VIR_ERR_DEPRECATED in improvements" Revert "error: Add VIR_ERR_DEPRECATED error code" docs/drvqemu.html.in | 2 +- docs/hvsupport.pl | 25 +++++++++++++++---------- docs/libvirt.css | 4 ++-- docs/news.xml | 10 ---------- include/libvirt/virterror.h | 1 - src/qemu/qemu_driver.c | 33 ++------------------------------- src/util/virerror.c | 4 ---- 7 files changed, 20 insertions(+), 59 deletions(-) -- 2.21.0

2 9

[libvirt] [PATCH 0/4] Remove VIR_ERR_DEPRECATED & associated pieces
by Daniel P. Berrangé 27 Jun '19

27 Jun '19

A deprecation is inherantly a warning, not an error, so adding an error with this name makes no conceptual sense. Features in drivers may come & go at any time and we've always use the VIR_ERR_NO_SUPPORT to indicate when a hypervisor driver does not support a particular API. Daniel P. Berrangé (4): qemu: delete methods which are no longer supported Revert "error: Add VIR_ERR_DEPRECATED error code" Revert "docs: css: Add style for <span class='deprecated'> ..." Revert "docs: hvsupport: Add support for deprecating hypervisor implementations" docs/hvsupport.pl | 44 ++++++++++++------------------------- docs/libvirt.css | 10 --------- include/libvirt/virterror.h | 1 - src/qemu/qemu_driver.c | 31 -------------------------- src/util/virerror.c | 4 ---- 5 files changed, 14 insertions(+), 76 deletions(-) -- 2.21.0

4 15

[libvirt] [PATCH] qemu: blockjob: Don't leak 'cfg' from qemuBlockJobEventProcessLegacy
by Peter Krempa 27 Jun '19

27 Jun '19

Since c257352797a a reference of 'cfg' would be leaked if the function does not need to process anything. Fix it by using VIR_AUTOUNREF. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_blockjob.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index f105632a09..d7e1070c93 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -315,7 +315,7 @@ qemuBlockJobEventProcessLegacy(virQEMUDriverPtr driver, qemuBlockJobDataPtr job, int asyncJob) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg = virQEMUDriverGetConfig(driver); virDomainDiskDefPtr disk = job->disk; VIR_DEBUG("disk=%s, mirrorState=%s, type=%d, state=%d, newstate=%d", @@ -368,8 +368,6 @@ qemuBlockJobEventProcessLegacy(virQEMUDriverPtr driver, VIR_WARN("Unable to update persistent definition on vm %s " "after block job", vm->def->name); } - - virObjectUnref(cfg); } -- 2.21.0

2 1

[libvirt] [PATCH v3 0/8] CPU Model Baseline and Comparison for s390x
by Collin Walling 26 Jun '19

26 Jun '19

Changelog: v2 - numerous cleanups - removed "policy fix function" and now properly check for policy == -1 in the CPUDef -> JSON parser - resolved some memory leaks - added string arg to qemuMonitorJSONParseCPUModelData for error message to print out proper command name v1 - introduce baseline - split patches into small chunks - free'd lingering qemuMonitorCPUModelInfo pointer - when converting from virCPUDef -> virJSON, consider feature policy FORCED for enabled ___ To run these patches, execute the virsh hypervisor-cpu-compare or hypervisor-cpu-baseline commands and pass an XML file describing one or more CPU definition. You can use the definition from virsh domcapabilities or from a guest XML. There is no need extract it from the file and place it a new one, as the XML parser will look specifically for the CPU tags. ___ These patches hookup the virsh hypervisor-cpu-compare/baseline commands for the s390x architecture. They take an XML file describing some CPU definitions and passes the data to QEMU, where the actual CPU model comparison / baseline calculation is handled (available since QEMU 2.8.5). These calculations are compared against / baselined with the hypervisor CPU model, which can be observed via the virsh domcapabilities command for s390x. When baselining CPU models and the user appends the --features argument to the command, s390x will only report back features that supersede the base model definition. **NOTE** if the --features flag is intended to expand ALL features available to a CPU model (such as the huge list of features reported by a full CPU model expansion), please let me know and I can resolve this. The first patch pulls some code out of the CPU Model Expansion JSON function so that it can be later used for the Comparison and Baseline JSON functions. The rest of the patches follow this sequence: - introduce JSON monitor functions - introduce capability and update test files - hook up monitor functions to virsh command Patch 7 pulls out some code from the CPUDef XML parser to be reused in the comparison hookup. Thanks. x86 and Power review by Daniel Henrique Barboza (thanks!) Collin Walling (8): qemu_monitor: helper functions for CPU models qemu_monitor: implement query-cpu-model-baseline qemu_capabilities: introduce QEMU_CAPS_QUERY_CPU_MODEL_BASELINE qemu_driver: hook up query-cpu-model-baseline qemu_monitor: implement query-cpu-model-comparison qemu_capabilities: introduce QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON cpu_conf: xml to cpu definition parse helper qemu_driver: hook up query-cpu-model-comparison src/conf/cpu_conf.c | 30 +++ src/conf/cpu_conf.h | 6 + src/cpu/cpu.c | 14 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 138 +++++++++++ src/qemu/qemu_capabilities.h | 20 ++ src/qemu/qemu_driver.c | 38 +++ src/qemu/qemu_monitor.c | 44 ++++ src/qemu/qemu_monitor.h | 18 ++ src/qemu/qemu_monitor_json.c | 297 ++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 20 ++ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 + 18 files changed, 591 insertions(+), 49 deletions(-) -- 2.7.4

2 10

[libvirt] [PATCH v1 00/10] PCI Multifunction hotplug/unplug, part 1
by Daniel Henrique Barboza 26 Jun '19

26 Jun '19

This is the first part of the feature discussed at [1]. With the exception of patch 06, these patches are aimed into preparing the existing unit test infrastructure for the more sofisticated multifunction tests to come. First 3 Michal's patches helped me with unit test issues in the first 3-4 patches (see [2] for more info), thus I am relying on them being upstreamed as well. The whole feature can be checked out at [3]. All patches survives unit testing. The feature was stress tested with hundreds of consecutive hotplug/unplugs of a Broadcom BCM5719 multifunction network card in a guest running in a Power 8 server. Hopefully I'll find a suitable x86 env to stress test the feature there too. [1] https://www.redhat.com/archives/libvir-list/2019-June/msg00703.html [2] https://www.redhat.com/archives/libvir-list/2019-June/msg00726.html [3] https://github.com/danielhb/libvirt/tree/multifunction_latest Daniel Henrique Barboza (1): util/virhostdev: enhance VFIO device is in use detection Michal Prívozník (3): virpcimock: Move actions checking one level up Revert "virpcitest: Test virPCIDeviceDetach failure" virpcimock: Create driver_override file in device dirs Shivaprasad G Bhat (6): tests: Fix the iommu group path in mock pci tests: pci: Mock the iommu groups and vfio virpcitest: Change the stub driver to vfio from pci-stub virpcimock: Mock the SRIOV Virtual functions tests: qemu: Add test case for pci-hostdev hotplug tests: Add a baseline test for multifunction pci device use case src/util/virhostdev.c | 74 +++-- src/util/virprocess.h | 2 +- tests/Makefile.am | 7 + tests/qemuhotplugtest.c | 42 ++- .../qemuhotplug-hostdev-pci.xml | 6 + .../qemuhotplug-base-live+hostdev-pci.xml | 58 ++++ ...uhotplug-pseries-base-live+hostdev-pci.xml | 51 ++++ .../qemuhotplug-pseries-base-live.xml | 43 +++ .../hostdev-pci-multifunction.args | 35 +++ .../hostdev-pci-multifunction.xml | 59 ++++ .../hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-multidomain.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-fail.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2argvtest.c | 3 + .../hostdev-pci-multifunction.xml | 79 +++++ tests/qemuxml2xmloutdata/hostdev-vfio.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2xmltest.c | 1 + tests/virhostdevtest.c | 4 +- tests/virpcimock.c | 276 +++++++++++++++--- tests/virpcitest.c | 40 +-- tests/virpcitestdata/0000-06-12.0.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.1.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.2.config | Bin 0 -> 256 bytes tests/virprocessmock.c | 28 ++ 29 files changed, 726 insertions(+), 100 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml create mode 100644 tests/virpcitestdata/0000-06-12.0.config create mode 100644 tests/virpcitestdata/0000-06-12.1.config create mode 100644 tests/virpcitestdata/0000-06-12.2.config create mode 100644 tests/virprocessmock.c -- 2.20.1

1 10

[libvirt] [PATCH] network: avoid including sys/sysctl.h on Linux
by Daniel P. Berrangé 26 Jun '19

26 Jun '19

The sys/sysctl.h header is only needed on BSD platforms to get the sysctlbyname() function declaration. On Linux we talk to procfs instead to change sysctls. Unfortunately a legacy sys/sysctl.h header does exist on Linux and including it has recently started triggering a deprecation warning from glibc. Protect its inclusion with a HAVE_SYSCTLBYNAME check instead so that it only gets used on platforms where we need that function declaration. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as build fix for Fedora rawhide src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 465487432e..19faf7d514 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -33,7 +33,7 @@ #include <sys/wait.h> #include <sys/ioctl.h> #include <net/if.h> -#if HAVE_SYS_SYSCTL_H +#ifdef HAVE_SYSCTLBYNAME # include <sys/sysctl.h> #endif -- 2.21.0

1 0

[libvirt] [PATCH v3 0/7] cgroups v2 fixes and improvements
by Pavel Hrdina 26 Jun '19

26 Jun '19

Pavel Hrdina (7): util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB util: vircgroup: improve controller detection util: vircgroupv2: use any controller to create thread directory util: vircgroupv2: enable CPU controller only if it's available util: vircgroupv2: separate return values of virCgroupV2EnableController util: vircgroupv2: don't error out if enabling controller fails util: vircgroupv2: mark only requested controllers as available src/util/vircgroup.c | 32 +++++++++--------- src/util/vircgroupbackend.h | 3 +- src/util/vircgroupv1.c | 4 ++- src/util/vircgroupv2.c | 67 +++++++++++++++++++++++++++---------- 4 files changed, 71 insertions(+), 35 deletions(-) -- 2.21.0

2 14

[libvirt] [PATCH v2 0/4] qemu: Fix handling of 'dir' volumes with disk type='volume'
by Peter Krempa 26 Jun '19

26 Jun '19

Peter Krempa (4): util: storage: Fix virStorageSourceGetActualType if volume was not translated qemu: command: Use 'actualType' when deciding whether to use disk format qemu: domain: Allow 'VIR_STORAGE_TYPE_VOLUME' disks with 'fat' format qemu: Supply correct default type for 'dir' based VIR_STORAGE_TYPE_VOLUME src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 13 ++++++++++--- src/util/virstoragefile.c | 12 +++++++++++- tests/qemuxml2argvdata/disk-source-pool.args | 8 ++++++++ tests/qemuxml2argvdata/disk-source-pool.xml | 16 +++++++++++++++- tests/qemuxml2xmloutdata/disk-source-pool.xml | 14 ++++++++++++++ 6 files changed, 59 insertions(+), 6 deletions(-) -- 2.21.0

2 8

[libvirt] Live migration fails with "Migration without shared storage is unsafe" when using netapp storage on CentOS 7 and Libvirt 4.5.0
by Marko Todorić 26 Jun '19

26 Jun '19

Hello everyone, We've been using libvirt version 0.10.2 for a long time (on CentOS 6 OS) and now we have started creating new KVM cluster all based on CentOS 7 OS and libvirt version 4.5.0 (that came with CentOS repo). TLDR Version: - When we try to migrate using "virsh migrate test --live qemu+ssh://kvm_aquila-02/system" we get an error "error: Unsafe migration: Migration without shared storage is unsafe". - When we try to migrate using same method but adding "--unsafe" migration works. - When we try to migrate a VPS that is using QCOW image on a shared GFS2 image, mapped on both servers, migration is successful. We have two servers in a cluster so far, they are connected to NetApp storage and all luns that VPS server should be using are mapped to both servers. Long version with background: We have plenty CentOS 6 Servers which work perfectly fine with libvirt version up to 0.10.2. All connected also to a NetApp storage and all luns are mapped to all servers. LUN's (disks) are visible under /dev/mapper directory. When we create VPS, we point to raw disk to the same location, /dev/mapper. For example, VPS "test" would use "/dev/mapper/test" for disk with "cache=none" in xml file. If we issue "virsh migrate test --live qemu+ssh://kvm_server-0X/system", it will successfully migrate VPS to another hypervisor without errors, because disk already exists there. We also have a LUN mapped to each hypervisor and GFS2 established in a cluster between hypervisors where we keep qcow images. We can also migrate those machines without issues. On new CentOS 7 hypervisors, we have pretty much the exact same setup. NetApp storage connected to servers. All VPS LUN's mapped to all hypervisors. Clustered GFS2 volume. When we define VPS with approximately same XML, it will NOT migrate it and will issue out an error stated above. "--unsafe" parameter seems to work fine. BUT. We want to setup a proper libvirt/kvm cluster with pcs. I've defined a pcs resource for each VPS and live migration also doesn't work if i try "pcs resource move" command. It will not migrate it "live" as it should, and as it does with QCOW images, probably because of the same reason - because it's unable to perform live migrate via libvirt without "unsafe". If there would be any trick to add "--unsafe" parameter to pcs i would do it, but I'm not aware of it. Still, seems like a bug that libvirt would not realize that netapp storage is present in this configuration. Is this maybe corrected in later versions of libvirt? Unfortunately, 4.5.0 is latest in CentOS repo but i would try to compile it if needed. Any help would be greatly appreciated and if more info is needed i will be more than happy to provide. Thanks in advance, Marko Todoric

1 1

[libvirt] [PATCH 0/4] tests: Tweaks and updates to *-headless and *-graphics
by Andrea Bolognani 26 Jun '19

26 Jun '19

*** BLURBY MCBLURBFACE *** Andrea Bolognani (4): tests: Normalize quotes for *-graphics tests: Update *-headless and *-graphics tests: Add riscv64-virt-graphics tests: Enable *-headless and *-graphics in qemuxml2xml .../aarch64-virt-graphics.aarch64-latest.args | 6 +- .../aarch64-virt-graphics.xml | 52 ++++---- .../aarch64-virt-headless.aarch64-latest.args | 21 +-- .../aarch64-virt-headless.xml | 22 +++- .../ppc64-pseries-graphics.xml | 49 +++---- .../ppc64-pseries-headless.ppc64-latest.args | 8 +- .../ppc64-pseries-headless.xml | 18 ++- ...riscv64-virt-graphics.riscv64-latest.args} | 18 ++- .../riscv64-virt-graphics.xml | 45 +++++++ .../riscv64-virt-headless.riscv64-latest.args | 16 ++- .../riscv64-virt-headless.xml | 18 ++- .../s390x-ccw-graphics.s390x-latest.args | 6 +- tests/qemuxml2argvdata/s390x-ccw-graphics.xml | 49 +++---- .../s390x-ccw-headless.s390x-latest.args | 12 +- tests/qemuxml2argvdata/s390x-ccw-headless.xml | 21 ++- tests/qemuxml2argvdata/x86_64-pc-graphics.xml | 57 +++++---- .../x86_64-pc-headless.x86_64-latest.args | 23 ++-- tests/qemuxml2argvdata/x86_64-pc-headless.xml | 30 ++++- .../qemuxml2argvdata/x86_64-q35-graphics.xml | 57 +++++---- .../x86_64-q35-headless.x86_64-latest.args | 15 ++- .../qemuxml2argvdata/x86_64-q35-headless.xml | 30 ++++- tests/qemuxml2argvtest.c | 1 + .../aarch64-virt-graphics.aarch64-latest.xml | 115 +++++++++++++++++ .../aarch64-virt-headless.aarch64-latest.xml | 101 +++++++++++++++ .../ppc64-pseries-graphics.ppc64-latest.xml | 75 +++++++++++ .../ppc64-pseries-headless.ppc64-latest.xml | 66 ++++++++++ .../riscv64-virt-graphics.riscv64-latest.xml | 109 ++++++++++++++++ .../riscv64-virt-headless.riscv64-latest.xml | 95 ++++++++++++++ .../s390x-ccw-graphics.s390x-latest.xml | 66 ++++++++++ .../s390x-ccw-headless.s390x-latest.xml | 53 ++++++++ .../x86_64-pc-graphics.x86_64-latest.xml | 82 ++++++++++++ .../x86_64-pc-headless.x86_64-latest.xml | 74 +++++++++++ .../x86_64-q35-graphics.x86_64-latest.xml | 120 ++++++++++++++++++ .../x86_64-q35-headless.x86_64-latest.xml | 112 ++++++++++++++++ tests/qemuxml2xmltest.c | 16 +++ 35 files changed, 1448 insertions(+), 210 deletions(-) copy tests/qemuxml2argvdata/{aarch64-virt-graphics.aarch64-latest.args => riscv64-virt-graphics.riscv64-latest.args} (79%) create mode 100644 tests/qemuxml2argvdata/riscv64-virt-graphics.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml -- 2.21.0

2 12

[libvirt] [PATCH libvirt-python] Fix regression in lxcOpenNamespace
by Sergei Turchanov 26 Jun '19

26 Jun '19

This fixes regression caused by the 1d39dbaf637db03f6e597ed56b96aa065710b4a1 fdlist[i] erroneously was replaced by fdlist[1] which caused lxcOpenNamespace to return a list with identical elements. Signed-off-by: Sergei Turchanov <turchanov(a)farpost.com> --- libvirt-lxc-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 60c2e48..d7af154 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -83,7 +83,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, goto error; for (i = 0; i < c_retval; i++) - VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[1]), error); + VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[i]), error); cleanup: VIR_FREE(fdlist); -- 2.17.1

2 1

[libvirt] [PATCH v2] deprecate -mem-path fallback to anonymous RAM
by Igor Mammedov 26 Jun '19

26 Jun '19

Fallback might affect guest or worse whole host performance or functionality if backing file were used to share guest RAM with another process. Patch deprecates fallback so that we could remove it in future and ensure that QEMU will provide expected behavior and fail if it can't use user provided backing file. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- v2: * improve text language (Markus Armbruster <armbru(a)redhat.com>) numa.c | 6 ++++-- qemu-deprecated.texi | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/numa.c b/numa.c index 91a29138a2..c15e53e92d 100644 --- a/numa.c +++ b/numa.c @@ -494,8 +494,10 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, if (mem_prealloc) { exit(1); } - error_report("falling back to regular RAM allocation."); - + warn_report("falling back to regular RAM allocation"); + error_printf("This is deprecated. Make sure that -mem-path " + " specified path has sufficient resources to allocate" + " -m specified RAM amount or QEMU will fail to start"); /* Legacy behavior: if allocation failed, fall back to * regular RAM allocation. */ diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 2fe9b72121..1b7f3b10dc 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -112,6 +112,15 @@ QEMU using implicit generic or board specific splitting rule. Use @option{memdev} with @var{memory-backend-ram} backend or @option{mem} (if it's supported by used machine type) to define mapping explictly instead. +@subsection -mem-path fallback to RAM (since 4.1) +Currently if guest RAM allocation from file pointed by @option{mem-path} +fails, QEMU falls back to allocating from RAM, which might result +in unpredictable behavior since the backing file specified by the user +is ignored. In the future, users will be responsible for making sure +the backing storage specified with @option{-mem-path} can actually provide +the guest RAM configured with @option{-m} and fail to start up if RAM allocation +is unsuccessful. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) -- 2.18.1

4 4

[libvirt] [PATCH libvirt-python] Fix regression in lxcOpenNamespace
by Sergei Turchanov 26 Jun '19

26 Jun '19

This fixes regression caused by the 1d39dbaf637db03f6e597ed56b96aa065710b4a1 fdlist[i] erroneously was replaced by fdlist[1] which caused lxcOpenNamespace to return a list with identical elements. --- libvirt-lxc-override.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index 60c2e48..d7af154 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -83,7 +83,7 @@ libvirt_lxc_virDomainLxcOpenNamespace(PyObject *self ATTRIBUTE_UNUSED, goto error; for (i = 0; i < c_retval; i++) - VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[1]), error); + VIR_PY_LIST_APPEND_GOTO(py_retval, libvirt_intWrap(fdlist[i]), error); cleanup: VIR_FREE(fdlist); -- 2.17.1

2 3

[libvirt] [PATCH 00/10] qemu: Refactor disk hotplug code for better reuse with blockdev (blockdev-add saga)
by Peter Krempa 25 Jun '19

25 Jun '19

Move around few of the helpers which deal with disk addition and removal and fix a potential bug in the blockdev media change routine. The refactors will allow simplify a corner case of using blockdev such as if the disk frontend is unplugged the backends can be unplugged only after blockjobs terminate. This will allow simpler handling of the backing chain data in conjunction with blockjobs. To test the blockdev part you can use the new XML namespace element for qemu: <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> [...] <qemu:capabilities> <qemu:add capability='blockdev'/> </qemu:capabilities> if you have a recent enough qemu. Peter Krempa (10): qemu: block: Move and rename qemuHotplugRemoveStorageSourcePrepareData qemu: hotplug: Handle copy-on-read filter separate from rest of backing chain qemu: Introduce new set of helpers for attaching and detaching storage chains qemu: command: Use storage chain helpers in commandline generator qemu: command: Use VIR_AUTO infrastructure in qemuBuildDiskSourceCommandLine qemu: command: get rid of 'cleanup' in qemuBuildDiskSourceCommandLine qemu: hotplug: Use storage chain helpers in qemuDomainAttachDiskGeneric qemu: hotplug: Use storage chain helpers in qemuDomainRemoveDiskDevice qemu: hotplug: qemu: hotplug: Use storage chain helpers in qemuDomainChangeMediaBlockdev qemu: hotplug: Remove rest of source backend if hotplug fails src/qemu/qemu_block.c | 174 +++++++++++++++++++++ src/qemu/qemu_block.h | 33 ++++ src/qemu/qemu_command.c | 132 ++++++++++------ src/qemu/qemu_command.h | 11 ++ src/qemu/qemu_hotplug.c | 332 +++++++--------------------------------- 5 files changed, 361 insertions(+), 321 deletions(-) -- 2.21.0

2 21

[libvirt] [PATCH] conf: storage: also sanitize source dir
by Ján Tomko 25 Jun '19

25 Jun '19

Commit a7fb2258 added sanitization of storage pool target paths, however source dir paths were left unsanitized. A netfs pool with: <source> <host name='10.20.30.40'/> <dir path='/nfs/'/> </source> will not be correctly detected as mounted by virStorageBackendFileSystemIsMounted, because it shows up in the mount list without the trailing slash. Sanitize the source dir as well. https://bugzilla.redhat.com/show_bug.cgi?id=1723247 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/storage_conf.c | 5 ++++- .../storagepoolxml2xmlin/pool-netfs-slash.xml | 20 +++++++++++++++++++ .../pool-netfs-slash.xml | 20 +++++++++++++++++++ tests/storagepoolxml2xmltest.c | 1 + 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-slash.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-slash.xml diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 29988c36c4..397bd66870 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -533,6 +533,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, VIR_AUTOFREE(char *) port = NULL; VIR_AUTOFREE(char *) ver = NULL; VIR_AUTOFREE(xmlNodePtr *) nodeset = NULL; + VIR_AUTOFREE(char *) sourcedir = NULL; relnode = ctxt->node; ctxt->node = node; @@ -630,7 +631,9 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, } - source->dir = virXPathString("string(./dir/@path)", ctxt); + sourcedir = virXPathString("string(./dir/@path)", ctxt); + if (sourcedir) + source->dir = virFileSanitizePath(sourcedir); /* In gluster, a missing dir defaults to "/" */ if (!source->dir && pool_type == VIR_STORAGE_POOL_GLUSTER && VIR_STRDUP(source->dir, "/") < 0) diff --git a/tests/storagepoolxml2xmlin/pool-netfs-slash.xml b/tests/storagepoolxml2xmlin/pool-netfs-slash.xml new file mode 100644 index 0000000000..63f5d401ba --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-netfs-slash.xml @@ -0,0 +1,20 @@ +<pool type='netfs'> + <name>nfsimages</name> + <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + <host name='localhost'/> + <dir path='/var/lib/libvirt/images/'/> + <format type='nfs'/> + </source> + <target> + <path>/mnt</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff --git a/tests/storagepoolxml2xmlout/pool-netfs-slash.xml b/tests/storagepoolxml2xmlout/pool-netfs-slash.xml new file mode 100644 index 0000000000..8a5f272137 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-netfs-slash.xml @@ -0,0 +1,20 @@ +<pool type='netfs'> + <name>nfsimages</name> + <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> + <source> + <host name='localhost'/> + <dir path='/var/lib/libvirt/images'/> + <format type='nfs'/> + </source> + <target> + <path>/mnt</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index b6f4cb4226..96dd04faec 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -73,6 +73,7 @@ mymain(void) DO_TEST("pool-iscsi"); DO_TEST("pool-iscsi-auth"); DO_TEST("pool-netfs"); + DO_TEST("pool-netfs-slash"); DO_TEST("pool-netfs-auto"); DO_TEST("pool-netfs-protocol-ver"); DO_TEST("pool-netfs-gluster"); -- 2.20.1

2 1

[libvirt] [PATCH 0/3] error: Introdude and use VIR_ERR_DEPRECATED error code
by Peter Krempa 25 Jun '19

25 Jun '19

Peter Krempa (3): error: Add VIR_ERR_DEPRECATED error code qemu: Use VIR_ERR_DEPRECATED in QemuAttach and DomainXMLFromNative stubs news: Mention VIR_ERR_DEPRECATED in improvements docs/news.xml | 10 ++++++++++ include/libvirt/virterror.h | 1 + src/qemu/qemu_driver.c | 4 ++-- src/util/virerror.c | 4 ++++ 4 files changed, 17 insertions(+), 2 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH 0/3] qemu: Fix handling of 'dir' volumes with disk type='volume'
by Peter Krempa 25 Jun '19

25 Jun '19

Peter Krempa (3): util: storage: Fix virStorageSourceGetActualType if volume was not translated qemu: domain: Allow 'VIR_STORAGE_TYPE_VOLUME' disks with 'fat' format qemu: Supply correct default type for 'dir' based VIR_STORAGE_TYPE_VOLUME src/qemu/qemu_domain.c | 13 ++++++++++--- src/util/virstoragefile.c | 12 +++++++++++- tests/qemuxml2argvdata/disk-source-pool.args | 8 ++++++++ tests/qemuxml2argvdata/disk-source-pool.xml | 16 +++++++++++++++- tests/qemuxml2xmloutdata/disk-source-pool.xml | 14 ++++++++++++++ 5 files changed, 58 insertions(+), 5 deletions(-) -- 2.21.0

1 4

[libvirt] Plans for next release
by Daniel Veillard 25 Jun '19

25 Jun '19

Ideally if we want to push the next release on Monday, we should enter freeze tomorrow, then push Rc2 on Friday and then if everything goes well we can push 5.5.0 final next Monday. Hopefully that plan works for everyone, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] qemu: distinguish pr disk before qemuHotplugRemoveManagedPR
by Jie Wang 25 Jun '19

25 Jun '19

when a disk without PR perform attach or detach operation, need not call qemuHotplugRemoveManagedPR, otherwise, it will print err log about PR, let us fix it. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- src/qemu/qemu_hotplug.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index efda539..7ef92d0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -928,7 +928,9 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) ret = -2; - if (qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) + + if (virStorageSourceChainHasManagedPR(disk->src) && + qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) ret = -2; virDomainAuditDisk(vm, NULL, disk->src, "attach", false); @@ -4481,7 +4483,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, dev.data.disk = disk; ignore_value(qemuRemoveSharedDevice(driver, &dev, vm->def->name)); - if (qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) + if (virStorageSourceChainHasManagedPR(disk->src) && + qemuHotplugRemoveManagedPR(driver, vm, QEMU_ASYNC_JOB_NONE) < 0) goto cleanup; ret = 0; -- 1.8.3.1

3 3

[libvirt] [PATCH] storage: omit comma for ceph mon hosts to librados
by Yi Li 25 Jun '19

25 Jun '19

Silly mistakes omit the comma for multiple ipaddr Fixes: cdd362e0e7a34d4f8f102c75f2ca513d23dd1db0 Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_backend_rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index bd6e3d5..315bef2 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -272,10 +272,10 @@ virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, const char *incFormat; if (virSocketAddrNumericFamily(source->hosts[i].name) == AF_INET6) { /* IPv6 address must be escaped in brackets on the cmd line */ - incFormat = "[%s]:%d"; + incFormat = "[%s]:%d,"; } else { /* listenAddress is a hostname or IPv4 */ - incFormat = "%s:%d"; + incFormat = "%s:%d,"; } virBufferAsprintf(&mon_host, incFormat, source->hosts[i].name, -- 2.7.5

3 2

[libvirt] [PATCH] deprecate -mem-path fallback to anonymous RAM
by Igor Mammedov 25 Jun '19

25 Jun '19

Fallback might affect guest or worse whole host performance or functionality if backing file were used to share guest RAM with another process. Patch deprecates fallback so that we could remove it in future and ensure that QEMU will provide expected behavior and fail if it can't use user provided backing file. Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- PS: Patch is written on top of [PATCH v4 0/3] numa: deprecate '-numa node, mem' and default memory distribution to avoid conflicts in qemu-deprecated.texi numa.c | 4 ++-- qemu-deprecated.texi | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/numa.c b/numa.c index 91a29138a2..53d67b8ad9 100644 --- a/numa.c +++ b/numa.c @@ -494,8 +494,8 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, if (mem_prealloc) { exit(1); } - error_report("falling back to regular RAM allocation."); - + warn_report("falling back to regular RAM allocation. " + "Fallback to RAM allocation is deprecated."); /* Legacy behavior: if allocation failed, fall back to * regular RAM allocation. */ diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 2fe9b72121..2193705644 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -112,6 +112,14 @@ QEMU using implicit generic or board specific splitting rule. Use @option{memdev} with @var{memory-backend-ram} backend or @option{mem} (if it's supported by used machine type) to define mapping explictly instead. +@subsection -mem-path fallback to RAM (since 4.1) +Currently if system memory allocation from file pointed by @option{mem-path} +fails, QEMU fallbacks to allocating from anonymous RAM. Which might result +in unpredictable behavior since provided backing file wasn't used. In future +QEMU will not fallback and fail to start up, so user could fix his/her QEMU/host +configuration or explicitly use -m without -mem-path if system memory allocated +from anonymous RAM suits usecase. + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) -- 2.18.1

4 8

[libvirt] [PATCH v2 0/6] cgroups v2 fixes and improvements
by Pavel Hrdina 25 Jun '19

25 Jun '19

Pavel Hrdina (6): util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB util: vircgroup: improve controller detection util: vircgroupv2: use any controller to create thread directory util: vircgroupv2: enable CPU controller only if it's available util: vircgroupv2: separate return values of virCgroupV2EnableController util: vircgroupv2: don't error out if enabling controller fails src/util/vircgroup.c | 32 ++++++++++---------- src/util/vircgroupbackend.h | 3 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv2.c | 59 +++++++++++++++++++++++++++++-------- 4 files changed, 66 insertions(+), 31 deletions(-) -- 2.21.0

1 7

[libvirt] [PATCH 0/3] conf: Fix parsing of <disk> <seclabel> (blockdev-add saga)
by Peter Krempa 25 Jun '19

25 Jun '19

The parser for the seclabel would mess up context leaving disk source private data unparsed. Peter Krempa (3): tests: qemustatusxml2xml: Split out the output file for 'modern' test tests: qemustatusxml2xml: Add a seclabel for a disk with privateData conf: domain: Restore XPath context after virSecurityDeviceLabelDefParseXML src/conf/domain_conf.c | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 3 + tests/qemustatusxml2xmldata/modern-out.xml | 474 ++++++++++++++++++++- 3 files changed, 477 insertions(+), 1 deletion(-) mode change 120000 => 100644 tests/qemustatusxml2xmldata/modern-out.xml -- 2.21.0

2 8

[libvirt] [PATCH 5/6] docs: Deprecate CPU model runnability guarantees
by Eduardo Habkost 25 Jun '19

25 Jun '19

Document that CPU model runnability guarantees won't apply to unversioned CPU models anymore. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- Cc: libvir-list(a)redhat.com --- qemu-deprecated.texi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index df04f2840b..5fafb62a6d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -243,3 +243,22 @@ Note that if you are exposing the export via /dev/nbd0, it is easier to just export the entire image and then mount only /dev/nbd0p1 than it is to reinvoke @command{qemu-nbd -c /dev/nbd0} limited to just a subset of the image. + +@section Backwards compatibility + +@subsection Runnability guarantee of CPU models (since 4.1.0) + +Previous versions of QEMU never changed existing CPU models in +ways that introduced additional host software or hardware +requirements to the VM. This allowed management software to +safely change the machine type of an existing VM without +introducing new requirements ("runnability guarantee"). This +prevented CPU models from being updated to include CPU +vulnerability mitigations, leaving guests vulnerable in the +default configuration. + +The CPU model runnability guarantee won't apply anymore to +existing CPU models. Management software that needs runnability +guarantees must resolve the CPU model aliases using te +``alias-of'' field returned by the ``query-cpu-definitions'' QMP +command. -- 2.18.0.rc1.1.g3f1ff2140

1 0

[libvirt] [PATCH 0/2] test_driver: A couple of small changes in testDomainInterfaceAddresses
by Ilias Stamatis 24 Jun '19

24 Jun '19

Ilias Stamatis (2): test_driver: use addr_offset for non-network infs too test_driver: use virDomainNetDefPtr instead of virDomainNetDef * src/test/test_driver.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) -- 2.22.0

1 2

[libvirt] [PATCH v2] test_driver: implement virNetworkGetDHCPLeases
by Ilias Stamatis 24 Jun '19

24 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 141 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4b1f2724a0..180940f859 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4072,6 +4072,146 @@ testNetworkSetAutostart(virNetworkPtr net, } +static int +testNetworkGetDHCPLeases(virNetworkPtr net, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags) +{ + int ret = -1; + int ndomains = 0; + size_t i, j; + size_t nleases = 0; + size_t addr_offset; + bool need_results = !!leases; + char *hostname = NULL; + VIR_AUTOFREE(char *) bridge_name = NULL; + char mac_str[VIR_MAC_STRING_BUFLEN]; + virMacAddr mac_addr; + virDomainObjPtr vm = NULL; + virDomainPtr *domains = NULL; + virDomainNetDefPtr inf = NULL; + virNetworkObjPtr obj = NULL; + virNetworkDefPtr obj_def = NULL; + virNetworkDHCPLeasePtr lease = NULL; + virNetworkDHCPLeasePtr *leases_ret = NULL; + virDomainInterfacePtr iface = NULL; + testDriverPtr privconn = net->conn->privateData; + + virCheckFlags(0, -1); + + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + + if (!(obj = testNetworkObjFindByName(privconn, net->name))) + return -1; + + obj_def = virNetworkObjGetDef(obj); + + if (VIR_STRDUP(bridge_name, obj_def->bridge) < 0) + goto cleanup; + + virNetworkObjEndAPI(&obj); + + if ((ndomains = virDomainObjListExport(privconn->domains, net->conn, &domains, + NULL, VIR_CONNECT_LIST_DOMAINS_ACTIVE)) < 0) + goto cleanup; + + for (i = 0; i < ndomains; i++) { + /* the following must be called before testDomObjFromDomain */ + hostname = testDomainGetHostname(domains[i], 0); + + if (!(vm = testDomObjFromDomain(domains[i]))) + continue; + + for (j = 0; j < vm->def->nnets; j++) { + inf = vm->def->nets[j]; + + if (STRNEQ(inf->data.network.name, net->name)) + continue; + + virMacAddrFormat(&inf->mac, mac_str); + if (mac && virMacAddrCompare(mac, mac_str)) + continue; + + if (!need_results) { + nleases++; + continue; + } + + if (VIR_ALLOC(lease) < 0 || VIR_ALLOC(iface) < 0 || VIR_ALLOC(iface->addrs) < 0) + goto error; + iface->naddrs = 1; + + /* should be the same value as in testDomainInterfaceAddresses */ + addr_offset = 20 * (vm->def->id - 1) + j + 1; + if (testDomainInterfaceAddressFromNet(privconn, inf, addr_offset, iface) < 0) + goto error; + + if (VIR_STRDUP(lease->mac, mac_str) < 0 || + VIR_STRDUP(lease->iface, bridge_name) < 0 || + VIR_STRDUP(lease->hostname, hostname) < 0 || + VIR_STRDUP(lease->ipaddr, iface->addrs->addr) < 0) + goto error; + + lease->prefix = iface->addrs->prefix; + lease->type = iface->addrs->type; + + virDomainInterfaceFree(iface); + iface = NULL; + + lease->expirytime = 0; + + lease->iaid = NULL; + if (lease->type == VIR_IP_ADDR_TYPE_IPV6) { + if (VIR_STRDUP(lease->clientid, + "00:01:00:01:16:C1:BA:6E:08:00:27:30:C3:B8") < 0) + goto error; + } else { + lease->clientid = NULL; + } + + if (VIR_INSERT_ELEMENT(leases_ret, nleases, nleases, lease) < 0) + goto error; + } + + VIR_FREE(hostname); + virDomainObjEndAPI(&vm); + } + + if (leases_ret) { + /* NULL terminated array */ + ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1)); + VIR_STEAL_PTR(*leases, leases_ret); + } + + ret = nleases; + + cleanup: + for (i = 0; i < ndomains; i++) + virDomainFree(domains[i]); + + VIR_FREE(domains); + VIR_FREE(lease); + VIR_FREE(hostname); + + virNetworkObjEndAPI(&obj); + virDomainInterfaceFree(iface); + virDomainObjEndAPI(&vm); + return ret; + + error: + if (leases_ret) { + for (i = 0; i < nleases; i++) + virNetworkDHCPLeaseFree(leases_ret[i]); + VIR_FREE(leases_ret); + } + goto cleanup; +} + + /* * Physical host interface routines */ @@ -7359,6 +7499,7 @@ static virNetworkDriver testNetworkDriver = { .networkGetBridgeName = testNetworkGetBridgeName, /* 0.3.2 */ .networkGetAutostart = testNetworkGetAutostart, /* 0.3.2 */ .networkSetAutostart = testNetworkSetAutostart, /* 0.3.2 */ + .networkGetDHCPLeases = testNetworkGetDHCPLeases, /* 5.5.0 */ .networkIsActive = testNetworkIsActive, /* 0.7.3 */ .networkIsPersistent = testNetworkIsPersistent, /* 0.7.3 */ }; -- 2.22.0

1 1

[libvirt] [PATCH 1/1] virpci: report dev->name in virPCIGetHeaderType error message
by Daniel Henrique Barboza 24 Jun '19

24 Jun '19

Trivial change. Adding the name of the device that has an unknown PCI header type in that function helps when debugging PCI code. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/util/virpci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8f2936c23a..75e8daadd5 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3239,7 +3239,8 @@ int virPCIGetHeaderType(virPCIDevicePtr dev, int *hdrType) type &= PCI_HEADER_TYPE_MASK; if (type >= VIR_PCI_HEADER_LAST) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown PCI header type '%d'"), type); + _("Unknown PCI header type '%d' for device '%s'"), + type, dev->name); return -1; } -- 2.20.1

2 1

[libvirt] [PATCH] RFC: maint: Sort public symbols within a release
by Eric Blake 24 Jun '19

24 Jun '19

In libvirt_private.syms, we have a policy of keeping blocks of symbols sorted by name - in fact, we enforce it during 'make check' with our check-symsorting rule calling out to a perl script. But libvirt_public.syms has been more cavalier over the years. 21 releases have been trivially sorted due to adding only one symbol; while the following 27 releases listed multiple symbols in alphabetical order, even if the symbols were not chronologically added in that order [1]: 0.0.3 0.9.5 1.1.0 0.3.0 0.9.7 1.1.1 0.3.3 0.9.8 1.2.5 0.4.2 0.9.9 1.2.8 0.6.3 0.9.10 1.2.11 0.7.5 0.9.13 1.2.15 0.9.0 1.0.1 1.3.3 0.9.2 1.0.2 3.1.0 0.9.3 1.0.3 3.4.0 [1] Case study: git log -p v0.9.9..v0.9.10 src/libvirt_public.syms shows 9 commits adding 9 APIs among 7 authors: 0b7ddf9e - trivially in order adb99a05 - appending happened to also be sorted order 1f7aa0ac - irrelevant (removing TABs, not adding symbol) 6714fd04 - added in sorted order 8f8b0802 - appended, out of order e1eea747 - re-sorted previous addition, and added in sorted order 02af3e13 - added in sorted order c471e55e - added in sorted order 99fd69c3 - added in sorted order The following patch changes the remaining 37 releases to do likewise, and documents the practice. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm not sure if we want this patch - it got much bigger than I was expecting. 37 releases is less than half of the total versions in the file, but larger than the number of releases that were sorted (where it is not even obvious if that was always intentional or by luck). We could also decide to adopt a policy of listing symbols in the same order as remote_protocol.x (although not all symbols go over RPC), but that seems like it would be even more churn and harder to enforce. Ideally, if we DO want this patch, we should also teach 'make check' via src/check-symsorting.pl how to enforce it on the public file; as I did not do that, this is marked RFC. The diffstat shows a delta because I deleted 5 blank lines and added 2 comment lines. --- src/libvirt_public.syms | 313 ++++++++++++++++++++-------------------- 1 file changed, 155 insertions(+), 158 deletions(-) diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 75f7fdfb0c..f9e0072352 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -10,6 +10,8 @@ # soname version info can't enforce this since we never # change the soname # +# Keep this file sorted by version, then by symbols within each version. +# LIBVIRT_0.0.3 { global: virConnectClose; @@ -43,44 +45,43 @@ LIBVIRT_0.0.3 { LIBVIRT_0.0.5 { global: - virDomainLookupByUUID; virDomainGetUUID; + virDomainLookupByUUID; } LIBVIRT_0.0.3; LIBVIRT_0.1.0 { global: + virConnCopyLastError; + virConnGetLastError; + virConnResetLastError; + virConnSetErrorFunc; + virCopyLastError; + virDefaultErrorFunc; + virDomainReboot; + virGetLastError; virInitialize; virNodeGetInfo; - virDomainReboot; - - virCopyLastError; - virConnSetErrorFunc; - virResetLastError; virResetError; - virConnGetLastError; - virGetLastError; + virResetLastError; virSetErrorFunc; - virConnCopyLastError; - virConnResetLastError; - virDefaultErrorFunc; } LIBVIRT_0.0.5; LIBVIRT_0.1.1 { global: - virDomainLookupByUUIDString; + virConnectListDefinedDomains; + virDomainCreate; + virDomainDefineXML; virDomainGetUUIDString; + virDomainLookupByUUIDString; virDomainSetMemory; - virDomainDefineXML; - virDomainCreate; virDomainUndefine; - virConnectListDefinedDomains; } LIBVIRT_0.1.0; LIBVIRT_0.1.4 { global: - virDomainSetVcpus; - virDomainPinVcpu; virDomainGetVcpus; + virDomainPinVcpu; + virDomainSetVcpus; } LIBVIRT_0.1.1; LIBVIRT_0.1.5 { @@ -90,39 +91,39 @@ LIBVIRT_0.1.5 { LIBVIRT_0.1.9 { global: - virDomainCoreDump; virDomainAttachDevice; + virDomainCoreDump; virDomainDetachDevice; } LIBVIRT_0.1.5; LIBVIRT_0.2.0 { global: - virConnectNumOfNetworks; + virConnectListDefinedNetworks; virConnectListNetworks; virConnectNumOfDefinedNetworks; - virConnectListDefinedNetworks; - virNetworkLookupByName; - virNetworkLookupByUUID; - virNetworkLookupByUUIDString; + virConnectNumOfNetworks; + virNetworkCreate; virNetworkCreateXML; virNetworkDefineXML; - virNetworkUndefine; - virNetworkCreate; virNetworkDestroy; virNetworkFree; + virNetworkGetBridgeName; virNetworkGetName; virNetworkGetUUID; virNetworkGetUUIDString; virNetworkGetXMLDesc; - virNetworkGetBridgeName; + virNetworkLookupByName; + virNetworkLookupByUUID; + virNetworkLookupByUUIDString; + virNetworkUndefine; } LIBVIRT_0.1.9; LIBVIRT_0.2.1 { global: virConnectGetCapabilities; virConnectGetMaxVcpus; - virDomainGetMaxVcpus; virDomainGetAutostart; + virDomainGetMaxVcpus; virDomainSetAutostart; virNetworkGetAutostart; virNetworkSetAutostart; @@ -130,8 +131,8 @@ LIBVIRT_0.2.1 { LIBVIRT_0.2.3 { global: - virDomainGetSchedulerType; virDomainGetSchedulerParameters; + virDomainGetSchedulerType; virDomainSetSchedulerParameters; } LIBVIRT_0.2.1; @@ -145,9 +146,9 @@ LIBVIRT_0.3.0 { LIBVIRT_0.3.2 { global: - virDomainMigrate; virDomainBlockStats; virDomainInterfaceStats; + virDomainMigrate; } LIBVIRT_0.3.0; LIBVIRT_0.3.3 { @@ -158,52 +159,51 @@ LIBVIRT_0.3.3 { LIBVIRT_0.4.0 { global: - virConnectOpenAuth; virConnectAuthPtrDefault; + virConnectOpenAuth; } LIBVIRT_0.3.3; LIBVIRT_0.4.1 { global: - virStoragePoolGetConnect; - virConnectNumOfStoragePools; - virConnectNumOfDefinedStoragePools; - virConnectListStoragePools; virConnectListDefinedStoragePools; - virStoragePoolLookupByName; - virStoragePoolLookupByUUID; - virStoragePoolLookupByUUIDString; - virStoragePoolLookupByVolume; + virConnectListStoragePools; + virConnectNumOfDefinedStoragePools; + virConnectNumOfStoragePools; + virStoragePoolBuild; + virStoragePoolCreate; virStoragePoolCreateXML; virStoragePoolDefineXML; - virStoragePoolUndefine; - virStoragePoolCreate; - virStoragePoolBuild; - virStoragePoolDestroy; virStoragePoolDelete; - virStoragePoolRefresh; + virStoragePoolDestroy; virStoragePoolFree; + virStoragePoolGetAutostart; + virStoragePoolGetConnect; + virStoragePoolGetInfo; virStoragePoolGetName; virStoragePoolGetUUID; virStoragePoolGetUUIDString; - virStoragePoolGetInfo; virStoragePoolGetXMLDesc; - virStoragePoolSetAutostart; - virStoragePoolGetAutostart; - virStoragePoolNumOfVolumes; virStoragePoolListVolumes; - - virStorageVolGetConnect; - virStorageVolLookupByName; - virStorageVolLookupByKey; - virStorageVolLookupByPath; + virStoragePoolLookupByName; + virStoragePoolLookupByUUID; + virStoragePoolLookupByUUIDString; + virStoragePoolLookupByVolume; + virStoragePoolNumOfVolumes; + virStoragePoolRefresh; + virStoragePoolSetAutostart; + virStoragePoolUndefine; virStorageVolCreateXML; virStorageVolDelete; virStorageVolFree; - virStorageVolGetName; - virStorageVolGetKey; + virStorageVolGetConnect; virStorageVolGetInfo; - virStorageVolGetXMLDesc; + virStorageVolGetKey; + virStorageVolGetName; virStorageVolGetPath; + virStorageVolGetXMLDesc; + virStorageVolLookupByKey; + virStorageVolLookupByName; + virStorageVolLookupByPath; } LIBVIRT_0.4.0; LIBVIRT_0.4.2 { @@ -219,21 +219,19 @@ LIBVIRT_0.4.5 { LIBVIRT_0.5.0 { global: + virConnectDomainEventDeregister; + virConnectDomainEventRegister; virDomainCreateXML; virEventRegisterImpl; - virConnectDomainEventRegister; - virConnectDomainEventDeregister; - - virNodeNumOfDevices; - virNodeListDevices; - virNodeDeviceLookupByName; virNodeDeviceFree; - virNodeDeviceGetXMLDesc; virNodeDeviceGetName; virNodeDeviceGetParent; - virNodeDeviceNumOfCaps; + virNodeDeviceGetXMLDesc; virNodeDeviceListCaps; - + virNodeDeviceLookupByName; + virNodeDeviceNumOfCaps; + virNodeListDevices; + virNodeNumOfDevices; } LIBVIRT_0.4.5; LIBVIRT_0.6.0 { @@ -241,21 +239,20 @@ LIBVIRT_0.6.0 { virConnectRef; virDomainRef; virNetworkRef; + virNodeDeviceRef; virStoragePoolRef; virStorageVolRef; - virNodeDeviceRef; - } LIBVIRT_0.5.0; LIBVIRT_0.6.1 { global: + virDomainGetSecurityLabel; virFreeError; - virSaveLastError; virNodeDeviceDettach; virNodeDeviceReAttach; virNodeDeviceReset; - virDomainGetSecurityLabel; virNodeGetSecurityModel; + virSaveLastError; } LIBVIRT_0.6.0; LIBVIRT_0.6.3 { @@ -266,67 +263,67 @@ LIBVIRT_0.6.3 { LIBVIRT_0.6.4 { global: - virInterfaceGetConnect; - virConnectNumOfInterfaces; + virConnectDomainXMLFromNative; + virConnectDomainXMLToNative; virConnectListInterfaces; - virInterfaceLookupByName; - virInterfaceLookupByMACString; - virInterfaceGetName; + virConnectNumOfInterfaces; + virInterfaceCreate; + virInterfaceDefineXML; + virInterfaceDestroy; + virInterfaceFree; + virInterfaceGetConnect; virInterfaceGetMACString; + virInterfaceGetName; virInterfaceGetXMLDesc; + virInterfaceLookupByMACString; + virInterfaceLookupByName; virInterfaceRef; - virInterfaceFree; - virInterfaceDefineXML; virInterfaceUndefine; - virInterfaceCreate; - virInterfaceDestroy; virStorageVolCreateXMLFrom; - virConnectDomainXMLFromNative; - virConnectDomainXMLToNative; } LIBVIRT_0.6.3; LIBVIRT_0.7.0 { global: - virConnectNumOfDefinedInterfaces; virConnectListDefinedInterfaces; + virConnectNumOfDefinedInterfaces; } LIBVIRT_0.6.4; LIBVIRT_0.7.1 { global: - virSecretGetConnect; - virConnectNumOfSecrets; virConnectListSecrets; - virSecretLookupByUUID; - virSecretLookupByUUIDString; - virSecretLookupByUsage; + virConnectNumOfSecrets; virSecretDefineXML; + virSecretFree; + virSecretGetConnect; virSecretGetUUID; virSecretGetUUIDString; - virSecretGetUsageType; virSecretGetUsageID; + virSecretGetUsageType; + virSecretGetValue; virSecretGetXMLDesc; + virSecretLookupByUUID; + virSecretLookupByUUIDString; + virSecretLookupByUsage; + virSecretRef; virSecretSetValue; - virSecretGetValue; virSecretUndefine; - virSecretRef; - virSecretFree; } LIBVIRT_0.7.0; LIBVIRT_0.7.2 { global: - virStreamNew; - virStreamRef; - virStreamSend; - virStreamRecv; - virStreamSendAll; - virStreamRecvAll; + virDomainMigrateToURI; + virStreamAbort; virStreamEventAddCallback; - virStreamEventUpdateCallback; virStreamEventRemoveCallback; + virStreamEventUpdateCallback; virStreamFinish; - virStreamAbort; virStreamFree; - virDomainMigrateToURI; + virStreamNew; + virStreamRecv; + virStreamRecvAll; + virStreamRef; + virStreamSend; + virStreamSendAll; } LIBVIRT_0.7.1; LIBVIRT_0.7.3 { @@ -336,11 +333,11 @@ LIBVIRT_0.7.3 { virConnectIsSecure; virDomainIsActive; virDomainIsPersistent; + virInterfaceIsActive; virNetworkIsActive; virNetworkIsPersistent; virStoragePoolIsActive; virStoragePoolIsPersistent; - virInterfaceIsActive; } LIBVIRT_0.7.2; LIBVIRT_0.7.5 { @@ -351,46 +348,46 @@ LIBVIRT_0.7.5 { LIBVIRT_0.7.7 { global: + virConnectBaselineCPU; + virDomainAbortJob; virDomainAttachDeviceFlags; virDomainDetachDeviceFlags; - virConnectBaselineCPU; virDomainGetJobInfo; - virDomainAbortJob; } LIBVIRT_0.7.5; LIBVIRT_0.8.0 { global: - virStorageVolWipe; - virDomainMigrateSetMaxDowntime; - virConnectDomainEventRegisterAny; virConnectDomainEventDeregisterAny; - virDomainUpdateDeviceFlags; + virConnectDomainEventRegisterAny; virConnectListNWFilters; virConnectNumOfNWFilters; - virNWFilterLookupByName; - virNWFilterLookupByUUID; - virNWFilterLookupByUUIDString; + virDomainHasCurrentSnapshot; + virDomainHasManagedSaveImage; + virDomainManagedSave; + virDomainManagedSaveRemove; + virDomainMigrateSetMaxDowntime; + virDomainRevertToSnapshot; + virDomainSnapshotCreateXML; + virDomainSnapshotCurrent; + virDomainSnapshotDelete; + virDomainSnapshotFree; + virDomainSnapshotGetXMLDesc; + virDomainSnapshotListNames; + virDomainSnapshotLookupByName; + virDomainSnapshotNum; + virDomainUpdateDeviceFlags; + virNWFilterDefineXML; virNWFilterFree; virNWFilterGetName; virNWFilterGetUUID; virNWFilterGetUUIDString; virNWFilterGetXMLDesc; + virNWFilterLookupByName; + virNWFilterLookupByUUID; + virNWFilterLookupByUUIDString; virNWFilterRef; - virNWFilterDefineXML; virNWFilterUndefine; - virDomainManagedSave; - virDomainHasManagedSaveImage; - virDomainManagedSaveRemove; - virDomainSnapshotCreateXML; - virDomainSnapshotGetXMLDesc; - virDomainSnapshotNum; - virDomainSnapshotListNames; - virDomainSnapshotLookupByName; - virDomainHasCurrentSnapshot; - virDomainSnapshotCurrent; - virDomainRevertToSnapshot; - virDomainSnapshotDelete; - virDomainSnapshotFree; + virStorageVolWipe; } LIBVIRT_0.7.7; @@ -407,16 +404,16 @@ LIBVIRT_0.8.2 { LIBVIRT_0.8.5 { global: - virDomainSetMemoryParameters; virDomainGetMemoryParameters; virDomainGetVcpusFlags; + virDomainSetMemoryParameters; virDomainSetVcpusFlags; } LIBVIRT_0.8.2; LIBVIRT_0.8.6 { global: - virDomainOpenConsole; virDomainIsUpdated; + virDomainOpenConsole; } LIBVIRT_0.8.5; LIBVIRT_0.8.8 { @@ -468,16 +465,16 @@ LIBVIRT_0.9.3 { LIBVIRT_0.9.4 { global: + virDomainBlockJobAbort; + virDomainBlockJobSetSpeed; + virDomainBlockPull; + virDomainDestroyFlags; + virDomainGetBlockJobInfo; virDomainRestoreFlags; virDomainSaveFlags; virDomainSaveImageDefineXML; virDomainSaveImageGetXMLDesc; virDomainUndefineFlags; - virDomainDestroyFlags; - virDomainBlockJobAbort; - virDomainGetBlockJobInfo; - virDomainBlockJobSetSpeed; - virDomainBlockPull; } LIBVIRT_0.9.3; LIBVIRT_0.9.5 { @@ -546,20 +543,20 @@ LIBVIRT_0.9.13 { LIBVIRT_0.10.0 { global: - virDomainGetHostname; virConnectRegisterCloseCallback; virConnectUnregisterCloseCallback; + virDomainGetEmulatorPinInfo; + virDomainGetHostname; virDomainGetSecurityLabelList; virDomainPinEmulator; - virDomainGetEmulatorPinInfo; } LIBVIRT_0.9.13; LIBVIRT_0.10.2 { global: virConnectListAllInterfaces; + virConnectListAllNWFilters; virConnectListAllNetworks; virConnectListAllNodeDevices; - virConnectListAllNWFilters; virConnectListAllSecrets; virConnectListAllStoragePools; virDomainBlockCommit; @@ -641,8 +638,8 @@ LIBVIRT_1.1.3 { LIBVIRT_1.2.1 { global: - virConnectNetworkEventRegisterAny; virConnectNetworkEventDeregisterAny; + virConnectNetworkEventRegisterAny; } LIBVIRT_1.1.3; LIBVIRT_1.2.3 { @@ -660,9 +657,9 @@ LIBVIRT_1.2.5 { LIBVIRT_1.2.6 { global: - virNodeGetFreePages; virNetworkDHCPLeaseFree; virNetworkGetDHCPLeases; + virNodeGetFreePages; } LIBVIRT_1.2.5; LIBVIRT_1.2.7 { @@ -697,11 +694,11 @@ LIBVIRT_1.2.12 { LIBVIRT_1.2.14 { global: - virDomainIOThreadInfoFree; virDomainGetIOThreadInfo; - virDomainPinIOThread; + virDomainIOThreadInfoFree; virDomainInterfaceAddresses; virDomainInterfaceFree; + virDomainPinIOThread; } LIBVIRT_1.2.12; LIBVIRT_1.2.15 { @@ -727,30 +724,30 @@ LIBVIRT_1.2.19 { LIBVIRT_1.3.3 { global: - virDomainMigrateStartPostCopy; virDomainGetPerfEvents; + virDomainMigrateStartPostCopy; virDomainSetPerfEvents; } LIBVIRT_1.2.19; LIBVIRT_2.0.0 { global: - virConnectStoragePoolEventRegisterAny; virConnectStoragePoolEventDeregisterAny; + virConnectStoragePoolEventRegisterAny; virDomainGetGuestVcpus; virDomainSetGuestVcpus; } LIBVIRT_1.3.3; LIBVIRT_2.2.0 { global: - virConnectNodeDeviceEventRegisterAny; virConnectNodeDeviceEventDeregisterAny; + virConnectNodeDeviceEventRegisterAny; } LIBVIRT_2.0.0; LIBVIRT_3.0.0 { global: - virStorageVolGetInfoFlags; - virConnectSecretEventRegisterAny; virConnectSecretEventDeregisterAny; + virConnectSecretEventRegisterAny; + virStorageVolGetInfoFlags; } LIBVIRT_2.2.0; LIBVIRT_3.1.0 { @@ -770,9 +767,9 @@ LIBVIRT_3.4.0 { LIBVIRT_3.7.0 { global: - virDomainMigrateGetMaxDowntime; - virDomainManagedSaveGetXMLDesc; virDomainManagedSaveDefineXML; + virDomainManagedSaveGetXMLDesc; + virDomainMigrateGetMaxDowntime; } LIBVIRT_3.4.0; LIBVIRT_3.9.0 { @@ -787,26 +784,26 @@ LIBVIRT_4.1.0 { LIBVIRT_4.4.0 { global: - virDomainDetachDeviceAlias; - virConnectCompareHypervisorCPU; virConnectBaselineHypervisorCPU; + virConnectCompareHypervisorCPU; + virDomainDetachDeviceAlias; } LIBVIRT_4.1.0; LIBVIRT_4.5.0 { global: + virConnectListAllNWFilterBindings; + virDomainGetLaunchSecurityInfo; virGetLastErrorCode; virGetLastErrorDomain; - virNodeGetSEVInfo; - virDomainGetLaunchSecurityInfo; - virNWFilterBindingLookupByPortDev; - virConnectListAllNWFilterBindings; virNWFilterBindingCreateXML; - virNWFilterBindingGetXMLDesc; virNWFilterBindingDelete; - virNWFilterBindingRef; virNWFilterBindingFree; - virNWFilterBindingGetPortDev; virNWFilterBindingGetFilterName; + virNWFilterBindingGetPortDev; + virNWFilterBindingGetXMLDesc; + virNWFilterBindingLookupByPortDev; + virNWFilterBindingRef; + virNodeGetSEVInfo; } LIBVIRT_4.4.0; LIBVIRT_4.10.0 { @@ -821,18 +818,18 @@ LIBVIRT_5.2.0 { LIBVIRT_5.5.0 { virNetworkListAllPorts; - virNetworkPortLookupByUUID; - virNetworkPortLookupByUUIDString; virNetworkPortCreateXML; + virNetworkPortDelete; + virNetworkPortFree; virNetworkPortGetNetwork; virNetworkPortGetParameters; - virNetworkPortGetXMLDesc; virNetworkPortGetUUID; virNetworkPortGetUUIDString; - virNetworkPortDelete; - virNetworkPortFree; + virNetworkPortGetXMLDesc; + virNetworkPortLookupByUUID; + virNetworkPortLookupByUUIDString; virNetworkPortRef; virNetworkPortSetParameters; } LIBVIRT_5.2.0; -# .... define new API here using predicted next version number .... +# .... define new API in sorted order using predicted next version number .... -- 2.20.1

2 2

[libvirt] [PATCH 0/2] A couple coverity patches
by John Ferlan 22 Jun '19

22 Jun '19

Coverity has been tripped up a few more times recently... The memory leak patch probably I what I noted from Jiri's recent CPU series. The return value check is older. It wasn't clear though if the intention of the module was to ignore errors so I just chose to error out like other similar callers. If there's a better way - then other patches can be posted. John Ferlan (2): cpu_x86: Fix memory leak - virCPUx86GetHost cpu_x86: Handle error in x86DataToCPU when calling x86DataAdd src/cpu/cpu_x86.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] qemu: Adjust ATTRIBUTE_NONNULL
by John Ferlan 21 Jun '19

21 Jun '19

Commit 7bf679ae removed the @json argument from the qemuMonitorOpen prototype; however, it did not update the ATTRIBUTE_NONNULL value which causes a build failure for when checking is enabled such as when lv_cv_static_analysis is enabled. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under build breaker rule. src/qemu/qemu_monitor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 35e3d28c22..c41428b048 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -343,7 +343,7 @@ qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, unsigned long long timeout, qemuMonitorCallbacksPtr cb, void *opaque) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5); qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm, int sockfd, qemuMonitorCallbacksPtr cb, -- 2.20.1

1 0

[libvirt] [PATCH] maint: Add missing 'global:' tag in libvirt_public.syms
by Eric Blake 21 Jun '19

21 Jun '19

Fixes: c08fc8d1 Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial src/libvirt_public.syms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 75f7fdfb0c..18500ec8b2 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -820,6 +820,7 @@ LIBVIRT_5.2.0 { } LIBVIRT_4.10.0; LIBVIRT_5.5.0 { + global: virNetworkListAllPorts; virNetworkPortLookupByUUID; virNetworkPortLookupByUUIDString; -- 2.20.1

1 0

[libvirt] [PATCH v8.5 00/13] Checkpoint APIs (incremental backup saga)
by Eric Blake 21 Jun '19

21 Jun '19

This is a subset of v8 of incremental backup, focusing more on just the checkpoint manipulation code (as this had fewer review comments that still needed addressing). I think there is enough here that even if this lands in 5.5 while the backup APIs slide into 5.6 that we'd still have a reasonably usable set of APIs. I probably still need to double-check that creating checkpoints while an external snapshot exists gives a sane error, and that creating an external snapshot while checkoints exist give a sane error (in both cases, with plans to relax that error later once we finish our design); that can be done as a patch on top of these or if I have to respin this part of the series once more before 5.5. I do plan on tagging a v9 label of the full backup series, but that will be in a separate thread built on top of this one (hence naming this one v8.5). Since v8: - Completely drop the virDomainHasCurrentCheckpoint API (you get the same effect by calling virDomainCheckpointCurrent) - Defer the virDomainCheckpointHasMetadata API for a later day (if we ever want it); for now, all checkpoints require libvirt metadta - Expand the code to implement Checkpoint APIs for the test driver - rebase to master - Defer the Backup API work to a later series - Split out the handling of VIR_DOMAIN_CHECKPOINT_XML_SIZE into its own patch (that one is probably the most likely to need a respin, or even deferring it post-5.5 as adding flag support is different than adding new API) 001/13:[----] [--] 'backup: Document new XML for checkpoints' 002/13:[0121] [FC] 'backup: Introduce virDomainCheckpoint APIs' 003/13:[0004] [FC] 'backup: Document nuances between different state capture APIs' 004/13:[0127] [FC] 'backup: Parse and output checkpoint XML' 005/13:[0111] [FC] 'backup: Allow for lists of checkpoint objects' 006/13:[----] [--] 'backup: Add new domain:checkpoint access control' 007/13:[down] 'backup: Implement checkpoint APIs for remote driver' 008/13:[0065] [FC] 'backup: Implement virsh support for checkpoints' 009/13:[down] 'snapshot: Refactor test to utilize virDomainMoment more' 010/13:[down] 'backup: test: Implement metadata tracking for checkpoint APIs' 011/13:[0184] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 012/13:[0016] [FC] 'backup: Wire up qemu checkpoint commands over QMP' 013/13:[down] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' Eric Blake (13): backup: Document new XML for checkpoints backup: Introduce virDomainCheckpoint APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects backup: Add new domain:checkpoint access control backup: Implement checkpoint APIs for remote driver backup: Implement virsh support for checkpoints snapshot: Refactor test to utilize virDomainMoment more backup: test: Implement metadata tracking for checkpoint APIs backup: qemu: Implement metadata tracking for checkpoint APIs backup: Wire up qemu checkpoint commands over QMP backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag include/libvirt/libvirt-domain-checkpoint.h | 149 ++ include/libvirt/libvirt-domain.h | 6 + include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 6 + src/conf/checkpoint_conf.h | 101 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 9 + src/conf/virdomaincheckpointobjlist.h | 66 + src/conf/virdomainmomentobjlist.h | 5 +- src/conf/virdomainobjlist.h | 7 +- src/driver-hypervisor.h | 48 + src/qemu/qemu_block.h | 3 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 15 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 3 + tools/virsh-checkpoint.h | 26 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 9 +- docs/domainstatecapture.html.in | 315 ++++ docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 204 +++ docs/formatsnapshot.html.in | 2 + docs/index.html.in | 3 +- docs/schemas/domaincheckpoint.rng | 87 ++ libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 3 +- src/conf/Makefile.inc.am | 4 + src/conf/checkpoint_conf.c | 662 ++++++++ src/conf/domain_conf.c | 6 + src/conf/virdomaincheckpointobjlist.c | 219 +++ src/conf/virdomainmomentobjlist.c | 2 +- src/conf/virdomainobjlist.c | 11 + src/libvirt-domain-checkpoint.c | 670 ++++++++ src/libvirt-domain.c | 18 +- src/libvirt_private.syms | 26 + src/libvirt_public.syms | 25 +- src/qemu/qemu_block.c | 12 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 183 +++ src/qemu/qemu_driver.c | 868 +++++++++++ src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 76 + src/remote/remote_daemon_dispatch.c | 20 + src/remote/remote_driver.c | 26 +- src/remote/remote_protocol.x | 155 +- src/remote_protocol-structs | 85 ++ src/rpc/gendispatch.pl | 32 +- src/test/test_driver.c | 461 +++++- tests/Makefile.am | 11 +- tests/domaincheckpointxml2xmlin/empty.xml | 1 + tests/domaincheckpointxml2xmlin/sample.xml | 7 + tests/domaincheckpointxml2xmlin/size.xml | 4 + tests/domaincheckpointxml2xmlout/empty.xml | 7 + .../internal-active-invalid.xml | 53 + .../internal-inactive-invalid.xml | 53 + tests/domaincheckpointxml2xmlout/redefine.xml | 63 + tests/domaincheckpointxml2xmlout/sample.xml | 12 + tests/domaincheckpointxml2xmlout/size.xml | 11 + tests/domaincheckpointxml2xmltest.c | 223 +++ tests/virschematest.c | 2 + tools/Makefile.am | 1 + tools/virsh-checkpoint.c | 1342 +++++++++++++++++ tools/virsh-completer.c | 51 + tools/virsh-domain-monitor.c | 23 + tools/virsh-domain.c | 9 + tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 238 ++- 76 files changed, 6745 insertions(+), 61 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/domaincheckpointxml2xmlin/empty.xml create mode 100644 tests/domaincheckpointxml2xmlin/sample.xml create mode 100644 tests/domaincheckpointxml2xmlin/size.xml create mode 100644 tests/domaincheckpointxml2xmlout/empty.xml create mode 100644 tests/domaincheckpointxml2xmlout/internal-active-invalid.xml create mode 100644 tests/domaincheckpointxml2xmlout/internal-inactive-invalid.xml create mode 100644 tests/domaincheckpointxml2xmlout/redefine.xml create mode 100644 tests/domaincheckpointxml2xmlout/sample.xml create mode 100644 tests/domaincheckpointxml2xmlout/size.xml create mode 100644 tests/domaincheckpointxml2xmltest.c create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

2 24

[libvirt] [PATCH] Don't parse/format vram attribute for cirrus video
by Jonathon Jongsma 21 Jun '19

21 Jun '19

Since the cirrus vga memory size isn't configurable, we can ignore any 'vram' attribute when parsing a domain definition. However, when no value is specified, it ends up getting set to a default value of 16MB. This 16MB value is not used anywhere (for example, it is not passed as an argument to qemu), but is displayed in the XML definition. So by changing this default value to 0, it will also be omitted from the XML definition of the domain. Fixes: rhbz#1447831 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- This is an attempt to apply the fix suggested by Gerd at https://bugzilla.redhat.com/show_bug.cgi?id=1447831#c2. I'm not totally confident that this is the right approach, since I'm relatively new to the code. Another approach might be to simply close the bug as NOTABUG since it doesn't seem that having this unused attribute in the domain definition has any significant drawbacks. src/conf/domain_conf.c | 2 +- src/qemu/qemu_domain.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c69d382d70..d06e094b11 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15154,7 +15154,6 @@ virDomainVideoDefaultRAM(const virDomainDef *def, { switch (type) { case VIR_DOMAIN_VIDEO_TYPE_VGA: - case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (def->virtType == VIR_DOMAIN_VIRT_VBOX) return 8 * 1024; @@ -15172,6 +15171,7 @@ virDomainVideoDefaultRAM(const virDomainDef *def, /* QEMU use 64M as the minimal video memory for qxl device */ return 64 * 1024; + case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: case VIR_DOMAIN_VIDEO_TYPE_VBOX: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e5c6ef3fda..7f0baf57ac 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6835,6 +6835,9 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && !video->vgamem) { video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_CIRRUS) { + /* cirrus vram is not configurable. Ignore it */ + video->vram = 0; } return 0; -- 2.20.1

2 4

[libvirt] [PATCH] virStorageSourceChainHasManagedPR: Check propely
by Michal Privoznik 21 Jun '19

21 Jun '19

In the virStorageSourceChainHasManagedPR() function we iterate over whole backing chain trying to determine if one of the layers has managed PR configured. But due to a typo we in fact check the top layer only. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virstoragefile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2b1c0a5b8e..f7495ab6da 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2083,7 +2083,7 @@ virStorageSourceChainHasManagedPR(virStorageSourcePtr src) virStorageSourcePtr n; for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) { - if (virStoragePRDefIsManaged(src->pr)) + if (virStoragePRDefIsManaged(n->pr)) return true; } -- 2.21.0

2 1

[libvirt] [PATCH v2 0/7] Finish support for IA32_ARCH_CAPABILITIES MSR features
by Jiri Denemark 21 Jun '19

21 Jun '19

As promised in v1 this series contains a few additional patches which limit usage of MSR features to QEMU that supports "unavailable-features" CPU property. This series intentionally enables MSR features for all QEMU versions before restricting the usage to make this restriction more visible in the test results. Version 2: - all but 2 patches from version 1 were pushed - 5 new patches Jiri Denemark (7): conf: Introduce virCPUDefCheckFeatures cpu_x86: Turn virCPUx86DataIteratorInit into a function cpu_x86: Introduce virCPUx86FeatureIsMSR cpu_x86: Read CPU features from IA32_ARCH_CAPABILITIES MSR cpu_map: Introduce IA32_ARCH_CAPABILITIES MSR features qemu: Forbid MSR features with old QEMU qemu: Drop MSR features from host-model with old QEMU src/conf/cpu_conf.c | 33 +++++++ src/conf/cpu_conf.h | 6 ++ src/cpu/cpu_x86.c | 96 +++++++++++++++++-- src/cpu/cpu_x86.h | 3 + src/cpu_map/x86_features.xml | 20 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 16 ++++ src/qemu/qemu_process.c | 29 +++++- .../x86_64-cpuid-Core-i7-7600U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-json.xml | 1 + ...86_64-cpuid-Xeon-Platinum-8268-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 3 + .../qemu_4.1.0.x86_64.xml | 1 + 15 files changed, 207 insertions(+), 13 deletions(-) -- 2.22.0

3 17

[libvirt] [PATCH] rpc: add $(SASL_CFLAGS) to libvirt_net_rpc_server_la_CFLAGS
by Daniel P. Berrangé 21 Jun '19

21 Jun '19

The files for libvirt-net-rpc-server.la refernce the sasl/sasl.h system header but never used the $(SASL_CFLAGS) variable. This was never noticed previously because the $(AVAHI_CLFAGS) were set and these typically pulled in the same include directory. When mDNS/Avahi support was removed this exposed the bug which caused FreeBSD builds to break as /usr/local/include was no longer searched for headers. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix src/rpc/Makefile.inc.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index e5b830605a..b8ca53c69a 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -111,6 +111,7 @@ libvirt_net_rpc_server_la_SOURCES = \ libvirt_net_rpc_server_la_CFLAGS = \ $(DBUS_CFLAGS) \ $(XDR_CFLAGS) \ + $(SASL_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) libvirt_net_rpc_server_la_LDFLAGS = \ -- 2.21.0

1 0

[libvirt] [PATCH 0/5] cgroups v2 fixes and improvements
by Pavel Hrdina 21 Jun '19

21 Jun '19

Pavel Hrdina (5): util: vircgroup: pass parent cgroup into virCgroupDetectControllersCB util: vircgroup: improve controller detection util: vircgroupv2: use any controller to create thread directory util: vircgroupv2: enable CPU controller only if it's available util: vircgroupv2: don't error out if enabling controller fails src/util/vircgroup.c | 32 ++++++++++++++++---------------- src/util/vircgroupbackend.h | 3 ++- src/util/vircgroupv1.c | 3 ++- src/util/vircgroupv2.c | 36 ++++++++++++++++++++++++------------ 4 files changed, 44 insertions(+), 30 deletions(-) -- 2.21.0

2 11

[libvirt] [PATCH v2] test_driver: properly handle DHCP ranges and IPv6 networks in testDomainInterfaceAddresses
by Ilias Stamatis 21 Jun '19

21 Jun '19

testDomainInterfaceAddresses always returns the same hard-coded addresses. Change the behavior such as if there is a DHCP range defined, addresses are returned from that pool. The specific address returned depends on both the domain id and the specific guest interface in an attempt to return unique addresses *most of the time*. Additionally, properly handle IPv6 networks which were previously ignored completely. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 44 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2a0ffbc6c5..21bd95941e 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3414,6 +3414,10 @@ static int testDomainBlockStats(virDomainPtr domain, return ret; } + +static virNetworkObjPtr testNetworkObjFindByName(testDriverPtr privconn, const char *name); + + static int testDomainInterfaceAddresses(virDomainPtr dom, virDomainInterfacePtr **ifaces, @@ -3422,11 +3426,15 @@ testDomainInterfaceAddresses(virDomainPtr dom, { size_t i; size_t ifaces_count = 0; + size_t addr_offset; int ret = -1; char macaddr[VIR_MAC_STRING_BUFLEN]; virDomainObjPtr vm = NULL; virDomainInterfacePtr iface = NULL; virDomainInterfacePtr *ifaces_ret = NULL; + virSocketAddr addr; + virNetworkObjPtr net = NULL; + virNetworkDefPtr net_def = NULL; virCheckFlags(0, -1); @@ -3447,6 +3455,12 @@ testDomainInterfaceAddresses(virDomainPtr dom, goto cleanup; for (i = 0; i < vm->def->nnets; i++) { + if (!(net = testNetworkObjFindByName(dom->conn->privateData, + vm->def->nets[i]->data.network.name))) + goto cleanup; + + net_def = virNetworkObjGetDef(net); + if (VIR_ALLOC(iface) < 0) goto cleanup; @@ -3460,14 +3474,33 @@ testDomainInterfaceAddresses(virDomainPtr dom, if (VIR_ALLOC(iface->addrs) < 0) goto cleanup; - iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; - iface->addrs[0].prefix = 24; - if (virAsprintf(&iface->addrs[0].addr, "192.168.0.%zu", 1 + i) < 0) - goto cleanup; - iface->naddrs = 1; + iface->addrs[0].prefix = virSocketAddrGetIPPrefix(&net_def->ips->address, + &net_def->ips->netmask, + net_def->ips->prefix); + + if (net_def->ips->nranges > 0) + addr = net_def->ips->ranges[0].start; + else + addr = net_def->ips->address; + + /* try using different addresses per different inf and domain */ + addr_offset = 20 * (vm->def->id - 1) + i + 1; + + if (net_def->ips->family && STREQ(net_def->ips->family, "ipv6")) { + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV6; + addr.data.inet6.sin6_addr.s6_addr[15] += addr_offset; + } else { + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4; + addr.data.inet4.sin_addr.s_addr = \ + htonl(ntohl(addr.data.inet4.sin_addr.s_addr) + addr_offset); + } + + if (!(iface->addrs[0].addr = virSocketAddrFormat(&addr))) + goto cleanup; VIR_APPEND_ELEMENT_INPLACE(ifaces_ret, ifaces_count, iface); + virNetworkObjEndAPI(&net); } VIR_STEAL_PTR(*ifaces, ifaces_ret); @@ -3475,6 +3508,7 @@ testDomainInterfaceAddresses(virDomainPtr dom, cleanup: virDomainObjEndAPI(&vm); + virNetworkObjEndAPI(&net); if (ifaces_ret) { for (i = 0; i < ifaces_count; i++) -- 2.22.0

2 5

[libvirt] [PATCH 0/4] cgroups: add support for BFQ scheduler
by Pavel Hrdina 21 Jun '19

21 Jun '19

Pavel Hrdina (4): util: vircgroup: introduce virCgroup(Get|Set)ValueRaw util: vircgroup: move virCgroupGetValueStr out of virCgroupGetValueForBlkDev util: vircgroupv1: add support for BFQ blkio files util: vircgroupv2: add support for BFQ files src/util/vircgroup.c | 70 +++++++++------- src/util/vircgrouppriv.h | 12 ++- src/util/vircgroupv1.c | 174 +++++++++++++++++++++++++++++---------- src/util/vircgroupv2.c | 156 +++++++++++++++++++++++++---------- 4 files changed, 292 insertions(+), 120 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH] docs: Space out entries in news.html
by Peter Krempa 21 Jun '19

21 Jun '19

The header for the news entry blends together with the text and other entries. This patch tries to space them out somewhat for better visual separation. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- You can see the difference here: https://github.com/pipo/libvirt/blob/screenshots/before.png https://github.com/pipo/libvirt/blob/screenshots/after.png docs/libvirt.css | 15 +++++++++++++++ docs/news-html.xsl | 13 +++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index 4c7afc4042..e44ef616d8 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -591,3 +591,18 @@ td.enumvalue { .deprecatedhv { color: darkred; } + +ul.news-section { + margin-top: 0.5em; +} + +ul.news-section li dl dt { + margin: 0; +} + +ul.news-section li dl dd { + margin-left: 1em; + margin-right: 0; + margin-top: 0.5em; + margin-bottom: 0.5em; +} diff --git a/docs/news-html.xsl b/docs/news-html.xsl index 4d40798028..fb0178f9e2 100644 --- a/docs/news-html.xsl +++ b/docs/news-html.xsl @@ -58,7 +58,7 @@ <xsl:value-of select="@title"/> </strong> <xsl:if test="*"> - <ul> + <ul class="news-section"> <xsl:apply-templates select="change"/> </ul> </xsl:if> @@ -68,8 +68,14 @@  <xsl:template match="change"> <li> - <xsl:apply-templates select="summary"/> - <xsl:apply-templates select="description"/> + <dl> + <dt> + <xsl:apply-templates select="summary"/> + </dt> + <dd> + <xsl:apply-templates select="description"/> + </dd> + </dl> </li> </xsl:template> @@ -80,7 +86,6 @@  <xsl:template match="description"> - <br/> <xsl:apply-templates/> </xsl:template> -- 2.21.0

3 2

[libvirt] [PATCH] Revert "news: Document removal of qemu commandline parsing"
by Peter Krempa 21 Jun '19

21 Jun '19

Jano probably based his branch on top of mine and didn't notice when I moved the section up slightly and thus git applied it again. Keep only the instance followin the new features section. This reverts commit 9c68bb4a5c2c8c050e531533e5188a637ba1dd9f. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the trivial rule. docs/news.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 681e9a60a3..cada389092 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -67,18 +67,6 @@ </section> <section title="Bug fixes"> </section> - <section title="Removed features"> - <change> - <summary> - qemu: Remove support for virDomainQemuAttach and virConnectDomainXMLFromNative APIs - </summary> - <description> - The qemu implementations for the APIs mentioned above were removed - and the APIs now return error. The implementation was stale for a - long time and did not allow working with moder use of qemu in libvirt. - </description> - </change> - </section> </release> <release version="v5.4.0" date="2019-06-03"> <section title="Security"> -- 2.21.0

2 1

[libvirt] [PATCH] rpc: virnetlibsshsession: update deprecated functions
by Pavel Hrdina 21 Jun '19

21 Jun '19

In libssh 0.9.0 functions ssh_is_server_known and ssh_write_knownhost are marked as deprecated. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1722735 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- m4/virt-libssh.m4 | 8 ++++++++ src/rpc/virnetlibsshsession.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 index 01c3b75c72..132447da16 100644 --- a/m4/virt-libssh.m4 +++ b/m4/virt-libssh.m4 @@ -33,6 +33,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ [], [AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey], [ssh_get_publickey is deprecated and replaced by ssh_get_server_publickey.])]) + AC_CHECK_FUNC([ssh_session_is_known_server], + [], + [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_known], + [ssh_is_server_known is deprecated and replaced by ssh_session_is_known_server.])]) + AC_CHECK_FUNC([ssh_session_update_known_hosts], + [], + [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_knownhost], + [ssh_write_knownhost is deprecated and replaced by ssh_session_update_known_hosts.])]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 486437e7bf..093ac29071 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -284,7 +284,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (sess->hostKeyVerify == VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE) return 0; - state = ssh_is_server_known(sess->session); + state = ssh_session_is_known_server(sess->session); switch (state) { case SSH_SERVER_KNOWN_OK: @@ -378,7 +378,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) /* write the host key file, if specified */ if (sess->knownHostsFile) { - if (ssh_write_knownhost(sess->session) < 0) { + if (ssh_session_update_known_hosts(sess->session) < 0) { errmsg = ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, _("failed to write known_host file '%s': %s"), -- 2.21.0

3 3

[libvirt] [PATCH] Fix 'validate' typo in comments
by Jonathon Jongsma 21 Jun '19

21 Jun '19

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d06e094b11..8604ba63d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21375,7 +21375,7 @@ virDomainObjParseXML(xmlDocPtr xml, if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) < 0) goto error; - /* valdiate configuration */ + /* validate configuration */ if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0) goto error; @@ -21465,7 +21465,7 @@ virDomainDefParseNode(xmlDocPtr xml, if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0) goto cleanup; - /* valdiate configuration */ + /* validate configuration */ if (virDomainDefValidate(def, caps, flags, xmlopt) < 0) goto cleanup; -- 2.20.1

2 1

[libvirt] [PATCH 0/3] snapshots: Allow <seclabel> for snapshot disk source
by Peter Krempa 20 Jun '19

20 Jun '19

This is just a schema improvement, the code actually already does everything. Peter Krempa (3): docs: snapshot: Encourage people ot use disk 'target' to refer to disks docs: schemas: Add 'seclabel' for external disk snapshot tests: domainsnapshotxml2xml: make 'disk-seclabel' test operational docs/formatsnapshot.html.in | 18 +++++++++++++++--- docs/schemas/domainsnapshot.rng | 6 ++++++ ...-seclabel-invalid.xml => disk-seclabel.xml} | 0 .../domainsnapshotxml2xmlout/disk-seclabel.xml | 15 +++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + 5 files changed, 37 insertions(+), 3 deletions(-) rename tests/domainsnapshotxml2xmlin/{disk-seclabel-invalid.xml => disk-seclabel.xml} (100%) create mode 100644 tests/domainsnapshotxml2xmlout/disk-seclabel.xml -- 2.21.0

3 6

[libvirt] [PATCH 00/15] qemu: Add possibility to control qemu capabilities for debug (blockdev-add saga spin-off)
by Peter Krempa 20 Jun '19

20 Jun '19

While this is not strictly required for blockdev to work it was created as a part of the testing (and possibly regression mitigation) effort. These patches introduce the option to add or remove qemu capabilities via the qemu XML namespace custom elements and remove features via qemu.conf. This series depends (very slightly) on the series deleting qemu parsing. To make applying it easy I'd sugges you fetrch everything needed by: git fetch https://github.com/pipo/libvirt.git features-filter Peter Krempa (15): qemu: Rename qemuDomainCmdlineDefPtr to qemuDomainXmlNsDefPtr qemu: Move qemuDomainXmlNsDef(Free) from qemu_conf.(ch) qemu: domain: Use virStringListFreeCount in qemuDomainXmlNsDefFree qemu: Extract parsing of qemu namespace arguments into separate function qemu: Extract parsing of qemu namespace env vars into separate function qemu: Refactor qemuDomainDefNamespaceParse qemu: domain: Split out commandline namespace data formatting conf: Add taint flag for custom hypervisor features qemu: Add support for controling qemu capabilities via the qemu XML namespace qemu: domain: Add support for modifying qemu capability list via qemu namespace tests: qemuxml2argv: Modernize and fork 'qemu-ns' test tests: qemuxml2argv: Test qemu namespace capability tweaking qemu: Remove unused var 'corestr' from virQEMUDriverConfigLoadFile qemu: conf: Add debug option to allow disabling qemu capabilities qemu: Implement support for 'capability_filters' config option docs/drvqemu.html.in | 30 ++ docs/schemas/domaincommon.rng | 19 ++ src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 7 + src/qemu/qemu_command.c | 16 +- src/qemu/qemu_conf.c | 39 ++- src/qemu/qemu_conf.h | 17 +- src/qemu/qemu_domain.c | 285 +++++++++++++----- src/qemu/qemu_domain.h | 19 ++ src/qemu/qemu_process.c | 55 ++++ src/qemu/test_libvirtd_qemu.aug.in | 3 + tests/qemuxml2argvdata/qemu-ns.args | 33 -- .../qemu-ns.x86_64-4.0.0.args | 41 +++ .../qemu-ns.x86_64-latest.args | 41 +++ tests/qemuxml2argvdata/qemu-ns.xml | 5 + tests/qemuxml2argvtest.c | 3 +- 18 files changed, 458 insertions(+), 160 deletions(-) delete mode 100644 tests/qemuxml2argvdata/qemu-ns.args create mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args -- 2.21.0

2 30

[libvirt] [PATCH] docs: Fix Blog Planet links
by Martin Kletzander 20 Jun '19

20 Jun '19

They were pointing to the blogs instead, now they point the articles. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial-and-thoroughly-tested. docs/js/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/js/main.js b/docs/js/main.js index e48e95075cf6..2edc62830453 100644 --- a/docs/js/main.js +++ b/docs/js/main.js @@ -116,10 +116,10 @@ function fetchRSS() { var name = e.querySelector("author > name").textContent; var title = e.querySelector("title").textContent; var updated = e.querySelector("updated").textContent; - var uri = e.querySelector("author > uri").textContent; + var link = e.querySelector("link").attributes.href.textContent; var a = document.createElement("a"); - a.href = uri; + a.href = link; a.innerText = title; var dt = document.createElement("dt"); -- 2.22.0

1 0

[libvirt] [PATCH] remote: refactor how unprivileged user session connection is identified
by Daniel P. Berrangé 20 Jun '19

20 Jun '19

Currently the VIR_DRV_OPEN_REMOTE_USER flag is only set when we identify that we're connecting to a local libvirtd daemon. We would like to be able to set that even if connecting to a remote libvirtd daemon. This entails refactoring the conditional check. One subtle change is that the VIR_DRV_OPEN_REMOTE_USER is now set when the test+XXX:// URI is used, even if a servername is present. This has no effect in this patch, but will later. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index a95781a797..e1eaa56230 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1390,25 +1390,35 @@ remoteConnectOpen(virConnectPtr conn, rflags |= VIR_DRV_OPEN_REMOTE_RO; /* - * If no servername is given, and no +XXX - * transport is listed, or transport is unix, - * and path is /session, and uid is unprivileged - * then auto-spawn a daemon. + * User session daemon is used for + * + * - Any URI with /session suffix + * - Test driver, if a protocol is given + * + * provided we are running non-root */ if (conn->uri && - !conn->uri->server && conn->uri->path && conn->uri->scheme && - (transport == NULL || STREQ(transport, "unix")) && (STREQ(conn->uri->path, "/session") || STRPREFIX(conn->uri->scheme, "test+")) && geteuid() > 0) { - VIR_DEBUG("Auto-spawn user daemon instance"); + VIR_DEBUG("User session daemon required"); rflags |= VIR_DRV_OPEN_REMOTE_USER; + + /* + * Furthermore if no servername is given, and no +XXX + * transport is listed, or transport is unix, + * and uid is unprivileged then auto-spawn a daemon. + */ if (!virIsSUID() && + !conn->uri->server && + (transport == NULL || STREQ(transport, "unix")) && (!autostart || - STRNEQ(autostart, "0"))) + STRNEQ(autostart, "0"))) { + VIR_DEBUG("Try daemon autostart"); rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; + } } /* -- 2.21.0

2 1

[libvirt] [PATCH 0/2] error: Allow better reporting of errors in some nested cases
by Peter Krempa 20 Jun '19

20 Jun '19

Peter Krempa (2): util: error: Add API for prefixing last set error with a string qemu: process: Report better error when virtlogd connection fails cfg.mk | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_process.c | 4 +++- src/util/virerror.c | 38 ++++++++++++++++++++++++++++++++++++++ src/util/virerror.h | 3 +++ 5 files changed, 46 insertions(+), 1 deletion(-) -- 2.21.0

2 4

[libvirt] [PATCH] Revert "spec: Bump minimum supported Fedora version to 29"
by Ján Tomko 20 Jun '19

20 Jun '19

This reverts commit 8a1179831b5edc0a3590489eda693914fc0ff94f. It bumped the version prematurely, before the EOL of Fedora 28. Morover, this arbitrary bump did not let us perform any cleanups in the specfile. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 78b7f43934..5c0b4a7605 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -4,7 +4,7 @@ # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. %define min_rhel 7 -%define min_fedora 29 +%define min_fedora 28 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) %define supported_platform 1 diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 9add033669..8a96ea914c 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -3,7 +3,7 @@ # This spec file assumes you are building on a Fedora version # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. -%define min_fedora 29 +%define min_fedora 28 %if 0%{?fedora} && 0%{?fedora} >= %{min_fedora} %define supported_platform 1 -- 2.20.1

3 4

[libvirt] [PATCH] virNetworkGetDHCPLeases: fix docstring format
by Ilias Stamatis 20 Jun '19

20 Jun '19

The docstring of virNetworkGetDHCPLeases is not correctly formatted and as a result the example code snippet appears as normal text under the "Returns:" section. This patch fixes the problem. Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/libvirt-network.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libvirt-network.c b/src/libvirt-network.c index 6ed32c8ba2..2d7a68eaa1 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1156,8 +1156,7 @@ virConnectNetworkEventDeregisterAny(virConnectPtr conn, * lease info about a specific guest interface with @mac. There can be * multiple leases for a single @mac because this API supports DHCPv6 too. * - * Returns the number of leases found or -1 and sets @leases to NULL in - * case of error. On success, the array stored into @leases is guaranteed to + * On success, the array stored into @leases is guaranteed to * have an extra allocated element set to NULL but not included in the return * count, to make iteration easier. The caller is responsible for calling * virNetworkDHCPLeaseFree() on each array element, then calling free() on @leases. @@ -1167,30 +1166,33 @@ virConnectNetworkEventDeregisterAny(virConnectPtr conn, * * Example of usage: * - * virNetworkDHCPLeasePtr *leases = NULL; - * virNetworkPtr network = ... obtain a network pointer here ...; - * size_t i; - * int nleases; - * unsigned int flags = 0; + * virNetworkDHCPLeasePtr *leases = NULL; + * virNetworkPtr network = ... obtain a network pointer here ...; + * size_t i; + * int nleases; + * unsigned int flags = 0; + * + * nleases = virNetworkGetDHCPLeases(network, NULL, &leases, flags); + * if (nleases < 0) + * error(); * - * nleases = virNetworkGetDHCPLeases(network, NULL, &leases, flags); - * if (nleases < 0) - * error(); + * ... do something with returned values, for example: * - * ... do something with returned values, for example: + * for (i = 0; i < nleases; i++) { + * virNetworkDHCPLeasePtr lease = leases[i]; * - * for (i = 0; i < nleases; i++) { - * virNetworkDHCPLeasePtr lease = leases[i]; + * printf("Time(epoch): %lu, MAC address: %s, " + * "IP address: %s, Hostname: %s, ClientID: %s\n", + * lease->expirytime, lease->mac, lease->ipaddr, + * lease->hostname, lease->clientid); * - * printf("Time(epoch): %lu, MAC address: %s, " - * "IP address: %s, Hostname: %s, ClientID: %s\n", - * lease->expirytime, lease->mac, lease->ipaddr, - * lease->hostname, lease->clientid); + * virNetworkDHCPLeaseFree(leases[i]); + * } * - * virNetworkDHCPLeaseFree(leases[i]); - * } + * free(leases); * - * free(leases); + * Returns the number of leases found or -1 and sets @leases to NULL in + * case of error. * */ int -- 2.22.0

2 1

[libvirt] [PATCH 0/2] qemu: fix snapshot crasher bug and improve virsh (blockdev-add saga)
by Peter Krempa 20 Jun '19

20 Jun '19

While reviewers liked my story plot, the CPU did not. Fix it to make everyone happy. Peter Krempa (2): qemu: driver: Fix off-by-one in qemuDomainSnapshotDiskDataCollect virsh: snapshot: Don't block --no-metadata with --print-xml src/qemu/qemu_driver.c | 2 +- tools/virsh-snapshot.c | 8 +------- tools/virsh.pod | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH RFC] test_driver: check that the domain is running in testDomainGetTime
by Ilias Stamatis 20 Jun '19

20 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- Currently in the test driver in APIs that would normally require guest agents and similar we are just checking if the domain is active (using virDomainObjCheckActive). But a domain will be active even if stopped, so I would say that most of the time this is not sufficient since we really want to now that the domain is actually running, not that it's just active. So something like what I include in this patch is needed instead. I wonder if it would make sense to add a new function such as testDomainAgentAvailable inspired by the QEMU driver. So the check whether the domain is actually running or not could be done there. Also, in that case I'm not sure if calling both virDomainObjCheckActive and testDomainAgentAvailable is needed. I feel like calling the second one only is sufficient. However, in the QEMU driver always both are called. Should I go ahead with implementing the testDomainAgentAvailable function and search for all the places in the test driver that it should be used instead of virDomainObjCheckActive? src/test/test_driver.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2a0ffbc6c5..8e5bd4e670 100755 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1984,17 +1984,33 @@ testDomainGetState(virDomainPtr domain, } static int -testDomainGetTime(virDomainPtr dom ATTRIBUTE_UNUSED, +testDomainGetTime(virDomainPtr dom, long long *seconds, unsigned int *nseconds, unsigned int flags) { + int ret = -1; + virDomainObjPtr vm = NULL; + virCheckFlags(0, -1); + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + *seconds = 627319920; *nseconds = 0; - return 0; + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; } #define TEST_SAVE_MAGIC "TestGuestMagic" -- 2.22.0

2 1

[libvirt] [PATCH v3 0/2] Ditch external JavaScript libraries
by Martin Kletzander 20 Jun '19

20 Jun '19

This is a response to all the discussions (mainly) other people had about all the JS code we're currently using, bundling, etc. CORS [1] is set up on planet.virt-tools.org, so we can just get the XML and use it. [1] https://en.wikipedia.org/wiki/Cross-origin_resource_sharing Martin Kletzander (2): docs: Use our own implementation for fetching the RSS data docs: Remove unused JS libraries docs/Makefile.am | 5 +-- docs/index.html.in | 15 ++------- docs/js/jquery-3.1.1.min.js | 4 --- docs/js/jquery.rss.min.js | 11 ------- docs/js/main.js | 62 +++++++++++++++++++++++++++++++++++++ docs/js/moment.min.js | 7 ----- 6 files changed, 65 insertions(+), 39 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js delete mode 100644 docs/js/jquery.rss.min.js delete mode 100644 docs/js/moment.min.js -- 2.22.0

2 5

[libvirt] [PATCH python 0/5] Fix many screwups in virNetworkPort
by Daniel P. Berrangé 20 Jun '19

20 Jun '19

The awesome thing about the python code generator is how it generates rubbish unless you had the right code hacks in the generator. This series of fixes correct all the screwups missed first time around. Pushed as build fixes. Daniel P. Berrangé (5): Fix syntax error with missing ; and too many ) Define virNetworkPortPtr typedef on old libvirt generator: fix naming of getter APIs for virNetworkPort sanitytest: add some special cases for virNetworkPort APIs Add missing impl of virNetworkListAllPorts generator.py | 3 +++ libvirt-override-virNetwork.py | 11 ++++++++ libvirt-override.c | 48 +++++++++++++++++++++++++++++++++- sanitytest.py | 5 +++- typewrappers.h | 3 +++ 5 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 libvirt-override-virNetwork.py -- 2.21.0

1 5

[libvirt] [PATCH 0/2] qemu: Delete HMP cpu hotplug code
by Peter Krempa 20 Jun '19

20 Jun '19

Peter Krempa (2): qemu: monitor: Remove text monitor support for cpu hot(un)plug qemu: Remove qemuMonitorTextSetCPU src/qemu/qemu_monitor_json.c | 15 ++++----------- src/qemu/qemu_monitor_text.c | 30 ------------------------------ src/qemu/qemu_monitor_text.h | 2 -- 3 files changed, 4 insertions(+), 43 deletions(-) -- 2.21.0

2 4

[libvirt] [security-notice PATCH] notices: fix some typos
by Ján Tomko 20 Jun '19

20 Jun '19

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- notices/2008/0001.xml | 4 ++-- notices/2010/0004.xml | 2 +- notices/2011/0001.xml | 2 +- notices/2011/0003.xml | 2 +- notices/2013/0001.xml | 2 +- notices/2013/0007.xml | 2 +- notices/2013/0008.xml | 2 +- notices/2013/0010.xml | 2 +- notices/2017/0001.xml | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/notices/2008/0001.xml b/notices/2008/0001.xml index 7d2bfcf..d4f9355 100644 --- a/notices/2008/0001.xml +++ b/notices/2008/0001.xml @@ -6,8 +6,8 @@ <description> <![CDATA[The APIs virDomainMigrate, virDomainBlockPeek, virDomainMemoryPeek, virDomainSetAutostart, virNetworkSetAutostart, virConnectFindStoragePoolSources -and virStoragePoolSetAutostart did not check the read-only flag of the -connection. This allow unprivileged users to invoke APIs that they should +and virStoragePoolSetAutostart did not check the read-only flag of the +connection. This allowed unprivileged users to invoke APIs that they should not have access to.]]> </description> diff --git a/notices/2010/0004.xml b/notices/2010/0004.xml index 080114d..1f8202a 100644 --- a/notices/2010/0004.xml +++ b/notices/2010/0004.xml @@ -18,7 +18,7 @@ virtualization host, by checking if the source port is less than virtual network to gain access to network services only intended to be used by the host. For example, an NFS filesystem exported to the virtualization host relying on IP based security with the "secure" -option will be inadvertantly accessible to guests.]]> +option will be inadvertently accessible to guests.]]> </impact> <workaround> diff --git a/notices/2011/0001.xml b/notices/2011/0001.xml index a24dd0f..a5b275e 100644 --- a/notices/2011/0001.xml +++ b/notices/2011/0001.xml @@ -7,7 +7,7 @@ <![CDATA[The APIs virConnectDomainXMLToNative, virNodeDeviceDettach, virNodeDeviceReAttach, virNodeDeviceReset, virDomainRevertToSnapshot, virDomainSnapshotDelete did not check -the read-only flag of the connection. This allow unprivileged +the read-only flag of the connection. This allowed unprivileged users to invoke APIs that they should not have access to.]]> </description> diff --git a/notices/2011/0003.xml b/notices/2011/0003.xml index e772ff8..4aa655f 100644 --- a/notices/2011/0003.xml +++ b/notices/2011/0003.xml @@ -13,7 +13,7 @@ access to inappropriate host files.]]> <impact> <![CDATA[A malicious guest disk image could trick the security -drivre into providing access to inappropriate host files]]> +driver into providing access to inappropriate host files]]> </impact> <workaround> diff --git a/notices/2013/0001.xml b/notices/2013/0001.xml index 97d8949..9425a64 100644 --- a/notices/2013/0001.xml +++ b/notices/2013/0001.xml @@ -6,7 +6,7 @@ <description> <![CDATA[When reading and dispatching of a message failed the message was freed but was not removed from the message queue. -When the conneciton was later clsed this would result in an +When the connection was later closed this would result in an attempt to free uninitialized memory]]> </description> diff --git a/notices/2013/0007.xml b/notices/2013/0007.xml index 55ba600..2c8f409 100644 --- a/notices/2013/0007.xml +++ b/notices/2013/0007.xml @@ -5,7 +5,7 @@ <description> <![CDATA[The legacy Xen driver code for listing inactive domains -would stasrt populating an array at index -1. This causes memory +would start populating an array at index -1. This causes memory corruption leading to a crash of libvirtd]]> </description> diff --git a/notices/2013/0008.xml b/notices/2013/0008.xml index d690fe7..eb79599 100644 --- a/notices/2013/0008.xml +++ b/notices/2013/0008.xml @@ -1,7 +1,7 @@ <security-notice xmlns="http://security.libvirt.org/xmlns/security-notice/1.0"> <id>2013-0008</id> - <summary>Libvirt security driver does nto clear supplementary groups</summary> + <summary>Libvirt security driver does not clear supplementary groups</summary> <description> <![CDATA[When parsing the process security label for the DAC driver diff --git a/notices/2013/0010.xml b/notices/2013/0010.xml index 27515b0..056fc2b 100644 --- a/notices/2013/0010.xml +++ b/notices/2013/0010.xml @@ -6,7 +6,7 @@ <description> <![CDATA[The code handling the virDomainMemoryStats API in the libvirtd daemon dispatch did not correctly initialize variables -to NULL. This if RPC parameter validation failed it was possible +to NULL. Thus if RPC parameter validation failed it was possible for libvirtd to access uninitialized memory during cleanup.]]> </description> diff --git a/notices/2017/0001.xml b/notices/2017/0001.xml index 0c74ca0..3255c24 100644 --- a/notices/2017/0001.xml +++ b/notices/2017/0001.xml @@ -5,8 +5,8 @@ <description> <![CDATA[When calling the virConnectGetAllDomainStats API on a guest which has - a CDROM drive with no media present, libvirtd will crash on a NULL pointer - acess]]> + a CDROM drive with no media present, libvirtd will crash on a NULL pointer + access]]> </description> <impact> -- 2.20.1

2 1

[libvirt] [PATCH 0/4] disallow multiple APIs on read-only connections
by Ján Tomko 20 Jun '19

20 Jun '19

One patch per CVE for: CVE-2019-10161 CVE-2019-10166 CVE-2019-10167 CVE-2019-10168 Ján Tomko (4): api: disallow virDomainSaveImageGetXMLDesc on read-only connections api: disallow virDomainManagedSaveDefineXML on read-only connections api: disallow virConnectGetDomainCapabilities on read-only connections api: disallow virConnect*HypervisorCPU on read-only connections src/libvirt-domain.c | 13 ++++--------- src/libvirt-host.c | 2 ++ src/qemu/qemu_driver.c | 2 +- src/remote/remote_protocol.x | 3 +-- 4 files changed, 8 insertions(+), 12 deletions(-) Now pushed. -- 2.20.1

1 4

[libvirt] [PATCH v2 0/3] Ditch external JavaScript libraries
by Martin Kletzander 20 Jun '19

20 Jun '19

This is a response to all the discussions (mainly) other people had about all the JS code we're currently using, bundling, etc. Ideally, we'll set up CORS [1] on planet.virt-tools.org, but for now this is already a nice clean-up by itself. [1] https://en.wikipedia.org/wiki/Cross-origin_resource_sharing Martin Kletzander (3): docs: Some JavaScript clean-up docs: Use our own implementation for fetching the RSS data docs: Remove unused JS libraries docs/Makefile.am | 5 +- docs/index.html.in | 15 +----- docs/js/jquery-3.1.1.min.js | 4 -- docs/js/jquery.rss.min.js | 11 ---- docs/js/main.js | 102 +++++++++++++++++++++++++++--------- docs/js/moment.min.js | 7 --- 6 files changed, 81 insertions(+), 63 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js delete mode 100644 docs/js/jquery.rss.min.js delete mode 100644 docs/js/moment.min.js -- 2.22.0

3 9

[libvirt] [PATCH 0/3] Ditch external JavaScript libraries
by Martin Kletzander 20 Jun '19

20 Jun '19

This is a response to all the discussions (mainly) other people had about all the JS code we're currently using, bundling, etc. I would love some feedback on whether we can work on any of the solutions for getting rid of that external proxy. We would have to: - either have our own proxy, - send a 'Access-Control-Allow-Origin' header from the libvirt.org server to allow fetching the atom.xml or - be providing JSONP access to the RSS feed on virt-planet. I do not have access to any of the infrastructure, so I cannot say if any of that is possible. It is definitely possible from the technical point of view. Martin Kletzander (3): docs: Use our own implementation for fetching the RSS data docs: use case sensitive javascript docs: Remove unused JS libraries docs/Makefile.am | 6 +---- docs/index.html.in | 16 ------------ docs/js/jquery-3.1.1.min.js | 4 --- docs/js/jquery.rss.min.js | 11 --------- docs/js/main.js | 49 ++++++++++++++++++++++++++++++++++++- docs/js/moment.min.js | 7 ------ 6 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js delete mode 100644 docs/js/jquery.rss.min.js delete mode 100644 docs/js/moment.min.js -- 2.21.0

4 13

[libvirt] [PATCH v3 0/5] docs: Update third-party JavaScript libraries
by Andrea Bolognani 20 Jun '19

20 Jun '19

We're carrying around embedded copies of a few JavaScript libraries for use in our homepage, and we've been unforgivably bad at keeping them up to date. Address that. While doing so, replace the minified version of each library with its non-minified counterpart so that libvirt.git and release archives will include the actual source code for them, rather than what is basically the JavaScript equivalent of binary blobs. Note that I consider this to be merely a stop-gap measure until we start generating the blog roll, the only part of the libvirt website that uses these libraries, on the server side and finally drop them entirely. I don't have cycles to dedicate to that effort at the moment though, and this is better than leaving the situation unchanged for who knows how much longer. Since the diffs are kinda big and honestly just not very interesting, I've snipped them liberally; the unabridged version of this series can be fetched with $ git fetch https://github.com/andreabolognani/libvirt js Changes from [v2]: * import non-minified libraries and minify them at build time. Changes from [v1]: * drop libraries instead of updating them. [v2] https://www.redhat.com/archives/libvir-list/2019-June/msg00611.html [v1] https://www.redhat.com/archives/libvir-list/2019-June/msg00551.html Andrea Bolognani (5): docs: Update jQuery docs: Update Moment.js docs: Update jquery.rss docs: Perform JavaScript minimization at build time spec: Require uglifyjs for RPM build .gitignore | 1 + docs/Makefile.am | 37 +- docs/index.html.in | 6 +- docs/js/jquery-3.1.1.min.js | 4 - docs/js/jquery-3.4.1.js | 10598 +++++++++++++++++++++++++++++++++ docs/js/jquery.rss-3.3.0.js | 333 ++ docs/js/jquery.rss.min.js | 11 - docs/js/moment-2.24.0.js | 4602 ++++++++++++++ docs/js/moment.min.js | 7 - docs/page.xsl | 2 +- docs/site.xsl | 1 + docs/subsite.xsl | 1 + libvirt.spec.in | 5 + m4/virt-external-programs.m4 | 2 + 14 files changed, 15578 insertions(+), 32 deletions(-) delete mode 100644 docs/js/jquery-3.1.1.min.js create mode 100644 docs/js/jquery-3.4.1.js create mode 100644 docs/js/jquery.rss-3.3.0.js delete mode 100644 docs/js/jquery.rss.min.js create mode 100644 docs/js/moment-2.24.0.js delete mode 100644 docs/js/moment.min.js -- 2.21.0

2 9

[libvirt] [PATCHv2 0/9] qemu: drop command line parsing
by Peter Krempa 20 Jun '19

20 Jun '19

All the code is mostly outdated and does not really help in most cases. Since this was already proposed and I did not see anything against here are the patches. As a follow up I'll refactor and move the rest of qemu_parse_command.c once this is out of the way. you can fetch this by git fetch https://github.com/pipo/libvirt.git parse-command-delete Version 2 contains fixes for things suggested by Jano and Andrea and also adds documentation to the hvsupport page and also to news. Additionally the rest of the code from qemu_parse_command.(ch) is moved out. Peter Krempa (9): docs: hvsupport: Add support for deprecating hypervisor implementations qemu: driver: Drop support for qemu-attach qemu: parse: Drop qemuParseCommandLinePid and friends qemu: driver: Remove support for native->XML conversion news: Document removal of qemu commandline parsing tests: Drop qemuargv2xmltest qemu: parse: Drop unused qemu command line parsing infrastructure qemu: Move QEMU_QXL_VGAMEM_DEFAULT macro qemu: Move qemuParseKeywords(Free) to the monitor code docs/hvsupport.pl | 44 +- docs/libvirt.css | 4 + docs/news.xml | 12 + po/POTFILES | 1 - src/check-aclrules.pl | 1 + src/qemu/Makefile.inc.am | 2 - src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 138 +- src/qemu/qemu_monitor_json.c | 124 +- src/qemu/qemu_parse_command.c | 2861 ----------------- src/qemu/qemu_parse_command.h | 60 - tests/Makefile.am | 11 +- tests/qemuargv2xmldata/boot-cdrom.args | 22 - tests/qemuargv2xmldata/boot-cdrom.xml | 35 - tests/qemuargv2xmldata/boot-floppy.args | 23 - tests/qemuargv2xmldata/boot-floppy.xml | 41 - tests/qemuargv2xmldata/boot-network.args | 22 - tests/qemuargv2xmldata/boot-network.xml | 34 - tests/qemuargv2xmldata/clock-localtime.args | 23 - tests/qemuargv2xmldata/clock-localtime.xml | 34 - tests/qemuargv2xmldata/clock-utc.args | 22 - tests/qemuargv2xmldata/clock-utc.xml | 34 - tests/qemuargv2xmldata/console-compat.args | 22 - tests/qemuargv2xmldata/console-compat.xml | 42 - tests/qemuargv2xmldata/disk-cdrom-empty.args | 23 - tests/qemuargv2xmldata/disk-cdrom-empty.xml | 40 - tests/qemuargv2xmldata/disk-cdrom.args | 23 - tests/qemuargv2xmldata/disk-cdrom.xml | 41 - .../disk-drive-boot-cdrom.args | 23 - .../disk-drive-boot-cdrom.xml | 41 - .../disk-drive-boot-disk.args | 23 - .../qemuargv2xmldata/disk-drive-boot-disk.xml | 41 - .../disk-drive-cache-directsync.args | 24 - .../disk-drive-cache-directsync.xml | 41 - .../disk-drive-cache-unsafe.args | 24 - .../disk-drive-cache-unsafe.xml | 41 - .../disk-drive-cache-v2-none.args | 23 - .../disk-drive-cache-v2-none.xml | 41 - .../disk-drive-cache-v2-wb.args | 24 - .../disk-drive-cache-v2-wb.xml | 41 - .../disk-drive-cache-v2-wt.args | 24 - .../disk-drive-cache-v2-wt.xml | 41 - .../disk-drive-error-policy-enospace.args | 24 - .../disk-drive-error-policy-enospace.xml | 41 - .../disk-drive-error-policy-stop.args | 24 - .../disk-drive-error-policy-stop.xml | 41 - ...sk-drive-error-policy-wreport-rignore.args | 24 - ...isk-drive-error-policy-wreport-rignore.xml | 41 - .../qemuargv2xmldata/disk-drive-fmt-qcow.args | 23 - .../qemuargv2xmldata/disk-drive-fmt-qcow.xml | 41 - .../disk-drive-network-gluster.args | 25 - .../disk-drive-network-gluster.xml | 41 - .../disk-drive-network-iscsi-auth.args | 25 - .../disk-drive-network-iscsi-auth.xml | 44 - .../disk-drive-network-iscsi.args | 25 - .../disk-drive-network-iscsi.xml | 41 - .../disk-drive-network-nbd-export.args | 23 - .../disk-drive-network-nbd-export.xml | 42 - .../disk-drive-network-nbd-ipv6-export.args | 23 - .../disk-drive-network-nbd-ipv6-export.xml | 42 - .../disk-drive-network-nbd-ipv6.args | 23 - .../disk-drive-network-nbd-ipv6.xml | 42 - .../disk-drive-network-nbd-unix.args | 23 - .../disk-drive-network-nbd-unix.xml | 42 - .../disk-drive-network-nbd.args | 23 - .../disk-drive-network-nbd.xml | 42 - .../disk-drive-network-rbd-auth.args | 26 - .../disk-drive-network-rbd-auth.xml | 47 - .../disk-drive-network-rbd-ceph-env.args | 25 - .../disk-drive-network-rbd-ceph-env.xml | 44 - .../disk-drive-network-rbd-ipv6.args | 25 - .../disk-drive-network-rbd-ipv6.xml | 45 - .../disk-drive-network-rbd.args | 29 - .../disk-drive-network-rbd.xml | 72 - .../disk-drive-network-sheepdog.args | 23 - .../disk-drive-network-sheepdog.xml | 42 - tests/qemuargv2xmldata/disk-floppy.args | 24 - tests/qemuargv2xmldata/disk-floppy.xml | 47 - tests/qemuargv2xmldata/disk-many.args | 25 - tests/qemuargv2xmldata/disk-many.xml | 52 - tests/qemuargv2xmldata/disk-usb.args | 23 - tests/qemuargv2xmldata/disk-usb.xml | 39 - tests/qemuargv2xmldata/disk-virtio.args | 25 - tests/qemuargv2xmldata/disk-virtio.xml | 53 - .../graphics-sdl-fullscreen.args | 25 - .../graphics-sdl-fullscreen.xml | 39 - tests/qemuargv2xmldata/graphics-sdl.args | 24 - tests/qemuargv2xmldata/graphics-sdl.xml | 39 - .../qemuargv2xmldata/graphics-vnc-policy.args | 23 - .../qemuargv2xmldata/graphics-vnc-policy.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-sasl.args | 24 - tests/qemuargv2xmldata/graphics-vnc-sasl.xml | 41 - .../qemuargv2xmldata/graphics-vnc-socket.args | 23 - .../qemuargv2xmldata/graphics-vnc-socket.xml | 41 - tests/qemuargv2xmldata/graphics-vnc-tls.args | 24 - tests/qemuargv2xmldata/graphics-vnc-tls.xml | 41 - .../graphics-vnc-websocket.args | 22 - .../graphics-vnc-websocket.xml | 32 - tests/qemuargv2xmldata/graphics-vnc.args | 23 - tests/qemuargv2xmldata/graphics-vnc.xml | 41 - .../qemuargv2xmldata/hostdev-pci-address.args | 23 - .../qemuargv2xmldata/hostdev-pci-address.xml | 40 - .../qemuargv2xmldata/hostdev-usb-address.args | 23 - .../qemuargv2xmldata/hostdev-usb-address.xml | 39 - tests/qemuargv2xmldata/hyperv-panic.args | 21 - tests/qemuargv2xmldata/hyperv-panic.xml | 29 - tests/qemuargv2xmldata/hyperv.args | 21 - tests/qemuargv2xmldata/hyperv.xml | 33 - tests/qemuargv2xmldata/input-usbmouse.args | 23 - tests/qemuargv2xmldata/input-usbmouse.xml | 35 - tests/qemuargv2xmldata/input-usbtablet.args | 23 - tests/qemuargv2xmldata/input-usbtablet.xml | 35 - tests/qemuargv2xmldata/kvm-features.args | 21 - tests/qemuargv2xmldata/kvm-features.xml | 31 - tests/qemuargv2xmldata/kvmclock.args | 22 - tests/qemuargv2xmldata/kvmclock.xml | 30 - .../machine-aeskeywrap-off-argv.args | 18 - .../machine-aeskeywrap-off-argv.xml | 23 - .../machine-aeskeywrap-on-argv.args | 18 - .../machine-aeskeywrap-on-argv.xml | 23 - tests/qemuargv2xmldata/machine-core-off.args | 22 - tests/qemuargv2xmldata/machine-core-off.xml | 34 - tests/qemuargv2xmldata/machine-core-on.args | 22 - tests/qemuargv2xmldata/machine-core-on.xml | 34 - .../machine-deakeywrap-off-argv.args | 18 - .../machine-deakeywrap-off-argv.xml | 23 - .../machine-deakeywrap-on-argv.args | 18 - .../machine-deakeywrap-on-argv.xml | 23 - .../machine-keywrap-none-argv.args | 18 - .../machine-keywrap-none-argv.xml | 20 - .../qemuargv2xmldata/mem-scale-maxmemory.args | 22 - .../qemuargv2xmldata/mem-scale-maxmemory.xml | 38 - tests/qemuargv2xmldata/mem-scale.args | 22 - tests/qemuargv2xmldata/mem-scale.xml | 37 - tests/qemuargv2xmldata/migrate.args | 23 - tests/qemuargv2xmldata/migrate.xml | 34 - tests/qemuargv2xmldata/misc-acpi.args | 21 - tests/qemuargv2xmldata/misc-acpi.xml | 37 - tests/qemuargv2xmldata/misc-disable-s3.args | 23 - tests/qemuargv2xmldata/misc-disable-s3.xml | 37 - .../misc-disable-suspends.args | 24 - .../misc-disable-suspends.xml | 38 - tests/qemuargv2xmldata/misc-enable-s4.args | 23 - tests/qemuargv2xmldata/misc-enable-s4.xml | 37 - tests/qemuargv2xmldata/misc-no-reboot.args | 23 - tests/qemuargv2xmldata/misc-no-reboot.xml | 34 - tests/qemuargv2xmldata/misc-uuid.args | 21 - tests/qemuargv2xmldata/misc-uuid.xml | 37 - tests/qemuargv2xmldata/net-eth-ifname.args | 23 - tests/qemuargv2xmldata/net-eth-ifname.xml | 41 - tests/qemuargv2xmldata/net-eth.args | 23 - tests/qemuargv2xmldata/net-eth.xml | 40 - tests/qemuargv2xmldata/net-user.args | 23 - tests/qemuargv2xmldata/net-user.xml | 39 - tests/qemuargv2xmldata/net-virtio.args | 23 - tests/qemuargv2xmldata/net-virtio.xml | 39 - .../nographics-vga-display.args | 23 - .../nographics-vga-display.xml | 34 - tests/qemuargv2xmldata/nographics-vga.args | 23 - tests/qemuargv2xmldata/nographics-vga.xml | 34 - tests/qemuargv2xmldata/nomachine-ppc64.args | 11 - tests/qemuargv2xmldata/nomachine-ppc64.xml | 50 - tests/qemuargv2xmldata/nomachine-x86_64.args | 11 - tests/qemuargv2xmldata/nomachine-x86_64.xml | 49 - tests/qemuargv2xmldata/nosharepages.args | 22 - tests/qemuargv2xmldata/nosharepages.xml | 37 - tests/qemuargv2xmldata/parallel-tcp.args | 22 - tests/qemuargv2xmldata/parallel-tcp.xml | 39 - tests/qemuargv2xmldata/pseries-disk.args | 18 - tests/qemuargv2xmldata/pseries-disk.xml | 50 - tests/qemuargv2xmldata/pseries-nvram.args | 22 - tests/qemuargv2xmldata/pseries-nvram.xml | 30 - tests/qemuargv2xmldata/qemu-ns-no-env.args | 23 - tests/qemuargv2xmldata/qemu-ns-no-env.xml | 38 - .../reboot-timeout-disabled.args | 21 - .../reboot-timeout-disabled.xml | 26 - .../reboot-timeout-enabled.args | 21 - .../reboot-timeout-enabled.xml | 26 - tests/qemuargv2xmldata/restore-v2.args | 23 - tests/qemuargv2xmldata/restore-v2.xml | 34 - tests/qemuargv2xmldata/serial-dev.args | 22 - tests/qemuargv2xmldata/serial-dev.xml | 44 - tests/qemuargv2xmldata/serial-file.args | 22 - tests/qemuargv2xmldata/serial-file.xml | 44 - tests/qemuargv2xmldata/serial-many.args | 23 - tests/qemuargv2xmldata/serial-many.xml | 48 - tests/qemuargv2xmldata/serial-pty.args | 22 - tests/qemuargv2xmldata/serial-pty.xml | 42 - tests/qemuargv2xmldata/serial-tcp-telnet.args | 22 - tests/qemuargv2xmldata/serial-tcp-telnet.xml | 46 - tests/qemuargv2xmldata/serial-tcp.args | 22 - tests/qemuargv2xmldata/serial-tcp.xml | 46 - tests/qemuargv2xmldata/serial-udp.args | 23 - tests/qemuargv2xmldata/serial-udp.xml | 52 - tests/qemuargv2xmldata/serial-unix.args | 22 - tests/qemuargv2xmldata/serial-unix.xml | 44 - tests/qemuargv2xmldata/serial-vc.args | 22 - tests/qemuargv2xmldata/serial-vc.xml | 42 - tests/qemuargv2xmldata/smp.args | 22 - tests/qemuargv2xmldata/smp.xml | 37 - tests/qemuargv2xmldata/sound.args | 23 - tests/qemuargv2xmldata/sound.xml | 42 - tests/qemuargv2xmldata/watchdog.args | 24 - tests/qemuargv2xmldata/watchdog.xml | 35 - tests/qemuargv2xmltest.c | 323 -- tests/virschematest.c | 2 +- 206 files changed, 190 insertions(+), 9306 deletions(-) delete mode 100644 src/qemu/qemu_parse_command.c delete mode 100644 src/qemu/qemu_parse_command.h delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/boot-floppy.args delete mode 100644 tests/qemuargv2xmldata/boot-floppy.xml delete mode 100644 tests/qemuargv2xmldata/boot-network.args delete mode 100644 tests/qemuargv2xmldata/boot-network.xml delete mode 100644 tests/qemuargv2xmldata/clock-localtime.args delete mode 100644 tests/qemuargv2xmldata/clock-localtime.xml delete mode 100644 tests/qemuargv2xmldata/clock-utc.args delete mode 100644 tests/qemuargv2xmldata/clock-utc.xml delete mode 100644 tests/qemuargv2xmldata/console-compat.args delete mode 100644 tests/qemuargv2xmldata/console-compat.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom-empty.xml delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-cdrom.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-boot-disk.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-directsync.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-unsafe.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-none.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wb.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-cache-v2-wt.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-enospace.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-stop.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-error-policy-wreport-rignore.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-fmt-qcow.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-gluster.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-iscsi.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6-export.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd-unix.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-nbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-auth.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ceph-env.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd-ipv6.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-rbd.xml delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.args delete mode 100644 tests/qemuargv2xmldata/disk-drive-network-sheepdog.xml delete mode 100644 tests/qemuargv2xmldata/disk-floppy.args delete mode 100644 tests/qemuargv2xmldata/disk-floppy.xml delete mode 100644 tests/qemuargv2xmldata/disk-many.args delete mode 100644 tests/qemuargv2xmldata/disk-many.xml delete mode 100644 tests/qemuargv2xmldata/disk-usb.args delete mode 100644 tests/qemuargv2xmldata/disk-usb.xml delete mode 100644 tests/qemuargv2xmldata/disk-virtio.args delete mode 100644 tests/qemuargv2xmldata/disk-virtio.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl-fullscreen.xml delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.args delete mode 100644 tests/qemuargv2xmldata/graphics-sdl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-policy.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-sasl.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-socket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-tls.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc-websocket.xml delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.args delete mode 100644 tests/qemuargv2xmldata/graphics-vnc.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-pci-address.xml delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.args delete mode 100644 tests/qemuargv2xmldata/hostdev-usb-address.xml delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.args delete mode 100644 tests/qemuargv2xmldata/hyperv-panic.xml delete mode 100644 tests/qemuargv2xmldata/hyperv.args delete mode 100644 tests/qemuargv2xmldata/hyperv.xml delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.args delete mode 100644 tests/qemuargv2xmldata/input-usbmouse.xml delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.args delete mode 100644 tests/qemuargv2xmldata/input-usbtablet.xml delete mode 100644 tests/qemuargv2xmldata/kvm-features.args delete mode 100644 tests/qemuargv2xmldata/kvm-features.xml delete mode 100644 tests/qemuargv2xmldata/kvmclock.args delete mode 100644 tests/qemuargv2xmldata/kvmclock.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-aeskeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-off.args delete mode 100644 tests/qemuargv2xmldata/machine-core-off.xml delete mode 100644 tests/qemuargv2xmldata/machine-core-on.args delete mode 100644 tests/qemuargv2xmldata/machine-core-on.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-off-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-deakeywrap-on-argv.xml delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.args delete mode 100644 tests/qemuargv2xmldata/machine-keywrap-none-argv.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.args delete mode 100644 tests/qemuargv2xmldata/mem-scale-maxmemory.xml delete mode 100644 tests/qemuargv2xmldata/mem-scale.args delete mode 100644 tests/qemuargv2xmldata/mem-scale.xml delete mode 100644 tests/qemuargv2xmldata/migrate.args delete mode 100644 tests/qemuargv2xmldata/migrate.xml delete mode 100644 tests/qemuargv2xmldata/misc-acpi.args delete mode 100644 tests/qemuargv2xmldata/misc-acpi.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-s3.xml delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.args delete mode 100644 tests/qemuargv2xmldata/misc-disable-suspends.xml delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.args delete mode 100644 tests/qemuargv2xmldata/misc-enable-s4.xml delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.args delete mode 100644 tests/qemuargv2xmldata/misc-no-reboot.xml delete mode 100644 tests/qemuargv2xmldata/misc-uuid.args delete mode 100644 tests/qemuargv2xmldata/misc-uuid.xml delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.args delete mode 100644 tests/qemuargv2xmldata/net-eth-ifname.xml delete mode 100644 tests/qemuargv2xmldata/net-eth.args delete mode 100644 tests/qemuargv2xmldata/net-eth.xml delete mode 100644 tests/qemuargv2xmldata/net-user.args delete mode 100644 tests/qemuargv2xmldata/net-user.xml delete mode 100644 tests/qemuargv2xmldata/net-virtio.args delete mode 100644 tests/qemuargv2xmldata/net-virtio.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga-display.xml delete mode 100644 tests/qemuargv2xmldata/nographics-vga.args delete mode 100644 tests/qemuargv2xmldata/nographics-vga.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-ppc64.xml delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-x86_64.xml delete mode 100644 tests/qemuargv2xmldata/nosharepages.args delete mode 100644 tests/qemuargv2xmldata/nosharepages.xml delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.args delete mode 100644 tests/qemuargv2xmldata/parallel-tcp.xml delete mode 100644 tests/qemuargv2xmldata/pseries-disk.args delete mode 100644 tests/qemuargv2xmldata/pseries-disk.xml delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.args delete mode 100644 tests/qemuargv2xmldata/pseries-nvram.xml delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.args delete mode 100644 tests/qemuargv2xmldata/qemu-ns-no-env.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-disabled.xml delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.args delete mode 100644 tests/qemuargv2xmldata/reboot-timeout-enabled.xml delete mode 100644 tests/qemuargv2xmldata/restore-v2.args delete mode 100644 tests/qemuargv2xmldata/restore-v2.xml delete mode 100644 tests/qemuargv2xmldata/serial-dev.args delete mode 100644 tests/qemuargv2xmldata/serial-dev.xml delete mode 100644 tests/qemuargv2xmldata/serial-file.args delete mode 100644 tests/qemuargv2xmldata/serial-file.xml delete mode 100644 tests/qemuargv2xmldata/serial-many.args delete mode 100644 tests/qemuargv2xmldata/serial-many.xml delete mode 100644 tests/qemuargv2xmldata/serial-pty.args delete mode 100644 tests/qemuargv2xmldata/serial-pty.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp-telnet.xml delete mode 100644 tests/qemuargv2xmldata/serial-tcp.args delete mode 100644 tests/qemuargv2xmldata/serial-tcp.xml delete mode 100644 tests/qemuargv2xmldata/serial-udp.args delete mode 100644 tests/qemuargv2xmldata/serial-udp.xml delete mode 100644 tests/qemuargv2xmldata/serial-unix.args delete mode 100644 tests/qemuargv2xmldata/serial-unix.xml delete mode 100644 tests/qemuargv2xmldata/serial-vc.args delete mode 100644 tests/qemuargv2xmldata/serial-vc.xml delete mode 100644 tests/qemuargv2xmldata/smp.args delete mode 100644 tests/qemuargv2xmldata/smp.xml delete mode 100644 tests/qemuargv2xmldata/sound.args delete mode 100644 tests/qemuargv2xmldata/sound.xml delete mode 100644 tests/qemuargv2xmldata/watchdog.args delete mode 100644 tests/qemuargv2xmldata/watchdog.xml delete mode 100644 tests/qemuargv2xmltest.c -- 2.21.0

3 30

[libvirt] [PATCH 0/3] tests: drop the JSON field from qemuMonitorTest
by Ján Tomko 20 Jun '19

20 Jun '19

Ján Tomko (3): tests: assume JSON in qemuMonitorTestIO tests: qemuMonitorTestProcessCommandDefaultValidate: simplify condition tests: qemuMonitorTest: drop the JSON field tests/qemumonitortestutils.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.19.2

2 6

[libvirt] [PATCH] test_driver: implement virDomainGetMemoryParameters
by Ilias Stamatis 20 Jun '19

20 Jun '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 8ef843b203..9e8236a5b6 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1474,6 +1474,7 @@ static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, return 32; } + static char * testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, const char **xmlCPUs, @@ -2498,6 +2499,50 @@ testDomainGetMaxVcpus(virDomainPtr domain) VIR_DOMAIN_VCPU_MAXIMUM)); } + +#define TEST_ASSIGN_MEM_PARAM(index, name, value) \ + if (index < *nparams && \ + virTypedParameterAssign(&params[index], name, VIR_TYPED_PARAM_ULLONG, \ + value) < 0) \ + goto cleanup + +static int +testDomainGetMemoryParameters(virDomainPtr dom, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) +{ + int ret = -1; + virDomainObjPtr vm = NULL; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG | + VIR_TYPED_PARAM_STRING_OKAY, -1); + + if ((*nparams) == 0) { + *nparams = 3; + return 0; + } + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + TEST_ASSIGN_MEM_PARAM(0, VIR_DOMAIN_MEMORY_HARD_LIMIT, vm->def->mem.hard_limit); + TEST_ASSIGN_MEM_PARAM(1, VIR_DOMAIN_MEMORY_SOFT_LIMIT, vm->def->mem.soft_limit); + TEST_ASSIGN_MEM_PARAM(2, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, vm->def->mem.swap_hard_limit); + + if (*nparams > 3) + *nparams = 3; + + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} +#undef TEST_ASSIGN_MEM_PARAM + + static int testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, unsigned int flags) @@ -7162,6 +7207,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetVcpus = testDomainGetVcpus, /* 0.7.3 */ .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ + .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.5.0 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ -- 2.21.0

2 2

[libvirt] [PATCH 0/8] virhostdev: Couple of improvements
by Michal Privoznik 20 Jun '19

20 Jun '19

I'm working around this area and noticed a room for improvements. This is basically a few patches that I have at the bottom if my branch and they are independent of the feature I'm working on. Michal Prívozník (8): virHostdevGetPCIHostDeviceList: Add @pci a bit later virHostdevGetPCIHostDeviceList: Use VIR_AUTOPTR for virPCIDevice virHostdevPreparePCIDevices: Construct pcidevs list earlier virHostdevReAttachPCIDevices: Construct pcidevs list earlier virhostdev: Use VIR_AUTOUNREF more virHostdevFindUSBDevice: Simplify flow a bit virHostdevPrepareSCSIVHostDevices: Simplify logic virhostdev: Use VIR_AUTOPTR more src/util/virhostdev.c | 220 +++++++++++++++++------------------------- 1 file changed, 87 insertions(+), 133 deletions(-) -- 2.21.0

2 16

[libvirt] [PATCH] tests: qemucaps: Update 4.1.0 capabilities to a more recent version
by Peter Krempa 20 Jun '19

20 Jun '19

Update the capabilities from a non-upstream version (9c70209b63 is not in qemu.git) to qemu upstream commit 33d6099906 (2019/06/18) so that we get the QMP schema 'features' field support and are able to detect that the 'file' block backend supports dynamic auto-read-only. Note that I've rebuilt this on a machine with a more modern kernel and microcode which exposes e.g. the recent CPU bug mitigations, thus I opted to keep the CPU changes rather than trying to do a franken-caps by updating only the output of query-qmp-schema. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../qemu_4.1.0.x86_64.xml | 24 +- .../caps_4.1.0.x86_64.replies | 4595 ++++++++--------- .../caps_4.1.0.x86_64.xml | 125 +- 3 files changed, 2335 insertions(+), 2409 deletions(-) diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml index 389e641bbb..d638795359 100644 --- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml @@ -30,7 +30,7 @@ <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> - <model fallback='forbid'>Skylake-Client</model> + <model fallback='forbid'>Skylake-Client-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='vmx'/> @@ -38,9 +38,13 @@ <feature policy='require' name='tsc_adjust'/> <feature policy='require' name='clflushopt'/> <feature policy='require' name='umip'/> + <feature policy='require' name='md-clear'/> + <feature policy='require' name='stibp'/> <feature policy='require' name='arch-capabilities'/> + <feature policy='require' name='ssbd'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> + <feature policy='require' name='invtsc'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> @@ -55,13 +59,13 @@ <model usable='yes'>coreduo</model> <model usable='yes'>core2duo</model> <model usable='no'>athlon</model> - <model usable='no'>Westmere-IBRS</model> + <model usable='yes'>Westmere-IBRS</model> <model usable='yes'>Westmere</model> <model usable='no'>Skylake-Server-IBRS</model> <model usable='no'>Skylake-Server</model> - <model usable='no'>Skylake-Client-IBRS</model> + <model usable='yes'>Skylake-Client-IBRS</model> <model usable='yes'>Skylake-Client</model> - <model usable='no'>SandyBridge-IBRS</model> + <model usable='yes'>SandyBridge-IBRS</model> <model usable='yes'>SandyBridge</model> <model usable='yes'>Penryn</model> <model usable='no'>Opteron_G5</model> @@ -69,23 +73,23 @@ <model usable='no'>Opteron_G3</model> <model usable='yes'>Opteron_G2</model> <model usable='yes'>Opteron_G1</model> - <model usable='no'>Nehalem-IBRS</model> + <model usable='yes'>Nehalem-IBRS</model> <model usable='yes'>Nehalem</model> - <model usable='no'>IvyBridge-IBRS</model> + <model usable='yes'>IvyBridge-IBRS</model> <model usable='yes'>IvyBridge</model> <model usable='no'>Icelake-Server</model> <model usable='no'>Icelake-Client</model> - <model usable='no'>Haswell-noTSX-IBRS</model> + <model usable='yes'>Haswell-noTSX-IBRS</model> <model usable='yes'>Haswell-noTSX</model> - <model usable='no'>Haswell-IBRS</model> + <model usable='yes'>Haswell-IBRS</model> <model usable='yes'>Haswell</model> <model usable='no'>EPYC-IBPB</model> <model usable='no'>EPYC</model> <model usable='yes'>Conroe</model> <model usable='no'>Cascadelake-Server</model> - <model usable='no'>Broadwell-noTSX-IBRS</model> + <model usable='yes'>Broadwell-noTSX-IBRS</model> <model usable='yes'>Broadwell-noTSX</model> - <model usable='no'>Broadwell-IBRS</model> + <model usable='yes'>Broadwell-IBRS</model> <model usable='yes'>Broadwell</model> <model usable='yes'>486</model> </mode> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies index 77de06bdd7..516e7139bd 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies @@ -21,7 +21,7 @@ "minor": 0, "major": 4 }, - "package": "v4.0.0-1173-g9c70209b63" + "package": "v4.0.0-1481-g33d6099906" }, "id": "libvirt-2" } @@ -619,399 +619,379 @@ { "return": [ { - "name": "vhost-vsock-pci", - "parent": "vhost-vsock-pci-base" + "name": "pcie-pci-bridge", + "parent": "base-pci-bridge" }, { - "name": "scsi-generic", - "parent": "scsi-device" + "name": "pc-q35-2.11-machine", + "parent": "generic-pc-machine" }, { - "name": "qio-channel-tls", - "parent": "qio-channel" + "name": "isa-applesmc", + "parent": "isa-device" }, { - "name": "scsi-hd", - "parent": "scsi-disk-base" + "name": "Westmere-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "usb-bot", - "parent": "usb-storage-dev" + "name": "floppy-bus", + "parent": "bus" }, { - "name": "chardev-null", - "parent": "chardev" + "name": "chardev-stdio", + "parent": "chardev-fd" }, { - "name": "chardev-parallel", + "name": "chardev-testdev", "parent": "chardev" }, { - "name": "qemu-xhci", - "parent": "base-xhci" - }, - { - "name": "lsi53c895a", - "parent": "pci-device" + "name": "virtio-rng-device", + "parent": "virtio-device" }, { - "name": "kvm-ioapic", - "parent": "ioapic-common" + "name": "sev-guest", + "parent": "object" }, { - "name": "cpu-cluster", - "parent": "device" + "name": "usb-redir", + "parent": "usb-device" }, { - "name": "virtio-keyboard-pci", - "parent": "virtio-input-hid-pci" + "name": "filter-buffer", + "parent": "netfilter" }, { - "name": "xen-sysbus", - "parent": "bus" + "name": "usb-wacom-tablet", + "parent": "usb-device" }, { - "name": "xen-bus", - "parent": "bus" + "name": "ich9-usb-uhci6", + "parent": "pci-uhci-usb" }, { - "name": "i440FX", - "parent": "pci-device" + "name": "secondary-vga", + "parent": "pci-vga" }, { - "name": "ide-hd", - "parent": "ide-device" + "name": "kvm-pit", + "parent": "pit-common" }, { - "name": "Opteron_G1-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vhost-user-input-pci", + "parent": "virtio-input-pci" }, { - "name": "kvm64-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "rtl8139", + "parent": "pci-device" }, { - "name": "vhost-scsi-pci-non-transitional", - "parent": "vhost-scsi-pci-base" + "name": "ich9-usb-uhci5", + "parent": "pci-uhci-usb" }, { - "name": "virtio-net-device", - "parent": "virtio-device" + "name": "pci-bridge", + "parent": "base-pci-bridge" }, { - "name": "kvm-i8259", - "parent": "pic-common" + "name": "pc-i440fx-3.0-machine", + "parent": "generic-pc-machine" }, { - "name": "virtio-9p-pci-non-transitional", - "parent": "virtio-9p-pci-base" + "name": "pcm3680_pci", + "parent": "pci-device" }, { - "name": "chardev-pty", - "parent": "chardev" + "name": "virtio-crypto-device", + "parent": "virtio-device" }, { - "name": "xen-apic", - "parent": "apic-common" + "name": "core2duo-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "SUNW,fdtwo", - "parent": "base-sysbus-fdc" + "name": "virtio-blk-pci-transitional", + "parent": "virtio-blk-pci-base" }, { - "name": "isa-pcspk", - "parent": "isa-device" + "name": "pc-q35-2.5-machine", + "parent": "generic-pc-machine" }, { - "name": "Haswell-IBRS-x86_64-cpu", + "name": "max-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pc-q35-4.1-machine", - "parent": "generic-pc-machine" + "name": "vmware-svga", + "parent": "pci-device" }, { - "name": "loader", + "name": "tpm-crb", "parent": "device" }, { - "name": "filter-rewriter", - "parent": "netfilter" - }, - { - "name": "pc-q35-4.0-machine", - "parent": "generic-pc-machine" - }, - { - "name": "virtio-serial-pci", - "parent": "virtio-serial-pci-base" + "name": "kvm-ioapic", + "parent": "ioapic-common" }, { - "name": "Nehalem-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "gus", + "parent": "isa-device" }, { - "name": "pc-0.12-machine", - "parent": "generic-pc-machine" + "name": "ich9-usb-uhci4", + "parent": "pci-uhci-usb" }, { - "name": "pcie-root-port", - "parent": "pcie-root-port-base" + "name": "usb-hub", + "parent": "usb-device" }, { - "name": "virtio-crypto-device", + "name": "virtio-blk-device", "parent": "virtio-device" }, { - "name": "usb-host", - "parent": "usb-device" + "name": "ich9-usb-uhci3", + "parent": "pci-uhci-usb" }, { "name": "Icelake-Client-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "usb-bt-dongle", - "parent": "usb-device" + "name": "chardev-wctablet", + "parent": "chardev" }, { - "name": "igd-passthrough-isa-bridge", - "parent": "pci-device" + "name": "ich9-usb-uhci2", + "parent": "pci-uhci-usb" }, { - "name": "usb-mtp", - "parent": "usb-device" + "name": "pc-i440fx-2.8-machine", + "parent": "generic-pc-machine" }, { - "name": "qemu64-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "chardev-serial", + "parent": "chardev-fd" }, { - "name": "virtio-input-host-pci", - "parent": "virtio-input-pci" + "name": "qtest-accel", + "parent": "accel" }, { - "name": "pc-i440fx-2.10-machine", - "parent": "generic-pc-machine" + "name": "chardev-pty", + "parent": "chardev" }, { - "name": "phenom-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "PCIE", + "parent": "PCI" }, { - "name": "e1000", - "parent": "e1000-base" + "name": "ich9-usb-uhci1", + "parent": "pci-uhci-usb" }, { - "name": "PIIX3-xen", - "parent": "pci-piix3" + "name": "scsi-generic", + "parent": "scsi-device" }, { - "name": "sysbus-ahci", + "name": "kvmclock", "parent": "sys-bus-device" }, { - "name": "ccid-card-emulated", - "parent": "ccid-card" + "name": "x3130-upstream", + "parent": "pcie-port" }, { - "name": "ich9-usb-uhci5", - "parent": "pci-uhci-usb" + "name": "memory-backend-ram", + "parent": "memory-backend" }, { - "name": "pc-i440fx-1.4-machine", - "parent": "generic-pc-machine" + "name": "virtio-serial-pci-transitional", + "parent": "virtio-serial-pci-base" }, { - "name": "ICH9-LPC", + "name": "e1000e", "parent": "pci-device" }, { - "name": "pc-q35-2.6-machine", - "parent": "generic-pc-machine" + "name": "n270-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "ich9-usb-uhci6", - "parent": "pci-uhci-usb" + "name": "pxb-host", + "parent": "pci-host-bridge" }, { - "name": "ich9-usb-uhci4", - "parent": "pci-uhci-usb" + "name": "scsi-disk", + "parent": "scsi-disk-base" }, { - "name": "chardev-spicevmc", - "parent": "chardev-spice" + "name": "chardev-file", + "parent": "chardev-fd" }, { - "name": "ich9-usb-uhci3", - "parent": "pci-uhci-usb" + "name": "tpm-passthrough", + "parent": "tpm-backend" }, { - "name": "ich9-usb-uhci2", - "parent": "pci-uhci-usb" + "name": "virtio-serial-bus", + "parent": "bus" }, { - "name": "ich9-usb-uhci1", - "parent": "pci-uhci-usb" + "name": "usb-host", + "parent": "usb-device" }, { - "name": "tls-creds-psk", - "parent": "tls-creds" + "name": "piix3-ide", + "parent": "pci-ide" }, { - "name": "tpci200", - "parent": "pci-device" + "name": "filter-rewriter", + "parent": "netfilter" }, { - "name": "memory-backend-file", - "parent": "memory-backend" + "name": "pc-i440fx-4.0-machine", + "parent": "generic-pc-machine" }, { - "name": "pc-q35-2.5-machine", + "name": "pc-1.2-machine", "parent": "generic-pc-machine" }, { - "name": "AMDVI-PCI", - "parent": "pci-device" + "name": "isa-ipmi-bt", + "parent": "isa-device" }, { - "name": "filter-redirector", - "parent": "netfilter" + "name": "vhost-scsi-pci", + "parent": "vhost-scsi-pci-base" }, { - "name": "rtl8139", - "parent": "pci-device" + "name": "virtio-gpu-pci", + "parent": "virtio-gpu-pci-base" }, { - "name": "chardev-hci", - "parent": "chardev" + "name": "xio3130-downstream", + "parent": "pcie-slot" }, { - "name": "pc-q35-2.4-machine", - "parent": "generic-pc-machine" + "name": "intel-iommu-iommu-memory-region", + "parent": "qemu:iommu-memory-region" }, { - "name": "container", - "parent": "object" + "name": "pc-i440fx-2.3-machine", + "parent": "generic-pc-machine" }, { - "name": "pc-i440fx-3.1-machine", - "parent": "generic-pc-machine" - }, - { - "name": "megasas", - "parent": "megasas-base" + "name": "ICH9-LPC", + "parent": "pci-device" }, { - "name": "base-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "PCI", + "parent": "bus" }, { - "name": "virtio-balloon-pci-non-transitional", - "parent": "virtio-balloon-pci-base" + "name": "sdhci-bus", + "parent": "sd-bus" }, { - "name": "qxl-vga", - "parent": "pci-qxl" + "name": "imx-usdhc", + "parent": "generic-sdhci" }, { - "name": "scsi-block", - "parent": "scsi-disk-base" + "name": "pci-serial-2x", + "parent": "pci-device" }, { - "name": "Opteron_G2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "igd-passthrough-isa-bridge", + "parent": "pci-device" }, { - "name": "unimplemented-device", - "parent": "sys-bus-device" + "name": "virtio-9p-device", + "parent": "virtio-device" }, { - "name": "vhost-user-input", - "parent": "virtio-input-device" + "name": "virtio-scsi-pci", + "parent": "virtio-scsi-pci-base" }, { - "name": "tls-creds-anon", - "parent": "tls-creds" + "name": "ipmi-bmc-extern", + "parent": "ipmi-bmc" }, { - "name": "pc-i440fx-3.0-machine", + "name": "pc-q35-4.0-machine", "parent": "generic-pc-machine" }, { - "name": "scsi-cd", - "parent": "scsi-disk-base" - }, - { - "name": "pxb-bus", - "parent": "PCI" + "name": "authz-list-file", + "parent": "authz" }, { - "name": "pc-0.14-machine", - "parent": "generic-pc-machine" + "name": "usb-audio", + "parent": "usb-device" }, { - "name": "accel", - "parent": "object" + "name": "qemu32-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "floppy-bus", - "parent": "bus" + "name": "ich9-usb-ehci2", + "parent": "pci-ehci-usb" }, { - "name": "usb-audio", + "name": "usb-net", "parent": "usb-device" }, { - "name": "virtio-vga", - "parent": "virtio-vga-base" + "name": "vhost-vsock-pci-non-transitional", + "parent": "vhost-vsock-pci-base" }, { - "name": "pc-i440fx-2.12-machine", - "parent": "generic-pc-machine" + "name": "isa-debug-exit", + "parent": "isa-device" }, { - "name": "vmware-svga", - "parent": "pci-device" + "name": "KnightsMill-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-0.13-machine", - "parent": "generic-pc-machine" + "name": "vfio-pci-nohotplug", + "parent": "vfio-pci" }, { - "name": "isa-serial", - "parent": "isa-device" + "name": "i2c-bus", + "parent": "bus" }, { - "name": "virtio-serial-device", - "parent": "virtio-device" + "name": "ich9-usb-ehci1", + "parent": "pci-ehci-usb" }, { - "name": "isa-debug-exit", - "parent": "isa-device" + "name": "virtio-input-host-pci", + "parent": "virtio-input-pci" }, { - "name": "vhost-scsi-pci", - "parent": "vhost-scsi-pci-base" + "name": "mch", + "parent": "pci-device" }, { - "name": "chardev-gdb", + "name": "chardev-hci", "parent": "chardev" }, { - "name": "fdc37m81x-superio", - "parent": "isa-superio" + "name": "nvdimm", + "parent": "pc-dimm" }, { - "name": "pc-testdev", - "parent": "isa-device" + "name": "pc-q35-3.0-machine", + "parent": "generic-pc-machine" }, { - "name": "xen-backend", - "parent": "xen-sysdev" + "name": "virtio-9p-pci-transitional", + "parent": "virtio-9p-pci-base" }, { - "name": "Haswell-noTSX-IBRS-x86_64-cpu", + "name": "Opteron_G1-x86_64-cpu", "parent": "x86_64-cpu" }, { @@ -1019,1484 +999,1440 @@ "parent": "pr-manager" }, { - "name": "fw_cfg_mem", - "parent": "fw_cfg" + "name": "pc-i440fx-2.10-machine", + "parent": "generic-pc-machine" }, { - "name": "virtio-scsi-pci-transitional", - "parent": "virtio-scsi-pci-base" + "name": "i82557c", + "parent": "pci-device" }, { - "name": "usb-uas", - "parent": "usb-device" + "name": "virtio-scsi-device", + "parent": "virtio-scsi-common" }, { - "name": "ide-cd", - "parent": "ide-device" + "name": "pxb-pcie", + "parent": "pci-device" }, { - "name": "pc-q35-2.8-machine", - "parent": "generic-pc-machine" + "name": "Haswell-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-2.11-machine", - "parent": "generic-pc-machine" + "name": "cpu-cluster", + "parent": "device" }, { - "name": "pc-i440fx-1.6-machine", - "parent": "generic-pc-machine" + "name": "i82557b", + "parent": "pci-device" }, { - "name": "virtio-balloon-pci", - "parent": "virtio-balloon-pci-base" + "name": "migration", + "parent": "device" }, { - "name": "chardev-socket", - "parent": "chardev" + "name": "pc-q35-2.8-machine", + "parent": "generic-pc-machine" }, { - "name": "iothread", - "parent": "object" + "name": "vhost-user-scsi-pci-non-transitional", + "parent": "vhost-user-scsi-pci-base" }, { - "name": "sb16", - "parent": "isa-device" + "name": "generic-sdhci", + "parent": "sys-bus-device" }, { - "name": "chardev-mux", - "parent": "chardev" + "name": "i82557a", + "parent": "pci-device" }, { - "name": "pc-q35-2.7-machine", + "name": "pc-0.13-machine", "parent": "generic-pc-machine" }, { - "name": "pc-i440fx-1.5-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci-non-transitional", + "parent": "virtio-scsi-pci-base" }, { - "name": "486-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vmmouse", + "parent": "isa-device" }, { - "name": "bochs-display", - "parent": "pci-device" + "name": "athlon-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "usb-ccid", - "parent": "usb-device" + "name": "chardev-udp", + "parent": "chardev" }, { - "name": "isa-cirrus-vga", - "parent": "isa-device" + "name": "virtio-mouse-pci", + "parent": "virtio-input-hid-pci" }, { - "name": "qio-channel-rdma", - "parent": "qio-channel" + "name": "chardev-memory", + "parent": "chardev-ringbuf" }, { - "name": "vhost-vsock-device", - "parent": "virtio-device" + "name": "pc-i440fx-1.6-machine", + "parent": "generic-pc-machine" }, { - "name": "sdhci-pci", - "parent": "pci-device" + "name": "vhost-user-vga", + "parent": "virtio-vga-base" }, { - "name": "virtio-input-host-device", - "parent": "virtio-input-device" + "name": "usb-braille", + "parent": "usb-serial-dev" }, { - "name": "i82559er", - "parent": "pci-device" + "name": "EPYC-IBPB-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pci-bridge", - "parent": "base-pci-bridge" + "name": "ib700", + "parent": "isa-device" }, { - "name": "cs4231a", - "parent": "isa-device" + "name": "amd-iommu", + "parent": "x86-iommu" }, { - "name": "ivshmem-doorbell", - "parent": "ivshmem-common" + "name": "virtio-9p-pci-non-transitional", + "parent": "virtio-9p-pci-base" }, { - "name": "chardev-udp", - "parent": "chardev" + "name": "igd-passthrough-i440FX", + "parent": "i440FX" }, { - "name": "virtio-rng-device", - "parent": "virtio-device" + "name": "memory-backend-file", + "parent": "memory-backend" }, { - "name": "isa-parallel", + "name": "isa-pcspk", "parent": "isa-device" }, { - "name": "piix4-ide", - "parent": "pci-ide" + "name": "vhost-vsock-device", + "parent": "virtio-device" }, { - "name": "adlib", - "parent": "isa-device" + "name": "sd-card", + "parent": "device" }, { - "name": "pc-0.15-machine", + "name": "pc-q35-4.0.1-machine", "parent": "generic-pc-machine" }, { - "name": "authz-list-file", - "parent": "authz" - }, - { - "name": "kvmvapic", + "name": "sysbus-ahci", "parent": "sys-bus-device" }, { - "name": "hda-micro", - "parent": "hda-audio" + "name": "vhost-scsi", + "parent": "vhost-scsi-common" }, { - "name": "pci-bridge-seat", - "parent": "pci-bridge" + "name": "usb-tablet", + "parent": "usb-hid" }, { - "name": "dc390", - "parent": "am53c974" + "name": "virtio-blk-pci-non-transitional", + "parent": "virtio-blk-pci-base" }, { - "name": "chardev-pipe", - "parent": "chardev-fd" + "name": "esp", + "parent": "sys-bus-device" }, { - "name": "qemu,register", - "parent": "device" + "name": "isabus-bridge", + "parent": "sys-bus-device" }, { - "name": "IDE", + "name": "ne2k_pci", + "parent": "pci-device" + }, + { + "name": "usb-bus", "parent": "bus" }, { - "name": "fw_cfg_io", - "parent": "fw_cfg" + "name": "ide-cd", + "parent": "ide-device" }, { - "name": "tpm-crb", - "parent": "device" + "name": "tcg-accel", + "parent": "accel" }, { - "name": "am53c974", - "parent": "pci-device" + "name": "virtio-balloon-pci", + "parent": "virtio-balloon-pci-base" }, { - "name": "memory-backend-ram", - "parent": "memory-backend" + "name": "qemu:memory-region", + "parent": "object" }, { - "name": "xen-cdrom", - "parent": "xen-block" + "name": "virtio-gpu-device", + "parent": "virtio-gpu-base" }, { - "name": "virtio-blk-device", - "parent": "virtio-device" + "name": "e1000", + "parent": "e1000-base" }, { - "name": "pc-q35-2.9-machine", - "parent": "generic-pc-machine" + "name": "ES1370", + "parent": "pci-device" }, { - "name": "nvdimm", - "parent": "pc-dimm" + "name": "pc-i440fx-2.6-machine", + "parent": "generic-pc-machine" }, { - "name": "mc146818rtc", - "parent": "isa-device" + "name": "i82551", + "parent": "pci-device" }, { - "name": "qio-channel-websock", - "parent": "qio-channel" + "name": "isa-ipmi-kcs", + "parent": "isa-device" }, { - "name": "qio-channel-file", - "parent": "qio-channel" + "name": "nvme", + "parent": "pci-device" }, { - "name": "chardev-msmouse", - "parent": "chardev" + "name": "SandyBridge-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-1.7-machine", - "parent": "generic-pc-machine" + "name": "vmxnet3", + "parent": "pci-device" }, { - "name": "pc-q35-4.0.1-machine", - "parent": "generic-pc-machine" + "name": "piix4-ide", + "parent": "pci-ide" }, { - "name": "cryptodev-backend-builtin", - "parent": "cryptodev-backend" + "name": "vhost-user-backend", + "parent": "object" }, { - "name": "hda-output", - "parent": "hda-audio" + "name": "mioe3680_pci", + "parent": "pci-device" }, { - "name": "KnightsMill-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "i82550", + "parent": "pci-device" }, { - "name": "chardev-spiceport", - "parent": "chardev-spice" + "name": "nec-usb-xhci", + "parent": "base-xhci" }, { - "name": "VGA", - "parent": "pci-vga" + "name": "kvm-apic", + "parent": "apic-common" }, { - "name": "vfio-pci-nohotplug", - "parent": "vfio-pci" + "name": "kvm64-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "sga", - "parent": "isa-device" + "name": "isa-pit", + "parent": "pit-common" }, { - "name": "i8257", - "parent": "isa-device" + "name": "memory-backend-memfd", + "parent": "memory-backend" }, { - "name": "qio-net-listener", - "parent": "object" + "name": "smbus-eeprom", + "parent": "smbus-device" }, { - "name": "port92", - "parent": "isa-device" + "name": "virtio-serial-device", + "parent": "virtio-device" }, { - "name": "mptsas1068", - "parent": "pci-device" + "name": "vhost-user-gpu-pci", + "parent": "virtio-gpu-pci-base" }, { - "name": "edu", - "parent": "pci-device" + "name": "virtio-crypto-pci", + "parent": "virtio-pci" }, { - "name": "Dhyana-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "iothread", + "parent": "object" }, { - "name": "virtio-mouse-pci", - "parent": "virtio-input-hid-pci" + "name": "i8042", + "parent": "isa-device" }, { - "name": "Skylake-Client-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "System", + "parent": "bus" }, { - "name": "ICH9 SMB", - "parent": "pci-device" + "name": "or-irq", + "parent": "device" }, { - "name": "Broadwell-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-1.0-machine", + "parent": "generic-pc-machine" }, { - "name": "vfio-pci-igd-lpc-bridge", + "name": "ati-vga", "parent": "pci-device" }, { - "name": "HDA", - "parent": "bus" + "name": "pentium3-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "n270-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "kvm-i8259", + "parent": "pic-common" }, { - "name": "usb-redir", - "parent": "usb-device" + "name": "isa-serial", + "parent": "isa-device" }, { - "name": "pcm3680_pci", + "name": "cirrus-vga", "parent": "pci-device" }, { - "name": "floppy", - "parent": "device" + "name": "pc-i440fx-2.1-machine", + "parent": "generic-pc-machine" }, { - "name": "qemu:memory-region", - "parent": "object" + "name": "virtio-serial-pci", + "parent": "virtio-serial-pci-base" }, { - "name": "mioe3680_pci", + "name": "i82559er", "parent": "pci-device" }, { - "name": "sysbus-ohci", - "parent": "sys-bus-device" + "name": "virtio-rng-pci-non-transitional", + "parent": "virtio-rng-pci-base" }, { - "name": "chardev-ringbuf", - "parent": "chardev" + "name": "Skylake-Client-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "max-x86_64-cpu", + "name": "Opteron_G3-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "can-bus", - "parent": "object" + "name": "split-irq", + "parent": "device" }, { - "name": "qtest-accel", - "parent": "accel" + "name": "am53c974", + "parent": "pci-device" }, { - "name": "qio-channel-command", - "parent": "qio-channel" + "name": "container", + "parent": "object" }, { - "name": "pxb-host", - "parent": "pci-host-bridge" + "name": "scsi-cd", + "parent": "scsi-disk-base" }, { - "name": "IvyBridge-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vmport", + "parent": "isa-device" }, { - "name": "vhost-user-gpu", - "parent": "virtio-gpu-base" + "name": "vhost-user-blk-pci-non-transitional", + "parent": "vhost-user-blk-pci-base" }, { - "name": "xio3130-downstream", - "parent": "pcie-slot" + "name": "isa-ide", + "parent": "isa-device" }, { - "name": "virtio-gpu-device", - "parent": "virtio-gpu-base" + "name": "e1000-82545em", + "parent": "e1000-base" }, { - "name": "virtio-blk-pci", - "parent": "virtio-blk-pci-base" + "name": "virtio-serial-pci-non-transitional", + "parent": "virtio-serial-pci-base" }, { - "name": "cirrus-vga", + "name": "ICH9 SMB", "parent": "pci-device" }, { - "name": "isa-ipmi-kcs", - "parent": "isa-device" - }, - { - "name": "kvmclock", - "parent": "sys-bus-device" + "name": "pxb-pcie-bus", + "parent": "PCIE" }, { - "name": "cryptodev-vhost-user", - "parent": "cryptodev-backend" + "name": "sdhci-pci", + "parent": "pci-device" }, { - "name": "Opteron_G3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vhost-user-scsi", + "parent": "vhost-scsi-common" }, { - "name": "lsi53c810", - "parent": "lsi53c895a" + "name": "PIIX4_PM", + "parent": "pci-device" }, { - "name": "System", - "parent": "bus" + "name": "virtio-rng-pci-transitional", + "parent": "virtio-rng-pci-base" }, { - "name": "Westmere-IBRS-x86_64-cpu", + "name": "EPYC-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "usb-serial", - "parent": "usb-serial-dev" + "name": "usb-bot", + "parent": "usb-storage-dev" }, { - "name": "Cascadelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-q35-2.12-machine", + "parent": "generic-pc-machine" }, { - "name": "vt82c686b-usb-uhci", - "parent": "pci-uhci-usb" + "name": "VGA", + "parent": "pci-vga" }, { - "name": "chardev-braille", - "parent": "chardev" + "name": "qio-channel-buffer", + "parent": "qio-channel" }, { - "name": "chardev-file", - "parent": "chardev-fd" + "name": "i440FX", + "parent": "pci-device" }, { - "name": "vhost-user-scsi-pci-non-transitional", - "parent": "vhost-user-scsi-pci-base" + "name": "vhost-vsock-pci-transitional", + "parent": "vhost-vsock-pci-base" }, { - "name": "xen-sysdev", - "parent": "sys-bus-device" + "name": "Conroe-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "intel-iommu", - "parent": "x86-iommu" - }, - { - "name": "pc-q35-2.10-machine", + "name": "pc-i440fx-3.1-machine", "parent": "generic-pc-machine" }, { - "name": "tpm-tis", - "parent": "isa-device" + "name": "fdc37m81x-superio", + "parent": "isa-superio" }, { - "name": "PCIE", - "parent": "PCI" + "name": "pci-serial-4x", + "parent": "pci-device" }, { - "name": "pcie-pci-bridge", - "parent": "base-pci-bridge" + "name": "Icelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "ccid-card-passthru", - "parent": "ccid-card" + "name": "apic", + "parent": "apic-common" }, { - "name": "qio-dns-resolver", - "parent": "object" + "name": "sga", + "parent": "isa-device" }, { - "name": "vhost-user-blk-pci", - "parent": "vhost-user-blk-pci-base" + "name": "Opteron_G5-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "virtio-net-pci-transitional", - "parent": "virtio-net-pci-base" + "name": "pc-q35-2.6-machine", + "parent": "generic-pc-machine" }, { - "name": "virtio-serial-bus", - "parent": "bus" + "name": "hpet", + "parent": "sys-bus-device" }, { - "name": "kvm-pit", - "parent": "pit-common" + "name": "pci-ohci", + "parent": "pci-device" }, { - "name": "secondary-vga", - "parent": "pci-vga" + "name": "virtio-tablet-device", + "parent": "virtio-input-hid-device" }, { - "name": "vhost-scsi", - "parent": "vhost-scsi-common" + "name": "Haswell-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pci-ohci", - "parent": "pci-device" + "name": "ccid-card-passthru", + "parent": "ccid-card" }, { - "name": "cfi.pflash01", - "parent": "sys-bus-device" + "name": "pc-i440fx-1.4-machine", + "parent": "generic-pc-machine" }, { - "name": "usb-hub", - "parent": "usb-device" + "name": "chardev-parallel", + "parent": "chardev" }, { - "name": "ccid-bus", - "parent": "bus" + "name": "chardev-vc", + "parent": "chardev" }, { - "name": "xenpv-machine", - "parent": "machine" + "name": "cryptodev-backend", + "parent": "object" }, { - "name": "EPYC-IBPB-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "isapc-machine", + "parent": "generic-pc-machine" }, { - "name": "input-linux", - "parent": "object" + "name": "ide-drive", + "parent": "ide-device" }, { - "name": "piix3-ide-xen", - "parent": "pci-ide" + "name": "cryptodev-vhost-user", + "parent": "cryptodev-backend" }, { - "name": "vmgenid", - "parent": "device" + "name": "tpm-emulator", + "parent": "tpm-backend" }, { - "name": "virtio-rng-pci-transitional", - "parent": "virtio-rng-pci-base" + "name": "i8257", + "parent": "isa-device" }, { - "name": "virtio-serial-pci-transitional", - "parent": "virtio-serial-pci-base" + "name": "usb-uas", + "parent": "usb-device" }, { - "name": "ati-vga", - "parent": "pci-device" + "name": "IvyBridge-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-q35-3.0-machine", + "name": "pc-i440fx-2.9-machine", "parent": "generic-pc-machine" }, { - "name": "pci-serial", - "parent": "pci-device" + "name": "ivshmem-plain", + "parent": "ivshmem-common" }, { - "name": "vmport", - "parent": "isa-device" + "name": "virtio-keyboard-pci", + "parent": "virtio-input-hid-pci" }, { - "name": "vhost-user-scsi-pci", - "parent": "vhost-user-scsi-pci-base" + "name": "pcnet", + "parent": "pci-device" }, { - "name": "ipmi-bmc-extern", - "parent": "ipmi-bmc" + "name": "sysbus-fdc", + "parent": "base-sysbus-fdc" }, { - "name": "PIIX4_PM", + "name": "i82559c", "parent": "pci-device" }, { - "name": "i8042", - "parent": "isa-device" + "name": "AMDVI-PCI", + "parent": "pci-device" }, { - "name": "coreduo-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtserialport", + "parent": "virtio-serial-port" }, { - "name": "i82559c", - "parent": "pci-device" + "name": "ipoctal232", + "parent": "ipack-device" }, { - "name": "i82559b", - "parent": "pci-device" + "name": "filter-redirector", + "parent": "netfilter" }, { - "name": "i82559a", - "parent": "pci-device" + "name": "Nehalem-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "virtio-blk-pci-non-transitional", - "parent": "virtio-blk-pci-base" + "name": "i82559b", + "parent": "pci-device" }, { - "name": "pc-q35-2.12-machine", - "parent": "generic-pc-machine" + "name": "usb-mouse", + "parent": "usb-hid" }, { - "name": "SCSI", + "name": "ccid-bus", "parent": "bus" }, { - "name": "rocker", - "parent": "pci-device" + "name": "ide-hd", + "parent": "ide-device" }, { - "name": "pcnet", + "name": "Broadwell-x86_64-cpu", + "parent": "x86_64-cpu" + }, + { + "name": "i82559a", "parent": "pci-device" }, { - "name": "rng-egd", - "parent": "rng-backend" + "name": "kvaser_pci", + "parent": "pci-device" }, { - "name": "Skylake-Server-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vhost-user-scsi-pci", + "parent": "vhost-user-scsi-pci-base" }, { - "name": "Opteron_G4-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-4.1-machine", + "parent": "generic-pc-machine" }, { - "name": "pc-q35-2.11-machine", + "name": "pc-1.3-machine", "parent": "generic-pc-machine" }, { - "name": "chardev-testdev", - "parent": "chardev" + "name": "e1000-82544gc", + "parent": "e1000-base" }, { - "name": "PIIX3", - "parent": "pci-piix3" + "name": "chardev-spiceport", + "parent": "chardev-spice" }, { - "name": "filter-dump", - "parent": "netfilter" + "name": "qio-channel-command", + "parent": "qio-channel" }, { - "name": "migration", - "parent": "device" + "name": "usb-ccid", + "parent": "usb-device" }, { - "name": "vmmouse", - "parent": "isa-device" + "name": "tls-creds-x509", + "parent": "tls-creds" }, { - "name": "i82558b", - "parent": "pci-device" + "name": "virtio-blk-pci", + "parent": "virtio-blk-pci-base" }, { - "name": "i82558a", - "parent": "pci-device" + "name": "pc-i440fx-2.4-machine", + "parent": "generic-pc-machine" }, { - "name": "ioapic", - "parent": "ioapic-common" + "name": "port92", + "parent": "isa-device" }, { - "name": "smbus-eeprom", - "parent": "smbus-device" + "name": "isa-cirrus-vga", + "parent": "isa-device" }, { - "name": "Haswell-x86_64-cpu", + "name": "qemu64-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "i82801", - "parent": "pci-device" + "name": "unimplemented-device", + "parent": "sys-bus-device" }, { - "name": "tls-creds-x509", - "parent": "tls-creds" + "name": "pc-q35-4.1-machine", + "parent": "generic-pc-machine" }, { - "name": "virtio-net-pci", - "parent": "virtio-net-pci-base" + "name": "mc146818rtc", + "parent": "isa-device" }, { - "name": "virtio-keyboard-device", - "parent": "virtio-input-hid-device" + "name": "vfio-pci", + "parent": "pci-device" }, { - "name": "i82562", + "name": "bochs-display", "parent": "pci-device" }, { - "name": "Haswell-noTSX-x86_64-cpu", + "name": "Broadwell-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "usb-net", - "parent": "usb-device" + "name": "qio-net-listener", + "parent": "object" }, { - "name": "tpm-passthrough", - "parent": "tpm-backend" + "name": "edu", + "parent": "pci-device" }, { - "name": "q35-pcihost", - "parent": "pcie-host-bridge" + "name": "pc-testdev", + "parent": "isa-device" }, { - "name": "amd-iommu", - "parent": "x86-iommu" + "name": "SUNW,fdtwo", + "parent": "base-sysbus-fdc" }, { - "name": "i440FX-pcihost", - "parent": "pci-host-bridge" + "name": "megasas", + "parent": "megasas-base" }, { - "name": "i82557c", - "parent": "pci-device" + "name": "qio-channel-websock", + "parent": "qio-channel" }, { - "name": "i82557b", - "parent": "pci-device" + "name": "chardev-braille", + "parent": "chardev" }, { - "name": "i82557a", - "parent": "pci-device" + "name": "vmcoreinfo", + "parent": "device" }, { - "name": "chardev-memory", - "parent": "chardev-ringbuf" + "name": "tpci200", + "parent": "pci-device" }, { - "name": "isa-i8259", - "parent": "pic-common" + "name": "rocker", + "parent": "pci-device" }, { - "name": "virtio-gpu-pci", - "parent": "virtio-gpu-pci-base" + "name": "qio-channel-file", + "parent": "qio-channel" }, { - "name": "pc-i440fx-2.0-machine", + "name": "pc-q35-3.1-machine", "parent": "generic-pc-machine" }, { - "name": "SandyBridge-x86_64-cpu", - "parent": "x86_64-cpu" - }, - { - "name": "split-irq", - "parent": "device" + "name": "qio-channel-socket", + "parent": "qio-channel" }, { - "name": "usb-mouse", - "parent": "usb-hid" + "name": "qemu-console", + "parent": "object" }, { - "name": "i82551", - "parent": "pci-device" + "name": "host-x86_64-cpu", + "parent": "max-x86_64-cpu" }, { - "name": "sdhci-bus", - "parent": "sd-bus" + "name": "usb-ehci", + "parent": "pci-ehci-usb" }, { - "name": "i82550", + "name": "pxb", "parent": "pci-device" }, { - "name": "pc-q35-3.1-machine", + "name": "pc-i440fx-2.11-machine", "parent": "generic-pc-machine" }, { - "name": "host-x86_64-cpu", - "parent": "max-x86_64-cpu" - }, - { - "name": "virtio-crypto-pci", - "parent": "virtio-pci" - }, - { - "name": "ich9-usb-ehci2", - "parent": "pci-ehci-usb" - }, - { - "name": "vfio-pci", + "name": "AC97", "parent": "pci-device" }, { - "name": "ich9-usb-ehci1", - "parent": "pci-ehci-usb" + "name": "vmgenid", + "parent": "device" }, { - "name": "filter-mirror", - "parent": "netfilter" + "name": "virtio-net-pci-non-transitional", + "parent": "virtio-net-pci-base" }, { - "name": "xen-disk", - "parent": "xen-block" + "name": "cs4231a", + "parent": "isa-device" }, { - "name": "isa-ide", - "parent": "isa-device" + "name": "chardev-socket", + "parent": "chardev" }, { - "name": "irq", - "parent": "object" + "name": "scsi-hd", + "parent": "scsi-disk-base" }, { - "name": "throttle-group", + "name": "secret", "parent": "object" }, { - "name": "IvyBridge-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "usb-kbd", + "parent": "usb-hid" }, { - "name": "memory-backend-memfd", - "parent": "memory-backend" + "name": "isa-fdc", + "parent": "isa-device" }, { - "name": "can-host-socketcan", - "parent": "can-host" + "name": "input-linux", + "parent": "object" }, { - "name": "qio-channel-socket", - "parent": "qio-channel" + "name": "filter-replay", + "parent": "netfilter" }, { - "name": "nec-usb-xhci", - "parent": "base-xhci" + "name": "usb-mtp", + "parent": "usb-device" }, { - "name": "virtio-serial-pci-non-transitional", - "parent": "virtio-serial-pci-base" + "name": "virtio-net-device", + "parent": "virtio-device" }, { - "name": "virtio-rng-pci-non-transitional", - "parent": "virtio-rng-pci-base" + "name": "pc-q35-2.9-machine", + "parent": "generic-pc-machine" }, { - "name": "piix3-usb-uhci", - "parent": "pci-uhci-usb" + "name": "pc-0.14-machine", + "parent": "generic-pc-machine" }, { - "name": "virtserialport", - "parent": "virtio-serial-port" + "name": "Skylake-Server-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pvscsi", - "parent": "pci-device" + "name": "hyperv-testdev", + "parent": "isa-device" }, { - "name": "sd-bus", - "parent": "bus" + "name": "fw_cfg_mem", + "parent": "fw_cfg" }, { - "name": "Opteron_G5-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ccid-card-emulated", + "parent": "ccid-card" }, { - "name": "ich9-ahci", - "parent": "pci-device" + "name": "tpm-tis", + "parent": "isa-device" }, { - "name": "chardev-stdio", - "parent": "chardev-fd" + "name": "lsi53c810", + "parent": "lsi53c895a" }, { - "name": "Skylake-Client-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-i440fx-1.7-machine", + "parent": "generic-pc-machine" }, { - "name": "pc-dimm", - "parent": "device" + "name": "virtio-mouse-device", + "parent": "virtio-input-hid-device" }, { - "name": "gus", - "parent": "isa-device" + "name": "virtconsole", + "parent": "virtserialport" }, { - "name": "vhost-vsock-pci-non-transitional", - "parent": "vhost-vsock-pci-base" + "name": "ioh3420", + "parent": "pcie-root-port-base" }, { - "name": "hyperv-testdev", - "parent": "isa-device" + "name": "filter-mirror", + "parent": "netfilter" }, { - "name": "isa-vga", - "parent": "isa-device" + "name": "throttle-group", + "parent": "object" }, { - "name": "pc-i440fx-2.2-machine", + "name": "pc-q35-2.10-machine", "parent": "generic-pc-machine" }, { - "name": "xen-pci-passthrough", - "parent": "pci-device" + "name": "piix4-usb-uhci", + "parent": "pci-uhci-usb" }, { - "name": "cryptodev-backend", - "parent": "object" + "name": "virtio-rng-pci", + "parent": "virtio-rng-pci-base" }, { - "name": "IndustryPack", - "parent": "bus" + "name": "chardev-gdb", + "parent": "chardev" }, { - "name": "pc-i440fx-2.1-machine", - "parent": "generic-pc-machine" + "name": "virtio-scsi-pci-transitional", + "parent": "virtio-scsi-pci-base" }, { - "name": "pc-i440fx-4.0-machine", - "parent": "generic-pc-machine" + "name": "Skylake-Client-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Icelake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pci-testdev", + "parent": "pci-device" }, { - "name": "or-irq", - "parent": "device" + "name": "vhost-user-input", + "parent": "virtio-input-device" }, { - "name": "ipmi-bmc-sim", - "parent": "ipmi-bmc" + "name": "vt82c686b-usb-uhci", + "parent": "pci-uhci-usb" }, { - "name": "Broadwell-noTSX-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ich9-intel-hda", + "parent": "intel-hda-generic" }, { - "name": "usb-ehci", - "parent": "pci-ehci-usb" + "name": "PIIX3", + "parent": "pci-piix3" }, { - "name": "pentium2-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-q35-2.4-machine", + "parent": "generic-pc-machine" }, { - "name": "chardev-vc", - "parent": "chardev" + "name": "virtio-9p-pci", + "parent": "virtio-9p-pci-base" }, { - "name": "virtio-rng-pci", - "parent": "virtio-rng-pci-base" + "name": "ISA", + "parent": "bus" }, { - "name": "filter-replay", - "parent": "netfilter" + "name": "vhost-vsock-pci", + "parent": "vhost-vsock-pci-base" }, { - "name": "vhost-user-vga", - "parent": "virtio-vga-base" + "name": "pc-dimm", + "parent": "device" }, { - "name": "vhost-user-blk-pci-transitional", - "parent": "vhost-user-blk-pci-base" + "name": "virtio-balloon-pci-non-transitional", + "parent": "virtio-balloon-pci-base" }, { - "name": "e1000-82545em", - "parent": "e1000-base" + "name": "ipmi-bmc-sim", + "parent": "ipmi-bmc" }, { - "name": "chardev-wctablet", - "parent": "chardev" + "name": "virtio-net-pci-transitional", + "parent": "virtio-net-pci-base" }, { - "name": "vhost-user-gpu-pci", - "parent": "virtio-gpu-pci-base" + "name": "IvyBridge-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "hyperv-synic", - "parent": "device" + "name": "irq", + "parent": "object" }, { - "name": "pc-i440fx-2.5-machine", - "parent": "generic-pc-machine" + "name": "coreduo-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "e1000-82544gc", - "parent": "e1000-base" + "name": "tls-creds-psk", + "parent": "tls-creds" }, { - "name": "hpet", - "parent": "sys-bus-device" + "name": "usb-storage", + "parent": "usb-storage-dev" }, { - "name": "Broadwell-noTSX-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "vhost-user-blk-pci-transitional", + "parent": "vhost-user-blk-pci-base" }, { - "name": "ioh3420", - "parent": "pcie-root-port-base" + "name": "chardev-msmouse", + "parent": "chardev" }, { - "name": "pc-i440fx-2.4-machine", + "name": "pc-i440fx-2.7-machine", "parent": "generic-pc-machine" }, { - "name": "virtio-9p-pci", - "parent": "virtio-9p-pci-base" + "name": "vhost-scsi-pci-transitional", + "parent": "vhost-scsi-pci-base" }, { - "name": "vmcoreinfo", - "parent": "device" + "name": "isa-i8259", + "parent": "pic-common" }, { - "name": "filter-buffer", - "parent": "netfilter" + "name": "colo-compare", + "parent": "object" }, { - "name": "pci-serial-4x", - "parent": "pci-device" + "name": "pxb-bus", + "parent": "PCI" }, { - "name": "athlon-x86_64-cpu", + "name": "pentium2-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "ich9-intel-hda", - "parent": "intel-hda-generic" + "name": "qemu-xhci", + "parent": "base-xhci" }, { - "name": "pc-i440fx-2.3-machine", - "parent": "generic-pc-machine" + "name": "pvpanic", + "parent": "isa-device" }, { - "name": "virtio-9p-device", - "parent": "virtio-device" + "name": "rng-random", + "parent": "rng-backend" }, { - "name": "imx-usdhc", - "parent": "generic-sdhci" + "name": "kvmvapic", + "parent": "sys-bus-device" }, { - "name": "pc-i440fx-4.1-machine", - "parent": "generic-pc-machine" + "name": "Opteron_G2-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "vhost-user-blk-pci-non-transitional", + "name": "megasas-gen2", + "parent": "megasas-base" + }, + { + "name": "vhost-user-blk-pci", "parent": "vhost-user-blk-pci-base" }, { - "name": "xen-bridge", - "parent": "sys-bus-device" + "name": "authz-simple", + "parent": "authz" }, { - "name": "vhost-user-backend", - "parent": "object" + "name": "fw_cfg_io", + "parent": "fw_cfg" }, { - "name": "isa-ipmi-bt", - "parent": "isa-device" + "name": "intel-iommu", + "parent": "x86-iommu" }, { - "name": "ipoctal232", - "parent": "ipack-device" + "name": "none-machine", + "parent": "machine" }, { - "name": "virtio-tablet-device", - "parent": "virtio-input-hid-device" + "name": "HDA", + "parent": "bus" }, { - "name": "virtio-scsi-pci", - "parent": "virtio-scsi-pci-base" + "name": "Broadwell-noTSX-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "piix3-ide", - "parent": "pci-ide" + "name": "pc-1.1-machine", + "parent": "generic-pc-machine" }, { - "name": "virtio-pci-bus", - "parent": "virtio-bus" + "name": "qxl", + "parent": "pci-qxl" }, { - "name": "xen-pvdevice", - "parent": "pci-device" + "name": "cryptodev-backend-builtin", + "parent": "cryptodev-backend" }, { - "name": "ES1370", + "name": "vfio-pci-igd-lpc-bridge", "parent": "pci-device" }, { - "name": "x3130-upstream", - "parent": "pcie-port" + "name": "Broadwell-noTSX-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "xenfv-machine", + "name": "pc-i440fx-2.2-machine", "parent": "generic-pc-machine" }, { - "name": "pci-testdev", - "parent": "pci-device" - }, - { - "name": "qemu-console", + "name": "qio-dns-resolver", "parent": "object" }, - { - "name": "ISA", - "parent": "bus" - }, - { - "name": "piix4-usb-uhci", - "parent": "pci-uhci-usb" - }, { "name": "virtio-balloon-pci-transitional", "parent": "virtio-balloon-pci-base" }, { - "name": "pc-i440fx-2.7-machine", - "parent": "generic-pc-machine" + "name": "usb-bt-dongle", + "parent": "usb-device" }, { - "name": "tcg-accel", - "parent": "accel" + "name": "i82801b11-bridge", + "parent": "base-pci-bridge" }, { - "name": "virtconsole", - "parent": "virtserialport" + "name": "virtio-keyboard-device", + "parent": "virtio-input-hid-device" }, { - "name": "pci-serial-2x", - "parent": "pci-device" + "name": "ramfb", + "parent": "sys-bus-device" }, { - "name": "pentium3-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "hda-output", + "parent": "hda-audio" }, { - "name": "vhost-user-scsi-pci-transitional", - "parent": "vhost-user-scsi-pci-base" + "name": "virtio-input-host-device", + "parent": "virtio-input-device" }, { - "name": "ne2k_isa", - "parent": "isa-device" + "name": "IndustryPack", + "parent": "bus" }, { - "name": "isa-fdc", - "parent": "isa-device" + "name": "ioapic", + "parent": "ioapic-common" }, { - "name": "Nehalem-x86_64-cpu", + "name": "pentium-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-2.6-machine", - "parent": "generic-pc-machine" + "name": "Haswell-noTSX-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "xen-platform", + "name": "pci-serial", "parent": "pci-device" }, { - "name": "chardev-serial", - "parent": "chardev-fd" - }, - { - "name": "authz-pam", - "parent": "authz" - }, - { - "name": "igd-passthrough-i440FX", - "parent": "i440FX" - }, - { - "name": "colo-compare", - "parent": "object" + "name": "sysbus-ohci", + "parent": "sys-bus-device" }, { - "name": "virtio-tablet-pci", - "parent": "virtio-input-hid-pci" + "name": "kvm-accel", + "parent": "accel" }, { - "name": "e1000e", - "parent": "pci-device" + "name": "vhost-scsi-pci-non-transitional", + "parent": "vhost-scsi-pci-base" }, { - "name": "usb-bus", - "parent": "bus" + "name": "piix3-usb-uhci", + "parent": "pci-uhci-usb" }, { - "name": "i82801b11-bridge", - "parent": "base-pci-bridge" + "name": "ne2k_isa", + "parent": "isa-device" }, { - "name": "PCI", - "parent": "bus" + "name": "phenom-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "usb-storage", - "parent": "usb-storage-dev" + "name": "adlib", + "parent": "isa-device" }, { - "name": "vhost-user-scsi", - "parent": "vhost-scsi-common" + "name": "vhost-user-gpu", + "parent": "virtio-gpu-base" }, { - "name": "mch", - "parent": "pci-device" + "name": "hda-duplex", + "parent": "hda-audio" }, { - "name": "ib700", - "parent": "isa-device" + "name": "amd-iommu-iommu-memory-region", + "parent": "qemu:iommu-memory-region" }, { - "name": "tpm-emulator", - "parent": "tpm-backend" + "name": "can-bus", + "parent": "object" }, { - "name": "esp", - "parent": "sys-bus-device" + "name": "Nehalem-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "isabus-bridge", + "name": "cfi.pflash01", "parent": "sys-bus-device" }, { - "name": "qemu32-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-balloon-device", + "parent": "virtio-device" }, { - "name": "ne2k_pci", - "parent": "pci-device" + "name": "Skylake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Broadwell-IBRS-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "pc-0.12-machine", + "parent": "generic-pc-machine" }, { - "name": "vhost-user-blk", - "parent": "virtio-device" + "name": "pc-q35-2.7-machine", + "parent": "generic-pc-machine" }, { - "name": "ivshmem-plain", - "parent": "ivshmem-common" + "name": "isa-parallel", + "parent": "isa-device" }, { - "name": "usb-kbd", - "parent": "usb-hid" + "name": "chardev-null", + "parent": "chardev" }, { - "name": "isa-applesmc", + "name": "isa-vga", "parent": "isa-device" }, { - "name": "xen-accel", - "parent": "accel" + "name": "pc-i440fx-1.5-machine", + "parent": "generic-pc-machine" }, { - "name": "secret", - "parent": "object" + "name": "i440FX-pcihost", + "parent": "pci-host-bridge" }, { - "name": "hda-duplex", - "parent": "hda-audio" + "name": "isa-debugcon", + "parent": "isa-device" }, { - "name": "authz-simple", - "parent": "authz" + "name": "tls-creds-anon", + "parent": "tls-creds" }, { - "name": "kvm32-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "rng-egd", + "parent": "rng-backend" }, { - "name": "virtio-9p-pci-transitional", - "parent": "virtio-9p-pci-base" + "name": "Cascadelake-Server-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-i440fx-2.9-machine", - "parent": "generic-pc-machine" + "name": "i82558b", + "parent": "pci-device" }, { - "name": "kvm-apic", - "parent": "apic-common" + "name": "ivshmem-doorbell", + "parent": "ivshmem-common" }, { - "name": "sev-guest", - "parent": "object" + "name": "qxl-vga", + "parent": "pci-qxl" }, { - "name": "virtio-balloon-device", - "parent": "virtio-device" + "name": "PIIX3-xen", + "parent": "pci-piix3" }, { - "name": "none-machine", - "parent": "machine" + "name": "virtio-net-pci", + "parent": "virtio-net-pci-base" }, { - "name": "sysbus-fdc", - "parent": "base-sysbus-fdc" + "name": "i82558a", + "parent": "pci-device" }, { - "name": "ramfb", - "parent": "sys-bus-device" + "name": "loader", + "parent": "device" }, { - "name": "megasas-gen2", - "parent": "megasas-base" + "name": "usb-serial", + "parent": "usb-serial-dev" }, { - "name": "usb-tablet", - "parent": "usb-hid" + "name": "pvscsi", + "parent": "pci-device" }, { - "name": "pc-1.0-machine", - "parent": "generic-pc-machine" + "name": "i82801", + "parent": "pci-device" }, { - "name": "vhost-scsi-pci-transitional", - "parent": "vhost-scsi-pci-base" + "name": "accel", + "parent": "object" }, { - "name": "core2duo-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "virtio-tablet-pci", + "parent": "virtio-input-hid-pci" }, { - "name": "qxl", - "parent": "pci-qxl" + "name": "dc390", + "parent": "am53c974" }, { - "name": "isa-debugcon", - "parent": "isa-device" + "name": "i6300esb", + "parent": "pci-device" }, { - "name": "pc-i440fx-2.8-machine", - "parent": "generic-pc-machine" + "name": "floppy", + "parent": "device" }, { - "name": "nvme", - "parent": "pci-device" + "name": "authz-list", + "parent": "authz" }, { - "name": "SandyBridge-IBRS-x86_64-cpu", + "name": "Opteron_G4-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "Skylake-Server-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "sb16", + "parent": "isa-device" }, { - "name": "pentium-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "ich9-ahci", + "parent": "pci-device" }, { - "name": "vhost-user-input-pci", - "parent": "virtio-input-pci" + "name": "pc-i440fx-2.5-machine", + "parent": "generic-pc-machine" }, { - "name": "usb-braille", - "parent": "usb-serial-dev" + "name": "Westmere-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "qio-channel-buffer", - "parent": "qio-channel" + "name": "vhost-user-scsi-pci-transitional", + "parent": "vhost-user-scsi-pci-base" }, { - "name": "scsi-disk", - "parent": "scsi-disk-base" + "name": "chardev-pipe", + "parent": "chardev-fd" }, { - "name": "intel-hda", - "parent": "intel-hda-generic" + "name": "can-host-socketcan", + "parent": "can-host" }, { - "name": "kvm-accel", - "parent": "accel" + "name": "i82562", + "parent": "pci-device" }, { - "name": "pxb-pcie-bus", - "parent": "PCIE" + "name": "pci-bridge-seat", + "parent": "pci-bridge" }, { - "name": "virtio-scsi-device", - "parent": "virtio-scsi-common" + "name": "kvm32-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "AC97", + "name": "lsi53c895a", "parent": "pci-device" }, { - "name": "usb-wacom-tablet", - "parent": "usb-device" + "name": "SandyBridge-IBRS-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "virtio-blk-pci-transitional", - "parent": "virtio-blk-pci-base" + "name": "intel-hda", + "parent": "intel-hda-generic" }, { - "name": "i2c-bus", - "parent": "bus" + "name": "hyperv-synic", + "parent": "device" }, { - "name": "EPYC-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "chardev-mux", + "parent": "chardev" }, { - "name": "virtio-mouse-device", - "parent": "virtio-input-hid-device" + "name": "base-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "Conroe-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "IDE", + "parent": "bus" }, { - "name": "pxb-pcie", - "parent": "pci-device" + "name": "486-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "pc-1.3-machine", - "parent": "generic-pc-machine" + "name": "pcie-root-port", + "parent": "pcie-root-port-base" }, { - "name": "authz-list", - "parent": "authz" + "name": "mptsas1068", + "parent": "pci-device" }, { - "name": "ide-drive", - "parent": "ide-device" + "name": "scsi-block", + "parent": "scsi-disk-base" }, { - "name": "generic-sdhci", - "parent": "sys-bus-device" + "name": "chardev-spicevmc", + "parent": "chardev-spice" }, { - "name": "pvrdma", - "parent": "pci-device" + "name": "q35-pcihost", + "parent": "pcie-host-bridge" }, { - "name": "pc-1.2-machine", + "name": "pc-i440fx-2.0-machine", "parent": "generic-pc-machine" }, { - "name": "isa-pit", - "parent": "pit-common" + "name": "pc-i440fx-2.12-machine", + "parent": "generic-pc-machine" }, { - "name": "pxb", - "parent": "pci-device" + "name": "SCSI", + "parent": "bus" }, { - "name": "virtio-net-pci-non-transitional", - "parent": "virtio-net-pci-base" + "name": "Penryn-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "virtio-scsi-pci-non-transitional", - "parent": "virtio-scsi-pci-base" + "name": "hda-micro", + "parent": "hda-audio" }, { - "name": "intel-iommu-iommu-memory-region", - "parent": "qemu:iommu-memory-region" + "name": "piix3-ide-xen", + "parent": "pci-ide" }, { - "name": "pc-1.1-machine", - "parent": "generic-pc-machine" + "name": "Dhyana-x86_64-cpu", + "parent": "x86_64-cpu" }, { - "name": "sd-card", - "parent": "device" + "name": "sd-bus", + "parent": "bus" }, { - "name": "kvaser_pci", - "parent": "pci-device" + "name": "filter-dump", + "parent": "netfilter" }, { - "name": "vmxnet3", - "parent": "pci-device" + "name": "virtio-pci-bus", + "parent": "virtio-bus" }, { - "name": "i6300esb", - "parent": "pci-device" + "name": "qemu,register", + "parent": "device" }, { - "name": "Westmere-x86_64-cpu", - "parent": "x86_64-cpu" + "name": "chardev-ringbuf", + "parent": "chardev" }, { - "name": "amd-iommu-iommu-memory-region", - "parent": "qemu:iommu-memory-region" + "name": "pc-0.15-machine", + "parent": "generic-pc-machine" }, { - "name": "pvpanic", - "parent": "isa-device" + "name": "vhost-user-blk", + "parent": "virtio-device" }, { - "name": "Penryn-x86_64-cpu", + "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" }, { - "name": "vhost-vsock-pci-transitional", - "parent": "vhost-vsock-pci-base" - }, - { - "name": "apic", - "parent": "apic-common" + "name": "qio-channel-tls", + "parent": "qio-channel" }, { - "name": "isapc-machine", - "parent": "generic-pc-machine" + "name": "virtio-vga", + "parent": "virtio-vga-base" }, { - "name": "rng-random", - "parent": "rng-backend" + "name": "authz-pam", + "parent": "authz" } ], "id": "libvirt-6" @@ -2522,88 +2458,72 @@ "type": "bool" }, { - "name": "request-merging", - "description": "on/off", - "type": "bool" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "min_io_size", + "name": "num-queues", "type": "uint16" }, { - "name": "event_idx", - "description": "on/off", + "name": "share-rw", "type": "bool" }, { - "name": "serial", - "type": "str" + "name": "queue-size", + "type": "uint16" }, { - "name": "heads", - "type": "uint32" + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" }, { - "name": "ioeventfd", - "description": "on/off", - "type": "bool" + "name": "secs", + "type": "uint32" }, { - "name": "multifunction", - "description": "on/off", - "type": "bool" + "name": "bootindex", + "type": "int32" }, { - "name": "rombar", - "type": "uint32" + "name": "serial", + "type": "str" }, { - "name": "write-zeroes", - "description": "on/off", + "name": "x-ignore-backend-features", "type": "bool" }, { - "name": "scsi", - "description": "on/off", - "type": "bool" + "name": "rerror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" }, { "name": "cyls", "type": "uint32" }, { - "name": "x-disable-pcie", + "name": "heads", + "type": "uint32" + }, + { + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "virtio-backend", + "type": "child<virtio-blk-device>" }, { - "name": "bootindex", - "type": "int32" + "name": "min_io_size", + "type": "uint16" }, { - "name": "indirect_desc", + "name": "config-wce", "description": "on/off", "type": "bool" }, { - "name": "max-write-zeroes-sectors", - "type": "uint32" - }, - { - "name": "queue-size", - "type": "uint16" - }, - { - "name": "disable-modern", + "name": "multifunction", + "description": "on/off", "type": "bool" }, { @@ -2612,56 +2532,65 @@ "type": "str" }, { - "name": "x-pcie-lnkctl-init", + "name": "page-per-vq", "description": "on/off", "type": "bool" }, { - "name": "disable-legacy", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "vectors", + "type": "uint32" }, { - "name": "command_serr_enable", + "name": "x-pcie-deverr-init", "description": "on/off", "type": "bool" }, { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "disable-legacy", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "any_layout", + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, { - "name": "discard_granularity", + "name": "max-write-zeroes-sectors", "type": "uint32" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" }, { - "name": "page-per-vq", + "name": "ioeventfd", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-deverr-init", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "scsi", "description": "on/off", "type": "bool" }, { - "name": "max-discard-sectors", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" + }, + { + "name": "opt_io_size", "type": "uint32" }, { @@ -2670,89 +2599,96 @@ "type": "bool" }, { - "name": "share-rw", + "name": "x-disable-pcie", + "description": "on/off", "type": "bool" }, { - "name": "physical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "ats", + "description": "on/off", + "type": "bool" }, { - "name": "config-wce", + "name": "write-zeroes", "description": "on/off", "type": "bool" }, { - "name": "class", + "name": "max-discard-sectors", "type": "uint32" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" - }, - { - "name": "migrate-extra", + "name": "request-merging", "description": "on/off", "type": "bool" }, { - "name": "modern-pio-notify", + "name": "discard", "description": "on/off", "type": "bool" }, { - "name": "vectors", + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "discard_granularity", "type": "uint32" }, { - "name": "iommu_platform", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "x-pcie-lnkctl-init", "description": "on/off", "type": "bool" }, { - "name": "virtio-backend", - "type": "child<virtio-blk-device>" + "name": "romfile", + "type": "str" }, { - "name": "x-ignore-backend-features", - "type": "bool" + "name": "rombar", + "type": "uint32" }, { - "name": "discard", + "name": "event_idx", "description": "on/off", "type": "bool" }, { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "disable-modern", + "type": "bool" }, { - "name": "num-queues", - "type": "uint16" + "name": "class", + "type": "uint32" }, { - "name": "opt_io_size", - "type": "uint32" + "name": "migrate-extra", + "description": "on/off", + "type": "bool" }, { - "name": "ats", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "modern-pio-notify", + "description": "on/off", + "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "indirect_desc", + "description": "on/off", + "type": "bool" + }, + { + "name": "command_serr_enable", "description": "on/off", "type": "bool" } @@ -2771,12 +2707,12 @@ { "return": [ { - "name": "ctrl_mac_addr", + "name": "ctrl_vlan", "description": "on/off", "type": "bool" }, { - "name": "romfile", + "name": "duplex", "type": "str" }, { @@ -2785,9 +2721,12 @@ "type": "bool" }, { - "name": "status", - "description": "on/off", - "type": "bool" + "name": "virtio-backend", + "type": "child<virtio-net-device>" + }, + { + "name": "x-txtimer", + "type": "uint32" }, { "name": "notify_on_empty", @@ -2795,86 +2734,85 @@ "type": "bool" }, { - "name": "command_serr_enable", + "name": "guest_tso6", "description": "on/off", "type": "bool" }, { - "name": "indirect_desc", + "name": "status", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "ctrl_vq", "description": "on/off", "type": "bool" }, { - "name": "rsc_interval", - "type": "uint32" - }, - { - "name": "guest_csum", + "name": "guest_ufo", "description": "on/off", "type": "bool" }, { - "name": "speed", - "type": "int32" - }, - { - "name": "ctrl_rx", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, { - "name": "ctrl_vq", + "name": "ctrl_mac_addr", "description": "on/off", "type": "bool" }, { - "name": "bootindex", + "name": "romfile", + "type": "str" + }, + { + "name": "speed", "type": "int32" }, { - "name": "multifunction", + "name": "event_idx", "description": "on/off", "type": "bool" }, { - "name": "disable-modern", - "type": "bool" + "name": "mac", + "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56", + "type": "str" }, { - "name": "mrg_rxbuf", + "name": "ioeventfd", "description": "on/off", "type": "bool" }, { - "name": "host_tso6", + "name": "guest_tso4", "description": "on/off", "type": "bool" }, { - "name": "x-txtimer", - "type": "uint32" + "name": "netdev", + "description": "ID of a netdev to use as a backend", + "type": "str" }, { - "name": "host_tso4", + "name": "x-disable-pcie", "description": "on/off", "type": "bool" }, { - "name": "rombar", - "type": "uint32" + "name": "modern-pio-notify", + "description": "on/off", + "type": "bool" }, { - "name": "ctrl_rx_extra", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "gso", + "name": "guest_csum", "description": "on/off", "type": "bool" }, @@ -2884,48 +2822,50 @@ "type": "bool" }, { - "name": "x-disable-pcie", + "name": "x-mtu-bypass-backend", + "type": "bool" + }, + { + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, { - "name": "x-ignore-backend-features", + "name": "migrate-extra", + "description": "on/off", "type": "bool" }, { - "name": "x-txburst", + "name": "bootindex", "type": "int32" }, { - "name": "iommu_platform", + "name": "ats", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-lnkctl-init", + "name": "guest_announce", "description": "on/off", "type": "bool" }, { - "name": "host_mtu", - "type": "uint16" - }, - { - "name": "ctrl_vlan", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "guest_tso4", + "name": "mq", "description": "on/off", "type": "bool" }, { - "name": "virtio-backend", - "type": "child<virtio-net-device>" + "name": "disable-legacy", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "event_idx", + "name": "indirect_desc", "description": "on/off", "type": "bool" }, @@ -2934,134 +2874,130 @@ "type": "uint32" }, { - "name": "guest_announce", + "name": "host_tso6", "description": "on/off", "type": "bool" }, { - "name": "host_ecn", + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "rx_queue_size", + "type": "uint16" }, { - "name": "ats", - "description": "on/off", - "type": "bool" + "name": "tx_queue_size", + "type": "uint16" }, { - "name": "host_ufo", + "name": "host_ecn", "description": "on/off", "type": "bool" }, { - "name": "duplex", - "type": "str" - }, - { - "name": "guest_tso6", + "name": "ctrl_rx_extra", "description": "on/off", "type": "bool" }, { - "name": "ctrl_guest_offloads", - "description": "on/off", + "name": "x-ignore-backend-features", "type": "bool" }, + { + "name": "x-txburst", + "type": "int32" + }, { "name": "csum", "description": "on/off", "type": "bool" }, { - "name": "modern-pio-notify", + "name": "mrg_rxbuf", "description": "on/off", "type": "bool" }, { - "name": "ioeventfd", + "name": "host_tso4", "description": "on/off", "type": "bool" }, { - "name": "mq", + "name": "gso", "description": "on/off", "type": "bool" }, { - "name": "any_layout", + "name": "x-pcie-deverr-init", "description": "on/off", "type": "bool" }, { - "name": "guest_ecn", + "name": "host_ufo", "description": "on/off", "type": "bool" }, { - "name": "guest_ufo", - "description": "on/off", - "type": "bool" + "name": "host_mtu", + "type": "uint16" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "command_serr_enable", "description": "on/off", "type": "bool" }, { - "name": "mac", - "description": "Ethernet 6-byte MAC Address, example: 52:54:00:12:34:56", - "type": "str" - }, - { - "name": "tx_queue_size", - "type": "uint16" - }, - { - "name": "disable-legacy", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "disable-modern", + "type": "bool" }, { "name": "tx", "type": "str" }, { - "name": "x-pcie-extcap-init", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "x-mtu-bypass-backend", + "name": "guest_rsc_ext", + "description": "on/off", "type": "bool" }, { - "name": "x-pcie-deverr-init", + "name": "x-pcie-lnkctl-init", "description": "on/off", "type": "bool" }, { - "name": "netdev", - "description": "ID of a netdev to use as a backend", - "type": "str" + "name": "rombar", + "type": "uint32" }, { - "name": "migrate-extra", + "name": "rsc_interval", + "type": "uint32" + }, + { + "name": "ctrl_guest_offloads", "description": "on/off", "type": "bool" }, { - "name": "guest_rsc_ext", + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "ctrl_rx", "description": "on/off", "type": "bool" }, { - "name": "rx_queue_size", - "type": "uint16" + "name": "guest_ecn", + "description": "on/off", + "type": "bool" } ], "id": "libvirt-8" @@ -3078,54 +3014,57 @@ { "return": [ { - "name": "event_idx", + "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "ioeventfd", - "description": "on/off", + "name": "iothread", + "type": "link<iothread>" + }, + { + "name": "x-ignore-backend-features", "type": "bool" }, { - "name": "multifunction", + "name": "param_change", "description": "on/off", "type": "bool" }, { - "name": "rombar", + "name": "max_sectors", "type": "uint32" }, + { + "name": "virtio-backend", + "type": "child<virtio-scsi-device>" + }, { "name": "virtqueue_size", "type": "uint32" }, { - "name": "x-disable-pcie", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "indirect_desc", - "description": "on/off", - "type": "bool" + "name": "num_queues", + "type": "uint32" }, { - "name": "x-pcie-lnkctl-init", + "name": "page-per-vq", "description": "on/off", "type": "bool" }, { - "name": "disable-modern", - "type": "bool" - }, - { - "name": "num_queues", + "name": "vectors", "type": "uint32" }, { - "name": "cmd_per_lun", - "type": "uint32" + "name": "x-pcie-deverr-init", + "description": "on/off", + "type": "bool" }, { "name": "disable-legacy", @@ -3133,52 +3072,48 @@ "type": "OnOffAuto" }, { - "name": "command_serr_enable", + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, { - "name": "hotplug", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "page-per-vq", + "name": "ioeventfd", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-deverr-init", + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-lnksta-dllla", + "name": "x-disable-pcie", "description": "on/off", "type": "bool" }, { - "name": "max_sectors", - "type": "uint32" - }, - { - "name": "param_change", + "name": "ats", "description": "on/off", "type": "bool" }, { - "name": "any_layout", + "name": "hotplug", "description": "on/off", "type": "bool" }, { - "name": "iothread", - "type": "link<iothread>" + "name": "cmd_per_lun", + "type": "uint32" }, { "name": "addr", @@ -3186,53 +3121,54 @@ "type": "int32" }, { - "name": "migrate-extra", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "modern-pio-notify", + "name": "x-pcie-lnkctl-init", "description": "on/off", "type": "bool" }, { - "name": "vectors", + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", "type": "uint32" }, { - "name": "x-pcie-extcap-init", + "name": "event_idx", "description": "on/off", "type": "bool" }, { - "name": "virtio-backend", - "type": "child<virtio-scsi-device>" - }, - { - "name": "x-ignore-backend-features", + "name": "disable-modern", "type": "bool" }, { - "name": "notify_on_empty", + "name": "migrate-extra", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, { - "name": "ats", + "name": "modern-pio-notify", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "indirect_desc", + "description": "on/off", + "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "command_serr_enable", "description": "on/off", "type": "bool" } @@ -3299,104 +3235,99 @@ { "return": [ { - "name": "x-igd-opregion", - "description": "on/off", - "type": "bool" - }, - { - "name": "x-pci-vendor-id", + "name": "x-pci-sub-device-id", "type": "uint32" }, { - "name": "yres", - "type": "uint32" + "name": "x-no-kvm-intx", + "type": "bool" }, { - "name": "x-pci-sub-device-id", + "name": "x-pci-device-id", "type": "uint32" }, { - "name": "x-no-kvm-ioeventfd", + "name": "x-no-kvm-msi", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", - "type": "bool" + "name": "xres", + "type": "uint32" }, { - "name": "rombar", - "type": "uint32" + "name": "display", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "x-no-kvm-msi", - "type": "bool" + "name": "bootindex", + "type": "int32" }, { - "name": "x-req", - "description": "on/off", + "name": "x-no-mmap", "type": "bool" }, { - "name": "xres", + "name": "x-pci-sub-vendor-id", "type": "uint32" }, { - "name": "x-no-vfio-ioeventfd", - "type": "bool" + "name": "x-msix-relocation", + "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", + "type": "OffAutoPCIBAR" }, { - "name": "x-no-kvm-intx", + "name": "x-req", + "description": "on/off", "type": "bool" }, { - "name": "host", - "description": "Address (bus/device/function) of the host device, example: 04:10.0", - "type": "str" + "name": "x-no-kvm-ioeventfd", + "type": "bool" }, { - "name": "x-no-kvm-msix", - "type": "bool" + "name": "x-pci-vendor-id", + "type": "uint32" }, { - "name": "command_serr_enable", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "x-balloon-allowed", - "type": "bool" + "name": "x-nv-gpudirect-clique", + "description": "NVIDIA GPUDirect Clique ID (0 - 15)", + "type": "uint4" }, { - "name": "x-pcie-lnksta-dllla", - "description": "on/off", + "name": "x-no-vfio-ioeventfd", "type": "bool" }, { - "name": "x-pci-sub-vendor-id", + "name": "x-intx-mmap-timeout-ms", "type": "uint32" }, { - "name": "x-pci-device-id", + "name": "x-igd-gms", "type": "uint32" }, { - "name": "x-no-geforce-quirks", + "name": "x-pcie-lnksta-dllla", + "description": "on/off", "type": "bool" }, { - "name": "display", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "sysfsdev", + "type": "str" }, { - "name": "x-nv-gpudirect-clique", - "description": "NVIDIA GPUDirect Clique ID (0 - 15)", - "type": "uint4" + "name": "yres", + "type": "uint32" }, { - "name": "x-igd-gms", - "type": "uint32" + "name": "x-pcie-extcap-init", + "description": "on/off", + "type": "bool" }, { "name": "addr", @@ -3404,39 +3335,44 @@ "type": "int32" }, { - "name": "x-msix-relocation", - "description": "off/auto/bar0/bar1/bar2/bar3/bar4/bar5", - "type": "OffAutoPCIBAR" + "name": "romfile", + "type": "str" }, { - "name": "x-intx-mmap-timeout-ms", - "type": "uint32" + "name": "x-vga", + "description": "on/off", + "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "x-igd-opregion", "description": "on/off", "type": "bool" }, { - "name": "x-no-mmap", + "name": "x-no-kvm-msix", "type": "bool" }, { - "name": "bootindex", - "type": "int32" + "name": "rombar", + "type": "uint32" }, { - "name": "sysfsdev", + "name": "host", + "description": "Address (bus/device/function) of the host device, example: 04:10.0", "type": "str" }, { - "name": "x-vga", + "name": "x-no-geforce-quirks", + "type": "bool" + }, + { + "name": "command_serr_enable", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "x-balloon-allowed", + "type": "bool" } ], "id": "libvirt-13" @@ -3453,12 +3389,20 @@ { "return": [ { - "name": "min_io_size", - "type": "uint16" + "name": "scsi-id", + "type": "uint32" }, { - "name": "secs", - "type": "uint32" + "name": "share-rw", + "type": "bool" + }, + { + "name": "ver", + "type": "str" + }, + { + "name": "scsi_version", + "type": "int32" }, { "name": "removable", @@ -3466,68 +3410,67 @@ "type": "bool" }, { - "name": "channel", - "type": "uint32" + "name": "rotation_rate", + "type": "uint16" }, { - "name": "heads", - "type": "uint32" + "name": "max_unmap_size", + "type": "uint64" }, { - "name": "lun", + "name": "cyls", "type": "uint32" }, { - "name": "dpofua", - "description": "on/off", - "type": "bool" + "name": "serial", + "type": "str" }, { - "name": "ver", + "name": "secs", + "type": "uint32" + }, + { + "name": "product", "type": "str" }, { - "name": "scsi-id", + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "heads", "type": "uint32" }, { - "name": "cyls", + "name": "lun", "type": "uint32" }, { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "bootindex", + "type": "int32" }, { - "name": "rotation_rate", - "type": "uint16" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { "name": "drive", "description": "Node name or ID of a block device to use as a backend", "type": "str" }, - { - "name": "scsi_version", - "type": "int32" - }, { "name": "werror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "port_wwn", + "name": "wwn", "type": "uint64" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "vendor", + "type": "str" }, { "name": "rerror", @@ -3535,54 +3478,47 @@ "type": "BlockdevOnError" }, { - "name": "max_io_size", - "type": "uint64" - }, - { - "name": "device_id", - "type": "str" + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "wwn", - "type": "uint64" + "name": "physical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" }, { - "name": "share-rw", - "type": "bool" + "name": "channel", + "type": "uint32" }, { - "name": "product", - "type": "str" + "name": "max_io_size", + "type": "uint64" }, { - "name": "vendor", - "type": "str" + "name": "opt_io_size", + "type": "uint32" }, { - "name": "physical_block_size", + "name": "logical_block_size", "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "port_index", - "type": "uint16" - }, - { - "name": "bootindex", - "type": "int32" + "name": "discard_granularity", + "type": "uint32" }, { - "name": "serial", - "type": "str" + "name": "port_wwn", + "type": "uint64" }, { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "port_index", + "type": "uint16" }, { - "name": "opt_io_size", - "type": "uint32" + "name": "device_id", + "type": "str" } ], "id": "libvirt-14" @@ -3599,12 +3535,21 @@ { "return": [ { - "name": "serial", + "name": "bootindex", + "type": "int32" + }, + { + "name": "model", "type": "str" }, { - "name": "secs", - "type": "uint32" + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", + "type": "str" + }, + { + "name": "serial", + "type": "str" }, { "name": "logical_block_size", @@ -3612,41 +3557,36 @@ "type": "uint16" }, { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" + "name": "ver", + "type": "str" }, { - "name": "rotation_rate", - "type": "uint16" + "name": "share-rw", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", - "type": "str" + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "heads", + "name": "discard_granularity", "type": "uint32" }, { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "wwn", + "type": "uint64" }, { - "name": "share-rw", - "type": "bool" + "name": "heads", + "type": "uint32" }, { - "name": "min_io_size", - "type": "uint16" + "name": "unit", + "type": "uint32" }, { - "name": "opt_io_size", + "name": "cyls", "type": "uint32" }, { @@ -3655,30 +3595,25 @@ "type": "BiosAtaTranslation" }, { - "name": "unit", + "name": "opt_io_size", "type": "uint32" }, { - "name": "wwn", - "type": "uint64" - }, - { - "name": "werror", + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "model", - "type": "str" + "name": "secs", + "type": "uint32" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "rotation_rate", + "type": "uint16" }, { - "name": "ver", - "type": "str" + "name": "min_io_size", + "type": "uint16" }, { "name": "physical_block_size", @@ -3686,8 +3621,9 @@ "type": "uint16" }, { - "name": "cyls", - "type": "uint32" + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" } ], "id": "libvirt-15" @@ -3704,61 +3640,61 @@ { "return": [ { - "name": "memory-hotplug-support", - "type": "bool" + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" }, { - "name": "rombar", - "type": "uint32" + "name": "disable_s4", + "type": "uint8" }, { - "name": "x-pcie-lnksta-dllla", - "description": "on/off", + "name": "acpi-pci-hotplug-with-bridge-support", "type": "bool" }, { - "name": "acpi-pci-hotplug-with-bridge-support", + "name": "memory-hotplug-support", "type": "bool" }, { - "name": "multifunction", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" - }, - { - "name": "disable_s4", + "name": "disable_s3", "type": "uint8" }, { - "name": "disable_s3", + "name": "s4_val", "type": "uint8" }, { - "name": "x-pcie-extcap-init", + "name": "command_serr_enable", "description": "on/off", "type": "bool" }, { - "name": "command_serr_enable", + "name": "smb_io_base", + "type": "uint32" + }, + { + "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "s4_val", - "type": "uint8" + "name": "romfile", + "type": "str" }, { - "name": "smb_io_base", + "name": "rombar", "type": "uint32" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "multifunction", + "description": "on/off", + "type": "bool" } ], "id": "libvirt-16" @@ -3775,47 +3711,47 @@ { "return": [ { - "name": "filter", + "name": "chardev", + "description": "ID of a chardev to use as a backend", "type": "str" }, { - "name": "msos-desc", - "description": "on/off", - "type": "bool" + "name": "debug", + "type": "uint8" }, { - "name": "serial", + "name": "port", "type": "str" }, { - "name": "bootindex", - "type": "int32" + "name": "streams", + "type": "bool" }, { - "name": "port", - "type": "str" + "name": "attached", + "type": "bool" }, { - "name": "debug", - "type": "uint8" + "name": "msos-desc", + "description": "on/off", + "type": "bool" }, { - "name": "streams", - "type": "bool" + "name": "filter", + "type": "str" }, { - "name": "chardev", - "description": "ID of a chardev to use as a backend", + "name": "bootindex", + "type": "int32" + }, + { + "name": "serial", "type": "str" }, { "name": "full-path", "description": "on/off", "type": "bool" - }, - { - "name": "attached", - "type": "bool" } ], "id": "libvirt-17" @@ -3832,40 +3768,40 @@ { "return": [ { - "name": "short_root_bus", - "type": "uint32" - }, - { - "name": "pci-conf-idx[0]", - "type": "child<qemu:memory-region>" + "name": "pci-hole64-end", + "type": "uint64" }, { - "name": "pci-hole64-end", + "name": "pci-hole64-start", "type": "uint64" }, { - "name": "pci-hole-end", - "type": "uint32" + "name": "pci-conf-data[0]", + "type": "child<qemu:memory-region>" }, { "name": "pci-hole-start", "type": "uint32" }, { - "name": "pci-hole64-start", - "type": "uint64" + "name": "pci-hole-end", + "type": "uint32" }, { "name": "pci-hole64-size", "type": "size" }, { - "name": "pci-conf-data[0]", + "name": "x-pci-hole64-fix", + "type": "bool" + }, + { + "name": "pci-conf-idx[0]", "type": "child<qemu:memory-region>" }, { - "name": "x-pci-hole64-fix", - "type": "bool" + "name": "short_root_bus", + "type": "uint32" } ], "id": "libvirt-18" @@ -3882,80 +3818,80 @@ { "return": [ { - "name": "short_root_bus", - "type": "uint32" + "name": "mch", + "type": "child<mch>" }, { - "name": "system-mem", - "type": "link<qemu:memory-region>" + "name": "pci-hole64-start", + "type": "uint64" }, { - "name": "pci-conf-idx[0]", - "type": "child<qemu:memory-region>" + "name": "above-4g-mem-size", + "type": "size" + }, + { + "name": "io-mem", + "type": "link<qemu:memory-region>" }, { "name": "pcie-mmcfg-mmio[0]", "type": "child<qemu:memory-region>" }, { - "name": "pci-hole64-start", - "type": "uint64" + "name": "below-4g-mem-size", + "type": "size" }, { - "name": "io-mem", - "type": "link<qemu:memory-region>" + "name": "MCFG", + "type": "uint64" }, { "name": "pci-hole64-end", "type": "uint64" }, { - "name": "pci-hole-end", - "type": "uint32" - }, - { - "name": "above-4g-mem-size", - "type": "size" + "name": "pci-mem", + "type": "link<qemu:memory-region>" }, { - "name": "below-4g-mem-size", - "type": "size" + "name": "pci-hole-start", + "type": "uint32" }, { - "name": "ram-mem", + "name": "system-mem", "type": "link<qemu:memory-region>" }, { - "name": "pci-hole-start", - "type": "uint32" + "name": "pci-hole64-size", + "type": "size" }, { - "name": "MCFG", + "name": "mcfg_size", "type": "uint64" }, { - "name": "mch", - "type": "child<mch>" + "name": "pci-hole-end", + "type": "uint32" }, { - "name": "pci-hole64-size", - "type": "size" + "name": "pci-conf-data[0]", + "type": "child<qemu:memory-region>" }, { - "name": "pci-mem", - "type": "link<qemu:memory-region>" + "name": "pci-conf-idx[0]", + "type": "child<qemu:memory-region>" }, { - "name": "pci-conf-data[0]", - "type": "child<qemu:memory-region>" + "name": "ram-mem", + "type": "link<qemu:memory-region>" }, { "name": "x-pci-hole64-fix", "type": "bool" }, { - "name": "mcfg_size", - "type": "uint64" + "name": "short_root_bus", + "type": "uint32" } ], "id": "libvirt-19" @@ -3972,22 +3908,8 @@ { "return": [ { - "name": "serial", - "type": "str" - }, - { - "name": "msos-desc", - "description": "on/off", - "type": "bool" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" - }, - { - "name": "discard_granularity", - "type": "uint32" + "name": "bootindex", + "type": "int32" }, { "name": "drive", @@ -3995,58 +3917,72 @@ "type": "str" }, { - "name": "bootindex", - "type": "int32" + "name": "port", + "type": "str" }, { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "serial", + "type": "str" }, { - "name": "share-rw", - "type": "bool" + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", + "type": "uint16" }, { - "name": "min_io_size", - "type": "uint16" + "name": "share-rw", + "type": "bool" }, { - "name": "opt_io_size", - "type": "uint32" + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "port", - "type": "str" + "name": "removable", + "description": "on/off", + "type": "bool" }, { - "name": "attached", - "type": "bool" + "name": "discard_granularity", + "type": "uint32" }, { - "name": "werror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "msos-desc", + "description": "on/off", + "type": "bool" }, { "name": "full-path", "description": "on/off", "type": "bool" }, + { + "name": "opt_io_size", + "type": "uint32" + }, { "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "attached", "type": "bool" }, + { + "name": "min_io_size", + "type": "uint16" + }, { "name": "physical_block_size", "description": "A power of two between 512 and 32768", "type": "uint16" + }, + { + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" } ], "id": "libvirt-20" @@ -4062,13 +3998,13 @@ { "return": [ - { - "name": "iobase", - "type": "uint32" - }, { "name": "lost_tick_policy", "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "uint32" } ], "id": "libvirt-21" @@ -4085,66 +4021,74 @@ { "return": [ { - "name": "rombar", + "name": "global-vmstate", + "type": "bool" + }, + { + "name": "xmax", "type": "uint32" }, { - "name": "x-pcie-lnksta-dllla", - "description": "on/off", - "type": "bool" + "name": "yres", + "type": "uint32" }, { - "name": "mmio", - "description": "on/off", + "name": "big-endian-framebuffer", "type": "bool" }, { - "name": "multifunction", + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "qemu-extended-regs", + "name": "edid", "description": "on/off", "type": "bool" }, { - "name": "big-endian-framebuffer", - "type": "bool" + "name": "ymax", + "type": "uint32" }, { - "name": "command_serr_enable", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "x-pcie-extcap-init", + "description": "on/off", + "type": "bool" }, { - "name": "yres", + "name": "vgamem_mb", "type": "uint32" }, { - "name": "vgamem_mb", - "type": "uint32" + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "qemu-extended-regs", "description": "on/off", "type": "bool" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "rombar", + "type": "uint32" }, { - "name": "global-vmstate", - "type": "bool" + "name": "romfile", + "type": "str" }, { - "name": "edid", + "name": "mmio", "description": "on/off", "type": "bool" }, @@ -4166,28 +4110,32 @@ { "return": [ - { - "name": "rombar", - "type": "uint32" - }, { "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", + "name": "global-vmstate", "type": "bool" }, + { + "name": "vgamem_mb", + "type": "uint32" + }, { "name": "romfile", "type": "str" }, { - "name": "vgamem_mb", + "name": "rombar", "type": "uint32" }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, { "name": "x-pcie-extcap-init", "description": "on/off", @@ -4199,12 +4147,8 @@ "type": "bool" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" - }, - { - "name": "global-vmstate", + "name": "multifunction", + "description": "on/off", "type": "bool" } ], @@ -4222,12 +4166,11 @@ { "return": [ { - "name": "command_serr_enable", - "description": "on/off", + "name": "global-vmstate", "type": "bool" }, { - "name": "rombar", + "name": "debug", "type": "uint32" }, { @@ -4240,78 +4183,79 @@ "type": "uint32" }, { - "name": "ram_size_mb", - "type": "uint32" + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" }, { - "name": "global-vmstate", + "name": "multifunction", + "description": "on/off", "type": "bool" }, { - "name": "multifunction", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "vgamem_mb", + "name": "ram_size", "type": "uint32" }, { - "name": "romfile", - "type": "str" + "name": "ram_size_mb", + "type": "uint32" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", + "name": "surfaces", "type": "int32" }, { - "name": "debug", + "name": "guestdebug", "type": "uint32" }, { - "name": "vram_size_mb", + "name": "vram64_size_mb", "type": "uint32" }, { - "name": "revision", - "type": "uint32" + "name": "vram_size", + "type": "uint64" }, { - "name": "ram_size", - "type": "uint32" + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" }, { - "name": "vram64_size_mb", + "name": "cmdlog", "type": "uint32" }, { - "name": "x-pcie-extcap-init", - "description": "on/off", - "type": "bool" + "name": "vgamem_mb", + "type": "uint32" }, { - "name": "guestdebug", + "name": "vram_size_mb", "type": "uint32" }, { - "name": "vram_size", - "type": "uint64" + "name": "romfile", + "type": "str" }, { - "name": "surfaces", - "type": "int32" + "name": "rombar", + "type": "uint32" }, { "name": "max_outputs", "type": "uint16" }, { - "name": "xres", + "name": "revision", "type": "uint32" }, { - "name": "cmdlog", + "name": "xres", "type": "uint32" } ], @@ -4329,26 +4273,16 @@ { "return": [ { - "name": "event_idx", - "description": "on/off", - "type": "bool" - }, - { - "name": "yres", - "type": "uint32" - }, - { - "name": "ioeventfd", + "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", + "name": "x-ignore-backend-features", "type": "bool" }, { - "name": "rombar", + "name": "max_outputs", "type": "uint32" }, { @@ -4356,21 +4290,25 @@ "type": "uint32" }, { - "name": "x-disable-pcie", + "name": "virtio-backend", + "type": "child<virtio-gpu-device>" + }, + { + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "indirect_desc", + "name": "page-per-vq", "description": "on/off", "type": "bool" }, { - "name": "disable-modern", - "type": "bool" + "name": "vectors", + "type": "uint32" }, { - "name": "x-pcie-lnkctl-init", + "name": "x-pcie-deverr-init", "description": "on/off", "type": "bool" }, @@ -4380,26 +4318,27 @@ "type": "OnOffAuto" }, { - "name": "command_serr_enable", + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, { - "name": "page-per-vq", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-deverr-init", + "name": "ioeventfd", "description": "on/off", "type": "bool" }, { - "name": "max_outputs", - "type": "uint32" + "name": "any_layout", + "description": "on/off", + "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "stats", "description": "on/off", "type": "bool" }, @@ -4409,82 +4348,87 @@ "type": "bool" }, { - "name": "any_layout", + "name": "x-disable-pcie", "description": "on/off", "type": "bool" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" - }, - { - "name": "edid", + "name": "ats", "description": "on/off", "type": "bool" }, { - "name": "migrate-extra", - "description": "on/off", - "type": "bool" + "name": "max_hostmem", + "type": "size" }, { - "name": "modern-pio-notify", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "vectors", + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "yres", "type": "uint32" }, { - "name": "iommu_platform", + "name": "edid", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "x-pcie-lnkctl-init", "description": "on/off", "type": "bool" }, { - "name": "max_hostmem", - "type": "size" + "name": "romfile", + "type": "str" }, { - "name": "virtio-backend", - "type": "child<virtio-gpu-device>" + "name": "rombar", + "type": "uint32" + }, + { + "name": "event_idx", + "description": "on/off", + "type": "bool" }, { - "name": "x-ignore-backend-features", + "name": "disable-modern", "type": "bool" }, { - "name": "stats", + "name": "migrate-extra", "description": "on/off", "type": "bool" }, { - "name": "notify_on_empty", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, { - "name": "virgl", + "name": "modern-pio-notify", "description": "on/off", "type": "bool" }, { - "name": "ats", + "name": "indirect_desc", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "virgl", "description": "on/off", "type": "bool" } @@ -4503,17 +4447,21 @@ { "return": [ { - "name": "notify_on_empty", + "name": "indirect_desc", "description": "on/off", "type": "bool" }, { - "name": "any_layout", + "name": "yres", + "type": "uint32" + }, + { + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "indirect_desc", + "name": "stats", "description": "on/off", "type": "bool" }, @@ -4523,26 +4471,26 @@ "type": "bool" }, { - "name": "yres", - "type": "uint32" - }, - { - "name": "stats", + "name": "edid", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "virgl", + "name": "max_hostmem", + "type": "size" + }, + { + "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "edid", + "name": "virgl", "description": "on/off", "type": "bool" }, @@ -4550,10 +4498,6 @@ "name": "max_outputs", "type": "uint32" }, - { - "name": "max_hostmem", - "type": "size" - }, { "name": "xres", "type": "uint32" @@ -4573,93 +4517,93 @@ { "return": [ { - "name": "memory-hotplug-support", + "name": "s4_val", + "type": "uint8" + }, + { + "name": "noreboot", "type": "bool" }, { - "name": "rombar", - "type": "uint32" + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" }, { - "name": "sci_int", - "type": "uint32" + "name": "acpi_enable_cmd", + "type": "uint8" }, { - "name": "x-pcie-lnksta-dllla", - "description": "on/off", - "type": "bool" + "name": "disable_s3", + "type": "uint8" }, { - "name": "gpe0_blk_len", - "type": "uint32" + "name": "disable_s4", + "type": "uint8" }, { - "name": "pm_io_base", + "name": "sci_int", "type": "uint32" }, { - "name": "noreboot", + "name": "cpu-hotplug-legacy", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", + "name": "memory-hotplug-support", "type": "bool" }, { - "name": "cpu-hotplug-legacy", + "name": "x-pcie-extcap-init", + "description": "on/off", "type": "bool" }, { - "name": "acpi_disable_cmd", - "type": "uint8" + "name": "gpe0_blk_len", + "type": "uint32" }, { - "name": "x-smi-broadcast", + "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" }, { - "name": "disable_s3", - "type": "uint8" + "name": "gpe0_blk", + "type": "uint32" }, { - "name": "s4_val", - "type": "uint8" + "name": "enable_tco", + "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "x-smi-broadcast", "description": "on/off", "type": "bool" }, { - "name": "command_serr_enable", - "description": "on/off", - "type": "bool" + "name": "romfile", + "type": "str" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "rombar", + "type": "uint32" }, { - "name": "acpi_enable_cmd", + "name": "acpi_disable_cmd", "type": "uint8" }, { - "name": "enable_tco", + "name": "multifunction", + "description": "on/off", "type": "bool" }, { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "gpe0_blk", + "name": "pm_io_base", "type": "uint32" } ], @@ -4677,44 +4621,42 @@ { "return": [ { - "name": "guest-stats-polling-interval", - "type": "int" - }, - { - "name": "event_idx", + "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", + "name": "iothread", + "type": "link<iothread>" + }, + { + "name": "x-ignore-backend-features", "type": "bool" }, { - "name": "rombar", - "type": "uint32" + "name": "virtio-backend", + "type": "child<virtio-balloon-device>" }, { - "name": "x-disable-pcie", - "description": "on/off", - "type": "bool" + "name": "guest-stats-polling-interval", + "type": "int" }, { - "name": "indirect_desc", + "name": "x-pcie-pm-init", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-lnkctl-init", - "description": "on/off", - "type": "bool" + "name": "guest-stats", + "type": "guest statistics" }, { - "name": "disable-modern", + "name": "page-per-vq", + "description": "on/off", "type": "bool" }, { - "name": "free-page-hint", + "name": "x-pcie-deverr-init", "description": "on/off", "type": "bool" }, @@ -4724,51 +4666,44 @@ "type": "OnOffAuto" }, { - "name": "command_serr_enable", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "guest-stats", - "type": "guest statistics" - }, - { - "name": "deflate-on-oom", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "page-per-vq", + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-deverr-init", + "name": "free-page-hint", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-pm-init", + "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-lnksta-dllla", + "name": "x-disable-pcie", "description": "on/off", "type": "bool" }, { - "name": "any_layout", + "name": "ats", "description": "on/off", "type": "bool" }, { - "name": "iothread", - "type": "link<iothread>" - }, - { - "name": "class", - "type": "uint32" + "name": "deflate-on-oom", + "description": "on/off", + "type": "bool" }, { "name": "addr", @@ -4776,51 +4711,60 @@ "type": "int32" }, { - "name": "migrate-extra", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "modern-pio-notify", + "name": "x-pcie-lnkctl-init", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "romfile", + "type": "str" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "event_idx", "description": "on/off", "type": "bool" }, { - "name": "virtio-backend", - "type": "child<virtio-balloon-device>" + "name": "disable-modern", + "type": "bool" }, { - "name": "x-ignore-backend-features", - "type": "bool" + "name": "class", + "type": "uint32" }, { - "name": "notify_on_empty", + "name": "migrate-extra", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, { - "name": "ats", + "name": "modern-pio-notify", "description": "on/off", "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "indirect_desc", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" } ], "id": "libvirt-28" @@ -4853,44 +4797,39 @@ { "return": [ { - "name": "notify_on_empty", - "description": "on/off", - "type": "bool" + "name": "guest-stats", + "type": "guest statistics" }, { - "name": "any_layout", - "description": "on/off", - "type": "bool" + "name": "iothread", + "type": "link<iothread>" }, { - "name": "indirect_desc", + "name": "iommu_platform", "description": "on/off", "type": "bool" }, - { - "name": "guest-stats", - "type": "guest statistics" - }, { "name": "guest-stats-polling-interval", "type": "int" }, { - "name": "iothread", - "type": "link<iothread>" + "name": "event_idx", + "description": "on/off", + "type": "bool" }, { - "name": "event_idx", + "name": "any_layout", "description": "on/off", "type": "bool" }, { - "name": "free-page-hint", + "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "free-page-hint", "description": "on/off", "type": "bool" }, @@ -4898,6 +4837,11 @@ "name": "deflate-on-oom", "description": "on/off", "type": "bool" + }, + { + "name": "indirect_desc", + "description": "on/off", + "type": "bool" } ], "id": "libvirt-30" @@ -4914,11 +4858,17 @@ { "return": [ { - "name": "rombar", - "type": "uint32" + "name": "msix", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" }, { - "name": "intrs", + "name": "p2", "type": "uint32" }, { @@ -4927,61 +4877,55 @@ "type": "bool" }, { - "name": "msix", + "name": "msi", "description": "on/off/auto", "type": "OnOffAuto" }, { - "name": "multifunction", + "name": "force-pcie-endcap", "description": "on/off", "type": "bool" }, { - "name": "msi", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "intrs", + "type": "uint32" }, { - "name": "superspeed-ports-first", + "name": "x-pcie-extcap-init", "description": "on/off", "type": "bool" }, { - "name": "streams", + "name": "multifunction", "description": "on/off", "type": "bool" }, { - "name": "romfile", - "type": "str" - }, - { - "name": "force-pcie-endcap", + "name": "command_serr_enable", "description": "on/off", "type": "bool" }, { - "name": "x-pcie-extcap-init", + "name": "superspeed-ports-first", "description": "on/off", "type": "bool" }, { - "name": "command_serr_enable", - "description": "on/off", - "type": "bool" + "name": "romfile", + "type": "str" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "rombar", + "type": "uint32" }, { "name": "p3", "type": "uint32" }, { - "name": "p2", - "type": "uint32" + "name": "streams", + "description": "on/off", + "type": "bool" }, { "name": "slots", @@ -5002,16 +4946,15 @@ { "return": [ { - "name": "eim", - "description": "on/off/auto", - "type": "OnOffAuto" + "name": "device-iotlb", + "type": "bool" }, { - "name": "caching-mode", + "name": "x-scalable-mode", "type": "bool" }, { - "name": "x-buggy-eim", + "name": "caching-mode", "type": "bool" }, { @@ -5020,28 +4963,29 @@ "type": "OnOffAuto" }, { - "name": "version", - "type": "uint32" + "name": "aw-bits", + "type": "uint8" }, { - "name": "x-scalable-mode", - "type": "bool" + "name": "eim", + "description": "on/off/auto", + "type": "OnOffAuto" }, { - "name": "dma-drain", - "type": "bool" + "name": "version", + "type": "uint32" }, { - "name": "pt", + "name": "x-buggy-eim", "type": "bool" }, { - "name": "device-iotlb", + "name": "pt", "type": "bool" }, { - "name": "aw-bits", - "type": "uint8" + "name": "dma-drain", + "type": "bool" } ], "id": "libvirt-32" @@ -5057,27 +5001,27 @@ { "return": [ - { - "name": "rombar", - "type": "uint32" - }, { "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" }, { - "name": "multifunction", - "description": "on/off", - "type": "bool" + "name": "romfile", + "type": "str" }, { - "name": "extended-tseg-mbytes", - "type": "uint16" + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" }, { - "name": "romfile", - "type": "str" + "name": "rombar", + "type": "uint32" + }, + { + "name": "extended-tseg-mbytes", + "type": "uint16" }, { "name": "x-pcie-extcap-init", @@ -5090,9 +5034,9 @@ "type": "bool" }, { - "name": "addr", - "description": "Slot and optional function number, example: 06.0 or 06", - "type": "int32" + "name": "multifunction", + "description": "on/off", + "type": "bool" } ], "id": "libvirt-33" @@ -5108,33 +5052,33 @@ { "return": [ - { - "name": "slot", - "type": "int32" - }, { "name": "node", "type": "uint32" }, - { - "name": "size", - "type": "uint64" - }, { "name": "unarmed", "type": "bool" }, { - "name": "label-size", - "type": "int" + "name": "addr", + "type": "uint64" }, { "name": "memdev", "type": "link<memory-backend>" }, { - "name": "addr", + "name": "label-size", + "type": "int" + }, + { + "name": "size", "type": "uint64" + }, + { + "name": "slot", + "type": "int32" } ], "id": "libvirt-34" @@ -5154,11 +5098,6 @@ "name": "type", "type": "string" }, - { - "name": "policy", - "description": "Set the NUMA policy", - "type": "HostMemPolicy" - }, { "name": "dump", "description": "Set to 'off' to exclude from core dump", @@ -5170,17 +5109,22 @@ "type": "bool" }, { - "name": "prealloc", - "description": "Preallocate memory", + "name": "x-use-canonical-path-for-ramblock-id", "type": "bool" }, + { + "name": "policy", + "description": "Set the NUMA policy", + "type": "HostMemPolicy" + }, { "name": "size", "description": "Size of the memory region (ex: 500M)", "type": "int" }, { - "name": "x-use-canonical-path-for-ramblock-id", + "name": "prealloc", + "description": "Preallocate memory", "type": "bool" }, { @@ -5193,14 +5137,14 @@ "description": "Mark memory as mergeable", "type": "bool" }, - { - "name": "pmem", - "type": "bool" - }, { "name": "align", "type": "int" }, + { + "name": "pmem", + "type": "bool" + }, { "name": "mem-path", "type": "string" @@ -5227,11 +5171,6 @@ "name": "type", "type": "string" }, - { - "name": "policy", - "description": "Set the NUMA policy", - "type": "HostMemPolicy" - }, { "name": "dump", "description": "Set to 'off' to exclude from core dump", @@ -5243,17 +5182,22 @@ "type": "bool" }, { - "name": "prealloc", - "description": "Preallocate memory", + "name": "x-use-canonical-path-for-ramblock-id", "type": "bool" }, + { + "name": "policy", + "description": "Set the NUMA policy", + "type": "HostMemPolicy" + }, { "name": "size", "description": "Size of the memory region (ex: 500M)", "type": "int" }, { - "name": "x-use-canonical-path-for-ramblock-id", + "name": "prealloc", + "description": "Preallocate memory", "type": "bool" }, { @@ -5266,6 +5210,11 @@ "description": "Mark memory as mergeable", "type": "bool" }, + { + "name": "hugetlb", + "description": "Use huge pages", + "type": "bool" + }, { "name": "seal", "description": "Seal growing & shrinking", @@ -5275,11 +5224,6 @@ "name": "hugetlbsize", "description": "Huge pages size (ex: 2M, 1G)", "type": "int" - }, - { - "name": "hugetlb", - "description": "Use huge pages", - "type": "bool" } ], "id": "libvirt-36" @@ -5300,863 +5244,863 @@ "type": "string" }, { - "name": "min-xlevel2", - "type": "uint32" - }, - { - "name": "amd-ssbd", + "name": "sse4_1", "type": "bool" }, { - "name": "vendor", - "type": "string" + "name": "popcnt", + "type": "bool" }, { - "name": "gfni", + "name": "kvm_mmu", "type": "bool" }, { - "name": "clwb", + "name": "dtes64", "type": "bool" }, { - "name": "nx", - "type": "bool" + "name": "min-xlevel2", + "type": "uint32" }, { - "name": "x2apic", + "name": "xstore", "type": "bool" }, { - "name": "mds-no", - "type": "bool" + "name": "stepping", + "type": "int" }, { - "name": "kvmclock-stable-bit", + "name": "pse36", "type": "bool" }, { - "name": "vmcb_clean", + "name": "avx512-4vnniw", "type": "bool" }, { - "name": "min-level", - "type": "uint32" + "name": "fma4", + "type": "bool" }, { - "name": "fxsr-opt", + "name": "x-intel-pt-auto-level", "type": "bool" }, { - "name": "skinit", + "name": "avx2", "type": "bool" }, { - "name": "avx", + "name": "kvm_nopiodelay", "type": "bool" }, { - "name": "unavailable-features", - "type": "strList" + "name": "family", + "type": "int" }, { - "name": "3dnowext", + "name": "pclmuldq", "type": "bool" }, { - "name": "nodeid_msr", + "name": "vmware-cpuid-freq", "type": "bool" }, { - "name": "hv-crash", - "type": "bool" + "name": "hv-spinlocks", + "type": "int" }, { - "name": "hypervisor", + "name": "erms", "type": "bool" }, { - "name": "enforce", + "name": "vaes", "type": "bool" }, { - "name": "stepping", - "type": "int" + "name": "realized", + "type": "bool" }, { - "name": "sse4_2", + "name": "hv-reset", "type": "bool" }, { - "name": "sse4_1", + "name": "rdrand", "type": "bool" }, { - "name": "x-hv-max-vps", - "type": "int32" + "name": "model", + "type": "int" }, { - "name": "hv-frequencies", + "name": "avx512-vpopcntdq", "type": "bool" }, { - "name": "kvm-hint-dedicated", + "name": "tbm", "type": "bool" }, { - "name": "cmp_legacy", + "name": "xcrypt", "type": "bool" }, { - "name": "tm2", + "name": "movdiri", "type": "bool" }, { - "name": "smx", - "type": "bool" + "name": "memory", + "type": "link<qemu:memory-region>" }, { - "name": "host-cache-info", + "name": "kvm-pv-eoi", "type": "bool" }, { - "name": "kvm-pv-ipi", + "name": "lm", "type": "bool" }, { - "name": "hv-vendor-id", - "type": "str" + "name": "host-phys-bits-limit", + "type": "uint8" }, { - "name": "movbe", + "name": "pae", "type": "bool" }, { - "name": "3dnowprefetch", + "name": "ssse3", "type": "bool" }, { - "name": "mtrr", + "name": "hv-runtime", "type": "bool" }, { - "name": "wdt", + "name": "phe", "type": "bool" }, { - "name": "thread-id", - "type": "int32" - }, - { - "name": "aes", + "name": "host-phys-bits", "type": "bool" }, { - "name": "apic-id", - "type": "uint32" + "name": "perfctr_nb", + "type": "bool" }, { - "name": "lm", + "name": "arat", "type": "bool" }, { - "name": "family", - "type": "int" + "name": "avx512vbmi2", + "type": "bool" }, { - "name": "tsc-adjust", + "name": "perfctr_core", "type": "bool" }, { - "name": "pfthreshold", + "name": "kvm_asyncpf", "type": "bool" }, { - "name": "kvm-no-smi-migration", + "name": "x2apic", "type": "bool" }, { - "name": "amd-no-ssb", + "name": "npt", "type": "bool" }, { - "name": "pse", + "name": "avx512ifma", "type": "bool" }, { - "name": "filtered-features", - "type": "X86CPUFeatureWordInfo" + "name": "model-id", + "type": "string" }, { "name": "hv-evmcs", "type": "bool" }, { - "name": "hv-vpindex", + "name": "tsc", "type": "bool" }, { - "name": "i64", + "name": "pmm-en", "type": "bool" }, { - "name": "avx512bitalg", + "name": "dca", "type": "bool" }, { - "name": "adx", + "name": "ia64", "type": "bool" }, { - "name": "vaes", + "name": "perfctr-core", "type": "bool" }, { - "name": "ia64", + "name": "pmu", "type": "bool" }, { - "name": "nodeid-msr", + "name": "kvmclock", "type": "bool" }, { - "name": "ibpb", + "name": "pn", "type": "bool" }, { - "name": "hv-synic", + "name": "invtsc", "type": "bool" }, { - "name": "ibs", + "name": "avx512cd", "type": "bool" }, { - "name": "kvm_mmu", + "name": "md-clear", "type": "bool" }, { - "name": "tcg-cpuid", + "name": "cmp-legacy", "type": "bool" }, { - "name": "nrip_save", + "name": "cx16", "type": "bool" }, { - "name": "kvm_nopiodelay", + "name": "avx512dq", "type": "bool" }, { - "name": "lbrv", + "name": "abm", "type": "bool" }, { - "name": "rdtscp", + "name": "kvm-pv-ipi", "type": "bool" }, { - "name": "memory", - "type": "link<qemu:memory-region>" - }, - { - "name": "avx512vbmi2", + "name": "fxsr-opt", "type": "bool" }, { - "name": "ace2-en", + "name": "skip-l1dfl-vmentry", "type": "bool" }, { - "name": "invtsc", + "name": "fill-mtrr-mask", "type": "bool" }, { - "name": "sse4.2", + "name": "x-migrate-smi-count", "type": "bool" }, { - "name": "sse4.1", + "name": "pcid", "type": "bool" }, { - "name": "pbe", + "name": "rdpid", "type": "bool" }, { - "name": "rdrand", + "name": "wbnoinvd", "type": "bool" }, { - "name": "socket-id", - "type": "int32" + "name": "filtered-features", + "type": "X86CPUFeatureWordInfo" }, { - "name": "hotpluggable", + "name": "syscall", "type": "bool" }, { - "name": "l3-cache", + "name": "pse", "type": "bool" }, { - "name": "kvm-steal-time", + "name": "hotpluggable", "type": "bool" }, { - "name": "vmware-cpuid-freq", + "name": "tsc_scale", "type": "bool" }, { - "name": "legacy-cache", + "name": "xsaves", "type": "bool" }, { - "name": "xop", + "name": "mce", "type": "bool" }, { - "name": "tsc-frequency", - "type": "int" + "name": "node-id", + "type": "int32" }, { - "name": "fill-mtrr-mask", + "name": "ibpb", "type": "bool" }, { - "name": "core-id", - "type": "int32" + "name": "cldemote", + "type": "bool" }, { - "name": "intel-pt", + "name": "hv-tlbflush", "type": "bool" }, { - "name": "pat", + "name": "rtm", "type": "bool" }, { - "name": "pcid", + "name": "lwp", "type": "bool" }, { - "name": "rsba", + "name": "kvm-steal-time", "type": "bool" }, { - "name": "sse4-2", + "name": "cpuid-0xb", "type": "bool" }, { - "name": "sse4-1", + "name": "nrip_save", "type": "bool" }, { - "name": "pclmulqdq", + "name": "vme", "type": "bool" }, { - "name": "sha-ni", + "name": "kvm-pv-unhalt", "type": "bool" }, { - "name": "cmov", + "name": "kvm-no-smi-migration", "type": "bool" }, { - "name": "pae", + "name": "kvm_pv_unhalt", "type": "bool" }, { - "name": "smep", + "name": "svm", "type": "bool" }, { - "name": "arch-capabilities", + "name": "lahf-lm", "type": "bool" }, { - "name": "virt-ssbd", + "name": "kvm-hint-dedicated", "type": "bool" }, { - "name": "abm", + "name": "host-cache-info", "type": "bool" }, { - "name": "xstore", + "name": "mca", "type": "bool" }, { - "name": "tsc_adjust", + "name": "mtrr", "type": "bool" }, { - "name": "kvm-asyncpf", + "name": "cid", "type": "bool" }, { - "name": "pdpe1gb", + "name": "vmcb_clean", "type": "bool" }, { - "name": "min-xlevel", - "type": "uint32" + "name": "pfthreshold", + "type": "bool" }, { - "name": "kvm-mmu", + "name": "pmm", "type": "bool" }, { - "name": "kvm-pv-unhalt", + "name": "tcg-cpuid", "type": "bool" }, { - "name": "avx512f", - "type": "bool" + "name": "x-hv-max-vps", + "type": "int32" }, { - "name": "avx512vbmi", + "name": "tm", "type": "bool" }, { - "name": "xd", + "name": "pbe", "type": "bool" }, { - "name": "avx512-4vnniw", + "name": "apic-id", + "type": "uint32" + }, + { + "name": "fpu", "type": "bool" }, { - "name": "mmxext", + "name": "l3-cache", "type": "bool" }, { - "name": "decodeassists", + "name": "skinit", "type": "bool" }, { - "name": "ht", + "name": "sep", "type": "bool" }, { - "name": "xsave", + "name": "nx", "type": "bool" }, { - "name": "perfctr_core", + "name": "ds-cpl", "type": "bool" }, { - "name": "feature-words", - "type": "X86CPUFeatureWordInfo" + "name": "pause-filter", + "type": "bool" }, { - "name": "migratable", + "name": "pause_filter", "type": "bool" }, { - "name": "3dnow", + "name": "nodeid-msr", "type": "bool" }, { - "name": "spec-ctrl", + "name": "smap", "type": "bool" }, { - "name": "model", - "type": "int" + "name": "xlevel", + "type": "uint32" }, { - "name": "nrip-save", + "name": "cr8legacy", "type": "bool" }, { - "name": "lwp", + "name": "cmp_legacy", "type": "bool" }, { - "name": "xstore-en", + "name": "virt-ssbd", "type": "bool" }, { - "name": "avx512vl", + "name": "umip", "type": "bool" }, { - "name": "kvm_pv_unhalt", + "name": "avx512er", "type": "bool" }, { - "name": "bmi2", + "name": "avx512vl", "type": "bool" }, { - "name": "bmi1", + "name": "xstore-en", "type": "bool" }, { - "name": "la57", + "name": "rsba", "type": "bool" }, { - "name": "ffxsr", + "name": "cmov", "type": "bool" }, { - "name": "stibp", + "name": "xcrypt-en", "type": "bool" }, { - "name": "vmcb-clean", + "name": "tm2", "type": "bool" }, { - "name": "wbnoinvd", + "name": "hv-frequencies", "type": "bool" }, { - "name": "pause-filter", + "name": "fxsr_opt", "type": "bool" }, { - "name": "pni", + "name": "hotplugged", "type": "bool" }, { - "name": "kvm_steal_time", + "name": "fsgsbase", "type": "bool" }, { - "name": "rdctl-no", + "name": "x-hv-synic-kvm-only", "type": "bool" }, { - "name": "svm_lock", + "name": "avx512bw", "type": "bool" }, { - "name": "ibrs-all", + "name": "tsc-frequency", + "type": "int" + }, + { + "name": "lbrv", "type": "bool" }, { - "name": "pse36", + "name": "smx", "type": "bool" }, { - "name": "hv-stimer", + "name": "hle", "type": "bool" }, { - "name": "host-phys-bits", + "name": "monitor", "type": "bool" }, { - "name": "extapic", + "name": "sse4a", "type": "bool" }, { - "name": "skip-l1dfl-vmentry", + "name": "tce", "type": "bool" }, { - "name": "hv-spinlocks", - "type": "int" + "name": "vpclmulqdq", + "type": "bool" }, { - "name": "pmu", + "name": "tsc-scale", "type": "bool" }, { - "name": "pmm", + "name": "kvm-pv-tlb-flush", "type": "bool" }, { - "name": "vpclmulqdq", + "name": "mds-no", "type": "bool" }, { - "name": "avx512-vpopcntdq", + "name": "i64", "type": "bool" }, { - "name": "avx512er", + "name": "adx", "type": "bool" }, { - "name": "pdcm", - "type": "bool" + "name": "crash-information", + "type": "GuestPanicInformation" }, { - "name": "svm", + "name": "ffxsr", "type": "bool" }, { - "name": "apic", + "name": "amd-no-ssb", "type": "bool" }, { - "name": "xcrypt-en", - "type": "bool" + "name": "min-level", + "type": "uint32" }, { - "name": "cr8legacy", + "name": "full-cpuid-auto-level", "type": "bool" }, { - "name": "fma4", + "name": "svm_lock", "type": "bool" }, { - "name": "host-phys-bits-limit", - "type": "uint8" + "name": "ssb-no", + "type": "bool" }, { - "name": "erms", + "name": "msr", "type": "bool" }, { - "name": "msr", + "name": "clflush", "type": "bool" }, { - "name": "ds_cpl", + "name": "pclmulqdq", "type": "bool" }, { - "name": "xlevel", + "name": "xlevel2", "type": "uint32" }, { - "name": "xsaves", + "name": "mpx", "type": "bool" }, { - "name": "hotplugged", + "name": "extapic", "type": "bool" }, { - "name": "hv-relaxed", + "name": "hv-stimer", "type": "bool" }, { - "name": "pause_filter", + "name": "xop", "type": "bool" }, { - "name": "cldemote", + "name": "smep", "type": "bool" }, { - "name": "perfctr-core", + "name": "xsavec", "type": "bool" }, { - "name": "hv-ipi", + "name": "hv-synic", "type": "bool" }, { - "name": "smap", + "name": "cx8", "type": "bool" }, { - "name": "sse3", + "name": "pku", "type": "bool" }, { - "name": "avx512dq", + "name": "kvm", "type": "bool" }, { - "name": "ssse3", + "name": "sse4-2", "type": "bool" }, { - "name": "pmm-en", + "name": "vmcb-clean", "type": "bool" }, { - "name": "npt", + "name": "stibp", "type": "bool" }, { - "name": "kvm-pv-tlb-flush", + "name": "hv-reenlightenment", "type": "bool" }, { - "name": "tsc", + "name": "svm-lock", "type": "bool" }, { - "name": "monitor", + "name": "sse4-1", "type": "bool" }, { - "name": "f16c", + "name": "lahf_lm", "type": "bool" }, { - "name": "sse2", + "name": "legacy-cache", "type": "bool" }, { - "name": "rdpid", + "name": "sse", "type": "bool" }, { - "name": "mce", + "name": "hv-vpindex", "type": "bool" }, { - "name": "full-cpuid-auto-level", + "name": "ds", "type": "bool" }, { - "name": "xtpr", + "name": "osvw", "type": "bool" }, { - "name": "mca", + "name": "kvm_steal_time", "type": "bool" }, { - "name": "cid", + "name": "kvm_pv_eoi", "type": "bool" }, { - "name": "tm", + "name": "movdir64b", "type": "bool" }, { - "name": "sep", + "name": "acpi", "type": "bool" }, { - "name": "avx512vnni", + "name": "nrip-save", "type": "bool" }, { - "name": "ds", + "name": "gfni", "type": "bool" }, { - "name": "pku", + "name": "ds_cpl", "type": "bool" }, { - "name": "tce", + "name": "lmce", "type": "bool" }, { - "name": "sse4a", + "name": "kvm-mmu", "type": "bool" }, { - "name": "kvmclock", + "name": "avx512bitalg", "type": "bool" }, { - "name": "lahf-lm", + "name": "rdseed", "type": "bool" }, { - "name": "clflushopt", + "name": "sha-ni", "type": "bool" }, { - "name": "kvm", + "name": "sse2", "type": "bool" }, { - "name": "ss", + "name": "ace2", "type": "bool" }, { - "name": "flushbyasid", + "name": "nodeid_msr", "type": "bool" }, { - "name": "hv-tlbflush", + "name": "sse3", "type": "bool" }, { - "name": "lahf_lm", + "name": "f16c", "type": "bool" }, { - "name": "de", + "name": "3dnowprefetch", "type": "bool" }, { - "name": "xsavec", + "name": "xd", "type": "bool" }, { - "name": "est", + "name": "avx", "type": "bool" }, { - "name": "check", + "name": "topoext", "type": "bool" }, { - "name": "movdir64b", + "name": "rdctl-no", "type": "bool" }, { - "name": "dtes64", + "name": "mmx", "type": "bool" }, { - "name": "md-clear", + "name": "avx512-4fmaps", "type": "bool" }, { - "name": "vmx", + "name": "level", + "type": "uint32" + }, + { + "name": "avx512vnni", "type": "bool" }, { - "name": "svm-lock", + "name": "pni", "type": "bool" }, { - "name": "avx512ifma", + "name": "movbe", "type": "bool" }, { - "name": "clflush", + "name": "mmxext", "type": "bool" }, { - "name": "rdseed", + "name": "flushbyasid", "type": "bool" }, { - "name": "avx512cd", + "name": "rdtscp", "type": "bool" }, { - "name": "xsaveopt", + "name": "clwb", "type": "bool" }, { - "name": "tbm", + "name": "kvm-asyncpf", "type": "bool" }, { - "name": "ace2", + "name": "decodeassists", "type": "bool" }, { - "name": "vme", + "name": "pat", "type": "bool" }, { - "name": "kvm_asyncpf", + "name": "invpcid", "type": "bool" }, { - "name": "hv-vapic", + "name": "pdpe1gb", "type": "bool" }, { @@ -6164,19 +6108,19 @@ "type": "link<bus>" }, { - "name": "lmce", + "name": "tsc-adjust", "type": "bool" }, { - "name": "x-migrate-smi-count", + "name": "ht", "type": "bool" }, { - "name": "hv-reset", + "name": "xtpr", "type": "bool" }, { - "name": "hv-runtime", + "name": "tsc_adjust", "type": "bool" }, { @@ -6184,231 +6128,231 @@ "type": "bool" }, { - "name": "avx512bw", - "type": "bool" + "name": "hv-vendor-id", + "type": "str" }, { - "name": "xcrypt", + "name": "3dnowext", "type": "bool" }, { - "name": "fpu", + "name": "clflushopt", "type": "bool" }, { - "name": "arat", - "type": "bool" + "name": "unavailable-features", + "type": "strList" }, { - "name": "fxsr", + "name": "xsave", "type": "bool" }, { - "name": "ds-cpl", + "name": "pdcm", "type": "bool" }, { - "name": "kvm-pv-eoi", + "name": "hv-crash", "type": "bool" }, { - "name": "hle", + "name": "est", "type": "bool" }, { - "name": "mpx", - "type": "bool" + "name": "vendor", + "type": "string" }, { - "name": "invpcid", + "name": "pge", "type": "bool" }, { - "name": "cx8", + "name": "pcommit", "type": "bool" }, { - "name": "pcommit", + "name": "ibs", "type": "bool" }, { - "name": "sse", + "name": "tsc-deadline", "type": "bool" }, { - "name": "syscall", + "name": "misalignsse", "type": "bool" }, { - "name": "tsc_scale", + "name": "kvmclock-stable-bit", "type": "bool" }, { - "name": "movdiri", + "name": "check", "type": "bool" }, { - "name": "ssb-no", + "name": "hv-time", "type": "bool" }, { - "name": "xlevel2", - "type": "uint32" + "name": "perfctr-nb", + "type": "bool" }, { - "name": "hv-time", + "name": "migratable", "type": "bool" }, { - "name": "kvm_pv_eoi", - "type": "bool" + "name": "feature-words", + "type": "X86CPUFeatureWordInfo" }, { - "name": "osvw", - "type": "bool" + "name": "phys-bits", + "type": "uint32" }, { - "name": "perfctr-nb", + "name": "apic", "type": "bool" }, { - "name": "rtm", + "name": "avx512vbmi", "type": "bool" }, { - "name": "avx512-4fmaps", - "type": "bool" + "name": "thread-id", + "type": "int32" }, { - "name": "avx2", - "type": "bool" + "name": "min-xlevel", + "type": "uint32" }, { - "name": "perfctr_nb", - "type": "bool" + "name": "socket-id", + "type": "int32" }, { - "name": "kvm-nopiodelay", + "name": "avx512f", "type": "bool" }, { - "name": "avx512pf", + "name": "arch-capabilities", "type": "bool" }, { - "name": "level", - "type": "uint32" + "name": "bmi2", + "type": "bool" }, { - "name": "phys-bits", - "type": "uint32" + "name": "intel-pt", + "type": "bool" }, { - "name": "cpuid-0xb", + "name": "wdt", "type": "bool" }, { - "name": "tsc-deadline", + "name": "ace2-en", "type": "bool" }, { - "name": "fxsr_opt", + "name": "avx512pf", "type": "bool" }, { - "name": "xgetbv1", + "name": "bmi1", "type": "bool" }, { - "name": "popcnt", + "name": "enforce", "type": "bool" }, { - "name": "umip", + "name": "kvm-nopiodelay", "type": "bool" }, { - "name": "realized", + "name": "sse4.2", "type": "bool" }, { - "name": "phe", + "name": "3dnow", "type": "bool" }, { - "name": "cmp-legacy", + "name": "vmx", "type": "bool" }, { - "name": "dca", + "name": "la57", "type": "bool" }, { - "name": "acpi", + "name": "xgetbv1", "type": "bool" }, { - "name": "pn", + "name": "ibrs-all", "type": "bool" }, { - "name": "model-id", - "type": "string" + "name": "sse4.1", + "type": "bool" }, { - "name": "crash-information", - "type": "GuestPanicInformation" + "name": "xsaveopt", + "type": "bool" }, { - "name": "x-intel-pt-auto-level", + "name": "hv-relaxed", "type": "bool" }, { - "name": "x-hv-synic-kvm-only", + "name": "spec-ctrl", "type": "bool" }, { - "name": "tsc-scale", + "name": "fxsr", "type": "bool" }, { - "name": "node-id", - "type": "int32" + "name": "amd-ssbd", + "type": "bool" }, { - "name": "hv-reenlightenment", + "name": "hv-vapic", "type": "bool" }, { - "name": "cx16", + "name": "phe-en", "type": "bool" }, { - "name": "mmx", + "name": "hv-ipi", "type": "bool" }, { - "name": "topoext", + "name": "hypervisor", "type": "bool" }, { - "name": "pge", + "name": "aes", "type": "bool" }, { - "name": "fsgsbase", + "name": "de", "type": "bool" }, { - "name": "pclmuldq", + "name": "sse4_2", "type": "bool" }, { - "name": "misalignsse", - "type": "bool" + "name": "core-id", + "type": "int32" }, { - "name": "phe-en", + "name": "ss", "type": "bool" }, { @@ -6428,94 +6372,87 @@ "return": [ { "hotpluggable-cpus": true, - "name": "isapc", - "cpu-max": 1 + "name": "pc-0.15", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-1.1", + "name": "pc-i440fx-2.12", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-1.2", + "name": "pc-i440fx-2.0", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-1.3", + "name": "pc-i440fx-2.5", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.8", + "name": "pc-i440fx-1.5", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-1.0", + "name": "pc-q35-2.7", "cpu-max": 255 }, - { - "hotpluggable-cpus": false, - "name": "none", - "cpu-max": 1 - }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.9", + "name": "pc-0.12", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.6", + "name": "pc-i440fx-2.2", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.7", + "name": "pc-1.1", "cpu-max": 255 }, { - "hotpluggable-cpus": true, - "name": "xenfv", - "cpu-max": 128 + "hotpluggable-cpus": false, + "name": "none", + "cpu-max": 1 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-4.1", - "is-default": true, - "cpu-max": 255, - "alias": "pc" + "name": "pc-i440fx-2.7", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.3", + "name": "pc-q35-2.4", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.4", - "cpu-max": 255 + "name": "pc-q35-2.10", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.5", + "name": "pc-i440fx-1.7", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-4.0", + "name": "pc-0.14", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.1", - "cpu-max": 255 + "name": "pc-q35-2.9", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.2", + "name": "pc-i440fx-2.11", "cpu-max": 255 }, { @@ -6525,144 +6462,141 @@ }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.0", - "cpu-max": 255 + "name": "pc-q35-4.1", + "cpu-max": 288, + "alias": "q35" }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.11", - "cpu-max": 288 + "name": "pc-i440fx-2.4", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.12", - "cpu-max": 288 + "name": "pc-1.3", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-3.0", - "cpu-max": 288 - }, - { - "hotpluggable-cpus": false, - "name": "xenpv", - "cpu-max": 1 + "name": "pc-i440fx-4.1", + "is-default": true, + "cpu-max": 255, + "alias": "pc" }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.10", - "cpu-max": 288 + "name": "pc-i440fx-2.9", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-4.0.1", - "cpu-max": 288 + "name": "isapc", + "cpu-max": 1 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-1.7", + "name": "pc-i440fx-1.4", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.9", - "cpu-max": 288 + "name": "pc-q35-2.6", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-0.15", + "name": "pc-i440fx-3.1", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-1.5", - "cpu-max": 255 + "name": "pc-q35-2.12", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.7", + "name": "pc-i440fx-2.1", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-1.6", + "name": "pc-1.0", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.11", + "name": "pc-i440fx-2.6", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.8", + "name": "pc-q35-4.0.1", "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-0.13", + "name": "pc-i440fx-1.6", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.12", + "name": "pc-0.13", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-0.14", - "cpu-max": 255 + "name": "pc-q35-2.8", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-3.0", + "name": "pc-i440fx-2.10", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-3.1", - "cpu-max": 255 + "name": "pc-q35-3.0", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.4", - "cpu-max": 255 + "name": "pc-q35-4.0", + "cpu-max": 288 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.5", + "name": "pc-i440fx-2.3", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-2.6", + "name": "pc-1.2", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-1.4", + "name": "pc-i440fx-4.0", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-i440fx-2.10", + "name": "pc-i440fx-2.8", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-0.12", + "name": "pc-q35-2.5", "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-4.0", - "cpu-max": 288 + "name": "pc-i440fx-3.0", + "cpu-max": 255 }, { "hotpluggable-cpus": true, - "name": "pc-q35-4.1", - "cpu-max": 288, - "alias": "q35" + "name": "pc-q35-2.11", + "cpu-max": 288 } ], "id": "libvirt-38" @@ -6808,7 +6742,6 @@ "name": "Westmere-IBRS", "typename": "Westmere-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -6832,7 +6765,6 @@ "avx512bw", "avx512vl", "pku", - "spec-ctrl", "avx512f", "avx512f", "avx512f", @@ -6864,7 +6796,6 @@ "name": "Skylake-Client-IBRS", "typename": "Skylake-Client-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -6881,7 +6812,6 @@ "name": "SandyBridge-IBRS", "typename": "SandyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -6961,7 +6891,6 @@ "name": "Nehalem-IBRS", "typename": "Nehalem-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -6996,7 +6925,6 @@ "name": "IvyBridge-IBRS", "typename": "IvyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -7029,8 +6957,6 @@ "avx512bitalg", "avx512-vpopcntdq", "la57", - "spec-ctrl", - "ssbd", "wbnoinvd", "avx512f", "avx512f", @@ -7053,8 +6979,6 @@ "avx512vnni", "avx512bitalg", "avx512-vpopcntdq", - "spec-ctrl", - "ssbd", "wbnoinvd", "pku" ], @@ -7065,7 +6989,6 @@ "name": "Haswell-noTSX-IBRS", "typename": "Haswell-noTSX-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -7082,7 +7005,6 @@ "name": "Haswell-IBRS", "typename": "Haswell-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -7167,8 +7089,6 @@ "avx512vl", "pku", "avx512vnni", - "spec-ctrl", - "ssbd", "avx512f", "avx512f", "avx512f", @@ -7181,7 +7101,6 @@ "name": "Broadwell-noTSX-IBRS", "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -7198,7 +7117,6 @@ "name": "Broadwell-IBRS", "typename": "Broadwell-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -15730,7 +15648,10 @@ "type": "bool" } ], - "meta-type": "object" + "meta-type": "object", + "features": [ + "dynamic-auto-read-only" + ] }, { "name": "247", @@ -16094,6 +16015,11 @@ "name": "latency-ns", "default": null, "type": "int" + }, + { + "name": "read-zeroes", + "default": null, + "type": "bool" } ], "meta-type": "object" @@ -17719,6 +17645,11 @@ "name": "variants", "default": null, "type": "[439]" + }, + { + "name": "features", + "default": null, + "type": "[str]" } ], "meta-type": "object" @@ -18451,6 +18382,11 @@ "default": null, "type": "int" }, + { + "name": "iotype", + "default": null, + "type": "454" + }, { "name": "errno", "default": null, @@ -18538,7 +18474,7 @@ "members": [ { "name": "type", - "type": "454" + "type": "455" }, { "name": "host", @@ -18566,10 +18502,10 @@ "name": "371", "members": [ { - "type": "455" + "type": "456" }, { - "type": "456" + "type": "457" } ], "meta-type": "alternate" @@ -18580,17 +18516,17 @@ "variants": [ { "case": "aes", - "type": "458" + "type": "459" }, { "case": "luks", - "type": "459" + "type": "460" } ], "members": [ { "name": "format", - "type": "457" + "type": "458" } ], "meta-type": "object" @@ -18601,13 +18537,13 @@ "variants": [ { "case": "aes", - "type": "458" + "type": "459" } ], "members": [ { "name": "format", - "type": "460" + "type": "461" } ], "meta-type": "object" @@ -18705,7 +18641,7 @@ "variants": [ { "case": "hash", - "type": "462" + "type": "463" }, { "case": "none", @@ -18719,7 +18655,7 @@ "members": [ { "name": "mode", - "type": "461" + "type": "462" } ], "meta-type": "object" @@ -18738,7 +18674,7 @@ { "name": "preallocation", "default": null, - "type": "463" + "type": "464" }, { "name": "nocow", @@ -18762,7 +18698,7 @@ { "name": "preallocation", "default": null, - "type": "463" + "type": "464" } ], "meta-type": "object" @@ -18778,27 +18714,27 @@ { "name": "cipher-alg", "default": null, - "type": "464" + "type": "465" }, { "name": "cipher-mode", "default": null, - "type": "465" + "type": "466" }, { "name": "ivgen-alg", "default": null, - "type": "466" + "type": "467" }, { "name": "ivgen-hash-alg", "default": null, - "type": "467" + "type": "468" }, { "name": "hash-alg", "default": null, - "type": "467" + "type": "468" }, { "name": "iter-time", @@ -18868,7 +18804,7 @@ { "name": "encrypt", "default": null, - "type": "468" + "type": "469" } ], "meta-type": "object" @@ -18897,7 +18833,7 @@ { "name": "version", "default": null, - "type": "469" + "type": "470" }, { "name": "backing-file", @@ -18912,7 +18848,7 @@ { "name": "encrypt", "default": null, - "type": "468" + "type": "469" }, { "name": "cluster-size", @@ -18922,7 +18858,7 @@ { "name": "preallocation", "default": null, - "type": "463" + "type": "464" }, { "name": "lazy-refcounts", @@ -19009,12 +18945,12 @@ { "name": "preallocation", "default": null, - "type": "463" + "type": "464" }, { "name": "redundancy", "default": null, - "type": "470" + "type": "471" }, { "name": "object-size", @@ -19052,7 +18988,7 @@ { "name": "preallocation", "default": null, - "type": "463" + "type": "464" } ], "meta-type": "object" @@ -19081,7 +19017,7 @@ { "name": "subformat", "default": null, - "type": "471" + "type": "472" }, { "name": "block-state-zero", @@ -19110,7 +19046,7 @@ { "name": "subformat", "default": null, - "type": "472" + "type": "473" }, { "name": "backing-file", @@ -19120,7 +19056,7 @@ { "name": "adapter-type", "default": null, - "type": "473" + "type": "474" }, { "name": "hwversion", @@ -19149,7 +19085,7 @@ { "name": "subformat", "default": null, - "type": "474" + "type": "475" }, { "name": "force-size", @@ -19245,7 +19181,7 @@ "members": [ { "name": "data", - "type": "475" + "type": "476" } ], "meta-type": "object" @@ -19255,7 +19191,7 @@ "members": [ { "name": "data", - "type": "476" + "type": "477" } ], "meta-type": "object" @@ -19265,7 +19201,7 @@ "members": [ { "name": "data", - "type": "477" + "type": "478" } ], "meta-type": "object" @@ -19275,7 +19211,7 @@ "members": [ { "name": "data", - "type": "478" + "type": "479" } ], "meta-type": "object" @@ -19285,7 +19221,7 @@ "members": [ { "name": "data", - "type": "479" + "type": "480" } ], "meta-type": "object" @@ -19295,7 +19231,7 @@ "members": [ { "name": "data", - "type": "480" + "type": "481" } ], "meta-type": "object" @@ -19305,7 +19241,7 @@ "members": [ { "name": "data", - "type": "481" + "type": "482" } ], "meta-type": "object" @@ -19315,7 +19251,7 @@ "members": [ { "name": "data", - "type": "482" + "type": "483" } ], "meta-type": "object" @@ -19325,7 +19261,7 @@ "members": [ { "name": "data", - "type": "483" + "type": "484" } ], "meta-type": "object" @@ -19335,7 +19271,7 @@ "members": [ { "name": "data", - "type": "484" + "type": "485" } ], "meta-type": "object" @@ -19345,7 +19281,7 @@ "members": [ { "name": "data", - "type": "485" + "type": "486" } ], "meta-type": "object" @@ -19363,7 +19299,7 @@ "members": [ { "name": "data", - "type": "486" + "type": "487" } ], "meta-type": "object" @@ -19373,7 +19309,7 @@ "members": [ { "name": "data", - "type": "487" + "type": "488" } ], "meta-type": "object" @@ -19401,7 +19337,7 @@ "members": [ { "name": "data", - "type": "488" + "type": "489" } ], "meta-type": "object" @@ -19421,7 +19357,7 @@ "members": [ { "name": "data", - "type": "489" + "type": "490" } ], "meta-type": "object" @@ -19431,7 +19367,7 @@ "members": [ { "name": "data", - "type": "490" + "type": "491" } ], "meta-type": "object" @@ -19441,7 +19377,7 @@ "members": [ { "name": "data", - "type": "491" + "type": "492" } ], "meta-type": "object" @@ -19512,7 +19448,7 @@ "members": [ { "name": "data", - "type": "492" + "type": "493" } ], "meta-type": "object" @@ -19732,7 +19668,7 @@ "members": [ { "name": "bus", - "type": "493" + "type": "494" }, { "name": "devices", @@ -19853,7 +19789,7 @@ "members": [ { "name": "data", - "type": "494" + "type": "495" } ], "meta-type": "object" @@ -19863,7 +19799,7 @@ "members": [ { "name": "data", - "type": "495" + "type": "496" } ], "meta-type": "object" @@ -19873,7 +19809,7 @@ "members": [ { "name": "data", - "type": "496" + "type": "497" } ], "meta-type": "object" @@ -19928,23 +19864,36 @@ "l1_shrink_write_table", "l1_shrink_free_l2_clusters", "cor_write", - "cluster_alloc_space" + "cluster_alloc_space", + "none" ] }, { "name": "454", "meta-type": "enum", "values": [ - "inet" + "read", + "write", + "write-zeroes", + "discard", + "flush", + "block-status" ] }, { "name": "455", + "meta-type": "enum", + "values": [ + "inet" + ] + }, + { + "name": "456", "members": [ { "name": "template", "default": null, - "type": "456" + "type": "457" }, { "name": "main-header", @@ -19995,7 +19944,7 @@ "meta-type": "object" }, { - "name": "456", + "name": "457", "meta-type": "enum", "values": [ "none", @@ -20005,7 +19954,7 @@ ] }, { - "name": "457", + "name": "458", "meta-type": "enum", "values": [ "aes", @@ -20013,7 +19962,7 @@ ] }, { - "name": "458", + "name": "459", "members": [ { "name": "key-secret", @@ -20024,7 +19973,7 @@ "meta-type": "object" }, { - "name": "459", + "name": "460", "members": [ { "name": "key-secret", @@ -20035,14 +19984,14 @@ "meta-type": "object" }, { - "name": "460", + "name": "461", "meta-type": "enum", "values": [ "aes" ] }, { - "name": "461", + "name": "462", "meta-type": "enum", "values": [ "none", @@ -20051,11 +20000,11 @@ ] }, { - "name": "462", + "name": "463", "members": [ { "name": "type", - "type": "497" + "type": "498" }, { "name": "hash", @@ -20065,7 +20014,7 @@ "meta-type": "object" }, { - "name": "463", + "name": "464", "meta-type": "enum", "values": [ "off", @@ -20075,7 +20024,7 @@ ] }, { - "name": "464", + "name": "465", "meta-type": "enum", "values": [ "aes-128", @@ -20093,7 +20042,7 @@ ] }, { - "name": "465", + "name": "466", "meta-type": "enum", "values": [ "ecb", @@ -20103,7 +20052,7 @@ ] }, { - "name": "466", + "name": "467", "meta-type": "enum", "values": [ "plain", @@ -20112,7 +20061,7 @@ ] }, { - "name": "467", + "name": "468", "meta-type": "enum", "values": [ "md5", @@ -20125,28 +20074,28 @@ ] }, { - "name": "468", + "name": "469", "tag": "format", "variants": [ { "case": "qcow", - "type": "458" + "type": "459" }, { "case": "luks", - "type": "499" + "type": "500" } ], "members": [ { "name": "format", - "type": "498" + "type": "499" } ], "meta-type": "object" }, { - "name": "469", + "name": "470", "meta-type": "enum", "values": [ "v2", @@ -20154,28 +20103,28 @@ ] }, { - "name": "470", + "name": "471", "tag": "type", "variants": [ { "case": "full", - "type": "501" + "type": "502" }, { "case": "erasure-coded", - "type": "502" + "type": "503" } ], "members": [ { "name": "type", - "type": "500" + "type": "501" } ], "meta-type": "object" }, { - "name": "471", + "name": "472", "meta-type": "enum", "values": [ "dynamic", @@ -20183,7 +20132,7 @@ ] }, { - "name": "472", + "name": "473", "meta-type": "enum", "values": [ "monolithicSparse", @@ -20194,7 +20143,7 @@ ] }, { - "name": "473", + "name": "474", "meta-type": "enum", "values": [ "ide", @@ -20204,7 +20153,7 @@ ] }, { - "name": "474", + "name": "475", "meta-type": "enum", "values": [ "dynamic", @@ -20212,7 +20161,7 @@ ] }, { - "name": "475", + "name": "476", "members": [ { "name": "logfile", @@ -20242,7 +20191,7 @@ "meta-type": "object" }, { - "name": "476", + "name": "477", "members": [ { "name": "logfile", @@ -20262,7 +20211,7 @@ "meta-type": "object" }, { - "name": "477", + "name": "478", "members": [ { "name": "logfile", @@ -20327,7 +20276,7 @@ "meta-type": "object" }, { - "name": "478", + "name": "479", "members": [ { "name": "logfile", @@ -20352,7 +20301,7 @@ "meta-type": "object" }, { - "name": "479", + "name": "480", "members": [ { "name": "logfile", @@ -20368,7 +20317,7 @@ "meta-type": "object" }, { - "name": "480", + "name": "481", "members": [ { "name": "logfile", @@ -20388,7 +20337,7 @@ "meta-type": "object" }, { - "name": "481", + "name": "482", "members": [ { "name": "logfile", @@ -20409,7 +20358,7 @@ "meta-type": "object" }, { - "name": "482", + "name": "483", "members": [ { "name": "logfile", @@ -20429,7 +20378,7 @@ "meta-type": "object" }, { - "name": "483", + "name": "484", "members": [ { "name": "logfile", @@ -20449,7 +20398,7 @@ "meta-type": "object" }, { - "name": "484", + "name": "485", "members": [ { "name": "logfile", @@ -20485,7 +20434,7 @@ "meta-type": "object" }, { - "name": "485", + "name": "486", "members": [ { "name": "logfile", @@ -20506,7 +20455,7 @@ "meta-type": "object" }, { - "name": "486", + "name": "487", "members": [ { "name": "path", @@ -20522,7 +20471,7 @@ "meta-type": "object" }, { - "name": "487", + "name": "488", "members": [ { "name": "chardev", @@ -20532,7 +20481,7 @@ "meta-type": "object" }, { - "name": "488", + "name": "489", "meta-type": "enum", "values": [ "unmapped", @@ -20686,7 +20635,7 @@ ] }, { - "name": "489", + "name": "490", "members": [ { "name": "key", @@ -20700,11 +20649,11 @@ "meta-type": "object" }, { - "name": "490", + "name": "491", "members": [ { "name": "button", - "type": "503" + "type": "504" }, { "name": "down", @@ -20714,11 +20663,11 @@ "meta-type": "object" }, { - "name": "491", + "name": "492", "members": [ { "name": "axis", - "type": "504" + "type": "505" }, { "name": "value", @@ -20728,13 +20677,13 @@ "meta-type": "object" }, { - "name": "492", + "name": "493", "members": [ ], "meta-type": "object" }, { - "name": "493", + "name": "494", "members": [ { "name": "number", @@ -20750,21 +20699,21 @@ }, { "name": "io_range", - "type": "505" + "type": "506" }, { "name": "memory_range", - "type": "505" + "type": "506" }, { "name": "prefetchable_range", - "type": "505" + "type": "506" } ], "meta-type": "object" }, { - "name": "494", + "name": "495", "members": [ { "name": "compat", @@ -20797,18 +20746,18 @@ { "name": "encrypt", "default": null, - "type": "506" + "type": "507" }, { "name": "bitmaps", "default": null, - "type": "[507]" + "type": "[508]" } ], "meta-type": "object" }, { - "name": "495", + "name": "496", "members": [ { "name": "create-type", @@ -20830,28 +20779,28 @@ "meta-type": "object" }, { - "name": "496", + "name": "497", "members": [ { "name": "cipher-alg", - "type": "464" + "type": "465" }, { "name": "cipher-mode", - "type": "465" + "type": "466" }, { "name": "ivgen-alg", - "type": "466" + "type": "467" }, { "name": "ivgen-hash-alg", "default": null, - "type": "467" + "type": "468" }, { "name": "hash-alg", - "type": "467" + "type": "468" }, { "name": "payload-offset", @@ -20867,13 +20816,13 @@ }, { "name": "slots", - "type": "[508]" + "type": "[509]" } ], "meta-type": "object" }, { - "name": "497", + "name": "498", "meta-type": "enum", "values": [ "md5", @@ -20881,7 +20830,7 @@ ] }, { - "name": "498", + "name": "499", "meta-type": "enum", "values": [ "qcow", @@ -20889,7 +20838,7 @@ ] }, { - "name": "499", + "name": "500", "members": [ { "name": "key-secret", @@ -20899,27 +20848,27 @@ { "name": "cipher-alg", "default": null, - "type": "464" + "type": "465" }, { "name": "cipher-mode", "default": null, - "type": "465" + "type": "466" }, { "name": "ivgen-alg", "default": null, - "type": "466" + "type": "467" }, { "name": "ivgen-hash-alg", "default": null, - "type": "467" + "type": "468" }, { "name": "hash-alg", "default": null, - "type": "467" + "type": "468" }, { "name": "iter-time", @@ -20930,7 +20879,7 @@ "meta-type": "object" }, { - "name": "500", + "name": "501", "meta-type": "enum", "values": [ "full", @@ -20938,7 +20887,7 @@ ] }, { - "name": "501", + "name": "502", "members": [ { "name": "copies", @@ -20948,7 +20897,7 @@ "meta-type": "object" }, { - "name": "502", + "name": "503", "members": [ { "name": "data-strips", @@ -20962,7 +20911,7 @@ "meta-type": "object" }, { - "name": "503", + "name": "504", "meta-type": "enum", "values": [ "left", @@ -20975,7 +20924,7 @@ ] }, { - "name": "504", + "name": "505", "meta-type": "enum", "values": [ "x", @@ -20983,7 +20932,7 @@ ] }, { - "name": "505", + "name": "506", "members": [ { "name": "base", @@ -20997,12 +20946,12 @@ "meta-type": "object" }, { - "name": "506", + "name": "507", "tag": "format", "variants": [ { "case": "luks", - "type": "496" + "type": "497" }, { "case": "aes", @@ -21012,18 +20961,18 @@ "members": [ { "name": "format", - "type": "457" + "type": "458" } ], "meta-type": "object" }, { - "name": "[507]", - "element-type": "507", + "name": "[508]", + "element-type": "508", "meta-type": "array" }, { - "name": "507", + "name": "508", "members": [ { "name": "name", @@ -21035,7 +20984,7 @@ }, { "name": "flags", - "type": "[509]" + "type": "[510]" } ], "meta-type": "object" @@ -21046,12 +20995,12 @@ "meta-type": "array" }, { - "name": "[508]", - "element-type": "508", + "name": "[509]", + "element-type": "509", "meta-type": "array" }, { - "name": "508", + "name": "509", "members": [ { "name": "active", @@ -21075,12 +21024,12 @@ "meta-type": "object" }, { - "name": "[509]", - "element-type": "509", + "name": "[510]", + "element-type": "510", "meta-type": "array" }, { - "name": "509", + "name": "510", "meta-type": "enum", "values": [ "in-use", @@ -21160,7 +21109,7 @@ "3dnowprefetch": true, "avx512vbmi2": false, "cr8legacy": false, - "stibp": false, + "stibp": true, "xcrypt-en": false, "pn": false, "rsba": false, @@ -21206,7 +21155,7 @@ "svm": false, "invtsc": false, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, @@ -21245,7 +21194,7 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, @@ -21274,7 +21223,7 @@ "sep": true, "virt-ssbd": false, "nodeid-msr": false, - "md-clear": false, + "md-clear": true, "misalignsse": false, "min-xlevel": 2147483656, "bmi1": true, @@ -21380,7 +21329,7 @@ "3dnowprefetch": true, "avx512vbmi2": false, "cr8legacy": false, - "stibp": false, + "stibp": true, "xcrypt-en": false, "pn": false, "rsba": false, @@ -21424,9 +21373,9 @@ "syscall": true, "avx512dq": false, "svm": false, - "invtsc": false, + "invtsc": true, "sse2": true, - "ssbd": false, + "ssbd": true, "est": false, "avx512ifma": false, "tm2": false, @@ -21465,7 +21414,7 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, @@ -21494,7 +21443,7 @@ "sep": true, "virt-ssbd": false, "nodeid-msr": false, - "md-clear": false, + "md-clear": true, "misalignsse": false, "min-xlevel": 2147483656, "bmi1": true, diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 0e546bae1e..9cbf65b405 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -210,7 +210,7 @@ <version>4000050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100759</microcodeVersion> - <package>v4.0.0-1173-g9c70209b63</package> + <package>v4.0.0-1481-g33d6099906</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='cmov' type='boolean' value='true' migratable='yes'/> @@ -253,7 +253,7 @@ <property name='3dnowprefetch' type='boolean' value='true' migratable='yes'/> <property name='avx512vbmi2' type='boolean' value='false'/> <property name='cr8legacy' type='boolean' value='false'/> - <property name='stibp' type='boolean' value='false'/> + <property name='stibp' type='boolean' value='true' migratable='yes'/> <property name='xcrypt-en' type='boolean' value='false'/> <property name='pn' type='boolean' value='false'/> <property name='rsba' type='boolean' value='false'/> @@ -297,9 +297,9 @@ <property name='syscall' type='boolean' value='true' migratable='yes'/> <property name='avx512dq' type='boolean' value='false'/> <property name='svm' type='boolean' value='false'/> - <property name='invtsc' type='boolean' value='false'/> + <property name='invtsc' type='boolean' value='true' migratable='no'/> <property name='sse2' type='boolean' value='true' migratable='yes'/> - <property name='ssbd' type='boolean' value='false'/> + <property name='ssbd' type='boolean' value='true' migratable='yes'/> <property name='est' type='boolean' value='false'/> <property name='avx512ifma' type='boolean' value='false'/> <property name='tm2' type='boolean' value='false'/> @@ -338,7 +338,7 @@ <property name='osvw' type='boolean' value='false'/> <property name='apic' type='boolean' value='true' migratable='yes'/> <property name='pmm' type='boolean' value='false'/> - <property name='spec-ctrl' type='boolean' value='false'/> + <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/> <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='kvm-steal-time' type='boolean' value='true' migratable='yes'/> <property name='kvmclock' type='boolean' value='true' migratable='yes'/> @@ -367,7 +367,7 @@ <property name='sep' type='boolean' value='true' migratable='yes'/> <property name='virt-ssbd' type='boolean' value='false'/> <property name='nodeid-msr' type='boolean' value='false'/> - <property name='md-clear' type='boolean' value='false'/> + <property name='md-clear' type='boolean' value='true' migratable='yes'/> <property name='misalignsse' type='boolean' value='false'/> <property name='min-xlevel' type='number' value='2147483656'/> <property name='bmi1' type='boolean' value='true' migratable='yes'/> @@ -632,9 +632,7 @@ <blocker name='3dnowext'/> <blocker name='3dnow'/> </cpu> - <cpu type='kvm' name='Westmere-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Westmere-IBRS' usable='yes'/> <cpu type='kvm' name='Westmere' usable='yes'/> <cpu type='kvm' name='Skylake-Server-IBRS' usable='no'> <blocker name='avx512f'/> @@ -644,7 +642,6 @@ <blocker name='avx512bw'/> <blocker name='avx512vl'/> <blocker name='pku'/> - <blocker name='spec-ctrl'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -663,13 +660,9 @@ <blocker name='avx512f'/> <blocker name='pku'/> </cpu> - <cpu type='kvm' name='Skylake-Client-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Skylake-Client-IBRS' usable='yes'/> <cpu type='kvm' name='Skylake-Client' usable='yes'/> - <cpu type='kvm' name='SandyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='SandyBridge' usable='yes'/> <cpu type='kvm' name='Penryn' usable='yes'/> <cpu type='kvm' name='Opteron_G5' usable='no'> @@ -695,9 +688,7 @@ </cpu> <cpu type='kvm' name='Opteron_G2' usable='yes'/> <cpu type='kvm' name='Opteron_G1' usable='yes'/> - <cpu type='kvm' name='Nehalem-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/> <cpu type='kvm' name='Nehalem' usable='yes'/> <cpu type='kvm' name='KnightsMill' usable='no'> <blocker name='avx512f'/> @@ -711,9 +702,7 @@ <blocker name='avx512f'/> <blocker name='avx512f'/> </cpu> - <cpu type='kvm' name='IvyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='IvyBridge' usable='yes'/> <cpu type='kvm' name='Icelake-Server' usable='no'> <blocker name='avx512f'/> @@ -732,8 +721,6 @@ <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> <blocker name='la57'/> - <blocker name='spec-ctrl'/> - <blocker name='ssbd'/> <blocker name='wbnoinvd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> @@ -750,18 +737,12 @@ <blocker name='avx512vnni'/> <blocker name='avx512bitalg'/> <blocker name='avx512-vpopcntdq'/> - <blocker name='spec-ctrl'/> - <blocker name='ssbd'/> <blocker name='wbnoinvd'/> <blocker name='pku'/> </cpu> - <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell-noTSX' usable='yes'/> - <cpu type='kvm' name='Haswell-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Haswell-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell' usable='yes'/> <cpu type='kvm' name='EPYC-IBPB' usable='no'> <blocker name='sha-ni'/> @@ -807,20 +788,14 @@ <blocker name='avx512vl'/> <blocker name='pku'/> <blocker name='avx512vnni'/> - <blocker name='spec-ctrl'/> - <blocker name='ssbd'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='avx512f'/> <blocker name='pku'/> </cpu> - <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Broadwell-noTSX-IBRS' usable='yes'/> <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/> - <cpu type='kvm' name='Broadwell-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Broadwell-IBRS' usable='yes'/> <cpu type='kvm' name='Broadwell' usable='yes'/> <cpu type='kvm' name='486' usable='yes'/> <cpu type='tcg' name='max' usable='yes'/> @@ -1219,49 +1194,47 @@ </cpu> <cpu type='tcg' name='486' usable='yes'/> <machine name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/> - <machine name='isapc' hotplugCpus='yes' maxCpus='1'/> - <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/> - <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> - <machine name='xenpv' maxCpus='1'/> + <machine name='pc-1.1' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-0.15' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-0.14' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-1.3' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> + <machine name='isapc' hotplugCpus='yes' maxCpus='1'/> <machine name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-1.0' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-0.13' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/> - <machine name='pc-0.12' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/> - <machine name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-1.2' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/> + <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> </qemuCaps> -- 2.21.0

3 2

[libvirt] [PATCH v2] syntax check: update header guard check
by Jonathon Jongsma 20 Jun '19

20 Jun '19

Internal headers should use #pragma once instead of the standard #ifndef guard. Public headers still require the existing header guard. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v2: - fix error messages when no header guard is found (#ifndef for public headers, #pragma for internal headers) - fix test for identifying public headers (omit initial '/') - fix code spacing build-aux/header-ifdef.pl | 41 +++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl index 401f25fb81..dba3dbcbdc 100644 --- a/build-aux/header-ifdef.pl +++ b/build-aux/header-ifdef.pl @@ -6,18 +6,26 @@ # ...copyright header... # */ # <one blank line> -# #ifndef SYMBOL -# # define SYMBOL +# #pragma once # ....content.... -# #endif /* SYMBOL */ # -# For any file ending priv.h, before the #ifndef +#--- +# +# For any file ending priv.h, before the #pragma once # We will have a further section # # #ifndef SYMBOL_ALLOW # # error .... # #endif /* SYMBOL_ALLOW */ # <one blank line> +# +#--- +# +# For public headers (files in include/), use the standard header guard instead of #pragma once: +# #ifndef SYMBOL +# # define SYMBOL +# ....content.... +# #endif /* SYMBOL */ use strict; use warnings; @@ -38,6 +46,7 @@ my $file = " "; my $ret = 0; my $ifdef = ""; my $ifdefpriv = ""; +my $publicheader = 0; my $state = $STATE_EOF; my $mistake = 0; @@ -64,7 +73,11 @@ while (<>) { } elsif ($state == $STATE_PRIV_BLANK) { &mistake("$file: missing blank line after priv header check"); } elsif ($state == $STATE_GUARD_START) { - &mistake("$file: missing '#ifndef $ifdef'"); + if ($publicheader) { + &mistake("$file: missing '#ifndef $ifdef'"); + } else { + &mistake("$file: missing '#pragma once' header guard"); + } } elsif ($state == $STATE_GUARD_DEFINE) { &mistake("$file: missing '# define $ifdef'"); } elsif ($state == $STATE_GUARD_END) { @@ -83,6 +96,7 @@ while (<>) { $file = $ARGV; $state = $STATE_COPYRIGHT_COMMENT; $mistake = 0; + $publicheader = ($ARGV =~ /include\//); } if ($mistake || @@ -133,12 +147,19 @@ while (<>) { } elsif ($state == $STATE_GUARD_START) { if (/^$/) { &mistake("$file: too many blank lines after copyright header"); - } elsif(/#pragma once/) { - $state = $STATE_PRAGMA; - } elsif (/#ifndef $ifdef$/) { - $state = $STATE_GUARD_DEFINE; + } + if ($publicheader) { + if (/#ifndef $ifdef$/) { + $state = $STATE_GUARD_DEFINE; + } else { + &mistake("$file: missing '#ifndef $ifdef'"); + } } else { - &mistake("$file: missing '#ifndef $ifdef'"); + if (/#pragma once/) { + $state = $STATE_PRAGMA; + } else { + &mistake("$file: missing '#pragma once' header guard"); + } } } elsif ($state == $STATE_GUARD_DEFINE) { if (/# define $ifdef$/) { -- 2.20.1

2 1

[libvirt] [PATCH 00/24] Finish support for IA32_ARCH_CAPABILITIES MSR features
by Jiri Denemark 19 Jun '19

19 Jun '19

The MSR infrastructure is already present in our cpu driver, but no features were introduced yet since we needed additional support from QEMU. This is now pushed upstream and we can finally enable MSR features for QEMU. However, one more bit is missing here: we need to make sure to not use any MSR bits with QEMU which lack support for "unavailable-features" CPU property, otherwise migration, snapshots and save/restore would be broken. I'll send patches for this later to give more time for reviewing the core of this series. Jiri Denemark (24): qemu: Drop qemuFeatureNoEffect qemu_process: Drop cleanup label from qemuProcessUpdateGuestCPU cpu_conf: Introduce virCPUDefFilterFeatures qemu: Filter CPU features in active XML qemuxml2argvtest: Switch some tests to DO_TEST_CAPS_* qemu_command: Use consistent syntax for CPU features tests: Add QEMU caps data for future 4.1.0 tests: Add domain capabilities case for QEMU 4.1.0 qemuxml2argvtest: Add 4.0.0 cases for kvm features tests qemuxml2argvtest: Add test for CPU features translation qemu: Add APIs for translating CPU features qemu: Probe for max-x86_64-cpu type qemu: Probe for "unavailable-features" CPU property qemu: Probe host CPU after capabilities qemu_command: Use canonical names of CPU features qemu: Translate feature names from query-cpu-model-expansion qemu: Don't use full CPU model expansion qemu: Make qemuMonitorGetGuestCPU usable on x86 only cpu: Introduce virCPUDataAddFeature qemu: Add type filter to qemuMonitorJSONParsePropsList qemu: Introduce generic qemuMonitorGetGuestCPU qemu_process: Prefer generic qemuMonitorGetGuestCPU cpu_x86: Read CPU features from IA32_ARCH_CAPABILITIES MSR cpu_map: Introduce IA32_ARCH_CAPABILITIES MSR features src/conf/cpu_conf.c | 22 + src/conf/cpu_conf.h | 5 + src/cpu/cpu.c | 33 + src/cpu/cpu.h | 9 + src/cpu/cpu_x86.c | 25 +- src/cpu/cpu_x86.h | 3 - src/cpu_map/x86_features.xml | 20 + src/libvirt_private.syms | 3 +- src/qemu/qemu_capabilities.c | 125 +- src/qemu/qemu_capabilities.h | 11 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_command.c | 65 +- src/qemu/qemu_monitor.c | 51 +- src/qemu/qemu_monitor.h | 11 +- src/qemu/qemu_monitor_json.c | 272 +- src/qemu/qemu_monitor_json.h | 8 +- src/qemu/qemu_process.c | 70 +- tests/cputest.c | 2 +- .../x86_64-cpuid-Core-i7-7600U-enabled.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-json.xml | 1 + ...86_64-cpuid-Xeon-Platinum-8268-enabled.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 4 + .../x86_64-cpuid-Xeon-Platinum-8268-json.xml | 3 + .../qemu_3.1.0.x86_64.xml | 1 + .../qemu_4.0.0.x86_64.xml | 1 + .../qemu_4.1.0.x86_64.xml | 161 + tests/domaincapstest.c | 5 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.x86_64.replies | 1104 +- .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../caps_3.0.0.x86_64.replies | 1132 +- .../caps_3.0.0.x86_64.xml | 1 + .../caps_3.1.0.x86_64.replies | 1180 +- .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.x86_64.replies | 1196 +- .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.replies | 22716 ++++++++++++++++ .../caps_4.1.0.x86_64.xml | 1267 + tests/qemumonitorjsontest.c | 10 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 37 + .../cpu-translation.x86_64-4.0.0.args | 36 + .../cpu-translation.x86_64-latest.args | 36 + tests/qemuxml2argvdata/cpu-translation.xml | 34 + .../cpu-tsc-frequency.x86_64-4.0.0.args | 36 + ...ed.args => eoi-disabled.x86_64-2.7.0.args} | 12 +- .../eoi-disabled.x86_64-4.0.0.args | 33 + .../eoi-disabled.x86_64-latest.args | 33 + ...led.args => eoi-enabled.x86_64-2.7.0.args} | 12 +- .../eoi-enabled.x86_64-4.0.0.args | 33 + .../eoi-enabled.x86_64-latest.args | 33 + ...> kvmclock+eoi-disabled.x86_64-2.7.0.args} | 12 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 33 + .../kvmclock+eoi-disabled.x86_64-latest.args | 33 + ...=> pv-spinlock-disabled.x86_64-2.7.0.args} | 12 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 33 + .../pv-spinlock-disabled.x86_64-latest.args | 33 + ... => pv-spinlock-enabled.x86_64-2.7.0.args} | 12 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 33 + .../pv-spinlock-enabled.x86_64-latest.args | 33 + tests/qemuxml2argvtest.c | 22 +- 63 files changed, 29815 insertions(+), 308 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-translation.xml create mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args rename tests/qemuxml2argvdata/{eoi-disabled.args => eoi-disabled.x86_64-2.7.0.args} (65%) create mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args rename tests/qemuxml2argvdata/{eoi-enabled.args => eoi-enabled.x86_64-2.7.0.args} (65%) create mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args rename tests/qemuxml2argvdata/{kvmclock+eoi-disabled.args => kvmclock+eoi-disabled.x86_64-2.7.0.args} (66%) create mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args rename tests/qemuxml2argvdata/{pv-spinlock-disabled.args => pv-spinlock-disabled.x86_64-2.7.0.args} (66%) create mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args rename tests/qemuxml2argvdata/{pv-spinlock-enabled.args => pv-spinlock-enabled.x86_64-2.7.0.args} (66%) create mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args -- 2.22.0

2 51

[libvirt] [PATCH] qemuProcessLaunch: Return earlier if spawning qemu failed
by Michal Privoznik 19 Jun '19

19 Jun '19

If spawning qemu fails then we report an error and proceed to writing status XML onto the disk. This is unnecessary as we are sure that the domain is not running. At the same time, if virPidFileReadPath() fails it returns -errno. Use it in the error message. It may explain what went wrong. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90466771cd..5b5864c021 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6624,16 +6624,18 @@ qemuProcessLaunch(virConnectPtr conn, /* wait for qemu process to show up */ if (rv == 0) { - if (virPidFileReadPath(priv->pidfile, &vm->pid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain %s didn't show up"), vm->def->name); - rv = -1; + if ((rv = virPidFileReadPath(priv->pidfile, &vm->pid)) < 0) { + virReportSystemError(-rv, + _("Domain %s didn't show up"), + vm->def->name); + goto cleanup; } VIR_DEBUG("QEMU vm=%p name=%s running with pid=%lld", vm, vm->def->name, (long long)vm->pid); } else { VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", vm, vm->def->name); + goto cleanup; } VIR_DEBUG("Writing early domain status to disk"); -- 2.21.0

2 1

[libvirt] [PATCH] remote: delete the avahi mDNS support
by Daniel P. Berrangé 19 Jun '19

19 Jun '19

Libvirtd has long had integration with avahi for advertising libvirtd using mDNS when TCP/TLS listening is enabled. For a long time the virt-manager application had support for auto-detecting libvirtds on the local network using mDNS, but this was removed last year commit fc8f8d5d7e3ba80a0771df19cf20e84a05ed2422 Author: Cole Robinson <crobinso(a)redhat.com> Date: Sat Oct 6 20:55:31 2018 -0400 connect: Drop avahi support Libvirtd can advertise itself over avahi. The feature is disabled by default though and in practice I hear of no one actually using it and frankly I don't think it's all that useful The 'Open Connection' wizard has a disproportionate amount of code devoted to this feature, but I don't think it's useful or worth maintaining, so let's drop it I've never heard of any other applications having support for using mDNS to detect libvirtd instances. Though it is theoretically possible something exists out there, it is clearly going to be a niche use case in the virt ecosystem as a whole. By removing avahi integration we can cut down the dependancy chain for the basic libvirtd install and reduce our code maint burden. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- cfg.mk | 3 - configure.ac | 3 - docs/internals/rpc.html.in | 7 - docs/remote.html.in | 17 - docs/windows.html.in | 1 - libvirt.spec.in | 3 - m4/virt-avahi.m4 | 30 - mingw-libvirt.spec.in | 1 - po/POTFILES | 1 - src/libvirt_remote.syms | 13 - src/locking/lock_daemon.c | 6 +- src/logging/log_daemon.c | 6 +- src/lxc/lxc_controller.c | 3 +- src/remote/libvirtd.aug | 2 - src/remote/libvirtd.conf | 17 - src/remote/remote_daemon.c | 18 +- src/remote/remote_daemon_config.c | 29 - src/remote/remote_daemon_config.h | 3 - src/remote/test_libvirtd.aug.in | 2 - src/rpc/Makefile.inc.am | 4 - src/rpc/virnetdaemon.c | 14 - src/rpc/virnetserver.c | 64 +- src/rpc/virnetserver.h | 6 +- src/rpc/virnetservermdns.c | 682 ------------------ src/rpc/virnetservermdns.h | 107 --- tests/virconfdata/libvirtd.conf | 17 - tests/virconfdata/libvirtd.out | 14 - ...dmin-nomdns.json => input-data-admin.json} | 0 .../input-data-initial-nomdns.json | 63 -- .../virnetdaemondata/input-data-initial.json | 1 - ...min-nomdns.json => output-data-admin.json} | 0 .../output-data-initial-nomdns.json | 72 -- .../virnetdaemondata/output-data-initial.json | 1 - tests/virnetdaemontest.c | 17 +- 34 files changed, 16 insertions(+), 1211 deletions(-) delete mode 100644 m4/virt-avahi.m4 delete mode 100644 src/rpc/virnetservermdns.c delete mode 100644 src/rpc/virnetservermdns.h rename tests/virnetdaemondata/{input-data-admin-nomdns.json => input-data-admin.json} (100%) delete mode 100644 tests/virnetdaemondata/input-data-initial-nomdns.json rename tests/virnetdaemondata/{output-data-admin-nomdns.json => output-data-admin.json} (100%) delete mode 100644 tests/virnetdaemondata/output-data-initial-nomdns.json diff --git a/cfg.mk b/cfg.mk index c0c240b2c0..9465838175 100644 --- a/cfg.mk +++ b/cfg.mk @@ -146,9 +146,6 @@ useless_free_options = \ --name=virJSONValueFree \ --name=virLastErrFreeData \ --name=virNetMessageFree \ - --name=virNetServerMDNSFree \ - --name=virNetServerMDNSEntryFree \ - --name=virNetServerMDNSGroupFree \ --name=virNWFilterDefFree \ --name=virNWFilterEntryFree \ --name=virNWFilterHashTableFree \ diff --git a/configure.ac b/configure.ac index 1f05055d6f..3489a5725e 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,6 @@ LIBVIRT_LINKER_NO_UNDEFINED LIBVIRT_ARG_APPARMOR LIBVIRT_ARG_ATTR LIBVIRT_ARG_AUDIT -LIBVIRT_ARG_AVAHI LIBVIRT_ARG_BASH_COMPLETION LIBVIRT_ARG_BLKID LIBVIRT_ARG_CAPNG @@ -284,7 +283,6 @@ LIBVIRT_CHECK_APPARMOR LIBVIRT_CHECK_ATOMIC LIBVIRT_CHECK_ATTR LIBVIRT_CHECK_AUDIT -LIBVIRT_CHECK_AVAHI LIBVIRT_CHECK_BASH_COMPLETION LIBVIRT_CHECK_BLKID LIBVIRT_CHECK_CAPNG @@ -970,7 +968,6 @@ LIBVIRT_RESULT_ACL LIBVIRT_RESULT_APPARMOR LIBVIRT_RESULT_ATTR LIBVIRT_RESULT_AUDIT -LIBVIRT_RESULT_AVAHI LIBVIRT_RESULT_BASH_COMPLETION LIBVIRT_RESULT_BLKID LIBVIRT_RESULT_CAPNG diff --git a/docs/internals/rpc.html.in b/docs/internals/rpc.html.in index 048192f818..40d844f31c 100644 --- a/docs/internals/rpc.html.in +++ b/docs/internals/rpc.html.in @@ -539,13 +539,6 @@ C <-- |32| 8 | 1 | 3 | 1 | 1 | 0 | .o.oOo | <-- S (reply) be part of the underlying server. </dd> - <dt><code>virNetServerMDNSPtr</code> (virnetservermdns.h)</dt> - <dd>The virNetServerMDNS APIs are used to advertise a server - across the local network, enabling clients to automatically - detect the existence of remote services. This is done by - interfacing with the Avahi mDNS advertisement service. - </dd> - <dt><code>virNetServerClientPtr</code> (virnetserverclient.h)</dt> <dd>The virNetServerClient APIs are used to manage I/O related to a single client network connection. It handles initial diff --git a/docs/remote.html.in b/docs/remote.html.in index de09975039..fbcc8bf01c 100644 --- a/docs/remote.html.in +++ b/docs/remote.html.in @@ -821,23 +821,6 @@ Blank lines and comments beginning with <code>#</code> are ignored. <td> "16509" </td> <td> The port number or service name to listen on for unencrypted TCP connections. -</td> - </tr> - <tr> - <td> mdns_adv <i>[0|1]</i> </td> - <td> 0 (advertise with mDNS) </td> - <td> - If set to 1 then the virtualization service will be advertised over - mDNS to hosts on the local LAN segment. -</td> - </tr> - <tr> - <td> mdns_name <i>"name"</i> </td> - <td> "Virtualization Host HOSTNAME" </td> - <td> - The name to advertise for this host with Avahi mDNS. The default - includes the machine's short hostname. This must be unique to the - local LAN segment. </td> </tr> <tr> diff --git a/docs/windows.html.in b/docs/windows.html.in index 57abf8fde5..096d118bf7 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -182,7 +182,6 @@ <pre> ./configure \ --without-sasl \ - --without-avahi \ --without-polkit \ --without-python \ --without-libxl \ diff --git a/libvirt.spec.in b/libvirt.spec.in index 3b5b4925fd..d54f58f1d4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -297,7 +297,6 @@ BuildRequires: sanlock-devel >= 2.4 %endif BuildRequires: libpcap-devel BuildRequires: libnl3-devel -BuildRequires: avahi-devel BuildRequires: libselinux-devel BuildRequires: dnsmasq >= 2.41 BuildRequires: iptables @@ -436,7 +435,6 @@ Requires: iproute Requires: iproute-tc %endif -Requires: avahi-libs Requires: polkit >= 0.112 %ifarch %{ix86} x86_64 ia64 # For virConnectGetSysinfo @@ -1163,7 +1161,6 @@ rm -f po/stamp-po %{?arg_vbox} \ %{?arg_libxl} \ --with-sasl \ - --with-avahi \ --with-polkit \ --with-libvirtd \ %{?arg_phyp} \ diff --git a/m4/virt-avahi.m4 b/m4/virt-avahi.m4 deleted file mode 100644 index d4b3fc6131..0000000000 --- a/m4/virt-avahi.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libavahi.so library -dnl -dnl Copyright (C) 2012-2013 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_ARG_AVAHI],[ - LIBVIRT_ARG_WITH_FEATURE([AVAHI], [avahi-client], [check], [0.6.0]) -]) - -AC_DEFUN([LIBVIRT_CHECK_AVAHI],[ - LIBVIRT_CHECK_PKG([AVAHI], [avahi-client], [0.6.0]) -]) - -AC_DEFUN([LIBVIRT_RESULT_AVAHI],[ - LIBVIRT_RESULT_LIB([AVAHI]) -]) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 9add033669..280db4d1aa 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -167,7 +167,6 @@ autoreconf -if --without-vbox \ %{?_without_xenapi} \ --without-sasl \ - --without-avahi \ --without-polkit \ --without-libvirtd \ %{?_without_phyp} \ diff --git a/po/POTFILES b/po/POTFILES index 9dd4ee7d99..a5614ac88d 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -161,7 +161,6 @@ src/rpc/virnetmessage.c src/rpc/virnetsaslcontext.c src/rpc/virnetserver.c src/rpc/virnetserverclient.c -src/rpc/virnetservermdns.c src/rpc/virnetserverprogram.c src/rpc/virnetserverservice.c src/rpc/virnetsocket.c diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 3d68f6ce0a..eb7651a957 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -182,19 +182,6 @@ virNetServerClientStartKeepAlive; virNetServerClientWantCloseLocked; -# rpc/virnetservermdns.h -virNetServerMDNSAddEntry; -virNetServerMDNSAddGroup; -virNetServerMDNSEntryFree; -virNetServerMDNSFree; -virNetServerMDNSGroupFree; -virNetServerMDNSNew; -virNetServerMDNSRemoveEntry; -virNetServerMDNSRemoveGroup; -virNetServerMDNSStart; -virNetServerMDNSStop; - - # rpc/virnetserverprogram.h virNetServerProgramDispatch; virNetServerProgramGetID; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index d714ddd2dd..bc2fb4a7fb 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -167,7 +167,6 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged) if (!(srv = virNetServerNew("virtlockd", 1, 0, 0, 0, config->max_clients, config->max_clients, -1, 0, - NULL, virLockDaemonClientNew, virLockDaemonClientPreExecRestart, virLockDaemonClientFree, @@ -182,7 +181,6 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool privileged) if (!(srv = virNetServerNew("admin", 1, 0, 0, 0, config->admin_max_clients, config->admin_max_clients, -1, 0, - NULL, remoteAdmClientNew, remoteAdmClientPreExecRestart, remoteAdmClientFree, @@ -623,7 +621,7 @@ virLockDaemonSetupNetworkingSystemD(virNetServerPtr lockSrv, virNetServerPtr adm false, 0, 1))) return -1; - if (virNetServerAddService(srv, svc, NULL) < 0) { + if (virNetServerAddService(srv, svc) < 0) { virObjectUnref(svc); return -1; } @@ -644,7 +642,7 @@ virLockDaemonSetupNetworkingNative(virNetServerPtr srv, const char *sock_path) false, 0, 1))) return -1; - if (virNetServerAddService(srv, svc, NULL) < 0) { + if (virNetServerAddService(srv, svc) < 0) { virObjectUnref(svc); return -1; } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3469d87caa..014596b280 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -162,7 +162,6 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) if (!(srv = virNetServerNew("virtlogd", 1, 0, 0, 0, config->max_clients, config->max_clients, -1, 0, - NULL, virLogDaemonClientNew, virLogDaemonClientPreExecRestart, virLogDaemonClientFree, @@ -177,7 +176,6 @@ virLogDaemonNew(virLogDaemonConfigPtr config, bool privileged) if (!(srv = virNetServerNew("admin", 1, 0, 0, 0, config->admin_max_clients, config->admin_max_clients, -1, 0, - NULL, remoteAdmClientNew, remoteAdmClientPreExecRestart, remoteAdmClientFree, @@ -558,7 +556,7 @@ virLogDaemonSetupNetworkingSystemD(virNetServerPtr logSrv, virNetServerPtr admin false, 0, 1))) return -1; - if (virNetServerAddService(srv, svc, NULL) < 0) { + if (virNetServerAddService(srv, svc) < 0) { virObjectUnref(svc); return -1; } @@ -579,7 +577,7 @@ virLogDaemonSetupNetworkingNative(virNetServerPtr srv, const char *sock_path) false, 0, 1))) return -1; - if (virNetServerAddService(srv, svc, NULL) < 0) { + if (virNetServerAddService(srv, svc) < 0) { virObjectUnref(svc); return -1; } diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index cd842f2980..c677eb8f6d 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -953,7 +953,6 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) if (!(srv = virNetServerNew("LXC", 1, 0, 0, 0, 1, 0, -1, 0, - NULL, virLXCControllerClientPrivateNew, NULL, virLXCControllerClientPrivateFree, @@ -976,7 +975,7 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) if (virSecurityManagerClearSocketLabel(ctrl->securityManager, ctrl->def) < 0) goto error; - if (virNetServerAddService(srv, svc, NULL) < 0) + if (virNetServerAddService(srv, svc) < 0) goto error; virObjectUnref(svc); svc = NULL; diff --git a/src/remote/libvirtd.aug b/src/remote/libvirtd.aug index 13333448a4..0188c23dd7 100644 --- a/src/remote/libvirtd.aug +++ b/src/remote/libvirtd.aug @@ -29,8 +29,6 @@ module Libvirtd = | str_entry "tls_port" | str_entry "tcp_port" | str_entry "listen_addr" - | bool_entry "mdns_adv" - | str_entry "mdns_name" let sock_acl_entry = str_entry "unix_sock_group" | str_entry "unix_sock_ro_perms" diff --git a/src/remote/libvirtd.conf b/src/remote/libvirtd.conf index 233c127156..bbeb053495 100644 --- a/src/remote/libvirtd.conf +++ b/src/remote/libvirtd.conf @@ -50,23 +50,6 @@ #listen_addr = "192.168.0.1" -# Flag toggling mDNS advertizement of the libvirt service. -# -# Alternatively can disable for all services on a host by -# stopping the Avahi daemon -# -# This is disabled by default, uncomment this to enable it -#mdns_adv = 1 - -# Override the default mDNS advertizement name. This must be -# unique on the immediate broadcast network. -# -# The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is substituted for the short hostname of the machine (without domain) -# -#mdns_name = "Virtualization Host Joe Demo" - - ################################################################# # # UNIX socket access controls diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index c1544ba914..fdc9e4333a 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -429,14 +429,11 @@ daemonSetupNetworking(virNetServerPtr srv, goto cleanup; } - if (virNetServerAddService(srv, svc, - config->mdns_adv && !ipsock ? - "_libvirt._tcp" : - NULL) < 0) + if (virNetServerAddService(srv, svc) < 0) goto cleanup; if (svcRO && - virNetServerAddService(srv, svcRO, NULL) < 0) + virNetServerAddService(srv, svcRO) < 0) goto cleanup; if (sock_path_adm) { @@ -451,7 +448,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->admin_max_client_requests))) goto cleanup; - if (virNetServerAddService(srvAdm, svcAdm, NULL) < 0) + if (virNetServerAddService(srvAdm, svcAdm) < 0) goto cleanup; } @@ -469,8 +466,7 @@ daemonSetupNetworking(virNetServerPtr srv, config->max_client_requests))) goto cleanup; - if (virNetServerAddService(srv, svcTCP, - config->mdns_adv ? "_libvirt._tcp" : NULL) < 0) + if (virNetServerAddService(srv, svcTCP) < 0) goto cleanup; } @@ -530,9 +526,7 @@ daemonSetupNetworking(virNetServerPtr srv, virObjectUnref(ctxt); goto cleanup; } - if (virNetServerAddService(srv, svcTLS, - config->mdns_adv && - !config->listen_tcp ? "_libvirt._tcp" : NULL) < 0) + if (virNetServerAddService(srv, svcTLS) < 0) goto cleanup; virObjectUnref(ctxt); @@ -1197,7 +1191,6 @@ int main(int argc, char **argv) { config->max_anonymous_clients, config->keepalive_interval, config->keepalive_count, - config->mdns_adv ? config->mdns_name : NULL, remoteClientNew, NULL, remoteClientFree, @@ -1265,7 +1258,6 @@ int main(int argc, char **argv) { 0, config->admin_keepalive_interval, config->admin_keepalive_count, - NULL, remoteAdmClientNew, NULL, remoteAdmClientFree, diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_config.c index a56aa9065a..537b90a855 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -102,8 +102,6 @@ struct daemonConfig* daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) { struct daemonConfig *data; - char *localhost; - int ret; if (VIR_ALLOC(data) < 0) return NULL; @@ -141,8 +139,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) #endif data->auth_tls = REMOTE_AUTH_NONE; - data->mdns_adv = 0; - data->min_workers = 5; data->max_workers = 20; data->max_clients = 5000; @@ -170,25 +166,6 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) data->ovs_timeout = VIR_NETDEV_OVS_DEFAULT_TIMEOUT; - localhost = virGetHostname(); - if (localhost == NULL) { - /* we couldn't resolve the hostname; assume that we are - * running in disconnected operation, and report a less - * useful Avahi string - */ - ret = VIR_STRDUP(data->mdns_name, "Virtualization Host"); - } else { - char *tmp; - /* Extract the host part of the potentially FQDN */ - if ((tmp = strchr(localhost, '.'))) - *tmp = '\0'; - ret = virAsprintf(&data->mdns_name, "Virtualization Host %s", - localhost); - } - VIR_FREE(localhost); - if (ret < 0) - goto error; - return data; error: @@ -219,7 +196,6 @@ daemonConfigFree(struct daemonConfig *data) VIR_FREE(data->unix_sock_rw_perms); VIR_FREE(data->unix_sock_group); VIR_FREE(data->unix_sock_dir); - VIR_FREE(data->mdns_name); tmp = data->tls_allowed_dn_list; while (tmp && *tmp) { @@ -300,11 +276,6 @@ daemonConfigLoadOptions(struct daemonConfig *data, if (virConfGetValueString(conf, "unix_sock_dir", &data->unix_sock_dir) < 0) goto error; - if (virConfGetValueBool(conf, "mdns_adv", &data->mdns_adv) < 0) - goto error; - if (virConfGetValueString(conf, "mdns_name", &data->mdns_name) < 0) - goto error; - if (virConfGetValueBool(conf, "tls_no_sanity_certificate", &data->tls_no_sanity_certificate) < 0) goto error; if (virConfGetValueBool(conf, "tls_no_verify_certificate", &data->tls_no_verify_certificate) < 0) diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_config.h index 56d130bdce..5eac7e4410 100644 --- a/src/remote/remote_daemon_config.h +++ b/src/remote/remote_daemon_config.h @@ -47,9 +47,6 @@ struct daemonConfig { char **access_drivers; - bool mdns_adv; - char *mdns_name; - bool tls_no_verify_certificate; bool tls_no_sanity_certificate; char **tls_allowed_dn_list; diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug.in index 527e3d7d0d..ad6450a569 100644 --- a/src/remote/test_libvirtd.aug.in +++ b/src/remote/test_libvirtd.aug.in @@ -7,8 +7,6 @@ module Test_libvirtd = { "tls_port" = "16514" } { "tcp_port" = "16509" } { "listen_addr" = "192.168.0.1" } - { "mdns_adv" = "1" } - { "mdns_name" = "Virtualization Host Joe Demo" } { "unix_sock_group" = "libvirt" } { "unix_sock_ro_perms" = "0777" } { "unix_sock_rw_perms" = "0770" } diff --git a/src/rpc/Makefile.inc.am b/src/rpc/Makefile.inc.am index 68a4945198..e5b830605a 100644 --- a/src/rpc/Makefile.inc.am +++ b/src/rpc/Makefile.inc.am @@ -103,22 +103,18 @@ libvirt_net_rpc_server_la_SOURCES = \ rpc/virnetserverservice.c \ rpc/virnetserverclient.h \ rpc/virnetserverclient.c \ - rpc/virnetservermdns.h \ - rpc/virnetservermdns.c \ rpc/virnetdaemon.h \ rpc/virnetdaemon.c \ rpc/virnetserver.h \ rpc/virnetserver.c \ $(NULL) libvirt_net_rpc_server_la_CFLAGS = \ - $(AVAHI_CFLAGS) \ $(DBUS_CFLAGS) \ $(XDR_CFLAGS) \ $(AM_CFLAGS) \ $(NULL) libvirt_net_rpc_server_la_LDFLAGS = \ $(AM_LDFLAGS) \ - $(AVAHI_LIBS) \ $(DBUS_LIBS) \ $(NULL) libvirt_net_rpc_server_la_LIBADD = $(CYGWIN_EXTRA_LIBADD) diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 0ca61c5a9a..d098cf4ae9 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -32,7 +32,6 @@ #include "virutil.h" #include "virfile.h" #include "virnetserver.h" -#include "virnetservermdns.h" #include "virdbus.h" #include "virhash.h" #include "virstring.h" @@ -767,16 +766,6 @@ virNetDaemonUpdateServices(virNetDaemonPtr dmn, virObjectUnlock(dmn); } -static int -daemonServerRun(void *payload, - const void *key ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) -{ - virNetServerPtr srv = payload; - - return virNetServerStart(srv); -}; - static int daemonServerProcessClients(void *payload, const void *key ATTRIBUTE_UNUSED, @@ -802,9 +791,6 @@ virNetDaemonRun(virNetDaemonPtr dmn) goto cleanup; } - if (virHashForEach(dmn->servers, daemonServerRun, NULL) < 0) - goto cleanup; - dmn->quit = false; if (dmn->autoShutdownTimeout && diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 4934dba967..0f3fa63fbb 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -27,7 +27,6 @@ #include "virerror.h" #include "virthread.h" #include "virthreadpool.h" -#include "virnetservermdns.h" #include "virstring.h" #define VIR_FROM_THIS VIR_FROM_RPC @@ -52,10 +51,6 @@ struct _virNetServer { /* Immutable pointer, self-locking APIs */ virThreadPoolPtr workers; - char *mdnsGroupName; - virNetServerMDNSPtr mdns; - virNetServerMDNSGroupPtr mdnsGroup; - size_t nservices; virNetServerServicePtr *services; @@ -351,7 +346,6 @@ virNetServerPtr virNetServerNew(const char *name, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, virFreeCallback clientPrivFree, @@ -384,16 +378,6 @@ virNetServerPtr virNetServerNew(const char *name, srv->clientPrivFree = clientPrivFree; srv->clientPrivOpaque = clientPrivOpaque; - if (VIR_STRDUP(srv->mdnsGroupName, mdnsGroupName) < 0) - goto error; - if (srv->mdnsGroupName) { - if (!(srv->mdns = virNetServerMDNSNew())) - goto error; - if (!(srv->mdnsGroup = virNetServerMDNSAddGroup(srv->mdns, - srv->mdnsGroupName))) - goto error; - } - return srv; error: virObjectUnref(srv); @@ -421,7 +405,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, unsigned int keepaliveInterval; unsigned int keepaliveCount; unsigned long long next_client_id; - const char *mdnsGroupName = NULL; if (virJSONValueObjectGetNumberUint(object, "min_workers", &min_workers) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -464,13 +447,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, goto error; } - if (virJSONValueObjectHasKey(object, "mdnsGroupName") && - (!(mdnsGroupName = virJSONValueObjectGetString(object, "mdnsGroupName")))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed mdnsGroupName data in JSON document")); - goto error; - } - if (virJSONValueObjectGetNumberUlong(object, "next_client_id", &next_client_id) < 0) { VIR_WARN("Missing next_client_id data in JSON document"); @@ -482,7 +458,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, priority_workers, max_clients, max_anonymous_clients, keepaliveInterval, keepaliveCount, - mdnsGroupName, clientPrivNew, clientPrivPreExecRestart, clientPrivFree, clientPrivOpaque))) goto error; @@ -511,8 +486,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, if (!(service = virNetServerServiceNewPostExecRestart(child))) goto error; - /* XXX mdns entry names ? */ - if (virNetServerAddService(srv, service, NULL) < 0) { + if (virNetServerAddService(srv, service) < 0) { virObjectUnref(service); goto error; } @@ -622,13 +596,6 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) goto error; } - if (srv->mdnsGroupName && - virJSONValueObjectAppendString(object, "mdnsGroupName", srv->mdnsGroupName) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot set mdnsGroupName data in JSON document")); - goto error; - } - if (!(services = virJSONValueNewArray())) goto error; @@ -680,25 +647,13 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) int virNetServerAddService(virNetServerPtr srv, - virNetServerServicePtr svc, - const char *mdnsEntryName) + virNetServerServicePtr svc) { virObjectLock(srv); if (VIR_EXPAND_N(srv->services, srv->nservices, 1) < 0) goto error; - if (mdnsEntryName) { - int port = virNetServerServiceGetPort(svc); - - if (!virNetServerMDNSAddEntry(srv->mdnsGroup, - mdnsEntryName, - port)) { - srv->nservices--; - goto error; - } - } - srv->services[srv->nservices-1] = virObjectRef(svc); virNetServerServiceSetDispatcher(svc, @@ -820,9 +775,6 @@ void virNetServerDispose(void *obj) for (i = 0; i < srv->nclients; i++) virObjectUnref(srv->clients[i]); VIR_FREE(srv->clients); - - VIR_FREE(srv->mdnsGroupName); - virNetServerMDNSFree(srv->mdns); } void virNetServerClose(virNetServerPtr srv) @@ -909,18 +861,6 @@ virNetServerProcessClients(virNetServerPtr srv) virObjectUnlock(srv); } -int -virNetServerStart(virNetServerPtr srv) -{ - /* - * Do whatever needs to be done before starting. - */ - if (!srv->mdns) - return 0; - - return virNetServerMDNSStart(srv->mdns); -} - const char * virNetServerGetName(virNetServerPtr srv) { diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 92a856fb03..49203cdb3a 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -39,7 +39,6 @@ virNetServerPtr virNetServerNew(const char *name, size_t max_anonymous_clients, int keepaliveInterval, unsigned int keepaliveCount, - const char *mdnsGroupName, virNetServerClientPrivNew clientPrivNew, virNetServerClientPrivPreExecRestart clientPrivPreExecRestart, virFreeCallback clientPrivFree, @@ -61,8 +60,7 @@ void virNetServerClose(virNetServerPtr srv); virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv); int virNetServerAddService(virNetServerPtr srv, - virNetServerServicePtr svc, - const char *mdnsEntryName); + virNetServerServicePtr svc); int virNetServerAddProgram(virNetServerPtr srv, virNetServerProgramPtr prog); @@ -79,8 +77,6 @@ void virNetServerSetClientAuthenticated(virNetServerPtr srv, virNetServerClientP void virNetServerUpdateServices(virNetServerPtr srv, bool enabled); -int virNetServerStart(virNetServerPtr srv); - const char *virNetServerGetName(virNetServerPtr srv); int virNetServerGetThreadPoolParameters(virNetServerPtr srv, diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c deleted file mode 100644 index 4c10749364..0000000000 --- a/src/rpc/virnetservermdns.c +++ /dev/null @@ -1,682 +0,0 @@ -/* - * virnetservermdns.c: advertise server sockets - * - * Copyright (C) 2011-2012 Red Hat, Inc. - * Copyright (C) 2007 Daniel P. Berrange - * - * Derived from Avahi example service provider code. - * - * 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 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 - * Lesser General Public License for more details. - * - * 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/>. - */ - -#include <config.h> - -#include <time.h> - -#if WITH_AVAHI -# include <avahi-client/client.h> -# include <avahi-client/publish.h> - -# include <avahi-common/alternative.h> -# include <avahi-common/simple-watch.h> -# include <avahi-common/malloc.h> -# include <avahi-common/error.h> -# include <avahi-common/timeval.h> -#endif - -#include "virnetservermdns.h" -#include "vireventpoll.h" -#include "viralloc.h" -#include "virerror.h" -#include "virlog.h" -#include "virstring.h" - -#define VIR_FROM_THIS VIR_FROM_RPC - -VIR_LOG_INIT("rpc.netservermdns"); - -struct _virNetServerMDNSEntry { - char *type; - int port; - virNetServerMDNSEntryPtr next; -}; - -struct _virNetServerMDNSGroup { - virNetServerMDNSPtr mdns; -#if WITH_AVAHI - AvahiEntryGroup *handle; -#endif - char *name; - virNetServerMDNSEntryPtr entry; - virNetServerMDNSGroupPtr next; -}; - -struct _virNetServerMDNS { -#if WITH_AVAHI - AvahiClient *client; - AvahiPoll *poller; -#endif - virNetServerMDNSGroupPtr group; -}; - -#if WITH_AVAHI -/* Avahi API requires this struct name in the app :-( */ -struct AvahiWatch { - int watch; - int fd; - int revents; - AvahiWatchCallback callback; - void *userdata; -}; - -/* Avahi API requires this struct name in the app :-( */ -struct AvahiTimeout { - int timer; - AvahiTimeoutCallback callback; - void *userdata; -}; - -static void virNetServerMDNSCreateServices(virNetServerMDNSGroupPtr group); - -/* Called whenever the entry group state changes */ -static void virNetServerMDNSGroupCallback(AvahiEntryGroup *g ATTRIBUTE_UNUSED, - AvahiEntryGroupState state, - void *data) -{ - virNetServerMDNSGroupPtr group = data; - - switch (state) { - case AVAHI_ENTRY_GROUP_ESTABLISHED: - /* The entry group has been established successfully */ - VIR_DEBUG("Group '%s' established", group->name); - break; - - case AVAHI_ENTRY_GROUP_COLLISION: - { - char *n; - - /* A service name collision happened. Let's pick a new name */ - n = avahi_alternative_service_name(group->name); - VIR_FREE(group->name); - group->name = n; - - VIR_DEBUG("Group name collision, renaming service to '%s'", group->name); - - /* And recreate the services */ - virNetServerMDNSCreateServices(group); - } - break; - - case AVAHI_ENTRY_GROUP_FAILURE : - VIR_DEBUG("Group failure: %s", - avahi_strerror(avahi_client_errno(group->mdns->client))); - - /* Some kind of failure happened while we were registering our services */ - /* avahi_simple_poll_quit(simple_poll); */ - break; - - case AVAHI_ENTRY_GROUP_UNCOMMITED: - case AVAHI_ENTRY_GROUP_REGISTERING: - ; - } -} - -static void virNetServerMDNSCreateServices(virNetServerMDNSGroupPtr group) -{ - virNetServerMDNSPtr mdns = group->mdns; - virNetServerMDNSEntryPtr entry; - int ret; - VIR_DEBUG("Adding services to '%s'", group->name); - - /* If we've no services to advertise, just reset the group to make - * sure it is emptied of any previously advertised services */ - if (!group->entry) { - if (group->handle) - avahi_entry_group_reset(group->handle); - return; - } - - /* If this is the first time we're called, let's create a new entry group */ - if (!group->handle) { - VIR_DEBUG("Creating initial group %s", group->name); - if (!(group->handle = - avahi_entry_group_new(mdns->client, - virNetServerMDNSGroupCallback, - group))) { - VIR_DEBUG("avahi_entry_group_new() failed: %s", - avahi_strerror(avahi_client_errno(mdns->client))); - return; - } - } - - entry = group->entry; - while (entry) { - if ((ret = avahi_entry_group_add_service(group->handle, - AVAHI_IF_UNSPEC, - AVAHI_PROTO_UNSPEC, - 0, - group->name, - entry->type, - NULL, - NULL, - entry->port, - NULL)) < 0) { - VIR_DEBUG("Failed to add %s service on port %d: %s", - entry->type, entry->port, avahi_strerror(ret)); - avahi_entry_group_reset(group->handle); - return; - } - entry = entry->next; - } - - /* Tell the server to register the service */ - if ((ret = avahi_entry_group_commit(group->handle)) < 0) { - avahi_entry_group_reset(group->handle); - VIR_DEBUG("Failed to commit entry_group: %s", - avahi_strerror(ret)); - return; - } -} - - -static void virNetServerMDNSClientCallback(AvahiClient *c, - AvahiClientState state, - void *data) -{ - virNetServerMDNSPtr mdns = data; - virNetServerMDNSGroupPtr group; - if (!mdns->client) - mdns->client = c; - - VIR_DEBUG("Callback state=%d", state); - - /* Called whenever the client or server state changes */ - switch (state) { - case AVAHI_CLIENT_S_RUNNING: - /* The server has startup successfully and registered its host - * name on the network, so it's time to create our services */ - VIR_DEBUG("Client running %p", mdns->client); - group = mdns->group; - while (group) { - virNetServerMDNSCreateServices(group); - group = group->next; - } - break; - - case AVAHI_CLIENT_FAILURE: - VIR_DEBUG("Client failure: %s", - avahi_strerror(avahi_client_errno(c))); - virNetServerMDNSStop(mdns); - virNetServerMDNSStart(mdns); - break; - - case AVAHI_CLIENT_S_COLLISION: - /* Let's drop our registered services. When the server is back - * in AVAHI_SERVER_RUNNING state we will register them - * again with the new host name. */ - - ATTRIBUTE_FALLTHROUGH; - - case AVAHI_CLIENT_S_REGISTERING: - /* The server records are now being established. This - * might be caused by a host name change. We need to wait - * for our own records to register until the host name is - * properly established. */ - VIR_DEBUG("Client collision/connecting %p", mdns->client); - group = mdns->group; - while (group) { - if (group->handle) - avahi_entry_group_reset(group->handle); - group = group->next; - } - break; - - case AVAHI_CLIENT_CONNECTING: - VIR_DEBUG("Client connecting.... %p", mdns->client); - ; - } -} - - -static void virNetServerMDNSWatchDispatch(int watch, int fd, int events, void *opaque) -{ - AvahiWatch *w = opaque; - int fd_events = virEventPollToNativeEvents(events); - VIR_DEBUG("Dispatch watch %d FD %d Event %d", watch, fd, fd_events); - w->revents = fd_events; - w->callback(w, fd, fd_events, w->userdata); -} - -static void virNetServerMDNSWatchDofree(void *w) -{ - VIR_FREE(w); -} - - -static AvahiWatch *virNetServerMDNSWatchNew(const AvahiPoll *api ATTRIBUTE_UNUSED, - int fd, AvahiWatchEvent event, - AvahiWatchCallback cb, void *userdata) -{ - AvahiWatch *w; - virEventHandleType hEvents; - if (VIR_ALLOC(w) < 0) - return NULL; - - w->fd = fd; - w->revents = 0; - w->callback = cb; - w->userdata = userdata; - - VIR_DEBUG("New handle %p FD %d Event %d", w, w->fd, event); - hEvents = virEventPollFromNativeEvents(event); - if ((w->watch = virEventAddHandle(fd, hEvents, - virNetServerMDNSWatchDispatch, - w, - virNetServerMDNSWatchDofree)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to add watch for fd %d events %d"), fd, hEvents); - VIR_FREE(w); - return NULL; - } - - return w; -} - -static void virNetServerMDNSWatchUpdate(AvahiWatch *w, AvahiWatchEvent event) -{ - VIR_DEBUG("Update handle %p FD %d Event %d", w, w->fd, event); - virEventUpdateHandle(w->watch, event); -} - -static AvahiWatchEvent virNetServerMDNSWatchGetEvents(AvahiWatch *w) -{ - VIR_DEBUG("Get handle events %p %d", w, w->fd); - return w->revents; -} - -static void virNetServerMDNSWatchFree(AvahiWatch *w) -{ - VIR_DEBUG("Free handle %p %d", w, w->fd); - virEventRemoveHandle(w->watch); -} - -static void virNetServerMDNSTimeoutDispatch(int timer ATTRIBUTE_UNUSED, void *opaque) -{ - AvahiTimeout *t = (AvahiTimeout*)opaque; - VIR_DEBUG("Dispatch timeout %p %d", t, timer); - virEventUpdateTimeout(t->timer, -1); - t->callback(t, t->userdata); -} - -static void virNetServerMDNSTimeoutDofree(void *t) -{ - VIR_FREE(t); -} - -static AvahiTimeout *virNetServerMDNSTimeoutNew(const AvahiPoll *api ATTRIBUTE_UNUSED, - const struct timeval *tv, - AvahiTimeoutCallback cb, - void *userdata) -{ - AvahiTimeout *t; - struct timeval now; - long long nowms, thenms, timeout; - VIR_DEBUG("Add timeout TV %p", tv); - if (VIR_ALLOC(t) < 0) - return NULL; - - if (gettimeofday(&now, NULL) < 0) { - virReportSystemError(errno, "%s", - _("Unable to get current time")); - VIR_FREE(t); - return NULL; - } - - VIR_DEBUG("Trigger timed for %d %d %d %d", - (int)now.tv_sec, (int)now.tv_usec, - (int)(tv ? tv->tv_sec : 0), (int)(tv ? tv->tv_usec : 0)); - nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll); - if (tv) { - thenms = (tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll); - timeout = thenms > nowms ? nowms - thenms : 0; - if (timeout < 0) - timeout = 0; - } else { - timeout = -1; - } - - t->timer = virEventAddTimeout(timeout, - virNetServerMDNSTimeoutDispatch, - t, - virNetServerMDNSTimeoutDofree); - t->callback = cb; - t->userdata = userdata; - - if (t->timer < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to add timer with timeout %lld"), timeout); - VIR_FREE(t); - return NULL; - } - - return t; -} - -static void virNetServerMDNSTimeoutUpdate(AvahiTimeout *t, const struct timeval *tv) -{ - struct timeval now; - long long nowms, thenms, timeout; - VIR_DEBUG("Update timeout %p TV %p", t, tv); - if (gettimeofday(&now, NULL) < 0) { - VIR_FREE(t); - return; - } - - nowms = (now.tv_sec * 1000ll) + (now.tv_usec / 1000ll); - if (tv) { - thenms = ((tv->tv_sec * 1000ll) + (tv->tv_usec/1000ll)); - timeout = thenms > nowms ? nowms - thenms : 0; - if (timeout < 0) - timeout = 0; - } else { - timeout = -1; - } - - virEventUpdateTimeout(t->timer, timeout); -} - -static void virNetServerMDNSTimeoutFree(AvahiTimeout *t) -{ - VIR_DEBUG("Free timeout %p", t); - virEventRemoveTimeout(t->timer); -} - - -static AvahiPoll *virNetServerMDNSCreatePoll(void) -{ - AvahiPoll *p; - if (VIR_ALLOC(p) < 0) - return NULL; - - p->userdata = NULL; - - p->watch_new = virNetServerMDNSWatchNew; - p->watch_update = virNetServerMDNSWatchUpdate; - p->watch_get_events = virNetServerMDNSWatchGetEvents; - p->watch_free = virNetServerMDNSWatchFree; - - p->timeout_new = virNetServerMDNSTimeoutNew; - p->timeout_update = virNetServerMDNSTimeoutUpdate; - p->timeout_free = virNetServerMDNSTimeoutFree; - - return p; -} - - -virNetServerMDNS *virNetServerMDNSNew(void) -{ - virNetServerMDNS *mdns; - if (VIR_ALLOC(mdns) < 0) - return NULL; - - /* Allocate main loop object */ - if (!(mdns->poller = virNetServerMDNSCreatePoll())) { - VIR_FREE(mdns); - return NULL; - } - - return mdns; -} - - -int virNetServerMDNSStart(virNetServerMDNS *mdns) -{ - int error; - VIR_DEBUG("Starting client %p", mdns); - mdns->client = avahi_client_new(mdns->poller, - AVAHI_CLIENT_NO_FAIL, - virNetServerMDNSClientCallback, - mdns, &error); - - if (!mdns->client) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to create mDNS client: %s"), - avahi_strerror(error)); - return -1; - } - - return 0; -} - - -virNetServerMDNSGroupPtr virNetServerMDNSAddGroup(virNetServerMDNS *mdns, - const char *name) -{ - virNetServerMDNSGroupPtr group; - - VIR_DEBUG("Adding group '%s'", name); - if (VIR_ALLOC(group) < 0) - return NULL; - - if (VIR_STRDUP(group->name, name) < 0) { - VIR_FREE(group); - return NULL; - } - group->mdns = mdns; - group->next = mdns->group; - mdns->group = group; - return group; -} - - -void virNetServerMDNSRemoveGroup(virNetServerMDNSPtr mdns, - virNetServerMDNSGroupPtr group) -{ - virNetServerMDNSGroupPtr tmp = mdns->group, prev = NULL; - - while (tmp) { - if (tmp == group) { - VIR_FREE(group->name); - if (prev) - prev->next = group->next; - else - group->mdns->group = group->next; - VIR_FREE(group); - return; - } - prev = tmp; - tmp = tmp->next; - } -} - - -virNetServerMDNSEntryPtr virNetServerMDNSAddEntry(virNetServerMDNSGroupPtr group, - const char *type, - int port) -{ - virNetServerMDNSEntryPtr entry; - - VIR_DEBUG("Adding entry %s %d to group %s", type, port, group->name); - if (VIR_ALLOC(entry) < 0) - return NULL; - - entry->port = port; - if (VIR_STRDUP(entry->type, type) < 0) { - VIR_FREE(entry); - return NULL; - } - entry->next = group->entry; - group->entry = entry; - return entry; -} - - -void virNetServerMDNSRemoveEntry(virNetServerMDNSGroupPtr group, - virNetServerMDNSEntryPtr entry) -{ - virNetServerMDNSEntryPtr tmp = group->entry, prev = NULL; - - while (tmp) { - if (tmp == entry) { - VIR_FREE(entry->type); - if (prev) - prev->next = entry->next; - else - group->entry = entry->next; - return; - } - prev = tmp; - tmp = tmp->next; - } -} - - -void virNetServerMDNSStop(virNetServerMDNSPtr mdns) -{ - virNetServerMDNSGroupPtr group = mdns->group; - while (group) { - if (group->handle) { - avahi_entry_group_free(group->handle); - group->handle = NULL; - } - group = group->next; - } - if (mdns->client) - avahi_client_free(mdns->client); - mdns->client = NULL; -} - - -void virNetServerMDNSFree(virNetServerMDNSPtr mdns) -{ - virNetServerMDNSGroupPtr group, tmp; - - if (!mdns) - return; - - group = mdns->group; - while (group) { - tmp = group->next; - virNetServerMDNSGroupFree(group); - group = tmp; - } - - VIR_FREE(mdns->poller); - VIR_FREE(mdns); -} - - -void virNetServerMDNSGroupFree(virNetServerMDNSGroupPtr grp) -{ - virNetServerMDNSEntryPtr entry, tmp; - - if (!grp) - return; - - entry = grp->entry; - while (entry) { - tmp = entry->next; - virNetServerMDNSEntryFree(entry); - entry = tmp; - } - - VIR_FREE(grp->name); - VIR_FREE(grp); -} - - -void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry) -{ - if (!entry) - return; - - VIR_FREE(entry->type); - VIR_FREE(entry); -} - -#else /* ! WITH_AVAHI */ - -static const char *unsupported = N_("avahi not available at build time"); - -virNetServerMDNS * -virNetServerMDNSNew(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); - return NULL; -} - -int -virNetServerMDNSStart(virNetServerMDNS *mdns ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); - return -1; -} - -virNetServerMDNSGroupPtr -virNetServerMDNSAddGroup(virNetServerMDNS *mdns ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); - return NULL; -} - -void -virNetServerMDNSRemoveGroup(virNetServerMDNSPtr mdns ATTRIBUTE_UNUSED, - virNetServerMDNSGroupPtr group ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -virNetServerMDNSEntryPtr -virNetServerMDNSAddEntry(virNetServerMDNSGroupPtr group ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED, - int port ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); - return NULL; -} - -void -virNetServerMDNSRemoveEntry(virNetServerMDNSGroupPtr group ATTRIBUTE_UNUSED, - virNetServerMDNSEntryPtr entry ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -void -virNetServerMDNSStop(virNetServerMDNSPtr mdns ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -void -virNetServerMDNSFree(virNetServerMDNSPtr mdns ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -void -virNetServerMDNSGroupFree(virNetServerMDNSGroupPtr grp ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -void -virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr entry ATTRIBUTE_UNUSED) -{ - VIR_DEBUG("%s", _(unsupported)); -} - -#endif /* ! WITH_AVAHI */ diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h deleted file mode 100644 index 64511a65c8..0000000000 --- a/src/rpc/virnetservermdns.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * virnetservermdns.h: advertise server sockets - * - * Copyright (C) 2011 Red Hat, Inc. - * Copyright (C) 2007 Daniel P. Berrange - * - * Derived from Avahi example service provider code. - * - * 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 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 - * Lesser General Public License for more details. - * - * 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/>. - */ - -#ifndef LIBVIRT_VIRNETSERVERMDNS_H -# define LIBVIRT_VIRNETSERVERMDNS_H - -# include "internal.h" - -typedef struct _virNetServerMDNS virNetServerMDNS; -typedef virNetServerMDNS *virNetServerMDNSPtr; -typedef struct _virNetServerMDNSGroup virNetServerMDNSGroup; -typedef virNetServerMDNSGroup *virNetServerMDNSGroupPtr; -typedef struct _virNetServerMDNSEntry virNetServerMDNSEntry; -typedef virNetServerMDNSEntry *virNetServerMDNSEntryPtr; - - -/** - * Prepares a new mdns manager object for use - */ -virNetServerMDNSPtr virNetServerMDNSNew(void); - -/** - * Starts the mdns client, advertising any groups/entries currently registered - * - * @mdns: manager to start advertising - * - * Starts the mdns client. Services may not be immediately visible, since - * it may asynchronously wait for the mdns service to startup - * - * returns -1 upon failure, 0 upon success. - */ -int virNetServerMDNSStart(virNetServerMDNSPtr mdns); - -/** - * Stops the mdns client, removing any advertisements - * - * @mdns: manager to start advertising - * - */ -void virNetServerMDNSStop(virNetServerMDNSPtr mdns); - -/** - * Adds a group container for advertisement - * - * @mdns manager to attach the group to - * @name unique human readable service name - * - * returns the group record, or NULL upon failure - */ -virNetServerMDNSGroupPtr virNetServerMDNSAddGroup(virNetServerMDNSPtr mdns, - const char *name); - -/** - * Removes a group container from advertisement - * - * @mdns amanger to detach group from - * @group group to remove - */ -void virNetServerMDNSRemoveGroup(virNetServerMDNSPtr mdns, - virNetServerMDNSGroupPtr group); - -/** - * Adds a service entry in a group - * - * @group group to attach the entry to - * @type service type string - * @port tcp port number - * - * returns the service record, or NULL upon failure - */ -virNetServerMDNSEntryPtr virNetServerMDNSAddEntry(virNetServerMDNSGroupPtr group, - const char *type, int port); - -/** - * Removes a service entry from a group - * - * @group group to detach service entry from - * @entry service entry to remove - */ -void virNetServerMDNSRemoveEntry(virNetServerMDNSGroupPtr group, - virNetServerMDNSEntryPtr entry); - -void virNetServerMDNSFree(virNetServerMDNSPtr ptr); -void virNetServerMDNSGroupFree(virNetServerMDNSGroupPtr ptr); -void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr ptr); - -#endif /* LIBVIRT_VIRNETSERVERMDNS_H */ diff --git a/tests/virconfdata/libvirtd.conf b/tests/virconfdata/libvirtd.conf index ee57593109..602aa08d92 100644 --- a/tests/virconfdata/libvirtd.conf +++ b/tests/virconfdata/libvirtd.conf @@ -43,23 +43,6 @@ tcp_port = "16509" -# Flag toggling mDNS advertizement of the libvirt service. -# -# Alternatively can disable for all services on a host by -# stopping the Avahi daemon -# -# This is disabled by default, uncomment this to enable it -mdns_adv = 1 - -# Override the default mDNS advertizement name. This must be -# unique on the immediate broadcast network. -# -# The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) -# -mdns_name = "Virtualization Host Joe Demo" - - ################################################################# # # UNIX socket access controls diff --git a/tests/virconfdata/libvirtd.out b/tests/virconfdata/libvirtd.out index e0b6f0a606..d3f2bd20a7 100644 --- a/tests/virconfdata/libvirtd.out +++ b/tests/virconfdata/libvirtd.out @@ -32,20 +32,6 @@ tls_port = "16514" # This can be a port number, or service name # tcp_port = "16509" -# Flag toggling mDNS advertizement of the libvirt service. -# -# Alternatively can disable for all services on a host by -# stopping the Avahi daemon -# -# This is disabled by default, uncomment this to enable it -mdns_adv = 1 -# Override the default mDNS advertizement name. This must be -# unique on the immediate broadcast network. -# -# The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) -# -mdns_name = "Virtualization Host Joe Demo" ################################################################# # # UNIX socket access controls diff --git a/tests/virnetdaemondata/input-data-admin-nomdns.json b/tests/virnetdaemondata/input-data-admin.json similarity index 100% rename from tests/virnetdaemondata/input-data-admin-nomdns.json rename to tests/virnetdaemondata/input-data-admin.json diff --git a/tests/virnetdaemondata/input-data-initial-nomdns.json b/tests/virnetdaemondata/input-data-initial-nomdns.json deleted file mode 100644 index 6cf70d96e8..0000000000 --- a/tests/virnetdaemondata/input-data-initial-nomdns.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "min_workers": 10, - "max_workers": 50, - "priority_workers": 5, - "max_clients": 100, - "keepaliveInterval": 120, - "keepaliveCount": 5, - "keepaliveRequired": true, - "services": [ - { - "auth": 0, - "readonly": true, - "nrequests_client_max": 2, - "socks": [ - { - "fd": 100, - "errfd": -1, - "pid": 0, - "isClient": false - } - ] - }, - { - "auth": 2, - "readonly": false, - "nrequests_client_max": 5, - "socks": [ - { - "fd": 101, - "errfd": -1, - "pid": 0, - "isClient": false - } - ] - } - ], - "clients": [ - { - "auth": 1, - "readonly": true, - "nrequests_max": 15, - "sock": { - "fd": 102, - "errfd": -1, - "pid": -1, - "isClient": true - }, - "privateData": 1729 - }, - { - "auth": 2, - "readonly": true, - "nrequests_max": 66, - "sock": { - "fd": 103, - "errfd": -1, - "pid": -1, - "isClient": true - }, - "privateData": 1729 - } - ] -} diff --git a/tests/virnetdaemondata/input-data-initial.json b/tests/virnetdaemondata/input-data-initial.json index 5bb09ed36b..6cf70d96e8 100644 --- a/tests/virnetdaemondata/input-data-initial.json +++ b/tests/virnetdaemondata/input-data-initial.json @@ -6,7 +6,6 @@ "keepaliveInterval": 120, "keepaliveCount": 5, "keepaliveRequired": true, - "mdnsGroupName": "libvirtTest", "services": [ { "auth": 0, diff --git a/tests/virnetdaemondata/output-data-admin-nomdns.json b/tests/virnetdaemondata/output-data-admin.json similarity index 100% rename from tests/virnetdaemondata/output-data-admin-nomdns.json rename to tests/virnetdaemondata/output-data-admin.json diff --git a/tests/virnetdaemondata/output-data-initial-nomdns.json b/tests/virnetdaemondata/output-data-initial-nomdns.json deleted file mode 100644 index 916297c59d..0000000000 --- a/tests/virnetdaemondata/output-data-initial-nomdns.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "servers": { - "testServer0": { - "min_workers": 10, - "max_workers": 50, - "priority_workers": 5, - "max_clients": 100, - "max_anonymous_clients": 100, - "keepaliveInterval": 120, - "keepaliveCount": 5, - "next_client_id": 3, - "services": [ - { - "auth": 0, - "readonly": true, - "nrequests_client_max": 2, - "socks": [ - { - "fd": 100, - "errfd": -1, - "pid": 0, - "isClient": false - } - ] - }, - { - "auth": 2, - "readonly": false, - "nrequests_client_max": 5, - "socks": [ - { - "fd": 101, - "errfd": -1, - "pid": 0, - "isClient": false - } - ] - } - ], - "clients": [ - { - "id": 1, - "auth": 1, - "auth_pending": true, - "readonly": true, - "nrequests_max": 15, - "sock": { - "fd": 102, - "errfd": -1, - "pid": -1, - "isClient": true - }, - "privateData": 1729 - }, - { - "id": 2, - "auth": 2, - "auth_pending": true, - "readonly": true, - "nrequests_max": 66, - "sock": { - "fd": 103, - "errfd": -1, - "pid": -1, - "isClient": true - }, - "privateData": 1729 - } - ] - } - } -} diff --git a/tests/virnetdaemondata/output-data-initial.json b/tests/virnetdaemondata/output-data-initial.json index 5ed03472d6..916297c59d 100644 --- a/tests/virnetdaemondata/output-data-initial.json +++ b/tests/virnetdaemondata/output-data-initial.json @@ -9,7 +9,6 @@ "keepaliveInterval": 120, "keepaliveCount": 5, "next_client_id": 3, - "mdnsGroupName": "libvirtTest", "services": [ { "auth": 0, diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 3e9b007d9b..eae630a8f1 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -87,13 +87,6 @@ testCreateServer(const char *server_name, const char *host, int family) virNetServerClientPtr cln1 = NULL, cln2 = NULL; virNetSocketPtr sk1 = NULL, sk2 = NULL; int fdclient[2]; - const char *mdns_entry = NULL; - const char *mdns_group = NULL; - -# ifdef WITH_AVAHI - mdns_entry = "libvirt-ro"; - mdns_group = "libvirtTest"; -# endif if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) { virReportSystemError(errno, "%s", @@ -104,7 +97,6 @@ testCreateServer(const char *server_name, const char *host, int family) if (!(srv = virNetServerNew(server_name, 1, 10, 50, 5, 100, 10, 120, 5, - mdns_group, testClientNew, testClientPreExec, testClientFree, @@ -131,9 +123,9 @@ testCreateServer(const char *server_name, const char *host, int family) 5))) goto error; - if (virNetServerAddService(srv, svc1, mdns_entry) < 0) + if (virNetServerAddService(srv, svc1) < 0) goto error; - if (virNetServerAddService(srv, svc2, mdns_entry) < 0) + if (virNetServerAddService(srv, svc2) < 0) goto error; if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0) @@ -408,12 +400,9 @@ mymain(void) # define EXEC_RESTART_TEST_FAIL(file, N) EXEC_RESTART_TEST_FULL(file, N, false) -# ifdef WITH_AVAHI EXEC_RESTART_TEST("initial", 1); -# endif - EXEC_RESTART_TEST("initial-nomdns", 1); EXEC_RESTART_TEST("anon-clients", 1); - EXEC_RESTART_TEST("admin-nomdns", 2); + EXEC_RESTART_TEST("admin", 2); EXEC_RESTART_TEST("admin-server-names", 2); EXEC_RESTART_TEST("no-keepalive-required", 2); EXEC_RESTART_TEST("client-ids", 1); -- 2.21.0

2 1

[libvirt] [PATCH] docs: Advertise pcie-to-pci-bridge for use on q35
by Andrea Bolognani 19 Jun '19

19 Jun '19

We support pcie-to-pci-bridge, and prefer it to dmi-to-pci-bridge, since libvirt 4.3.0, but we didn't update all the documentation accordingly at the time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/formatdomain.html.in | 10 +++++----- docs/pci-hotplug.html.in | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 22ddcb71d3..452e3b0ee4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4414,7 +4414,7 @@ subelement <code><model></code> with an attribute <code>name</code>. The name attribute holds the name of the specific device that qemu is emulating (e.g. "i82801b11-bridge") - rather than simply the class of device ("dmi-to-pci-bridge", + rather than simply the class of device ("pcie-to-pci-bridge", "pci-bridge"), which is set in the controller element's model <b>attribute</b>. In almost all cases, you should not manually add a <code><model></code> subelement to a @@ -4603,11 +4603,11 @@ ... <devices> <controller type='pci' index='0' model='pcie-root'/> - <controller type='pci' index='1' model='dmi-to-pci-bridge'> - <address type='pci' domain='0' bus='0' slot='0xe' function='0'/> + <controller type='pci' index='1' model='pcie-root-port'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </controller> - <controller type='pci' index='2' model='pci-bridge'> - <address type='pci' domain='0' bus='1' slot='1' function='0'/> + <controller type='pci' index='2' model='pcie-to-pci-bridge'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> </devices> ...</pre> diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in index 9a26645aa4..29587b1e7e 100644 --- a/docs/pci-hotplug.html.in +++ b/docs/pci-hotplug.html.in @@ -99,13 +99,12 @@ </p> <pre> -<controller type='pci' model='dmi-to-pci-bridge'/> -<controller type='pci' model='pci-bridge'/></pre> +<controller type='pci' model='pcie-to-pci-bridge'/></pre> <p> and you'll be able to hotplug up to 31 legacy PCI devices, either emulated or assigned from the host, in the slots - from 0x01 to 0x1f of the <code>pci-bridge</code> controller. + from 0x01 to 0x1f of the <code>pcie-to-pci-bridge</code> controller. </p> <h3><a id="x86_64-i440fx">i440fx (pc) machine type</a></h3> -- 2.21.0

2 1

[libvirt] [PATCH 0/3] test_driver: improve testDomainInterfaceAddresses
by Ilias Stamatis 19 Jun '19

19 Jun '19

This patch series introduces the following improvements to the testDomainInterfaceAddresses function: - if a dhcp range is defined for the network, addresses are returned from there (instead of hard-coded addresses that were returned before) - if the network is IPv6 even when a dhcp range is not defined IPv6 addresses will be returned instead of IPv4 - the @source argument is validated - only networks of type VIR_DOMAIN_NET_TYPE_NETWORK are considered Ilias Stamatis (3): test_driver: validate @source in testDomainInterfaceAddresses test_driver: return addresses only for nets of type network test_driver: consider DHCP ranges in testDomainInterfaceAddresses src/test/test_driver.c | 96 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 86 insertions(+), 10 deletions(-) -- 2.22.0

3 13

[libvirt] [PATCH 00/46] Finish moving header guards to #pragma once
by Jonathon Jongsma 19 Jun '19

19 Jun '19

2 93