- Devel - libvirt List Archives

[libvirt] [PATCH] network: restart dnsmasq after adding/removing txt and srv records
by Laine Stump 31 May '16

31 May '16

Although dns host records are stored in a separate configuration file that is reread by dnsmasq when it receives a SIGHUP, the txt and srv records are directly in the dnsmasq .conf file which can't be reread after initial dnsmasq startup. This means that if an srv or txt record is modified in a network config, libvirt needs to restart the dnsmasq process rather than just sending a SIGHUP. This was pointed out in a question in https://bugzilla.redhat.com/show_bug.cgi?id=988718 , but no separate BZ was filed. --- src/network/bridge_driver.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0fd2095..7c8d2cc 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3404,9 +3404,14 @@ networkUpdate(virNetworkPtr net, if (section == VIR_NETWORK_SECTION_BRIDGE || section == VIR_NETWORK_SECTION_DOMAIN || section == VIR_NETWORK_SECTION_IP || - section == VIR_NETWORK_SECTION_IP_DHCP_RANGE) { - /* these sections all change things on the dnsmasq commandline, - * so we need to kill and restart dnsmasq. + section == VIR_NETWORK_SECTION_IP_DHCP_RANGE || + section == VIR_NETWORK_SECTION_DNS_TXT || + section == VIR_NETWORK_SECTION_DNS_SRV) { + /* these sections all change things on the dnsmasq + * commandline (i.e. in the .conf file), so we need to + * kill and restart dnsmasq, because dnsmasq sets its uid + * to "nobody" after it starts, and is unable to re-read + * the conf file (owned by root, mode 600) */ if (networkRestartDhcpDaemon(driver, network) < 0) goto cleanup; @@ -3434,12 +3439,10 @@ networkUpdate(virNetworkPtr net, goto cleanup; } - } else if (section == VIR_NETWORK_SECTION_DNS_HOST || - section == VIR_NETWORK_SECTION_DNS_TXT || - section == VIR_NETWORK_SECTION_DNS_SRV) { - /* these sections only change things in config files, so we - * can just update the config files and send SIGHUP to - * dnsmasq. + } else if (section == VIR_NETWORK_SECTION_DNS_HOST) { + /* this section only changes data in an external file + * (not the .conf file) so we can just update the config + * files and send SIGHUP to dnsmasq. */ if (networkRefreshDhcpDaemon(driver, network) < 0) goto cleanup; -- 2.5.5

2 1

[libvirt] [PATCH 0/2] qemu: expand domain memory statistics
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp and available along with other memory statistics. This information was not saved into domain statistics. Derbyshev Dmitry (2): qemu: expand domain memory statistics with 'usable' qemu: expand domain memory statistics with 'last-update' timestamp include/libvirt/libvirt-domain.h | 12 +++++++++++- src/libvirt-domain.c | 5 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++---------- tools/virsh-domain-monitor.c | 4 ++++ 4 files changed, 33 insertions(+), 11 deletions(-) -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH] qemu: expand domain memory statistics with 'last-update' timestamp
by Derbyshev Dmitriy 31 May '16

31 May '16

From: Derbyshev Dmitry <dderbyshev(a)virtuozzo.com> QEMU reports timestamp along with other memory statistics, but this information is not saved into domain statistics. It could be useful to determine if the data reported is fresh or not. Balloon statistics are not reported in hrf, so no modifications are made in qemu_monitor_text.c. --- include/libvirt/libvirt-domain.h | 6 +++++- src/libvirt-domain.c | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++---------- tools/virsh-domain-monitor.c | 2 ++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index e1d9a0d..51f9785 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -603,11 +603,15 @@ typedef enum { * is in kB */ VIR_DOMAIN_MEMORY_STAT_RSS = 7, + + /* Timestamp of the last update of statistics */ + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE = 8, + /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 8, + VIR_DOMAIN_MEMORY_STAT_NR = 9, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3e144b6..b1c7d73 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5988,6 +5988,8 @@ virDomainGetInterfaceParameters(virDomainPtr domain, * The total amount of memory available to the domain's OS (in kb). * VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON: * Current balloon value (in kb). + * VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE + * Timestamp of the last statistic * * Returns: The number of stats provided or -1 in case of failure. */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e767414..175ef10 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1602,10 +1602,10 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, * rates and/or whether data has been collected since a previous cycle. * It's currently unused. */ -#define GET_BALLOON_STATS(FIELD, TAG, DIVISOR) \ - if (virJSONValueObjectHasKey(statsdata, FIELD) && \ +#define GET_BALLOON_STATS(OBJECT, FIELD, TAG, DIVISOR) \ + if (virJSONValueObjectHasKey(OBJECT, FIELD) && \ (got < nr_stats)) { \ - if (virJSONValueObjectGetNumberUlong(statsdata, FIELD, &mem) < 0) { \ + if (virJSONValueObjectGetNumberUlong(OBJECT, FIELD, &mem) < 0) { \ VIR_DEBUG("Failed to get '%s' value", FIELD); \ } else { \ /* Not being collected? No point in providing bad data */ \ @@ -1676,19 +1676,20 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, goto cleanup; } - GET_BALLOON_STATS("stat-swap-in", + GET_BALLOON_STATS(statsdata, "stat-swap-in", VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 1024); - GET_BALLOON_STATS("stat-swap-out", + GET_BALLOON_STATS(statsdata, "stat-swap-out", VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 1024); - GET_BALLOON_STATS("stat-major-faults", + GET_BALLOON_STATS(statsdata, "stat-major-faults", VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 1); - GET_BALLOON_STATS("stat-minor-faults", + GET_BALLOON_STATS(statsdata, "stat-minor-faults", VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 1); - GET_BALLOON_STATS("stat-free-memory", + GET_BALLOON_STATS(statsdata, "stat-free-memory", VIR_DOMAIN_MEMORY_STAT_UNUSED, 1024); - GET_BALLOON_STATS("stat-total-memory", + GET_BALLOON_STATS(statsdata, "stat-total-memory", VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 1024); - + GET_BALLOON_STATS(data, "last-update", + VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 1); cleanup: virJSONValueFree(cmd); diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 0a93949..3893b90 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -373,6 +373,8 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "actual %llu\n", stats[i].val); if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_RSS) vshPrint(ctl, "rss %llu\n", stats[i].val); + if (stats[i].tag == VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE) + vshPrint(ctl, "last_update %llu\n", stats[i].val); } ret = true; -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH 0/3] Do not check for domain liveness in virDomainObjSetDefTransient
by Ján Tomko 31 May '16

31 May '16

virDomainObjSetDefTransient has an unintuitive attribute 'live': when set to 'true', it ignores the virDomainObjIsActive test. The most common usage is on domain startup, where most of the callers want to create a transient definition even though the domain is not yet active. The only place where live=false is still required is virDomainObjGetPersistentDef (and its usage could possibly be cleaned up too, since it's only called in the drivers that already do SetDefTransient on domain startup). Split out the virDomainObjIsActive check into virDomainObjGetPersistentDef and remove it for the rest of the callers along with the 'live' attribute. Ján Tomko (3): Clean up redundant usage of virDomainObjSetDefTransient Check if the domain is active in virDomainObjGetPersistentDef Do not check for domain liveness in virDomainObjSetDefTransient src/conf/domain_conf.c | 15 ++++----------- src/conf/domain_conf.h | 3 +-- src/libxl/libxl_domain.c | 3 +-- src/lxc/lxc_process.c | 6 +----- src/qemu/qemu_process.c | 4 ++-- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 5 ++--- 7 files changed, 12 insertions(+), 26 deletions(-) -- 2.7.3

2 6

[libvirt] [PATCH v5 0/2] qemu: Support for QXL heads
by Martin Kletzander 31 May '16

31 May '16

v5: - Just a rebase, plus v4 had some hunk in that didn't belong there so this one's cleaner to look at - https://www.redhat.com/archives/libvir-list/2016-March/msg01436.html v4: - Added test case without "heads=" - Don't consolidate 'size_t i, j' declarations v3: - rebase on top of current master in order to cleanly apply - https://www.redhat.com/archives/libvir-list/2016-March/msg01198.html v2: - don't change heads when migrating - https://www.redhat.com/archives/libvir-list/2016-March/msg00811.html v1: - https://www.redhat.com/archives/libvir-list/2016-March/msg00410.html Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Martin Kletzander (2): qemu: Check for qxl's max_outputs parameter qemu: Add support to QXL's max_outputs parameter src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 4 ++ src/qemu/qemu_command.c | 8 +++ src/qemu/qemu_migration.c | 64 ++++++++++++++++++++-- .../qemuxml2argv-video-qxl-heads.args | 28 ++++++++++ .../qemuxml2argv-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2argv-video-qxl-noheads.args | 24 ++++++++ .../qemuxml2argv-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2argvtest.c | 16 ++++++ .../qemuxml2xmlout-video-qxl-heads.xml | 47 ++++++++++++++++ .../qemuxml2xmlout-video-qxl-noheads.xml | 39 +++++++++++++ tests/qemuxml2xmltest.c | 3 + 12 files changed, 319 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-heads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-qxl-noheads.xml -- 2.8.1

4 6

[libvirt] [PATCH v3 0/2] Add support for zero-write detection
by Martin Kletzander 31 May '16

31 May '16

v3: - I know Peter said he'll review it, but there are conflicts every once in a while, so rebased version will apply cleanly for a while - And it's actually not that big of a change to wait for some bigger things to be designed, I believe =) - https://www.redhat.com/archives/libvir-list/2016-April/msg01926.html v2: - use 'zeroes' instead of 'zeros' - https://www.redhat.com/archives/libvir-list/2016-February/msg01146.html v1: - https://www.redhat.com/archives/libvir-list/2015-December/msg00511.html Martin Kletzander (2): conf: Add support of zero-detection for disks qemu: Add support for zero-detection writes docs/formatdomain.html.in | 10 +++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 21 +++++++++- src/conf/domain_conf.h | 11 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 11 ++++++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argv-disk-drive-detect-zeroes.args | 27 +++++++++++++ .../qemuxml2argv-disk-drive-detect-zeroes.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-disk-drive-detect-zeroes.xml | 1 + tests/qemuxml2xmltest.c | 1 + 17 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml -- 2.8.1

2 4

[libvirt] [PATCH 0/6] Final round of build fixes
by Michal Privoznik 31 May '16

31 May '16

Hopefully. Michal Privoznik (6): virNetDevBridgeGet: Avoid NULL dereference virDomainFormatSchedDef: Handle case when func returns NULL esxStorageVolGetXMLDesc: Lookup SCSI lun properly qemuMonitorTextGetAllBlockStatsInfo: Fix line validation ppc64Compute: Avoid false positive domain_conf: Avoid false positive src/conf/domain_conf.c | 27 ++++++++++++++++++++++++--- src/cpu/cpu_ppc64.c | 12 +++++++++++- src/esx/esx_storage_backend_iscsi.c | 4 ++-- src/qemu/qemu_monitor_text.c | 2 +- src/util/virnetdevbridge.c | 6 +++++- 5 files changed, 43 insertions(+), 8 deletions(-) -- 2.8.3

2 24

[libvirt] [libvirt-perl][PATCH 0/2] Catch up with latest libvirt
by Michal Privoznik 31 May '16

31 May '16

Two public constants are to be introduced in libvirt. While touching that are of code, update documentation to a constant of the same origin. Michal Privoznik (2): Add PERF_PARAM_MBML and PERF_PARAM_MBMT constants Expand description for PERF_PARAM_CMT constant Changes | 1 + Virt.xs | 2 ++ lib/Sys/Virt/Domain.pm | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) -- 2.8.3

2 4

[libvirt] [PATCH 0/3] docs/website: drop some old bits
by Cole Robinson 31 May '16

31 May '16

Patches to drop the (busted) website search, (busted) static todo list, and not-very-useful ChangeLog-old Cole Robinson (3): docs: website: remove search docs: website: drop the static todo list page docs: drop ChangeLog-old .gitignore | 2 - ChangeLog-old | 16699 ---------------------------------------------- Makefile.am | 1 - TODO | 22 +- docs/404.html.in | 9 +- docs/Makefile.am | 31 +- docs/devhelp/html.xsl | 4 - docs/index.py | 1266 ---- docs/libvirt.css | 24 - docs/page.xsl | 8 - docs/search.php.code.in | 225 - docs/search.php.in | 18 - docs/sitemap.html.in | 2 +- docs/todo.cfg-example | 26 - docs/todo.pl | 125 - 15 files changed, 13 insertions(+), 18449 deletions(-) delete mode 100644 ChangeLog-old delete mode 100755 docs/index.py delete mode 100644 docs/search.php.code.in delete mode 100644 docs/search.php.in delete mode 100644 docs/todo.cfg-example delete mode 100755 docs/todo.pl -- 2.7.4

2 6

[libvirt] [PATCH 0/2] Yet another round of build fixes
by Michal Privoznik 30 May '16

30 May '16

After these regular errors, I still cannot build cleanly: ../../src/conf/domain_conf.c: In function 'virDomainChrPreAlloc': ../../src/conf/domain_conf.c:14109:57: error: potential null pointer dereference [-Werror=null-dereference] return VIR_REALLOC_N(*arrPtr, *cntPtr + 1); ^ ../../src/conf/domain_conf.c: In function 'virDomainChrRemove': ../../src/conf/domain_conf.c:14133:21: error: potential null pointer dereference [-Werror=null-dereference] for (i = 0; i < *cntPtr; i++) { ^~~~~~~ cc1: all warnings being treated as errors These are obviously false positives. I know some developers here are not very fond of fixing those, so my question is - is it worth the effort or will my patches be NACKed straight away? Michal Privoznik (2): apibuild: Substitute only pure number tokens virSocketAddrIsPrivate: Work on 32bits platforms docs/apibuild.py | 2 +- src/util/virsocketaddr.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.8.3

2 4

[libvirt] [PATCH] conf: Skip MAC checks when using an auto-generated one during detach-device
by Kothapally Madhu Pavan 30 May '16

30 May '16

When we try to detach a network device without specifying the mac address, random mac address is generated. As the generated mac address will not be available in the running vm, detaching device will fail erroring out "error: operation failed: no device matching mac address xx:xx:xx:xx:xx:xx found". This patch allows to match DetachDeviec xml using PCI address when mac address is not specified. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 116 +++++++++++++++++++++++++++++----------------- src/conf/domain_conf.h | 6 ++ src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 6 +- src/qemu/qemu_driver.c | 40 ++++++++++++++-- src/qemu/qemu_hotplug.c | 16 ++++-- src/qemu/qemu_hotplug.h | 3 + 7 files changed, 132 insertions(+), 59 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 568c699..f07f178 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13613,14 +13613,20 @@ int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net) return 0; } -/* virDomainNetFindIdx: search according to mac address and guest side - * PCI address (if specified) +/* virDomainNetFindIdx: + * search according to mac address and guest side PCI address (if specified). + * + * @def: pointer to domain definition + * @net: pointer to network definition that has to be looked up for + * @MACAddrNotSpecified: when detaching a device it takes "true" when mac address is + * not specified in device xml and a random mac is generated which + * cannot be found in the domain def. * * Return: index of match if unique match found * -1 otherwise and an error is logged */ int -virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) +virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net, bool MACAddrNotSpecified) { size_t i; int matchidx = -1; @@ -13628,50 +13634,76 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); - for (i = 0; i < def->nnets; i++) { - if (virMacAddrCmp(&def->nets[i]->mac, &net->mac)) - continue; - - if ((matchidx >= 0) && !PCIAddrSpecified) { - /* there were multiple matches on mac address, and no - * qualifying guest-side PCI address was given, so we must - * fail (NB: a USB address isn't adequate, since it may - * specify only vendor and product ID, and there may be - * multiples of those. - */ - virReportError(VIR_ERR_OPERATION_FAILED, - _("multiple devices matching mac address %s found"), - virMacAddrFormat(&net->mac, mac)); - return -1; - } + /* MAC address is not specified in device xml. So, we need not check for it. + * Here we check for matching PCI address if specified. */ + if (MACAddrNotSpecified) { if (PCIAddrSpecified) { - if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, - &net->info.addr.pci)) { - /* exit early if the pci address was specified and - * it matches, as this guarantees no duplicates. + for (i = 0; i < def->nnets; i++) { + if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, + &net->info.addr.pci)) { + matchidx = i; + break; + } + } + if (matchidx < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device found on " + "%.4x:%.2x:%.2x.%.1x"), + net->info.addr.pci.domain, + net->info.addr.pci.bus, + net->info.addr.pci.slot, + net->info.addr.pci.function); + } + } else { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("mac address and pci address not specified in device xml")); + } + } else { + for (i = 0; i < def->nnets; i++) { + if (virMacAddrCmp(&def->nets[i]->mac, &net->mac)) + continue; + + if ((matchidx >= 0) && !PCIAddrSpecified) { + /* there were multiple matches on mac address, and no + * qualifying guest-side PCI address was given, so we must + * fail (NB: a USB address isn't adequate, since it may + * specify only vendor and product ID, and there may be + * multiples of those. */ + virReportError(VIR_ERR_OPERATION_FAILED, + _("multiple devices matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + return -1; + } + if (PCIAddrSpecified) { + if (virPCIDeviceAddressEqual(&def->nets[i]->info.addr.pci, + &net->info.addr.pci)) { + /* exit early if the pci address was specified and + * it matches, as this guarantees no duplicates. + */ + matchidx = i; + break; + } + } else { + /* no PCI address given, so there may be multiple matches */ matchidx = i; - break; } - } else { - /* no PCI address given, so there may be multiple matches */ - matchidx = i; } - } - if (matchidx < 0) { - if (PCIAddrSpecified) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("no device matching mac address %s found on " - "%.4x:%.2x:%.2x.%.1x"), - virMacAddrFormat(&net->mac, mac), - net->info.addr.pci.domain, - net->info.addr.pci.bus, - net->info.addr.pci.slot, - net->info.addr.pci.function); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, - _("no device matching mac address %s found"), - virMacAddrFormat(&net->mac, mac)); + if (matchidx < 0) { + if (PCIAddrSpecified) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device matching mac address %s found on " + "%.4x:%.2x:%.2x.%.1x"), + virMacAddrFormat(&net->mac, mac), + net->info.addr.pci.domain, + net->info.addr.pci.bus, + net->info.addr.pci.slot, + net->info.addr.pci.function); + } else { + virReportError(VIR_ERR_OPERATION_FAILED, + _("no device matching mac address %s found"), + virMacAddrFormat(&net->mac, mac)); + } } } return matchidx; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b1953b3..d3ebcdc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2581,6 +2581,8 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8, /* allow updates in post parse callback that would break ABI otherwise */ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, + /* indicates mac address is generated when not provided in device xml */ + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR = 1 << 10, } virDomainDefParseFlags; typedef enum { @@ -2710,7 +2712,9 @@ int virDomainDiskSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSourcePtr src); -int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); +int virDomainNetFindIdx(virDomainDefPtr def, + virDomainNetDefPtr net, + bool MACAddrNotSpecified); virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); bool virDomainHasNet(virDomainDefPtr def, virDomainNetDefPtr net); int virDomainNetInsert(virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 95dfc01..1c53c5f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3422,7 +3422,7 @@ libxlDomainDetachNetDevice(libxlDriverPrivatePtr driver, libxl_device_nic_init(&nic); - if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; @@ -3521,7 +3521,7 @@ libxlDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; /* this is guaranteed to succeed */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 67f14fe..3d1396a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3929,7 +3929,7 @@ lxcDomainUpdateDeviceConfig(virDomainDefPtr vmdef, switch (dev->type) { case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) goto cleanup; virDomainNetDefFree(vmdef->nets[idx]); @@ -3975,7 +3975,7 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, false)) < 0) goto cleanup; /* this is guaranteed to succeed */ @@ -4759,7 +4759,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, virDomainNetDefPtr detach = NULL; virNetDevVPortProfilePtr vport = NULL; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) goto cleanup; detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 10d3e3d..e6c811c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4105,6 +4105,31 @@ processDeviceDeletedEvent(virQEMUDriverPtr driver, virObjectUnref(cfg); } +static bool qemuIsMacAvailable(const char *xmlStr) +{ + xmlNodePtr cur; + xmlXPathContextPtr ctxt = NULL; + + if (!virXMLParseStringCtxt(xmlStr, _("(device_definition)"), &ctxt)) + goto endjob; + + cur = ctxt->node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (xmlStrEqual(cur->name, BAD_CAST "mac")) + goto cleanup; + } + cur = cur->next; + } + + endjob: + xmlXPathFreeContext(ctxt); + return false; + + cleanup: + xmlXPathFreeContext(ctxt); + return true; +} static void syncNicRxFilterMacAddr(char *ifname, virNetDevRxFilterPtr guestFilter, @@ -7587,7 +7612,8 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver, static int qemuDomainDetachDeviceLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev, - virDomainPtr dom) + virDomainPtr dom, + unsigned int parse_flags) { virQEMUDriverPtr driver = dom->conn->privateData; int ret = -1; @@ -7603,7 +7629,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, ret = qemuDomainDetachLease(driver, vm, dev->data.lease); break; case VIR_DOMAIN_DEVICE_NET: - ret = qemuDomainDetachNetDevice(driver, vm, dev); + ret = qemuDomainDetachNetDevice(driver, vm, dev, parse_flags); break; case VIR_DOMAIN_DEVICE_HOSTDEV: ret = qemuDomainDetachHostDevice(driver, vm, dev); @@ -7932,6 +7958,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, virDomainChrDefPtr chr; virDomainFSDefPtr fs; int idx; + bool skipMac = parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR ? true : false; switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -7946,7 +7973,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((idx = virDomainNetFindIdx(vmdef, net)) < 0) + if ((idx = virDomainNetFindIdx(vmdef, net, skipMac)) < 0) return -1; /* this is guaranteed to succeed */ @@ -8115,7 +8142,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_NET: net = dev->data.net; - if ((pos = virDomainNetFindIdx(vmdef, net)) < 0) + if ((pos = virDomainNetFindIdx(vmdef, net, false)) < 0) return -1; virDomainNetDefFree(vmdef->nets[pos]); @@ -8452,6 +8479,9 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; + if (!qemuIsMacAvailable(xml)) + parse_flags |= VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); @@ -8495,7 +8525,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, VIR_DOMAIN_DEVICE_ACTION_DETACH) < 0) goto endjob; - if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom)) < 0) + if ((ret = qemuDomainDetachDeviceLive(vm, dev_copy, dom, parse_flags)) < 0) goto endjob; /* * update domain status forcibly because the domain status may be diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6ce0a84..2bf82b4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2163,7 +2163,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, int ret = -1; int changeidx = -1; - if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) + if ((changeidx = virDomainNetFindIdx(vm->def, newdev, false)) < 0) goto cleanup; devslot = &vm->def->nets[changeidx]; @@ -3825,7 +3825,7 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, * function so that mac address / virtualport are reset */ if (detach->parent.type == VIR_DOMAIN_DEVICE_NET) - return qemuDomainDetachNetDevice(driver, vm, &detach->parent); + return qemuDomainDetachNetDevice(driver, vm, &detach->parent, 0); else return qemuDomainDetachThisHostDevice(driver, vm, detach); } @@ -3833,14 +3833,20 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev) + virDomainDeviceDefPtr dev, + unsigned int parse_flags) { int detachidx, ret = -1; virDomainNetDefPtr detach = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0) - goto cleanup; + if (parse_flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR) { + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, true)) < 0) + goto cleanup; + } else { + if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net, false)) < 0) + goto cleanup; + } detach = vm->def->nets[detachidx]; diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 165d345..f144879 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -82,7 +82,8 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver, virDomainDeviceDefPtr dev); int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, - virDomainDeviceDefPtr dev); + virDomainDeviceDefPtr dev, + unsigned int parse_flags); int qemuDomainDetachHostDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDeviceDefPtr dev);

2 1

[libvirt] [PATCH 0/3] Couple of build fixes
by Michal Privoznik 30 May '16

30 May '16

I've noticed couple of build failures with a bleeding edge gcc. Here are fixes to some of them. Michal Privoznik (3): docs: Teach apibuild to deal with (1U << 31) too Turn 1<<31 into 1U<<31 build: use gnulib's unsetenv bootstrap.conf | 1 + docs/apibuild.py | 3 ++- include/libvirt/libvirt-domain.h | 2 +- src/util/virtypedparam.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) -- 2.8.3

2 7

[libvirt] Entering freeze fro libvirt-1.3.5
by Daniel Veillard 28 May '16

28 May '16

Due to travel etc... I forgot to push RC1 on Thursday and could not yesterday, but I just tagged rc1 in git and am pushing signed tarball and rpms to the usual place now: ftp://libvirt.org/libvirt/ I think I can try to push rc2 on Tuesday or Wednesday, and then I will try to push 1.3.5 on Friday (3rd then), sorry for the delay, please give it a try, thanks Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH rfc 0/1] storage: vzstorage storage pool
by Olga Krishtal 28 May '16

28 May '16

In-Reply-To: This is first draft, that supports vzstorage in storage pools.i Virtuozzo Storage is a fault-tolerant distributed storage system, optimized for virtualization workloads. Vzstorage pool supports the same volume formats as directory, nfs, etc. In terms of volume management - there is no difference between these pools. You can find more information here: https://openvz.org/Virtuozzo_Storage XML: <pool type='vz'> <name>vz7_pool</name> <uuid>b27a72b5-a92e-4e58-a172-a80ba73b30fe</uuid> <capacity unit='bytes'>0</capacity> <allocation unit='bytes'>0</allocation> <available unit='bytes'>0</available> <source> <host name='127.0.0.2'/> <device path='vz7-vzstorage'/> <dir path='/pool1'/> </source> <target> <path>/vz7-vzstorage</path> </target> </pool> To compile libvirt with vz pool support use key --with-storage-vz I need some help to resolve some problems: - how to detect that pool is alredy mounted. - when we show pool sources do we need to show folders that may reside on vzstorage - I am not quite sure that we need host name in xml. I will be glad to here your opinion.

2 3

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Pulls in several portability fixes, including the fact that gnulib now only works on platforms with two's complement signed integers. Also makes for a smaller delta on the next update (we are waiting on a license change to unsetenv for the sake of mingw). * .gnulib: Update to latest. * bootstrap: Resync from upstream. * tests/virstringtest.c: Drop use of obsolete probes of integer properties. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'd like to get this in now, before RC1 is cut, so that we maximize the testing of the bulk of the gnulib changes (rather than waiting for the unsetenv change needed for mingw to land, but forcing the gnulib update to only get testing in RC2). * .gnulib 6cc32c6...8d807a9 (127): > gendocs.sh: Set default TOP_NODE_UP_URL in HTML output. > manywarnings: update for GCC 6.1 > autoupdate > intdiv0, memmem, nocrash, strcasestr, strstr: no exit > glob: size_t overflow checks > glob: don't assume INT_MAX < SIZE_MAX > Fix undefined behaviour in gettext.h. > autoupdate > git-version-gen: avoid undefined shift > update from texinfo > glob: merge glibc changes into lib/glob.c > mktime: spelling fix in comment > mktime: port to stricter signed overflow checking > mktime: speed up DEBUG_MKTIME benchmarks > mktime: resurrect DEBUG_MKTIME testing > mktime: simplify DEBUG_MKTIME > Port mktime_internal offset to unsigned time_t > xstrtol: prohibit monstrosities like "1bB" > xstrtod: reinstate setting of *result upon ERANGE > xstrtod: modify *result only if no errors > btowc: document problems in C locale > autoupdate > update from texinfo > mktime: improve integer overflow checking > intprops: check two's complement assumption > intprops, mktime, strtol: assume two's complement > stdint: port to strict C11 left shift > mbrtowc: work around glibc bug#19932 > update from texinfo > autoupdate > stdint: detect good enough pre-C++11 stdint.h in C++ mode > argp: merge changes from glibc > Prefer American spelling for "initialize" > autoupdate > stddef: support configuring with g++ > autoupdate > autoupdate > update from texinfo > test-framework-sh: minor cleanups > test-framework-sh: revert port to NetBSD 7.0 > autoupdate > Port better to Alpine Linux > test-framework-sh: port to NetBSD 7.0 > update from texinfo > gitlog-to-changelog: suppress ignored chatter > update from texinfo > update from texinfo > setlocale: add "sv" to Windows language table > update from texinfo > sys_select: port to new Cygwin > test-userspec.c: do not trigger gcc's new -Wmisleading-indentation > time_rz: port to clang -Wunused-const-variable > std-gnu11: improve clang support > select: port more to Intel 2016.1.150 compiler > select: try to port to 2016.1.150 compiler > localename-tests: memory allocation fixes > intprops: make .h file license match module > acl: fix missing return on Cygwin > update from texinfo > update from texinfo > extern-inline: port to PGI CC > update from texinfo > update from texinfo > signbit: port back to pre-C++11 GCC > mountlist: recognize autofs-mounted remote file systems, too > signbit: port to C++ with GCC 6 > regex: make it closer to libc > regex: merge patches from libc > update from texinfo > update from texinfo > autoupdate > autoupdate > stdalign: port to older HP and IBM cc > stdalign: port to clang 3.7.0 > update from texinfo > readdir_r: now obsolescent > Use modern texinfo when syncing install.texi output from autoconf > update from texinfo > sync install.texi from autoconf > misc: port better to gcc -fsanitize=address > update from texinfo > autoupdate > verify-tests: also remove stray test-verify.Tpo > std-gnu11: new module > update from texinfo > update from texinfo > get-permissions, strftime: fix grammar in comments > gettext: mark as obsolete > gnulib-tool: don't give up on ln -s so easily > closedir: fix OS/2-related typos > openat_proc_name: fix that last '/' is overwritten on OS/2 kLIBC > regex: treat [x] as x if x is a unibyte encoding error > closedir, dirfd, opendir: port to OpenSolaris 5.10 > bootstrap: use American spelling > @item needed inside @itemize > hash-pjw-bare: fix comment > wcwidth: Replace also on OpenBSD 5.8 > update from texinfo > gnu-web-doc-update: fix addition of new files > utimens-tests: avoid pulling gettext .m4 files > regex: pacify static checkers > regex: fix [ diagnostic > regex: fix memory leaks > fts: don't unconditionally use leaf optimization for NFS > * gnulib-tool: fix stray debug line in previous patch > gnulib-tool: don't assume ln -s works > utimes: detect utimes() correctly on OS/2 kLIBC > openat_proc_name: port to OS/2 kLIBC > stdint: check _INTPTR_T_DECLARED for intptr_t etc. > doc: mention unfixed issues with unsupported localtime() values > Go back to gettext-0.19.7 > opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC > dup, dup2, fcntl: support a directory fd on OS/2 kLIBC > pipe_filter_ii_execute: port to OS/2 kLIBC > wchar: fix "conflicting types" error for __wcwidth on OS/2 kLIBC > w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC > pipe-filter-aux: undefine HAVE_SELECT on KLIBC > binary-io: don't put fd in binary mode if it is a console on EMX > doc: mention setlocale() issues on OpenBSD > sig2str: list all signals on FreeBSD >= 7 > acl-permissions: port to USE_ACL==0 platforms > mktime: rename macro to avoid glibc clash > Port "$@" to OpenIndiana ksh93 > autoupdate > Port Universal Time settings to strict POSIX > update from texinfo > update from texinfo .gnulib | 2 +- bootstrap | 6 +++--- tests/virstringtest.c | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gnulib b/.gnulib index 6cc32c6..8d807a9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 +Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 diff --git a/bootstrap b/bootstrap index 294c0bc..f060bab 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2014-12-08.12; # UTC +scriptversion=2016-01-24.06; # UTC # Bootstrap this package from checked-out sources. @@ -42,7 +42,7 @@ export LC_ALL local_gl_dir=gl -# Honour $PERL, but work even if there is none +# Honor $PERL, but work even if there is none. PERL="${PERL-perl}" me=$0 @@ -1021,6 +1021,6 @@ echo "$0: done. Now you can run './configure'." # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 7a1dcfd..63b8009 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,6 @@ #include <stdlib.h> #include "testutils.h" -#include "intprops.h" #include "verify.h" #include "virerror.h" #include "viralloc.h" @@ -409,13 +408,11 @@ struct stringToLongData { /* This test makes assumptions about our compilation platform that are * not guaranteed by POSIX. Good luck to you if you are crazy enough - * to try and port libvirt to a platform with 16-bit int. */ + * to try and port libvirt to a platform with 16-bit int. Gnulib + * already assumes that signed integers are two's complement. */ verify(sizeof(int) == 4); -verify(TYPE_TWOS_COMPLEMENT(int)); verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); -verify(TYPE_TWOS_COMPLEMENT(long)); verify(sizeof(long long) == 8); -verify(TYPE_TWOS_COMPLEMENT(long long)); static int testStringToLong(const void *opaque) -- 2.5.5

7 12

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 27 May '16

27 May '16

Fix a regression in checking for realpath (which caused link failures regarding duplicate rpl_canonicalize_file_name), and fix the mingw build regarding unsetenv. * .gnulib: Update to latest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Fixes the reported failure with canonicalize_file_name, but there's still the issue of new gcc warnings enabled which affect F24 with its newer gcc. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) * .gnulib 8d807a9...246b3b2 (3): > canonicalize: Fix broken probe for realpath. > unsetenv: relax to LGPLv2+ > update from texinfo diff --git a/.gnulib b/.gnulib index 8d807a9..246b3b2 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 +Subproject commit 246b3b28808ee5f4664be674dce573af9497fc7a -- 2.5.5

1 0

[libvirt] inconsistency in attribute usage between hv drivers
by Laine Stump 27 May '16

27 May '16

I just came across this problem while looking for the proper place to put <ip> info for the host side of <interface type='ethernet'>. I don't think there's really anything that can be done about it now, since everything below has been in place for so long, but maybe it can serve as a cautionary tale. Prologue: A week or two ago, I made patches to support <interface type='ethernet'> in the LXC driver. I did this not because I have a need for that, but because it seemed like the perfect avenue for investigating the best way to add IP address and route config to <interface>, as it is one environment where we have a need *and* the ability to setup IP info for both the host and guest sides of the interface. I accomplished this by simply generalizing the existing <interface type='bridge'> code to not attach the host-side veth device to a bridge. This makes all common attributes between type='ethernet' and type='bridge' consistent, including the configuration of guest-side and host-side device names, and here we come to the first inconsistency - the device name for the veth/tap on the host side is in the <target> element (which I've always been told is supposed to be used for device-specific info about how the device will be presented on the *guest* side, but I suppose this is because <interface type='direct'> uses <source dev='blah'> to provide the name of the physical device that the macvtap device (named in <target dev='macvblah'/> is attached to). And I guess because the dev attribute was already in-use in <target> the much more recently added guest-side name is given in the <guest> subelement (in LXC at least): <interface type='ethernet'> <target dev='hostblah'/> <-- name of veth on host side <guest dev='guestblah'/> <-- name of veth on guest side ... Now, this "is what it is". There is no changing it. In particular, the use of <target dev> for the host-side device name has been in use for so long and is so deeply ingrained that it's just part of the scenery. Moving for a minute to the IP address/route info for the guest side is already configured in the toplevel <ip> and <route> subelements of <interface>, <interface type='ethernet'> <ip address='1.2.3.4' .../> </interface> My first thought was to put the <ip> for the host side inside <source>: <interface type='ethernet'> <source> <ip address='1.2.3.5' .../> <-- host side </source> <ip address='1.2.3.4' .../> <-- guest side </interface> That makes sense to me because it parallels what we do with PCI addresses for hostdev - the PCI address in <source> tells what the address is on the host, and the one at the toplevel of <hostdev> tells what the PCI address will be in the guest. It *doesn't* fit well with the fact that the device we're setting up is named in <target> though, so we're already inconsistent, but putting the host-side IP config in <target> seems like an invitation to mix things up even more in the future, since <target> is used everywhere else as a place to put stuff related to what the device looks like in the guest (although... for <interface>, <target> *is* currently used only for the host-side tap/veth device name; so maybe we just can define the purpose of <target> differently in this one case... But I digress). So I went to the code to add parsing of <ip> inside <source>, and found that the type-specific data for ethernet has a dev, and that field in the object is set during parsing from <source dev='blah'/>, *and* that the openvz driver uses that dev name as the name of the network device in the *guest*! (even though my understanding of <source> is that it is supposed to be used for information about the *host* side of any device. Sigh.) So on openvz, we have this: <interface type='ethernet'> <target dev='hostblah'/> <-- name of interface on host side <source dev='guestblah'/> <-- name of interface on guest side ... which seems exactly the opposite of what it should be. Note that this doesn't seem to be documented anywhere except in the few lines in openvz_driver.c that implement it. (Note that, prior to commit 9a4b705f7 back in 2010, which added support for type='ethernet' in openvz, the "dev" field was already in the ethernet-specific sub-object of virDomainNetDef, but it was only used to hold the name of the bridge that a tap device was attached to when converting from a qemu commandline to XML (also, as previously stated, for type='direct' it is used to name the physical device on the host that the macvtap interface is connected to, i.e. *exactly* the opposite end of the chain). It looks like the poster of the openvz patch just saw an opportune existing-but-unused-by-type=ethernet attribute and took advantage, and it wasn't noticed in review). I'm actually skeptical that anyone even uses this, since openvz is a less-used driver, type='ethernet' is less used among interface types, and even after that it's valid to not provide a name, in which case one is automatically generated. But there is no way to verify that, so we're stuck with it. It is true that the LXC version of type='ethernet' was added only a few days ago, and there hasn't yet been a release, so I *could* modify it to be consistent with the attribute usage in the openvz driver. But that would make <interface type='ethernet'> in LXC inconsistent with <interface type='bridge'> in LXC, which is a much worse situation. IT seems there is nothing to change. As I said above "it is what it is". So why am I writing this message? Partly to just vent frustration (aka "whine") I suppose :-). Also partly as public testimony that my seemingly excessive worrying over attribute naming and placement is justified, and not just OCD. Also, as I said above, as a cautionary tale that any patch adding *any* XML config knob, or making use of an existing XML config knob needs extra scrutiny to help minimize such messes in the future.

1 0

[libvirt] [PATCH] unsetenv: relax to LGPLv2+
by Eric Blake 27 May '16

27 May '16

Especially since setenv is also LGPLv2+, and it makes sense for the two modules to stay in sync. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Libvirt wants LGPLv2+ when it uses gnulib, and recently ran into a problem where it can use the setenv module for mingw but not the unsetenv module. Barring any negative reviews, I'll push this in 24 hours, or sooner if I get a positive review; then libvirt will have to pick up the latest gnulib to make use of it. modules/unsetenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/unsetenv b/modules/unsetenv index 015ac4e..909cec9 100644 --- a/modules/unsetenv +++ b/modules/unsetenv @@ -24,7 +24,7 @@ Include: <stdlib.h> License: -LGPL +LGPLv2+ Maintainer: all -- 2.5.5

1 1

[libvirt] [PATCH] lxc: Fix virLXCDomainObjBeginJob position in lxcDomainSetMemoryParameters
by Katerina Koukiou 27 May '16

27 May '16

Adjust the code to perform the virLXCDomainObjBeginJob first and then the call virDomainLiveConfigHelperMethod. As Ján Tomko pointed out, in virDomainLiveConfigHelperMethod, there is a check to see if the domain is active when AFFECT_LIVE is set. Since virLXCDomainObjBeginJob unlocks the virDomainObjPtr lock, the domain could possibly be destroyed while we wait for the job and the check results would no longer be valid. Signed-off-by: Katerina Koukiou <k.koukiou(a)gmail.com> --- src/lxc/lxc_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3aadd64..f883ffb 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -841,14 +841,16 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, cfg = virLXCDriverGetConfig(driver); if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) < 0 || - !(caps = virLXCDriverGetCapabilities(driver, false)) || - virDomainLiveConfigHelperMethod(caps, driver->xmlopt, - vm, &flags, &vmdef) < 0) + !(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; + if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, + vm, &flags, &vmdef) < 0) + goto endjob; + if (flags & VIR_DOMAIN_AFFECT_LIVE && !virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_MEMORY)) { virReportError(VIR_ERR_OPERATION_INVALID, -- 2.7.4

2 1

[libvirt] New account at Wiki
by Artur Zochniak 26 May '16

26 May '16

Hello! Can I have an account for wiki? I ask here because I am following http://wiki.libvirt.org/page/Main_Page#libvirt_Wiki preferred username: arjamizo Thanks! BR Artur

1 0

[libvirt] [PATCHv2] Added hook for network modification event
by Khramov Anton 26 May '16

26 May '16

From: Anton Khramov <anton(a)endocode.com> Anton Khramov (1): network: Added hook for network modification event docs/hooks.html.in | 2 ++ src/network/bridge_driver.c | 5 +++++ src/util/virhook.c | 3 ++- src/util/virhook.h | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) -- 1.9.1

2 2

[libvirt] [PATCH v2] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- Changes made since v1: * Also patch esxVI_EnsureSession * Added cleanup to esxVI_Context_Connect to make sure escapedPassword is freed where appropiate. Also move the code block that escapes the password to happen earlier in the function body so that it can bail earlier in the event of failure and skip the rest of the processing. * Updated virReportError calls to pass syntax-check src/esx/esx_driver.c | 22 ++++--------------- src/esx/esx_vi.c | 62 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 50 insertions(+), 34 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 6520196..5fb2279 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,39 +996,52 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + int result = -1; + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_CURL_Alloc(&ctx->curl) < 0 || esxVI_CURL_Connect(ctx->curl, parsedUri) < 0 || VIR_STRDUP(ctx->url, url) < 0 || VIR_STRDUP(ctx->ipAddress, ipAddress) < 0 || VIR_STRDUP(ctx->username, username) < 0 || VIR_STRDUP(ctx->password, password) < 0) { - return -1; + goto cleanup; } if (VIR_ALLOC(ctx->sessionLock) < 0) - return -1; + goto cleanup; + if (virMutexInit(ctx->sessionLock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize session mutex")); - return -1; + goto cleanup; } if (esxVI_RetrieveServiceContent(ctx, &ctx->service) < 0) - return -1; + goto cleanup; if (STRNEQ(ctx->service->about->apiType, "HostAgent") && STRNEQ(ctx->service->about->apiType, "VirtualCenter")) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VI API type 'HostAgent' or 'VirtualCenter' " "but found '%s'"), ctx->service->about->apiType); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->apiVersion, @@ -1036,14 +1049,14 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse VI API version '%s'"), ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (ctx->apiVersion < 1000000 * 2 + 1000 * 5 /* 2.5 */) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Minimum supported %s version is %s but found version '%s'"), "VI API", "2.5", ctx->service->about->apiVersion); - return -1; + goto cleanup; } if (virParseVersionString(ctx->service->about->version, @@ -1051,7 +1064,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not parse product version '%s'"), ctx->service->about->version); - return -1; + goto cleanup; } if (STREQ(ctx->service->about->productLineId, "gsx")) { @@ -1060,7 +1073,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_GSX), "2.0", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_GSX; @@ -1071,7 +1084,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_ESX), "3.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_ESX; @@ -1081,7 +1094,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Minimum supported %s version is %s but found version '%s'"), esxVI_ProductLineToDisplayName(esxVI_ProductLine_VPX), "2.5", ctx->service->about->version); - return -1; + goto cleanup; } ctx->productLine = esxVI_ProductLine_VPX; @@ -1090,7 +1103,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, _("Expecting product 'gsx' or 'esx' or 'embeddedEsx' " "or 'vpx' but found '%s'"), ctx->service->about->productLineId); - return -1; + goto cleanup; } if (ctx->productLine == esxVI_ProductLine_ESX) { @@ -1107,12 +1120,19 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { - return -1; + goto cleanup; } - return 0; + result = 0; + + cleanup: + VIR_FREE(escapedPassword); + + return result; } int @@ -2062,6 +2082,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) esxVI_ObjectContent *sessionManager = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_UserSession *currentSession = NULL; + char *escapedPassword = NULL; if (!ctx->sessionLock) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call, no mutex")); @@ -2075,6 +2096,14 @@ esxVI_EnsureSession(esxVI_Context *ctx) goto cleanup; } + escapedPassword = esxUtil_EscapeForXml(ctx->password); + + if (!escapedPassword) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to escape password for XML")); + goto cleanup; + } + if (esxVI_String_AppendValueToList(&propertyNameList, "currentSession") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, @@ -2101,7 +2130,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) if (!currentSession) { esxVI_UserSession_Free(&ctx->session); - if (esxVI_Login(ctx, ctx->username, ctx->password, NULL, + if (esxVI_Login(ctx, ctx->username, escapedPassword, NULL, &ctx->session) < 0) { goto cleanup; } @@ -2117,6 +2146,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) cleanup: virMutexUnlock(ctx->sessionLock); + VIR_FREE(escapedPassword); esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(&currentSession); -- 2.7.4

2 1

[libvirt] [PATCH] testutils.c: unsetenv() iff platform has it
by Michal Privoznik 26 May '16

26 May '16

I've encountered the following problem (introduced by 6326865e): ../../tests/testutils.c: In function 'virtTestRun': ../../tests/testutils.c:289:5: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("VIR_TEST_MOCK_TESTNAME"); Apparently, mingw does not have unsetenv(). Therefore we should call it iff we are sure platform we are building for has it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is a tentative patch. Ideally, we would use gnulib's implementation (like we do for setenv()), but there are some licensing problems right now [1]. If they are resolved before our release, we can just pick new gnulib. If, however, they are not, we can just push this patch. 1: https://www.redhat.com/archives/libvir-list/2016-May/msg01952.html tests/testutils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index f4fbad2..8b7bf70 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -286,7 +286,9 @@ virtTestRun(const char *title, } #endif /* TEST_OOM */ +#ifdef HAVE_UNSETENV unsetenv("VIR_TEST_MOCK_TESTNAME"); +#endif return ret; } -- 2.8.3

2 2

[libvirt] [PATCH] qemu: Fix error message when PCI bridge has index <= bus
by Andrea Bolognani 26 May '16

26 May '16

Commit ff2126225df0 changed the error message to be more detailed about the failure at hand; however, while the new error message claims that "bus must be <= index", the error message is displayed if "idx <= addr->bus", ie. when bus is bigger than or *equal to* index. Change the error message to report the correct constraint, and format it in a way that mirrors the check exactly to make it clearer to people reading the code. The new error message reads "must be index > bus". --- I'm assuming the code, which is pre-existing, is correct here. CC'ing Laine for insights. src/qemu/qemu_domain_address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 7bd8ee5..650cb2a 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1598,14 +1598,14 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, break; } - /* check if every PCI bridge controller's ID is greater than + /* check if every PCI bridge controller's index is greater than * the bus it is placed onto */ if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE && idx <= addr->bus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("PCI controller at index %d (0x%02x) has " - "bus='0x%02x', but bus must be <= index"), + "bus='0x%02x'; must be index > bus"), idx, idx, addr->bus); goto cleanup; } -- 2.5.5

2 2

[libvirt] inconsistent handling of "qemu64" CPU model
by Chris Friesen 26 May '16

26 May '16

Hi, I'm not sure where the problem lies, hence the CC to both lists. Please copy me on the reply. I'm playing with OpenStack's devstack environment on an Ubuntu 14.04 host with a Celeron 2961Y CPU. (libvirt detects it as a Nehalem with a bunch of extra features.) Qemu gives version 2.2.0 (Debian 1:2.2+dfsg-5expubuntu9.7~cloud2). If I don't specify a virtual CPU model, it appears to give me a "qemu64" CPU, and /proc/cpuinfo in the guest instance looks something like this: processor 0 vendor_id GenuineIntel cpu family 6 model 6 model name: QEMU Virtual CPU version 2.2.0 stepping: 3 microcode: 0x1 flags: fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm rep_good nopl pni vmx cx16 x2apic popcnt hypervisor lahf_lm abm vnmi ept However, if I explicitly specify a custom CPU model of "qemu64" the instance refuses to boot and I get a log saying: libvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svmlibvirtError: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: svm When this happens, some of the XML for the domain looks like this: <os> <type arch='x86_64' machine='pc-i440fx-utopic'>hvm</type> .... <cpu mode='custom' match='exact'> <model fallback='allow'>qemu64</model> <topology sockets='1' cores='1' threads='1'/> </cpu> Of course "svm" is an AMD flag and I'm running an Intel CPU. But why does it work when I just rely on the default virtual CPU? Is kvm_default_unset_features handled differently when it's implicit vs explicit? If I explicitly specify a custom CPU model of "kvm64" then it boots, but of course I get a different virtual CPU from what I get if I don't specify anything. Following some old suggestions I tried turning off nested kvm, deleting /var/cache/libvirt/qemu/capabilities/*, and restarting libvirtd. Didn't help. So...anyone got any ideas what's going on? Is there no way to explicitly specify the model that you get by default? Thanks, Chris

3 3

[libvirt] [PATCH 0/8] lxc: add job support
by Katerina Koukiou 26 May '16

26 May '16

This patch series adds job support to the lxc driver, using techiques from the libxl driver. One benefit is no longer blocking get operations during long running modify operations. E.g. with these patches 'vish dominfo dom' will work while 'virsh save dom ...' is in progress. The first patch adds the job support machinery, followed by several patches that make use of it. Although this might look not needed that much right now, it is preparing environment for future work. This patch series has been reviewed by Michal Privoznik who is my mentor for GSoC 2016. Katerina Koukiou (8): lxc: Add job support to lxc driver lxc: use job functions in lxcDomain{CreateXMLWithFiles, CreateWithFiles} lxc: use job functions in lxcDomainSetMemoryFlags lxc: use job functions in lxcDomain{Suspend, Resume} lxc: use job functions in lxcDomain{AttachDeviceFlags, DetachDeviceFlags, UpdateDeviceFlags} lxc: add job functions in lxcDomainSetAutostart lxc: use job functions in lxcDomain* functions that do query operations. lxc: use job functions in lxcDomain* functions that perform modify actions. src/lxc/lxc_domain.c | 154 ++++++++++++++++++++-- src/lxc/lxc_domain.h | 37 ++++++ src/lxc/lxc_driver.c | 351 ++++++++++++++++++++++++++++++++++++--------------- 3 files changed, 428 insertions(+), 114 deletions(-) -- 2.7.4

4 12

[libvirt] [PATCH] daemon: cleanup state drivers in order reverse to init order
by Nikolay Shirokovskiy 26 May '16

26 May '16

This patch aims to fix observed crash on daemon shutdown. Main thread is in the process of state drivers cleanup, network driver is cleaned up and qemu driver is not yet. Meanwhile eof event from qemu process triggers qemuProcessStop -> networkReleaseActualDevice and crash happens as network driver is already cleaned up. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 114e88c..d79fe75 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -800,12 +800,12 @@ virStateInitialize(bool privileged, int virStateCleanup(void) { - size_t i; + int r; int ret = 0; - for (i = 0; i < virStateDriverTabCount; i++) { - if (virStateDriverTab[i]->stateCleanup && - virStateDriverTab[i]->stateCleanup() < 0) + for (r = virStateDriverTabCount - 1; r >= 0; r--) { + if (virStateDriverTab[r]->stateCleanup && + virStateDriverTab[r]->stateCleanup() < 0) ret = -1; } return ret; -- 1.8.3.1

2 3

[libvirt] [PATCH 0/3] esx: improve virtualHW > 7 handling.
by Dawid Zamirski 26 May '16

26 May '16

Hello, The following patches are for issues found when using libvirt to create/manage VMs on ESXi hosts (5.5 and 6). The first patch addresses a fairly common issue with creating VMs on ESXi with SCSI controllers. The other two are to less common but work around known ESX issues e.g. 4TB drive size limit and vMotion compatibility. Dawid Zamirski (3): esx: add pciBridge devices when SCSI is used esx: Add VMCI device for virtualHW >= 7 esx: use newer virtualHW version for 5.1+ hosts src/esx/esx_vi.c | 17 ++++++++++++++ src/vmx/vmx.c | 27 ++++++++++++++++++++++ tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 14 +++++++++++ .../xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 + tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 14 +++++++++++ tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 14 +++++++++++ 7 files changed, 88 insertions(+) -- 2.7.4

2 6

[libvirt] Question on output of virsh capabilities
by Eli Qiao 26 May '16

26 May '16

hi I am confused by the libvirt's "virsh capabilities" help said: DESCRIPTION Returns capabilities of hypervisor/driver. I got follow outtput of a host. <cpu> <arch>x86_64</arch> <model>Broadwell-noTSX</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> <feature name='invtsc'/> <feature name='mpx'/> <feature name='abm'/> <feature name='pdpe1gb'/> <feature name='rdrand'/> <feature name='f16c'/> <feature name='osxsave'/> <feature name='pdcm'/> <feature name='xtpr'/> <feature name='tm2'/> <feature name='est'/> <feature name='vmx'/> <feature name='ds_cpl'/> <feature name='monitor'/> <feature name='dtes64'/> <feature name='pbe'/> <feature name='tm'/> <feature name='ht'/> <feature name='ss'/> <feature name='acpi'/> <feature name='ds'/> <feature name='vme'/> <pages unit='KiB' size='4'/> <pages unit='KiB' size='2048'/> <pages unit='KiB' size='1048576'/> </cpu> but from cat /proc/cpuinfo flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc art arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf eagerfpu pni pclmulqdq dtes64 monitor ds_cpl vmx est tm2 ssse3 sdbg fma cx16 xtpr pdcm pcid sse4_1 sse4_2 x2apic movbe popcnt tsc_deadline_timer aes xsave avx f16c rdrand lahf_lm abm 3dnowprefetch epb intel_pt tpr_shadow vnmi flexpriority ept vpid fsgsbase tsc_adjust bmi1 avx2 smep bmi2 erms invpcid mpx rdseed adx smap clflushopt xsaveopt xsavec xgetbv1 dtherm ida arat pln pts hwp hwp_notify hwp_act_window hwp_epp The output of virsh seems missed some of the cpu features so my question what doesn't the features of "virsh capibalities" mean? why not pass all cpu flags? I see there is a cpu_map.xml in libvirt source, what does it used for? I have requirements to get all the hypervisors feature, what should I do? Thanks. -- Best Regards, Eli Qiao (乔立勇) Intel OTC China

2 1

[libvirt] [PATCH 00/19] Drop virt prefix from tests
by Tomáš Ryšavý 26 May '16

26 May '16

Replacig virt prefix with vir prefix in tests. It was suggested on wikipage: http://wiki.libvirt.org/page/BiteSizedTasks#Rename_test_suite_routines_from… Tomáš Ryšavý (19): tests: Rename virtTestRun to virTestRun. tests: Rename virtTestDifference to virTestDifference. tests: Rename virtTestLoadFile to virTestLoadFile. tests: Rename virtTestCompareToFile to virTestCompareToFile. tests: Rename virtTestDifferenceFull to virTestDifferenceFull. tests: Rename virtTestClearCommandPath to virTestClearCommandPath. tests: Rename virtTest00MActive to virTest00MActive. tests: Rename virtTestCounterReset to virTestCounterReset. tests: Rename virtTestLogContentAndReset to virTestLogContentAndReset. tests: Rename virtTestUseTerminalColors to virTestUseTerminalColors. tests: Rename virtTestQuiesceLibvirtErrors to virTestQuiesceLibvirtErrors. tests: Rename virtTestDifferenceFullNoRegenerate. tests: Rename virtTestDifferenceFullInternal to virTestDifferenceFullInternal. tests: Rename virtTestCaptureProgramExecChild to virTestCaptureProgramExecChild. tests: Rename virtTestDifferenceBin to virTestDifferenceBin. tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput. tests: Rename virtTestCounterNext to virTestCounterNext. tests: Rename virtTestErrorFuncQuiet to virTestErrorFuncQuiet. tests: Rename virtTestMain to virTestMain. tests/bhyvexml2argvtest.c | 8 ++--- tests/bhyvexml2xmltest.c | 2 +- tests/commandtest.c | 18 +++++----- tests/cputest.c | 8 ++--- tests/domaincapstest.c | 6 ++-- tests/domainconftest.c | 2 +- tests/domainsnapshotxml2xmltest.c | 8 ++--- tests/esxutilstest.c | 10 +++--- tests/eventtest.c | 2 +- tests/fchosttest.c | 10 +++--- tests/fdstreamtest.c | 8 ++--- tests/genericxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 6 ++-- tests/jsontest.c | 8 ++--- tests/libvirtdconftest.c | 2 +- tests/lxcconf2xmltest.c | 6 ++-- tests/lxcxml2xmltest.c | 2 +- tests/metadatatest.c | 10 +++--- tests/networkxml2conftest.c | 6 ++-- tests/networkxml2firewalltest.c | 6 ++-- tests/networkxml2xmltest.c | 4 +-- tests/networkxml2xmlupdatetest.c | 6 ++-- tests/nodedevxml2xmltest.c | 6 ++-- tests/nodeinfotest.c | 8 ++--- tests/nsstest.c | 2 +- tests/nwfilterebiptablestest.c | 42 +++++++++++----------- tests/nwfilterxml2firewalltest.c | 6 ++-- tests/nwfilterxml2xmltest.c | 4 +-- tests/objecteventtest.c | 18 +++++----- tests/openvzutilstest.c | 6 ++-- tests/qemuagenttest.c | 2 +- tests/qemuargv2xmltest.c | 10 +++--- tests/qemucapabilitiestest.c | 6 ++-- tests/qemucaps2xmltest.c | 6 ++-- tests/qemucommandutiltest.c | 4 +-- tests/qemuhelptest.c | 6 ++-- tests/qemuhotplugtest.c | 10 +++--- tests/qemumonitorjsontest.c | 14 ++++---- tests/qemumonitortest.c | 6 ++-- tests/qemuxml2argvtest.c | 64 ++++++++++++++++----------------- tests/qemuxml2xmltest.c | 14 ++++---- tests/scsihosttest.c | 4 +-- tests/secretxml2xmltest.c | 4 +-- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 26 +++++++------- tests/sexpr2xmltest.c | 6 ++-- tests/sockettest.c | 66 +++++++++++++++++----------------- tests/storagebackendsheepdogtest.c | 4 +-- tests/storagepoolxml2xmltest.c | 4 +-- tests/storagevolxml2argvtest.c | 4 +-- tests/storagevolxml2xmltest.c | 4 +-- tests/sysinfotest.c | 4 +-- tests/testutils.c | 74 +++++++++++++++++++------------------- tests/testutils.h | 68 +++++++++++++++++------------------ tests/utiltest.c | 6 ++-- tests/vboxsnapshotxmltest.c | 10 +++--- tests/viralloctest.c | 14 ++++---- tests/viratomictest.c | 4 +-- tests/virauthconfigtest.c | 16 ++++----- tests/virbitmaptest.c | 26 +++++++------- tests/virbuftest.c | 16 ++++----- tests/vircaps2xmltest.c | 4 +-- tests/vircapstest.c | 8 ++--- tests/vircgrouptest.c | 36 +++++++++---------- tests/vircryptotest.c | 4 +-- tests/virdbustest.c | 20 +++++------ tests/virdrivermoduletest.c | 8 ++--- tests/virendiantest.c | 4 +-- tests/virfiletest.c | 6 ++-- tests/virfirewalltest.c | 36 +++++++++---------- tests/virhashtest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viridentitytest.c | 12 +++---- tests/viriscsitest.c | 6 ++-- tests/virkeycodetest.c | 4 +-- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 6 ++-- tests/virlockspacetest.c | 14 ++++---- tests/virlogtest.c | 2 +- tests/virnetdaemontest.c | 4 +-- tests/virnetdevbandwidthtest.c | 4 +-- tests/virnetdevtest.c | 2 +- tests/virnetmessagetest.c | 16 ++++----- tests/virnetserverclienttest.c | 2 +- tests/virnetsockettest.c | 32 ++++++++--------- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 58 +++++++++++++++--------------- tests/virpcitest.c | 6 ++-- tests/virpolkittest.c | 12 +++---- tests/virportallocatortest.c | 8 ++--- tests/virrandomtest.c | 2 +- tests/virrotatingfiletest.c | 26 +++++++------- tests/virscsitest.c | 4 +-- tests/virshtest.c | 38 ++++++++++---------- tests/virstoragetest.c | 12 +++---- tests/virstringtest.c | 62 ++++++++++++++++---------------- tests/virsystemdtest.c | 52 +++++++++++++-------------- tests/virtimetest.c | 52 +++++++++++++-------------- tests/virtypedparamtest.c | 8 ++--- tests/viruritest.c | 24 ++++++------- tests/virusbtest.c | 14 ++++---- tests/vmwarevertest.c | 4 +-- tests/vmx2xmltest.c | 6 ++-- tests/xencapstest.c | 24 ++++++------- tests/xlconfigtest.c | 10 +++--- tests/xmconfigtest.c | 10 +++--- tests/xml2sexprtest.c | 4 +-- tests/xml2vmxtest.c | 4 +-- 108 files changed, 707 insertions(+), 707 deletions(-) -- 2.5.5

2 21

[libvirt] [PATCH] esx: do not store escaped password in esxVI_Context.
by Dawid Zamirski 26 May '16

26 May '16

This patch fixes an issue where screenshot API call was failing when the esx/vcenter password contains special characters such as apostrophee. The reason for failures was that passwords were escaped for XML and stored in esxVI_Context which was then passed to raw CURL API calls where the password must be passed in original form to authenticate successfully. So this patch addresses this by storing original passwords in the esxVI_Context struct and escape only for esxVI_Login call. --- src/esx/esx_driver.c | 22 ++++------------------ src/esx/esx_vi.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 00d0e0a..031c666 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -617,7 +617,6 @@ esxConnectToHost(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; esxVI_String *propertyNameList = NULL; @@ -647,18 +646,13 @@ esxConnectToHost(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); + password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, conn->uri->server, conn->uri->port) < 0) goto cleanup; @@ -705,7 +699,6 @@ esxConnectToHost(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); esxVI_String_Free(&propertyNameList); @@ -726,7 +719,6 @@ esxConnectToVCenter(esxPrivate *priv, int result = -1; char ipAddress[NI_MAXHOST] = ""; char *username = NULL; - char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; @@ -752,18 +744,13 @@ esxConnectToVCenter(esxPrivate *priv, } } - unescapedPassword = virAuthGetPassword(conn, auth, "esx", username, hostname); + password = virAuthGetPassword(conn, auth, "esx", username, hostname); - if (!unescapedPassword) { + if (!password) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed")); goto cleanup; } - password = esxUtil_EscapeForXml(unescapedPassword); - - if (!password) - goto cleanup; - if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport, hostname, conn->uri->port) < 0) goto cleanup; @@ -799,7 +786,6 @@ esxConnectToVCenter(esxPrivate *priv, cleanup: VIR_FREE(username); - VIR_FREE(unescapedPassword); VIR_FREE(password); VIR_FREE(url); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bf6f228..872cb7d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -996,6 +996,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, const char *password, esxUtil_ParsedUri *parsedUri) { + char *escapedPassword = NULL; + if (!ctx || !url || !ipAddress || !username || !password || ctx->url || ctx->service || ctx->curl) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -1107,7 +1109,16 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, if (ctx->productLine == esxVI_ProductLine_VPX) ctx->hasSessionIsActive = true; - if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || + escapedPassword = esxUtil_EscapeForXml(password); + + if (!escapedPassword) { + VIR_FREE(escapedPassword); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to escape password for XML")); + return -1; + } + + if (esxVI_Login(ctx, username, escapedPassword, NULL, &ctx->session) < 0 || esxVI_BuildSelectSetCollection(ctx) < 0) { return -1; } -- 2.7.4

3 3

[libvirt] [PATCH] lxc: support <interface type='ethernet'>
by Laine Stump 25 May '16

25 May '16

This is identical to type='bridge', but without the "connect to a bridge" part, so it can be handled by using the same functions (and often even the same cases in switch statements), after renaming virLXCProcessSetupInterfaceBridged() to virLXCProcessInterfaceTap() and enhancing it to skip bridge-related items when brname == NULL. To be truly useful, we need to support setting the ip address on the host side veth as well as guest side veth (already supported for type='bridge'), as well as setting the peer address for both. The <script> element isn't supported in this patch because I have no need for it. I'd rather add it after determining it's needed rather than adding it for no reason and than being required to support it forever. --- I wrote this mostly so that I could experiment with setting the peer addresses of both sides of the veth pair to see what was usable and what we needed to support in terms of setting IP addresses. I had intended to post this patch along with patches to re-enable the peer address setting patches that I reverted just before 1.3.4 was released, but decided that having lxc <interface type='ethernet'> already in might help in any discussion we had about that (since it gives everyone a working example where libvirt has control of both the host-side and guest-side interface config. This will of course be much more useful once the IP addresses can be set from within libvirt, but all code that is here will remain and, as I said above, it provides a useful platform for experimentation. src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_driver.c | 16 ++++--- src/lxc/lxc_native.c | 15 +++---- src/lxc/lxc_process.c | 36 +++++++-------- src/lxc/lxc_process.h | 6 +-- tests/lxcconf2xmldata/lxcconf2xml-ethernet.config | 44 ++++++++++++++++++ tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml | 54 +++++++++++++++++++++++ tests/lxcconf2xmltest.c | 1 + tests/lxcxml2xmldata/lxc-ethernet.xml | 42 ++++++++++++++++++ tests/lxcxml2xmltest.c | 1 + 10 files changed, 181 insertions(+), 38 deletions(-) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml create mode 100644 tests/lxcxml2xmldata/lxc-ethernet.xml diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 0304354..25f28ea 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_controller.c: linux container process controller @@ -371,6 +371,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) switch (ctrl->def->nets[i]->type) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (ctrl->def->nets[i]->ifname == NULL) continue; if (virNetDevGetIndex(ctrl->def->nets[i]->ifname, @@ -386,7 +387,6 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) break; case VIR_DOMAIN_NET_TYPE_USER: - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a226850..f811053 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright IBM Corp. 2008 * * lxc_driver.c: linux container driver functions @@ -4225,15 +4225,15 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(vm->def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, brname))) goto cleanup; } break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(vm->def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: { - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - vm->def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, vm->def, net))) goto cleanup; } break; default: @@ -4270,6 +4270,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); break; @@ -4695,6 +4696,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: + case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevVethDelete(detach->ifname) < 0) { virDomainAuditNet(vm, detach, NULL, "detach", false); goto cleanup; diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 31ffce7..0bea32e 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -360,14 +360,13 @@ lxcCreateNetDef(const char *type, net->mac = macAddr; if (STREQ(type, "veth")) { - if (!linkdev) - goto error; - - net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - - if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) - goto error; - + if (linkdev) { + net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + if (VIR_STRDUP(net->data.bridge.brname, linkdev) < 0) + goto error; + } else { + net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; + } } else if (STREQ(type, "macvlan")) { net->type = VIR_DOMAIN_NET_TYPE_DIRECT; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 8981d9a..f8a0c32 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -256,9 +256,9 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver, } -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname) +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname) { char *ret = NULL; char *parentVeth; @@ -277,13 +277,15 @@ char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, if (virNetDevSetMAC(containerVeth, &net->mac) < 0) goto cleanup; - if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { - if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, - vm->uuid, vport, virDomainNetGetActualVlan(net)) < 0) - goto cleanup; - } else { - if (virNetDevBridgeAddPort(brname, parentVeth) < 0) - goto cleanup; + if (brname) { + if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH) { + if (virNetDevOpenvswitchAddPort(brname, parentVeth, &net->mac, vm->uuid, + vport, virDomainNetGetActualVlan(net)) < 0) + goto cleanup; + } else { + if (virNetDevBridgeAddPort(brname, parentVeth) < 0) + goto cleanup; + } } if (virNetDevSetOnline(parentVeth, true) < 0) @@ -546,20 +548,18 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, _("No bridge name specified")); goto cleanup; } - if (!(veth = virLXCProcessSetupInterfaceBridged(def, - net, - brname))) + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, brname))) goto cleanup; } break; - + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceTap(def, net, NULL))) + goto cleanup; + break; case VIR_DOMAIN_NET_TYPE_DIRECT: - if (!(veth = virLXCProcessSetupInterfaceDirect(conn, - def, - net))) + if (!(veth = virLXCProcessSetupInterfaceDirect(conn, def, net))) goto cleanup; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index b6c8083..fcb50a8 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -47,9 +47,9 @@ void virLXCProcessAutostartAll(virLXCDriverPtr driver); int virLXCProcessReconnectAll(virLXCDriverPtr driver, virDomainObjListPtr doms); -char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, - virDomainNetDefPtr net, - const char *brname); +char *virLXCProcessSetupInterfaceTap(virDomainDefPtr vm, + virDomainNetDefPtr net, + const char *brname); char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virDomainDefPtr def, virDomainNetDefPtr net); diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config new file mode 100644 index 0000000..d39917d --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.config @@ -0,0 +1,44 @@ +# Template used to create this container: opensuse +# Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075ef + +lxc.network.type = veth +lxc.network.flags = up +lxc.network.hwaddr = 02:00:15:8f:05:c1 +lxc.network.name = eth0 +lxc.network.ipv4 = 192.168.122.2/24 +lxc.network.ipv4.gateway = 192.168.122.1 +lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.network.ipv6.gateway = 2003:db8:1:0:214:1234:fe0b:3595 + +#remove next line if host DNS configuration should not be available to container +lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0 +lxc.mount.entry = sysfs sys sysfs defaults 0 0 +lxc.mount.entry = tmpfs run tmpfs size=8m,mode=0755,nodev,nosuid 0 0 +lxc.mount.entry = /etc/resolv.conf etc/resolv.conf none bind,ro 0 0 +lxc.rootfs = /var/lib/lxc/migrate_test/rootfs +lxc.utsname = migrate_test +lxc.arch = x86 +lxc.autodev=1 +lxc.tty = 2 +lxc.pts = 1024 +lxc.cap.drop = sys_module mac_admin mac_override mknod + +# When using LXC with apparmor, uncomment the next line to run unconfined: +#lxc.aa_profile = unconfined + +lxc.cgroup.devices.deny = a +# /dev/null and zero +lxc.cgroup.devices.allow = c 1:3 rwm +lxc.cgroup.devices.allow = c 1:5 rwm +# consoles +lxc.cgroup.devices.allow = c 5:1 rwm +lxc.cgroup.devices.allow = c 5:0 rwm +lxc.cgroup.devices.allow = c 4:0 rwm +lxc.cgroup.devices.allow = c 4:1 rwm +# /dev/{,u}random +lxc.cgroup.devices.allow = c 1:9 rwm +lxc.cgroup.devices.allow = c 1:8 rwm +lxc.cgroup.devices.allow = c 136:* rwm +lxc.cgroup.devices.allow = c 5:2 rwm +# rtc +lxc.cgroup.devices.allow = c 254:0 rwm diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml new file mode 100644 index 0000000..24b017a --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet.xml @@ -0,0 +1,54 @@ +<domain type='lxc'> + <name>migrate_test</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>65536</memory> + <currentMemory unit='KiB'>65536</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>exe</type> + <init>/sbin/init</init> + </os> + <features> + <capabilities policy='allow'> + <mac_admin state='off'/> + <mac_override state='off'/> + <mknod state='off'/> + <sys_module state='off'/> + </capabilities> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/var/lib/lxc/migrate_test/rootfs'/> + <target dir='/'/> + </filesystem> + <filesystem type='ram' accessmode='passthrough'> + <source usage='8192' units='KiB'/> + <target dir='/run'/> + </filesystem> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/etc/resolv.conf'/> + <target dir='/etc/resolv.conf'/> + <readonly/> + </filesystem> + <interface type='ethernet'> + <mac address='02:00:15:8f:05:c1'/> + <ip address='192.168.122.2' family='ipv4' prefix='24'/> + <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv6' address='::' gateway='2003:db8:1:0:214:1234:fe0b:3595'/> + <guest dev='eth0'/> + <link state='up'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + <console type='pty'> + <target type='lxc' port='1'/> + </console> + </devices> +</domain> diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 83895cd..7a0893e 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -119,6 +119,7 @@ mymain(void) DO_TEST("cputune", false); DO_TEST("cpusettune", false); DO_TEST("blkiotune", false); + DO_TEST("ethernet", false); virObjectUnref(xmlopt); virObjectUnref(caps); diff --git a/tests/lxcxml2xmldata/lxc-ethernet.xml b/tests/lxcxml2xmldata/lxc-ethernet.xml new file mode 100644 index 0000000..6c4a739 --- /dev/null +++ b/tests/lxcxml2xmldata/lxc-ethernet.xml @@ -0,0 +1,42 @@ +<domain type='lxc'> + <name>8675309</name> + <uuid>e21987a5-e98e-9c99-0e35-803e4d9ad1fe</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <resource> + <partition>/machine</partition> + </resource> + <os> + <type arch='x86_64'>exe</type> + <init>/sbin/init</init> + </os> + <idmap> + <uid start='0' target='100000' count='100000'/> + <gid start='0' target='100000' count='100000'/> + </idmap> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount' accessmode='passthrough'> + <source dir='/mach/8675309'/> + <target dir='/'/> + </filesystem> + <interface type='ethernet'> + <mac address='00:16:3e:0f:ef:8a'/> + <ip address='192.168.122.12' family='ipv4' prefix='24'/> + <ip address='192.168.122.13' family='ipv4' prefix='24'/> + <route family='ipv4' address='0.0.0.0' gateway='192.168.122.1'/> + <route family='ipv4' address='192.168.124.0' prefix='24' gateway='192.168.124.1'/> + <target dev='veth0'/> + <guest dev='eth2'/> + </interface> + <console type='pty'> + <target type='lxc' port='0'/> + </console> + </devices> + <seclabel type='none'/> +</domain> diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c index fec0142..001aa8d 100644 --- a/tests/lxcxml2xmltest.c +++ b/tests/lxcxml2xmltest.c @@ -94,6 +94,7 @@ mymain(void) DO_TEST("idmap"); DO_TEST("capabilities"); DO_TEST("sharenet"); + DO_TEST("ethernet"); DO_TEST_FULL("filesystem-root", 0, false, VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS); -- 2.5.5

4 15

[libvirt] [PATCH v2 0/3] auto-assign controller indexes
by Laine Stump 25 May '16

25 May '16

Patches 1 and 2 just shuffle a couple of existing functions. Patch 3 gets to the point. v1->v2 changes are explained in patch 3. Laine Stump (3): conf/qemu: make IS_USB2_CONTROLLER globally available conf: make virDomainControllerFindUnusedIndex() more generally usable conf: permit auto-assignment of controller indexes docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 8 +- src/conf/domain_conf.c | 128 ++++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 7 - src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_hotplug.c | 8 ++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.args | 53 +++++++ tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml | 54 ++++++++ tests/qemuxml2argvtest.c | 9 ++ .../qemuxml2xmlout-autoindex.xml | 153 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 10 +- 13 files changed, 421 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-autoindex.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-autoindex.xml -- 2.5.5

2 5

[libvirt] [PATCH 0/2] Add virFirmware object for use by driver config
by Jim Fehlig 25 May '16

25 May '16

While refreshing and testing my series to add domain capabilities and UEFI support to the libxl driver [1], I realized it would be useful to support the '--with-loader-nvram' configure option as well. This would allow users/packagers to specify system-provided firmwares instead of those provided by the Xen installation. Instead of copying code from the qemu driver, I decided to create a virFirmware object containing the firmware name (loader) and associated nvram, along with a few operations on the object. Patch1 introduces the object in src/util/virfirmware.[ch] and switches the qemu driver to use. The patch could be split along those lines, but I thought it would be review-friendly to see the movement of code in a single patch. But it can be split if preferred. Patch2 adds virFirmware to the libxl driver config. It is unused in this series, but if this approach is aggreable it will be used when rebasing the domain capabilities series. Note that currently Xen does not support storage for non-volitile variables for UEFI firmware (OVMF), so 'nvram' will be unused for the time being. Adding a 'nvram' option to libxl.conf can be deferred until support is added to Xen. But even with this limitation, folks are using UEFI + HVM guests with xl/libxl and would like to do the same with libvirt. Patch1 is a lot of code movement to avoid copying virQEMUDriverConfigLoaderNVRAMParse (and eventually virQEMUDriverConfigNVRAMParse). But I've complained about copy/paste in some of my recent reviews and shouldn't be doing the same in my own patches :-). [1] https://www.redhat.com/archives/libvir-list/2016-April/msg01358.html Jim Fehlig (2): driver config: Introduce virFirmware object libxl: add default firmwares to driver config object po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt_private.syms | 6 ++ src/libxl/libxl_conf.c | 21 +++++++ src/libxl/libxl_conf.h | 4 ++ src/qemu/qemu_capabilities.c | 22 +++---- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_conf.c | 127 ++++++---------------------------------- src/qemu/qemu_conf.h | 7 +-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/util/virfirmware.c | 135 +++++++++++++++++++++++++++++++++++++++++++ src/util/virfirmware.h | 51 ++++++++++++++++ tests/domaincapstest.c | 3 +- 14 files changed, 260 insertions(+), 131 deletions(-) create mode 100644 src/util/virfirmware.c create mode 100644 src/util/virfirmware.h -- 2.1.4

2 9

Re: [libvirt] [PATCH] libxl: add .domainInterfaceAddresses
by Jim Fehlig 25 May '16

25 May '16

On 05/22/2016 09:34 PM, Chun Yan Liu wrote: > >>>> On 5/17/2016 at 11:46 PM, in message > <2fa0cb6f-ea83-d6f3-18f8-51a671574205(a)laine.org>, Laine Stump <laine(a)laine.org> > wrote: >> On 05/16/2016 06:05 PM, Jim Fehlig wrote: >>> Chun Yan Liu wrote: >>>>>>> On 5/14/2016 at 07:47 AM, in message <5736677D.8030209(a)suse.com>, Jim Fehlig >>>> <jfehlig(a)suse.com> wrote: >>>>> On 05/13/2016 12:21 AM, Chunyan Liu wrote: >>>>>> Add .domainInterfaceAddresses so that user can have a way to >>>>>> get domain interface address by 'virsh domifaddr'. Currently >>>>>> it only supports '--source lease'. >>>>>> >>>>>> Signed-off: Chunyan Liu <cyliu(a)suse.com> >>>>>> --- >>>>>> src/libxl/libxl_driver.c | 140 >>>>> +++++++++++++++++++++++++++++++++++++++++++++++ >>>>>> 1 file changed, 140 insertions(+) >>>>>> >>>>>> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c >>>>>> index 062d6f8..f2bd6fa 100644 >>>>>> --- a/src/libxl/libxl_driver.c >>>>>> +++ b/src/libxl/libxl_driver.c >>>>>> @@ -5425,6 +5425,145 @@ static int libxlNodeGetSecurityModel(virConnectPtr >>>>> conn, >>>>>> return 0; >>>>>> } >>>>>> >>>>>> +static int >>>>>> +libxlGetDHCPInterfaces(virDomainPtr dom, >>>>>> + virDomainObjPtr vm, >>>>>> + virDomainInterfacePtr **ifaces) >>>>>> +{ >>>>>> + int rv = -1; >>>>>> + int n_leases = 0; >>>>>> + size_t i, j; >>>>>> + size_t ifaces_count = 0; >>>>>> + virNetworkPtr network = NULL; >>>>>> + char macaddr[VIR_MAC_STRING_BUFLEN]; >>>>>> + virDomainInterfacePtr iface = NULL; >>>>>> + virNetworkDHCPLeasePtr *leases = NULL; >>>>>> + virDomainInterfacePtr *ifaces_ret = NULL; >>>>>> + >>>>>> + if (!dom->conn->networkDriver || >>>>>> + !dom->conn->networkDriver->networkGetDHCPLeases) { >>>>>> + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", >>>>>> + _("Network driver does not support DHCP lease >>>>> query")); >>>>>> + return -1; >>>>>> + } >>>>>> + >>>>>> + for (i = 0; i < vm->def->nnets; i++) { >>>>>> + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) >>>>>> + continue; >>>>>> + >>>>>> + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); >>>>>> + virObjectUnref(network); >>>>>> + network = virNetworkLookupByName(dom->conn, >>>>>> + >> vm->def->nets[i]->data.network.name); >>>>>> + >>>>>> + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, >>>>>> + &leases, 0)) < 0) >>>>>> + goto error; >>>>>> + >>>>>> + if (n_leases) { >>>>>> + if (VIR_EXPAND_N(ifaces_ret, ifaces_count, 1) < 0) >>>>>> + goto error; >>>>>> + >>>>>> + if (VIR_ALLOC(ifaces_ret[ifaces_count - 1]) < 0) >>>>>> + goto error; >>>>>> + >>>>>> + iface = ifaces_ret[ifaces_count - 1]; >>>>>> + /* Assuming each lease corresponds to a separate IP */ >>>>>> + iface->naddrs = n_leases; >>>>>> + >>>>>> + if (VIR_ALLOC_N(iface->addrs, iface->naddrs) < 0) >>>>>> + goto error; >>>>>> + >>>>>> + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) >>>>>> + goto cleanup; >>>>>> + >>>>>> + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) >>>>>> + goto cleanup; >>>>>> + } >>>>>> + >>>>>> + for (j = 0; j < n_leases; j++) { >>>>>> + virNetworkDHCPLeasePtr lease = leases[j]; >>>>>> + virDomainIPAddressPtr ip_addr = &iface->addrs[j]; >>>>>> + >>>>>> + if (VIR_STRDUP(ip_addr->addr, lease->ipaddr) < 0) >>>>>> + goto cleanup; >>>>>> + >>>>>> + ip_addr->type = lease->type; >>>>>> + ip_addr->prefix = lease->prefix; >>>>>> + } >>>>>> + >>>>>> + for (j = 0; j < n_leases; j++) >>>>>> + virNetworkDHCPLeaseFree(leases[j]); >>>>>> + >>>>>> + VIR_FREE(leases); >>>>>> + } >>>>>> + >>>>>> + *ifaces = ifaces_ret; >>>>>> + ifaces_ret = NULL; >>>>>> + rv = ifaces_count; >>>>>> + >>>>>> + cleanup: >>>>>> + virObjectUnref(network); >>>>>> + if (leases) { >>>>>> + for (i = 0; i < n_leases; i++) >>>>>> + virNetworkDHCPLeaseFree(leases[i]); >>>>>> + } >>>>>> + VIR_FREE(leases); >>>>>> + >>>>>> + return rv; >>>>>> + >>>>>> + error: >>>>>> + if (ifaces_ret) { >>>>>> + for (i = 0; i < ifaces_count; i++) >>>>>> + virDomainInterfaceFree(ifaces_ret[i]); >>>>>> + } >>>>>> + VIR_FREE(ifaces_ret); >>>>>> + >>>>>> + goto cleanup; >>>>>> +} >>>>> >>>>> It's unfortunate this is a copy-paste from the qemu driver. The code is not >>>>> trivial and any bug fixes in one copy could be missed in the other. A lot >> of >>>>> the >>>>> function is domain related, so probably can't be abstracted further to the >>>>> network code. Have you considered approaches that allow the drivers to >> share >>>>> this code? >>>> Well, it can be extracted and placed in bridge_driver.c as >> networkGetDHCPInterfaces, >>>> but I don't know if that is acceptable? >>> Hmm, maybe something like networkGetDHCPLeasesAll() is a better name. >> Regardless >>> of the name, I see that other functions in bridge_driver.c take a >>> virDomainDefPtr, so maybe extracting the code to bridge_driver.c is >> acceptable. >> >> Well, I don't really *like* the way that those network*() functions are >> implemented (just by exporting a symbol, implying that any hypervisor >> driver that uses them must directly link the bridge driver in, rather >> than being able to load an alternative), but that was the most expedient >> way of handling the need at the time, and nobody complained about it, >> so... :-) >> >> Definitely duplication of code is bad (I say that although I do it a lot >> myself!). And if a function is all about "doing something with a network >> device / connection" and it will need access to the network object, I >> think the network driver is the place to have it. *AND* if it's >> something that's not needed directly in the public API, then making it >> available as a public API call is a bad idea (since you're then stuck >> with it forever). >> >> However, I don't know that I like the idea of a function in the network >> driver that is trawling through the virDomainDef object. It may seem >> like a fine distinction - returning the lease info for a single >> interface vs. returning the lease info for all interfaces in the domain, >> but it does take the co-mingling between the network and hypervisor >> drivers to a new level. Yes, it's true that there are already functions >> that are part of this "backend super double secret network API" (watch >> Animal House and you'll understand the reference) that take a >> virDomainDefPtr as an argument; but they only use it to format the >> domain XML and send it to the network hook script. Technically there's >> nothing preventing a function in the network driver from accessing every >> attribute of the domain, or even modifying it :-O, that doesn't mean we >> should do it though. >> >> I'm trying to completely recall a vague memory of something similar to >> this that happened in the past - something that was needed in multiple >> hypervisors (which would imply that it should live either in util or >> conf), but that also needed to call a network function (or maybe some >> other driver, I forget). When trying to maintain some sort of separation >> and rules of engagement between the various components, there tend to be >> cases that just don't fit within the mold. >> >> In this case, I'm wondering if maybe the duplication can be reduced by >> creating a function in conf (either domain_conf.c or one of its >> subsidiaries) that takes a *function as an argument and calls that >> function for each interface. Something like this: >> >> int >> virDomainGetDHCPInterfaces(virDomainDefPtr def, >> virDomainDefGetDHCPLeasesCB getLeases, >> virDomainInterfacePtr **ifaces) >> { >> >> for (i = 0; i < def->nnets; i++) { >> virDomainNetDefPtr net = def->nets[i]; >> >> if (virDomainNetDefGetActualType(net) != >> VIR_DOMAIN_NET_TYPE_NETWORK) >> continue; >> if ((n_leases = getLeases(net->data.network.name, net->mac, >> &leases)) < 0) { >> OH NOES!!!!! >> goto error; >> if (n_leases) { >> bobloblawlawblog.com .... >> } >> >> etc etc. >> } >> >> various cleanup stuff etc. >> >> } >> >> The function getLeases would be a thin (if any) wrapper around a >> function in the network driver called networkGetDHCPLeases(). The >> toplevel function in qemu and libxl would then be simple a bit of glue >> followed by a call to virDomainGetDHCPInterfaces() with a pointer to the >> appropriate getLeases function. >> >> This way we would eliminate almost all of the duplicate code (most would >> go into domain_conf.c, and a bit into bridge_driver.c) without needing >> to teach the network driver about the internal workings of a domain def. >> >> Does that make any sense? > Had a look at this and tried, seems hard to put into domain_conf.c: > except for the vm->def->nets, almost all the other things are called > from src/libvirt-domain.c or src/libvirt-network.c, not only the > getLeases cb of a specific network, but even the virDomainInterfacePtr > itself is defined in libvirt-domain.h and also its Free function (in case of > error, virNetworkDHCPLeaseFree and virDomainInterfaceFree are also > needed). Ideas? Hrm, maybe just go with the small amount of copied code? :-) When originally looking at the patch, I thought it might be quite disruptive to factor it out into something that could be used by both drivers. Unless others have a clever idea, I'm leaning towards pushing this patch as is. Regards, Jim

2 2

[libvirt] [PATCHv2 0/3] qemu: support for SLIC ACPI tables
by Ján Tomko 25 May '16

25 May '16

Windows uses this BLOB for activation purposes. https://bugzilla.redhat.com/show_bug.cgi?id=1327537 In v2: * make <table> a subelement of <acpi> * minor documentation fixes * comma-escape the value on QEMU command line * mention that this option was added in 2009 Ján Tomko (3): conf: add <acpi><table> to <os> qemu: format SLIC ACPI table command line security: label the slic_table docs/formatdomain.html.in | 8 ++++ docs/schemas/domaincommon.rng | 18 +++++++++ src/conf/domain_conf.c | 46 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++ src/security/security_dac.c | 5 +++ src/security/security_selinux.c | 5 +++ src/security/virt-aa-helper.c | 4 ++ .../qemuxml2argvdata/qemuxml2argv-acpi-table.args | 19 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml | 30 ++++++++++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-acpi-table.xml | 34 ++++++++++++++++ tests/qemuxml2xmltest.c | 3 ++ 13 files changed, 182 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml -- 2.7.3

2 8

[libvirt] [PATCH] esx: use lsilogic adapter type in vol create.
by Dawid Zamirski 25 May '16

25 May '16

ESX will refuse to attach VMDKS that have buslogic adatper type to 64bit VMs whereas lsilogic works fine both 32bit and 64bit VMs. --- src/esx/esx_storage_backend_vmfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index d03d33a..a1a660b 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -966,9 +966,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool, /* * FIXME: The adapter type is a required parameter, but there is no * way to let the user specify it in the volume XML config. Therefore, - * default to 'busLogic' here. + * default to 'lsilogic' here. */ - virtualDiskSpec->adapterType = (char *)"busLogic"; + virtualDiskSpec->adapterType = (char *)"lsilogic"; virtualDiskSpec->capacityKb->value = VIR_DIV_UP(def->target.capacity, 1024); /* Scale from byte to kilobyte */ -- 2.7.4

2 1

[libvirt] [PATCH v2] qemucapstest: replace caps-1.6.50 with updated caps-1.7.0
by Pavel Hrdina 25 May '16

25 May '16

The qemu-1.6.50 is a beta before the new minor version, let's replace it with the release qemu-1.7.0. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml | 78 - tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 78 + tests/domaincapstest.c | 2 +- .../caps_1.6.50.x86_64.replies | 2848 ----------------- tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml | 197 -- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 3195 ++++++++++++++++++++ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 200 ++ tests/qemucapabilitiestest.c | 2 +- 8 files changed, 3475 insertions(+), 3125 deletions(-) delete mode 100644 tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml create mode 100644 tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml diff --git a/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml b/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml deleted file mode 100644 index 161d0ab..0000000 --- a/tests/domaincapsschemadata/qemu_1.6.50.x86_64.xml +++ /dev/null @@ -1,78 +0,0 @@ -<domainCapabilities> - <path>/usr/bin/qemu-system-x86_64</path> - <domain>kvm</domain> - <machine>pc-i440fx-1.7</machine> - <arch>x86_64</arch> - <vcpu max='255'/> - <os supported='yes'> - <loader supported='yes'> - <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> - <value>/usr/share/OVMF/OVMF_CODE.fd</value> - <enum name='type'> - <value>rom</value> - <value>pflash</value> - </enum> - <enum name='readonly'> - <value>yes</value> - <value>no</value> - </enum> - </loader> - </os> - <devices> - <disk supported='yes'> - <enum name='diskDevice'> - <value>disk</value> - <value>cdrom</value> - <value>floppy</value> - <value>lun</value> - </enum> - <enum name='bus'> - <value>ide</value> - <value>fdc</value> - <value>scsi</value> - <value>virtio</value> - <value>usb</value> - </enum> - </disk> - <graphics supported='yes'> - <enum name='type'> - <value>sdl</value> - <value>vnc</value> - <value>spice</value> - </enum> - </graphics> - <video supported='yes'> - <enum name='modelType'> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>qxl</value> - </enum> - </video> - <hostdev supported='yes'> - <enum name='mode'> - <value>subsystem</value> - </enum> - <enum name='startupPolicy'> - <value>default</value> - <value>mandatory</value> - <value>requisite</value> - <value>optional</value> - </enum> - <enum name='subsysType'> - <value>usb</value> - <value>pci</value> - <value>scsi</value> - </enum> - <enum name='capsType'/> - <enum name='pciBackend'> - <value>default</value> - <value>kvm</value> - <value>vfio</value> - </enum> - </hostdev> - </devices> - <features> - <gic supported='no'/> - </features> -</domainCapabilities> diff --git a/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml new file mode 100644 index 0000000..161d0ab --- /dev/null +++ b/tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml @@ -0,0 +1,78 @@ +<domainCapabilities> + <path>/usr/bin/qemu-system-x86_64</path> + <domain>kvm</domain> + <machine>pc-i440fx-1.7</machine> + <arch>x86_64</arch> + <vcpu max='255'/> + <os supported='yes'> + <loader supported='yes'> + <value>/usr/share/AAVMF/AAVMF_CODE.fd</value> + <value>/usr/share/OVMF/OVMF_CODE.fd</value> + <enum name='type'> + <value>rom</value> + <value>pflash</value> + </enum> + <enum name='readonly'> + <value>yes</value> + <value>no</value> + </enum> + </loader> + </os> + <devices> + <disk supported='yes'> + <enum name='diskDevice'> + <value>disk</value> + <value>cdrom</value> + <value>floppy</value> + <value>lun</value> + </enum> + <enum name='bus'> + <value>ide</value> + <value>fdc</value> + <value>scsi</value> + <value>virtio</value> + <value>usb</value> + </enum> + </disk> + <graphics supported='yes'> + <enum name='type'> + <value>sdl</value> + <value>vnc</value> + <value>spice</value> + </enum> + </graphics> + <video supported='yes'> + <enum name='modelType'> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>qxl</value> + </enum> + </video> + <hostdev supported='yes'> + <enum name='mode'> + <value>subsystem</value> + </enum> + <enum name='startupPolicy'> + <value>default</value> + <value>mandatory</value> + <value>requisite</value> + <value>optional</value> + </enum> + <enum name='subsysType'> + <value>usb</value> + <value>pci</value> + <value>scsi</value> + </enum> + <enum name='capsType'/> + <enum name='pciBackend'> + <value>default</value> + <value>kvm</value> + <value>vfio</value> + </enum> + </hostdev> + </devices> + <features> + <gic supported='no'/> + </features> +</domainCapabilities> diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 3436197..670f4fb 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -286,7 +286,7 @@ mymain(void) #if WITH_QEMU - DO_TEST_QEMU("1.6.50", "caps_1.6.50", + DO_TEST_QEMU("1.7.0", "caps_1.7.0", "/usr/bin/qemu-system-x86_64", NULL, "x86_64", VIR_DOMAIN_VIRT_KVM); diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies deleted file mode 100644 index d23249c..0000000 --- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.replies +++ /dev/null @@ -1,2848 +0,0 @@ -{ - "QMP": { - "version": { - "qemu": { - "micro": 50, - "minor": 6, - "major": 1 - }, - "package": "" - }, - "capabilities": [ - ] - } -} - -{ - "return": { - }, - "id": "libvirt-1" -} - -{ - "return": { - "qemu": { - "micro": 50, - "minor": 6, - "major": 1 - }, - "package": "" - }, - "id": "libvirt-2" -} - -{ - "return": { - "arch": "x86_64" - }, - "id": "libvirt-3" -} - -{ - "return": [ - { - "name": "query-rx-filter" - }, - { - "name": "chardev-remove" - }, - { - "name": "chardev-add" - }, - { - "name": "query-tpm-types" - }, - { - "name": "query-tpm-models" - }, - { - "name": "query-tpm" - }, - { - "name": "query-target" - }, - { - "name": "query-cpu-definitions" - }, - { - "name": "query-machines" - }, - { - "name": "device-list-properties" - }, - { - "name": "qom-list-types" - }, - { - "name": "change-vnc-password" - }, - { - "name": "nbd-server-stop" - }, - { - "name": "nbd-server-add" - }, - { - "name": "nbd-server-start" - }, - { - "name": "qom-get" - }, - { - "name": "qom-set" - }, - { - "name": "qom-list" - }, - { - "name": "query-block-jobs" - }, - { - "name": "query-balloon" - }, - { - "name": "query-migrate-capabilities" - }, - { - "name": "migrate-set-capabilities" - }, - { - "name": "query-migrate" - }, - { - "name": "query-command-line-options" - }, - { - "name": "query-uuid" - }, - { - "name": "query-name" - }, - { - "name": "query-spice" - }, - { - "name": "query-vnc" - }, - { - "name": "query-mice" - }, - { - "name": "query-status" - }, - { - "name": "query-kvm" - }, - { - "name": "query-pci" - }, - { - "name": "query-cpus" - }, - { - "name": "query-blockstats" - }, - { - "name": "query-block" - }, - { - "name": "query-chardev" - }, - { - "name": "query-events" - }, - { - "name": "query-commands" - }, - { - "name": "query-version" - }, - { - "name": "human-monitor-command" - }, - { - "name": "qmp_capabilities" - }, - { - "name": "add_client" - }, - { - "name": "expire_password" - }, - { - "name": "set_password" - }, - { - "name": "block_set_io_throttle" - }, - { - "name": "block_passwd" - }, - { - "name": "query-fdsets" - }, - { - "name": "remove-fd" - }, - { - "name": "add-fd" - }, - { - "name": "closefd" - }, - { - "name": "getfd" - }, - { - "name": "set_link" - }, - { - "name": "balloon" - }, - { - "name": "drive-mirror" - }, - { - "name": "blockdev-snapshot-delete-internal-sync" - }, - { - "name": "blockdev-snapshot-internal-sync" - }, - { - "name": "blockdev-snapshot-sync" - }, - { - "name": "transaction" - }, - { - "name": "block-job-complete" - }, - { - "name": "block-job-resume" - }, - { - "name": "block-job-pause" - }, - { - "name": "block-job-cancel" - }, - { - "name": "block-job-set-speed" - }, - { - "name": "drive-backup" - }, - { - "name": "block-commit" - }, - { - "name": "block-stream" - }, - { - "name": "block_resize" - }, - { - "name": "netdev_del" - }, - { - "name": "netdev_add" - }, - { - "name": "dump-guest-memory" - }, - { - "name": "client_migrate_info" - }, - { - "name": "migrate_set_downtime" - }, - { - "name": "migrate_set_speed" - }, - { - "name": "query-migrate-cache-size" - }, - { - "name": "migrate-set-cache-size" - }, - { - "name": "migrate_cancel" - }, - { - "name": "migrate" - }, - { - "name": "xen-set-global-dirty-log" - }, - { - "name": "xen-save-devices-state" - }, - { - "name": "ringbuf-read" - }, - { - "name": "ringbuf-write" - }, - { - "name": "inject-nmi" - }, - { - "name": "pmemsave" - }, - { - "name": "memsave" - }, - { - "name": "cpu-add" - }, - { - "name": "cpu" - }, - { - "name": "send-key" - }, - { - "name": "device_del" - }, - { - "name": "device_add" - }, - { - "name": "system_powerdown" - }, - { - "name": "system_reset" - }, - { - "name": "system_wakeup" - }, - { - "name": "cont" - }, - { - "name": "stop" - }, - { - "name": "screendump" - }, - { - "name": "change" - }, - { - "name": "eject" - }, - { - "name": "quit" - } - ], - "id": "libvirt-4" -} - -{ - "return": { - "fd": 10, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - -{ - "id": "libvirt-6", - "error": { - "class": "GenericError", - "desc": "Parameter 'top' is missing" - } -} - -{ - "return": [ - { - "name": "BLOCK_IMAGE_CORRUPTED" - }, - { - "name": "GUEST_PANICKED" - }, - { - "name": "SPICE_MIGRATE_COMPLETED" - }, - { - "name": "BALLOON_CHANGE" - }, - { - "name": "WAKEUP" - }, - { - "name": "SUSPEND_DISK" - }, - { - "name": "SUSPEND" - }, - { - "name": "NIC_RX_FILTER_CHANGED" - }, - { - "name": "DEVICE_TRAY_MOVED" - }, - { - "name": "DEVICE_DELETED" - }, - { - "name": "BLOCK_JOB_READY" - }, - { - "name": "BLOCK_JOB_ERROR" - }, - { - "name": "BLOCK_JOB_CANCELLED" - }, - { - "name": "BLOCK_JOB_COMPLETED" - }, - { - "name": "SPICE_DISCONNECTED" - }, - { - "name": "SPICE_INITIALIZED" - }, - { - "name": "SPICE_CONNECTED" - }, - { - "name": "WATCHDOG" - }, - { - "name": "RTC_CHANGE" - }, - { - "name": "BLOCK_IO_ERROR" - }, - { - "name": "VNC_DISCONNECTED" - }, - { - "name": "VNC_INITIALIZED" - }, - { - "name": "VNC_CONNECTED" - }, - { - "name": "RESUME" - }, - { - "name": "STOP" - }, - { - "name": "POWERDOWN" - }, - { - "name": "RESET" - }, - { - "name": "SHUTDOWN" - } - ], - "id": "libvirt-7" -} - -{ - "return": [ - { - "name": "virtio-blk-device" - }, - { - "name": "ib700" - }, - { - "name": "ICH9 LPC" - }, - { - "name": "port92" - }, - { - "name": "i6300esb" - }, - { - "name": "kvm-pci-assign" - }, - { - "name": "virtio-scsi-device" - }, - { - "name": "apic" - }, - { - "name": "pc-testdev" - }, - { - "name": "fusbh200-ehci-usb" - }, - { - "name": "virtio-scsi-pci" - }, - { - "name": "usb-ehci" - }, - { - "name": "exynos4210-ehci-usb" - }, - { - "name": "xlnx,ps7-usb" - }, - { - "name": "virtio-balloon-pci" - }, - { - "name": "virtio-net-pci" - }, - { - "name": "ich9-usb-ehci2" - }, - { - "name": "ich9-ahci" - }, - { - "name": "ich9-usb-ehci1" - }, - { - "name": "isa-ide" - }, - { - "name": "ICH9 SMB" - }, - { - "name": "piix4-usb-uhci" - }, - { - "name": "vt82c686b-usb-uhci" - }, - { - "name": "i82558b" - }, - { - "name": "i82558a" - }, - { - "name": "isa-fdc" - }, - { - "name": "isabus-bridge" - }, - { - "name": "sb16" - }, - { - "name": "i2c-bus" - }, - { - "name": "piix3-ide" - }, - { - "name": "ioapic" - }, - { - "name": "pci-bridge" - }, - { - "name": "HDA" - }, - { - "name": "am53c974" - }, - { - "name": "hpet" - }, - { - "name": "vmmouse" - }, - { - "name": "i82801b11-bridge" - }, - { - "name": "nvme" - }, - { - "name": "lsi53c810" - }, - { - "name": "vmxnet3" - }, - { - "name": "isa-cirrus-vga" - }, - { - "name": "dc390" - }, - { - "name": "vmware-svga" - }, - { - "name": "smbus-eeprom" - }, - { - "name": "i82801" - }, - { - "name": "ccid-card-passthru" - }, - { - "name": "fw_cfg" - }, - { - "name": "x86_64-cpu" - }, - { - "name": "piix3-usb-uhci" - }, - { - "name": "usb-audio" - }, - { - "name": "virtio-9p-device" - }, - { - "name": "i82557c" - }, - { - "name": "i82557b" - }, - { - "name": "i82557a" - }, - { - "name": "IndustryPack" - }, - { - "name": "qxl" - }, - { - "name": "pvscsi" - }, - { - "name": "rtl8139" - }, - { - "name": "isa-applesmc" - }, - { - "name": "xen-platform" - }, - { - "name": "container" - }, - { - "name": "virtio-mmio" - }, - { - "name": "vfio-pci" - }, - { - "name": "cfi.pflash01" - }, - { - "name": "usb-kbd" - }, - { - "name": "ich9-usb-uhci5" - }, - { - "name": "isa-vga" - }, - { - "name": "pci-testdev" - }, - { - "name": "usb-tablet" - }, - { - "name": "vmport" - }, - { - "name": "virtio-rng-pci" - }, - { - "name": "kvmvapic" - }, - { - "name": "usb-bt-dongle" - }, - { - "name": "sysbus-fdc" - }, - { - "name": "piix4-ide" - }, - { - "name": "xen-pci-passthrough" - }, - { - "name": "e1000" - }, - { - "name": "AC97" - }, - { - "name": "ich9-usb-uhci6" - }, - { - "name": "ipoctal232" - }, - { - "name": "mch" - }, - { - "name": "mc146818rtc" - }, - { - "name": "ivshmem" - }, - { - "name": "usb-ccid" - }, - { - "name": "sysbus-ahci" - }, - { - "name": "kvmclock" - }, - { - "name": "i82562" - }, - { - "name": "hda-output" - }, - { - "name": "pci-serial-4x" - }, - { - "name": "ccid-bus" - }, - { - "name": "i82559er" - }, - { - "name": "virtio-balloon-device" - }, - { - "name": "megasas" - }, - { - "name": "i8042" - }, - { - "name": "intel-hda" - }, - { - "name": "hda-duplex" - }, - { - "name": "virtio-serial-pci" - }, - { - "name": "ne2k_pci" - }, - { - "name": "ich9-usb-uhci2" - }, - { - "name": "ich9-usb-uhci3" - }, - { - "name": "virtconsole" - }, - { - "name": "ich9-usb-uhci4" - }, - { - "name": "isa-parallel" - }, - { - "name": "pci-serial" - }, - { - "name": "ich9-usb-uhci1" - }, - { - "name": "PCI" - }, - { - "name": "adlib" - }, - { - "name": "SUNW,fdtwo" - }, - { - "name": "ide-cd" - }, - { - "name": "isa-debugcon" - }, - { - "name": "usb-bot" - }, - { - "name": "i82551" - }, - { - "name": "i82550" - }, - { - "name": "isa-serial" - }, - { - "name": "PCIE" - }, - { - "name": "kvm-ioapic" - }, - { - "name": "nec-usb-xhci" - }, - { - "name": "System" - }, - { - "name": "kvm-apic" - }, - { - "name": "ich9-intel-hda" - }, - { - "name": "virtio-net-device" - }, - { - "name": "q35-pcihost" - }, - { - "name": "usb-wacom-tablet" - }, - { - "name": "PIIX4_PM" - }, - { - "name": "kvm-i8259" - }, - { - "name": "xen-apic" - }, - { - "name": "scsi-cd" - }, - { - "name": "pci-ohci" - }, - { - "name": "i440FX" - }, - { - "name": "usb-braille" - }, - { - "name": "virtserialport" - }, - { - "name": "pci-serial-2x" - }, - { - "name": "icc-bridge" - }, - { - "name": "xio3130-downstream" - }, - { - "name": "rng-random" - }, - { - "name": "hda-micro" - }, - { - "name": "scsi-disk" - }, - { - "name": "vhost-scsi" - }, - { - "name": "lsi53c895a" - }, - { - "name": "SCSI" - }, - { - "name": "pcnet" - }, - { - "name": "scsi-generic" - }, - { - "name": "pvpanic" - }, - { - "name": "virtio-serial-device" - }, - { - "name": "virtio-serial-bus" - }, - { - "name": "vhost-scsi-pci" - }, - { - "name": "usb-bus" - }, - { - "name": "ne2k_isa" - }, - { - "name": "IDE" - }, - { - "name": "ccid-card-emulated" - }, - { - "name": "tegra2-ehci-usb" - }, - { - "name": "usb-net" - }, - { - "name": "virtio-mmio-bus" - }, - { - "name": "usb-hub" - }, - { - "name": "i440FX-pcihost" - }, - { - "name": "usb-mouse" - }, - { - "name": "ISA" - }, - { - "name": "cs4231a" - }, - { - "name": "usb-serial" - }, - { - "name": "scsi-block" - }, - { - "name": "isa-i8259" - }, - { - "name": "sga" - }, - { - "name": "isa-debug-exit" - }, - { - "name": "virtio-rng-device" - }, - { - "name": "qemu-console" - }, - { - "name": "ioh3420" - }, - { - "name": "ES1370" - }, - { - "name": "PIIX3" - }, - { - "name": "isa-pcspk" - }, - { - "name": "ide-hd" - }, - { - "name": "rng-egd" - }, - { - "name": "cirrus-vga" - }, - { - "name": "kvm-pit" - }, - { - "name": "virtio-9p-pci" - }, - { - "name": "xen-pvdevice" - }, - { - "name": "icc-bus" - }, - { - "name": "ide-drive" - }, - { - "name": "x3130-upstream" - }, - { - "name": "virtio-pci-bus" - }, - { - "name": "qxl-vga" - }, - { - "name": "usb-uas" - }, - { - "name": "virtio-blk-pci" - }, - { - "name": "sysbus-ohci" - }, - { - "name": "esp" - }, - { - "name": "piix3-ide-xen" - }, - { - "name": "i82559c" - }, - { - "name": "i82559b" - }, - { - "name": "i82559a" - }, - { - "name": "scsi-hd" - }, - { - "name": "PIIX3-xen" - }, - { - "name": "usb-storage" - }, - { - "name": "isa-pit" - }, - { - "name": "tpci200" - }, - { - "name": "gus" - }, - { - "name": "VGA" - } - ], - "id": "libvirt-8" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "scsi", - "type": "on/off" - }, - { - "name": "config-wce", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "secs", - "type": "uint32" - }, - { - "name": "heads", - "type": "uint32" - }, - { - "name": "cyls", - "type": "uint32" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "x-data-plane", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "class", - "type": "hex32" - } - ], - "id": "libvirt-9" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "tx", - "type": "string" - }, - { - "name": "x-txburst", - "type": "int32" - }, - { - "name": "x-txtimer", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "netdev", - "type": "netdev" - }, - { - "name": "vlan", - "type": "vlan" - }, - { - "name": "mac", - "type": "macaddr" - }, - { - "name": "mq", - "type": "on/off" - }, - { - "name": "ctrl_guest_offloads", - "type": "on/off" - }, - { - "name": "ctrl_mac_addr", - "type": "on/off" - }, - { - "name": "ctrl_rx_extra", - "type": "on/off" - }, - { - "name": "ctrl_vlan", - "type": "on/off" - }, - { - "name": "ctrl_rx", - "type": "on/off" - }, - { - "name": "ctrl_vq", - "type": "on/off" - }, - { - "name": "status", - "type": "on/off" - }, - { - "name": "mrg_rxbuf", - "type": "on/off" - }, - { - "name": "host_ufo", - "type": "on/off" - }, - { - "name": "host_ecn", - "type": "on/off" - }, - { - "name": "host_tso6", - "type": "on/off" - }, - { - "name": "host_tso4", - "type": "on/off" - }, - { - "name": "guest_ufo", - "type": "on/off" - }, - { - "name": "guest_ecn", - "type": "on/off" - }, - { - "name": "guest_tso6", - "type": "on/off" - }, - { - "name": "guest_tso4", - "type": "on/off" - }, - { - "name": "gso", - "type": "on/off" - }, - { - "name": "guest_csum", - "type": "on/off" - }, - { - "name": "csum", - "type": "on/off" - }, - { - "name": "any_layout", - "type": "on/off" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - }, - { - "name": "ioeventfd", - "type": "on/off" - } - ], - "id": "libvirt-10" -} - -{ - "return": [ - { - "name": "ioeventfd", - "type": "on/off" - }, - { - "name": "vectors", - "type": "uint32" - } - ], - "id": "libvirt-11" -} - -{ - "id": "libvirt-12", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-ccw' not found" - } -} - -{ - "id": "libvirt-13", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-ccw' not found" - } -} - -{ - "id": "libvirt-14", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-scsi-ccw' not found" - } -} - -{ - "id": "libvirt-15", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-blk-s390' not found" - } -} - -{ - "id": "libvirt-16", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-net-s390' not found" - } -} - -{ - "id": "libvirt-17", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'pci-assign' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "configfd", - "type": "string" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "share_intx", - "type": "on/off" - }, - { - "name": "prefer_msi", - "type": "on/off" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-18" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "x-vga", - "type": "on/off" - }, - { - "name": "x-intx-mmap-timeout-ms", - "type": "uint32" - }, - { - "name": "host", - "type": "pci-host-devaddr" - } - ], - "id": "libvirt-19" -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "dpofua", - "type": "on/off" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "product", - "type": "string" - }, - { - "name": "vendor", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-20" -} - -{ - "return": [ - { - "name": "unit", - "type": "uint32" - }, - { - "name": "model", - "type": "string" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "wwn", - "type": "hex64" - }, - { - "name": "ver", - "type": "string" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-21" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "s4_val", - "type": "uint8" - }, - { - "name": "disable_s4", - "type": "uint8" - }, - { - "name": "disable_s3", - "type": "uint8" - }, - { - "name": "smb_io_base", - "type": "uint32" - } - ], - "id": "libvirt-22" -} - -{ - "id": "libvirt-23", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-redir' not found" - } -} - -{ - "id": "libvirt-24", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'usb-host' not found" - } -} - -{ - "return": [ - { - "name": "lun", - "type": "uint32" - }, - { - "name": "scsi-id", - "type": "uint32" - }, - { - "name": "channel", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-25" -} - -{ - "return": [ - { - "name": "pci-hole64-size", - "type": "size" - } - ], - "id": "libvirt-26" -} - -{ - "return": [ - { - "name": "pci-hole64-size", - "type": "size" - }, - { - "name": "MCFG", - "type": "uint64" - } - ], - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "full-path", - "type": "on/off" - }, - { - "name": "serial", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "removable", - "type": "on/off" - }, - { - "name": "discard_granularity", - "type": "uint32" - }, - { - "name": "bootindex", - "type": "int32" - }, - { - "name": "opt_io_size", - "type": "uint32" - }, - { - "name": "min_io_size", - "type": "uint16" - }, - { - "name": "physical_block_size", - "type": "blocksize" - }, - { - "name": "logical_block_size", - "type": "blocksize" - }, - { - "name": "drive", - "type": "drive" - } - ], - "id": "libvirt-28" -} - -{ - "return": [ - { - "name": "lost_tick_policy", - "type": "LostTickPolicy" - }, - { - "name": "iobase", - "type": "hex32" - } - ], - "id": "libvirt-29" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "mmio", - "type": "on/off" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-30" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "vgamem_mb", - "type": "uint32" - } - ], - "id": "libvirt-31" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-32" -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "surfaces", - "type": "int32" - }, - { - "name": "vgamem_mb", - "type": "uint32" - }, - { - "name": "vram64_size_mb", - "type": "uint32" - }, - { - "name": "vram_size_mb", - "type": "uint32" - }, - { - "name": "ram_size_mb", - "type": "uint32" - }, - { - "name": "cmdlog", - "type": "uint32" - }, - { - "name": "guestdebug", - "type": "uint32" - }, - { - "name": "debug", - "type": "uint32" - }, - { - "name": "revision", - "type": "uint32" - }, - { - "name": "vram_size", - "type": "uint32" - }, - { - "name": "ram_size", - "type": "uint32" - } - ], - "id": "libvirt-33" -} - -{ - "id": "libvirt-34", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-gpu-pci' not found" - } -} - -{ - "id": "libvirt-35", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'ICH9-LPC' not found" - } -} - -{ - "return": [ - { - "name": "command_serr_enable", - "type": "on/off" - }, - { - "name": "multifunction", - "type": "on/off" - }, - { - "name": "rombar", - "type": "uint32" - }, - { - "name": "romfile", - "type": "string" - }, - { - "name": "addr", - "type": "pci-devfn" - }, - { - "name": "class", - "type": "hex32" - }, - { - "name": "event_idx", - "type": "on/off" - }, - { - "name": "indirect_desc", - "type": "on/off" - } - ], - "id": "libvirt-36" -} - -{ - "id": "libvirt-37", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'virtio-balloon-ccw' not found" - } -} - -{ - "return": [ - ], - "id": "libvirt-38" -} - -{ - "return": [ - { - "name": "msi", - "type": "on/off" - }, - { - "name": "msix", - "type": "on/off" - }, - { - "name": "intrs", - "type": "uint32" - }, - { - "name": "slots", - "type": "uint32" - }, - { - "name": "2", - "type": "uint32" - }, - { - "name": "p3", - "type": "uint32" - } - ] -} - -{ - "return": [ - { - "name": "xenpv", - "cpu-max": 1 - }, - { - "name": "pc-q35-1.4", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.5", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.6", - "cpu-max": 255 - }, - { - "name": "pc-q35-1.7", - "cpu-max": 255, - "alias": "q35" - }, - { - "name": "xenfv", - "cpu-max": 128 - }, - { - "name": "isapc", - "cpu-max": 1 - }, - { - "name": "pc-0.10", - "cpu-max": 255 - }, - { - "name": "pc-0.11", - "cpu-max": 255 - }, - { - "name": "pc-0.12", - "cpu-max": 255 - }, - { - "name": "pc-0.13", - "cpu-max": 255 - }, - { - "name": "pc-0.14", - "cpu-max": 255 - }, - { - "name": "pc-0.15", - "cpu-max": 255 - }, - { - "name": "pc-1.0", - "cpu-max": 255 - }, - { - "name": "pc-1.1", - "cpu-max": 255 - }, - { - "name": "pc-1.2", - "cpu-max": 255 - }, - { - "name": "pc-1.3", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.4", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.5", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.6", - "cpu-max": 255 - }, - { - "name": "pc-i440fx-1.7", - "is-default": true, - "cpu-max": 255, - "alias": "pc" - }, - { - "name": "none", - "cpu-max": 1 - } - ], - "id": "libvirt-39" -} - -{ - "return": [ - { - "name": "Opteron_G5" - }, - { - "name": "Opteron_G4" - }, - { - "name": "Opteron_G3" - }, - { - "name": "Opteron_G2" - }, - { - "name": "Opteron_G1" - }, - { - "name": "Haswell" - }, - { - "name": "SandyBridge" - }, - { - "name": "Westmere" - }, - { - "name": "Nehalem" - }, - { - "name": "Penryn" - }, - { - "name": "Conroe" - }, - { - "name": "n270" - }, - { - "name": "athlon" - }, - { - "name": "pentium3" - }, - { - "name": "pentium2" - }, - { - "name": "pentium" - }, - { - "name": "486" - }, - { - "name": "coreduo" - }, - { - "name": "kvm32" - }, - { - "name": "qemu32" - }, - { - "name": "kvm64" - }, - { - "name": "core2duo" - }, - { - "name": "phenom" - }, - { - "name": "qemu64" - } - ], - "id": "libvirt-40" -} - -{ - "return": { - "enabled": false, - "present": true - }, - "id": "libvirt-41" -} - -{ - "return": [ - ], - "id": "libvirt-42" -} - -{ - "return": [ - ], - "id": "libvirt-43" -} - -{ - "return": [ - { - "parameters": [ - ], - "option": "smbios" - }, - { - "parameters": [ - { - "name": "seamless-migration", - "type": "boolean" - }, - { - "name": "playback-compression", - "type": "boolean" - }, - { - "name": "agent-mouse", - "type": "boolean" - }, - { - "name": "streaming-video", - "type": "string" - }, - { - "name": "zlib-glz-wan-compression", - "type": "string" - }, - { - "name": "jpeg-wan-compression", - "type": "string" - }, - { - "name": "image-compression", - "type": "string" - }, - { - "name": "plaintext-channel", - "type": "string" - }, - { - "name": "tls-channel", - "type": "string" - }, - { - "name": "tls-ciphers", - "type": "string" - }, - { - "name": "x509-dh-key-file", - "type": "string" - }, - { - "name": "x509-cacert-file", - "type": "string" - }, - { - "name": "x509-cert-file", - "type": "string" - }, - { - "name": "x509-key-password", - "type": "string" - }, - { - "name": "x509-key-file", - "type": "string" - }, - { - "name": "x509-dir", - "type": "string" - }, - { - "name": "sasl", - "type": "boolean" - }, - { - "name": "disable-agent-file-xfer", - "type": "boolean" - }, - { - "name": "disable-copy-paste", - "type": "boolean" - }, - { - "name": "disable-ticketing", - "type": "boolean" - }, - { - "name": "password", - "type": "string" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "addr", - "type": "string" - }, - { - "name": "tls-port", - "type": "number" - }, - { - "name": "port", - "type": "number" - } - ], - "option": "spice" - }, - { - "parameters": [ - ], - "option": "acpi" - }, - { - "parameters": [ - { - "name": "sock_fd", - "type": "number" - }, - { - "name": "socket", - "type": "string" - }, - { - "name": "readonly", - "type": "boolean" - }, - { - "name": "writeout", - "type": "string" - }, - { - "name": "security_model", - "type": "string" - }, - { - "name": "mount_tag", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "fsdriver", - "type": "string" - } - ], - "option": "virtfs" - }, - { - "parameters": [ - { - "name": "sock_fd", - "type": "number" - }, - { - "name": "socket", - "type": "string" - }, - { - "name": "readonly", - "type": "boolean" - }, - { - "name": "writeout", - "type": "string" - }, - { - "name": "security_model", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "fsdriver", - "type": "string" - } - ], - "option": "fsdev" - }, - { - "parameters": [ - { - "name": "timestamp", - "type": "boolean" - } - ], - "option": "msg" - }, - { - "parameters": [ - { - "name": "mlock", - "type": "boolean" - } - ], - "option": "realtime" - }, - { - "parameters": [ - ], - "option": "tpmdev" - }, - { - "parameters": [ - ], - "option": "object" - }, - { - "parameters": [ - { - "name": "opaque", - "help": "free-form string used to describe fd", - "type": "string" - }, - { - "name": "set", - "help": "ID of the fd set to add fd to", - "type": "number" - }, - { - "name": "fd", - "help": "file descriptor of which a duplicate is added to fd set", - "type": "number" - } - ], - "option": "add-fd" - }, - { - "parameters": [ - { - "name": "enable", - "type": "boolean" - } - ], - "option": "sandbox" - }, - { - "parameters": [ - { - "name": "strict", - "type": "string" - }, - { - "name": "reboot-timeout", - "type": "string" - }, - { - "name": "splash-time", - "type": "string" - }, - { - "name": "splash", - "type": "string" - }, - { - "name": "menu", - "type": "boolean" - }, - { - "name": "once", - "type": "string" - }, - { - "name": "order", - "type": "string" - } - ], - "option": "boot-opts" - }, - { - "parameters": [ - { - "name": "maxcpus", - "type": "number" - }, - { - "name": "threads", - "type": "number" - }, - { - "name": "cores", - "type": "number" - }, - { - "name": "sockets", - "type": "number" - }, - { - "name": "cpus", - "type": "number" - } - ], - "option": "smp-opts" - }, - { - "parameters": [ - { - "name": "usb", - "help": "Set on/off to enable/disable usb", - "type": "boolean" - }, - { - "name": "mem-merge", - "help": "enable/disable memory merge support", - "type": "boolean" - }, - { - "name": "dump-guest-core", - "help": "Include guest memory in a core dump", - "type": "boolean" - }, - { - "name": "dt_compatible", - "help": "Overrides the \"compatible\" property of the dt root node", - "type": "string" - }, - { - "name": "phandle_start", - "help": "The first phandle ID we may generate dynamically", - "type": "number" - }, - { - "name": "dumpdtb", - "help": "Dump current dtb to a file and quit", - "type": "string" - }, - { - "name": "dtb", - "help": "Linux kernel device tree file", - "type": "string" - }, - { - "name": "append", - "help": "Linux kernel command line", - "type": "string" - }, - { - "name": "initrd", - "help": "Linux initial ramdisk file", - "type": "string" - }, - { - "name": "kernel", - "help": "Linux kernel image file", - "type": "string" - }, - { - "name": "kvm_shadow_mem", - "help": "KVM shadow MMU size", - "type": "size" - }, - { - "name": "kernel_irqchip", - "help": "use KVM in-kernel irqchip", - "type": "boolean" - }, - { - "name": "accel", - "help": "accelerator list", - "type": "string" - }, - { - "name": "type", - "help": "emulated machine", - "type": "string" - } - ], - "option": "machine" - }, - { - "parameters": [ - { - "name": "romfile", - "type": "string" - }, - { - "name": "bootindex", - "type": "number" - } - ], - "option": "option-rom" - }, - { - "parameters": [ - { - "name": "file", - "type": "string" - }, - { - "name": "events", - "type": "string" - } - ], - "option": "trace" - }, - { - "parameters": [ - { - "name": "pretty", - "type": "boolean" - }, - { - "name": "default", - "type": "boolean" - }, - { - "name": "chardev", - "type": "string" - }, - { - "name": "mode", - "type": "string" - } - ], - "option": "mon" - }, - { - "parameters": [ - { - "name": "value", - "type": "string" - }, - { - "name": "property", - "type": "string" - }, - { - "name": "driver", - "type": "string" - } - ], - "option": "global" - }, - { - "parameters": [ - { - "name": "driftfix", - "type": "string" - }, - { - "name": "clock", - "type": "string" - }, - { - "name": "base", - "type": "string" - } - ], - "option": "rtc" - }, - { - "parameters": [ - ], - "option": "net" - }, - { - "parameters": [ - ], - "option": "netdev" - }, - { - "parameters": [ - ], - "option": "numa" - }, - { - "parameters": [ - ], - "option": "device" - }, - { - "parameters": [ - { - "name": "chardev", - "type": "string" - }, - { - "name": "size", - "type": "size" - }, - { - "name": "debug", - "type": "number" - }, - { - "name": "name", - "type": "string" - }, - { - "name": "signal", - "type": "boolean" - }, - { - "name": "mux", - "type": "boolean" - }, - { - "name": "rows", - "type": "number" - }, - { - "name": "cols", - "type": "number" - }, - { - "name": "height", - "type": "number" - }, - { - "name": "width", - "type": "number" - }, - { - "name": "telnet", - "type": "boolean" - }, - { - "name": "delay", - "type": "boolean" - }, - { - "name": "server", - "type": "boolean" - }, - { - "name": "wait", - "type": "boolean" - }, - { - "name": "ipv6", - "type": "boolean" - }, - { - "name": "ipv4", - "type": "boolean" - }, - { - "name": "to", - "type": "number" - }, - { - "name": "localport", - "type": "string" - }, - { - "name": "localaddr", - "type": "string" - }, - { - "name": "port", - "type": "string" - }, - { - "name": "host", - "type": "string" - }, - { - "name": "path", - "type": "string" - }, - { - "name": "backend", - "type": "string" - } - ], - "option": "chardev" - }, - { - "parameters": [ - ], - "option": "drive" - } - ], - "id": "libvirt-44" -} - -{ - "return": [ - { - "capability": "xbzrle", - "state": false - }, - { - "capability": "x-rdma-pin-all", - "state": false - }, - { - "capability": "auto-converge", - "state": false - }, - { - "capability": "zero-blocks", - "state": false - } - ], - "id": "libvirt-45" -} diff --git a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml deleted file mode 100644 index 296f769..0000000 --- a/tests/qemucapabilitiesdata/caps_1.6.50.x86_64.xml +++ /dev/null @@ -1,197 +0,0 @@ -<qemuCaps> - <qemuctime>0</qemuctime> - <selfctime>0</selfctime> - <selfvers>0</selfvers> - <usedQMP/> - <flag name='mem-path'/> - <flag name='drive-serial'/> - <flag name='chardev'/> - <flag name='enable-kvm'/> - <flag name='monitor-json'/> - <flag name='sdl'/> - <flag name='smp-topology'/> - <flag name='netdev'/> - <flag name='rtc'/> - <flag name='vhost-net'/> - <flag name='no-hpet'/> - <flag name='no-kvm-pit'/> - <flag name='pci-configfd'/> - <flag name='nodefconfig'/> - <flag name='boot-menu'/> - <flag name='fsdev'/> - <flag name='name-process'/> - <flag name='smbios-type'/> - <flag name='vga-qxl'/> - <flag name='spice'/> - <flag name='vga-none'/> - <flag name='boot-index'/> - <flag name='hda-duplex'/> - <flag name='drive-aio'/> - <flag name='pci-multibus'/> - <flag name='pci-bootindex'/> - <flag name='ccid-emulated'/> - <flag name='ccid-passthru'/> - <flag name='chardev-spicevmc'/> - <flag name='virtio-tx-alg'/> - <flag name='device-qxl-vga'/> - <flag name='pci-multifunction'/> - <flag name='virtio-blk-pci.ioeventfd'/> - <flag name='sga'/> - <flag name='virtio-blk-pci.event_idx'/> - <flag name='virtio-net-pci.event_idx'/> - <flag name='cache-directsync'/> - <flag name='piix3-usb-uhci'/> - <flag name='piix4-usb-uhci'/> - <flag name='usb-ehci'/> - <flag name='ich9-usb-ehci1'/> - <flag name='vt82c686b-usb-uhci'/> - <flag name='pci-ohci'/> - <flag name='usb-hub'/> - <flag name='no-shutdown'/> - <flag name='cache-unsafe'/> - <flag name='ich9-ahci'/> - <flag name='no-acpi'/> - <flag name='fsdev-readonly'/> - <flag name='virtio-blk-pci.scsi'/> - <flag name='drive-copy-on-read'/> - <flag name='fsdev-writeout'/> - <flag name='drive-iotune'/> - <flag name='system_wakeup'/> - <flag name='scsi-disk.channel'/> - <flag name='scsi-block'/> - <flag name='transaction'/> - <flag name='block-job-async'/> - <flag name='scsi-cd'/> - <flag name='ide-cd'/> - <flag name='no-user-config'/> - <flag name='hda-micro'/> - <flag name='dump-guest-memory'/> - <flag name='nec-usb-xhci'/> - <flag name='balloon-event'/> - <flag name='bridge'/> - <flag name='lsi'/> - <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> - <flag name='disable-s3'/> - <flag name='disable-s4'/> - <flag name='ide-drive.wwn'/> - <flag name='scsi-disk.wwn'/> - <flag name='seccomp-sandbox'/> - <flag name='reboot-timeout'/> - <flag name='dump-guest-core'/> - <flag name='seamless-migration'/> - <flag name='block-commit'/> - <flag name='vnc'/> - <flag name='drive-mirror'/> - <flag name='blockdev-snapshot-sync'/> - <flag name='qxl'/> - <flag name='VGA'/> - <flag name='cirrus-vga'/> - <flag name='vmware-svga'/> - <flag name='device-video-primary'/> - <flag name='usb-serial'/> - <flag name='usb-net'/> - <flag name='add-fd'/> - <flag name='nbd-server'/> - <flag name='virtio-rng'/> - <flag name='rng-random'/> - <flag name='rng-egd'/> - <flag name='dtb'/> - <flag name='megasas'/> - <flag name='ipv6-migration'/> - <flag name='machine-opt'/> - <flag name='machine-usb-opt'/> - <flag name='pci-bridge'/> - <flag name='vfio-pci'/> - <flag name='vfio-pci.bootindex'/> - <flag name='scsi-generic'/> - <flag name='scsi-generic.bootindex'/> - <flag name='mem-merge'/> - <flag name='vnc-websocket'/> - <flag name='mlock'/> - <flag name='vnc-share-policy'/> - <flag name='device-del-event'/> - <flag name='dmi-to-pci-bridge'/> - <flag name='i440fx-pci-hole64-size'/> - <flag name='q35-pci-hole64-size'/> - <flag name='usb-storage'/> - <flag name='usb-storage.removable'/> - <flag name='virtio-mmio'/> - <flag name='ich9-intel-hda'/> - <flag name='kvm-pit-lost-tick-policy'/> - <flag name='boot-strict'/> - <flag name='pvpanic'/> - <flag name='spice-file-xfer-disable'/> - <flag name='spiceport'/> - <flag name='usb-kbd'/> - <flag name='host-pci-multidomain'/> - <flag name='msg-timestamp'/> - <flag name='numa'/> - <flag name='usb-audio'/> - <flag name='splash-timeout'/> - <flag name='ivshmem'/> - <flag name='VGA.vgamem_mb'/> - <flag name='vmware-svga.vgamem_mb'/> - <flag name='qxl.vgamem_mb'/> - <flag name='qxl-vga.vgamem_mb'/> - <flag name='pci-serial'/> - <flag name='ioh3420'/> - <flag name='x3130-upstream'/> - <flag name='xio3130-downstream'/> - <flag name='rtl8139'/> - <flag name='e1000'/> - <flag name='virtio-net'/> - <flag name='qxl.vram64_size_mb'/> - <flag name='qxl-vga.vram64_size_mb'/> - <flag name='device-tray-moved-event'/> - <flag name='nec-usb-xhci-ports'/> - <version>1006050</version> - <kvmVersion>0</kvmVersion> - <package></package> - <arch>x86_64</arch> - <cpu name='Opteron_G5'/> - <cpu name='Opteron_G4'/> - <cpu name='Opteron_G3'/> - <cpu name='Opteron_G2'/> - <cpu name='Opteron_G1'/> - <cpu name='Haswell'/> - <cpu name='SandyBridge'/> - <cpu name='Westmere'/> - <cpu name='Nehalem'/> - <cpu name='Penryn'/> - <cpu name='Conroe'/> - <cpu name='n270'/> - <cpu name='athlon'/> - <cpu name='pentium3'/> - <cpu name='pentium2'/> - <cpu name='pentium'/> - <cpu name='486'/> - <cpu name='coreduo'/> - <cpu name='kvm32'/> - <cpu name='qemu32'/> - <cpu name='kvm64'/> - <cpu name='core2duo'/> - <cpu name='phenom'/> - <cpu name='qemu64'/> - <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/> - <machine name='xenpv' maxCpus='1'/> - <machine name='pc-q35-1.4' maxCpus='255'/> - <machine name='pc-q35-1.5' maxCpus='255'/> - <machine name='pc-q35-1.6' maxCpus='255'/> - <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/> - <machine name='xenfv' maxCpus='128'/> - <machine name='isapc' maxCpus='1'/> - <machine name='pc-0.10' maxCpus='255'/> - <machine name='pc-0.11' maxCpus='255'/> - <machine name='pc-0.12' maxCpus='255'/> - <machine name='pc-0.13' maxCpus='255'/> - <machine name='pc-0.14' maxCpus='255'/> - <machine name='pc-0.15' maxCpus='255'/> - <machine name='pc-1.0' maxCpus='255'/> - <machine name='pc-1.1' maxCpus='255'/> - <machine name='pc-1.2' maxCpus='255'/> - <machine name='pc-1.3' maxCpus='255'/> - <machine name='pc-i440fx-1.4' maxCpus='255'/> - <machine name='pc-i440fx-1.5' maxCpus='255'/> - <machine name='pc-i440fx-1.6' maxCpus='255'/> -</qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies new file mode 100644 index 0000000..50e4042 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -0,0 +1,3195 @@ +{ + "QMP": { + "version": { + "qemu": { + "micro": 0, + "minor": 7, + "major": 1 + }, + "package": "" + }, + "capabilities": [ + ] + } +} + +{ + "return": { + }, + "id": "libvirt-1" +} + +{ + "return": { + "qemu": { + "micro": 0, + "minor": 7, + "major": 1 + }, + "package": "" + }, + "id": "libvirt-2" +} + +{ + "return": { + "arch": "x86_64" + }, + "id": "libvirt-3" +} + +{ + "return": [ + { + "name": "blockdev-add" + }, + { + "name": "query-rx-filter" + }, + { + "name": "chardev-remove" + }, + { + "name": "chardev-add" + }, + { + "name": "query-tpm-types" + }, + { + "name": "query-tpm-models" + }, + { + "name": "query-tpm" + }, + { + "name": "query-target" + }, + { + "name": "query-cpu-definitions" + }, + { + "name": "query-machines" + }, + { + "name": "device-list-properties" + }, + { + "name": "qom-list-types" + }, + { + "name": "change-vnc-password" + }, + { + "name": "nbd-server-stop" + }, + { + "name": "nbd-server-add" + }, + { + "name": "nbd-server-start" + }, + { + "name": "qom-get" + }, + { + "name": "qom-set" + }, + { + "name": "qom-list" + }, + { + "name": "query-block-jobs" + }, + { + "name": "query-balloon" + }, + { + "name": "query-migrate-capabilities" + }, + { + "name": "migrate-set-capabilities" + }, + { + "name": "query-migrate" + }, + { + "name": "query-command-line-options" + }, + { + "name": "query-uuid" + }, + { + "name": "query-name" + }, + { + "name": "query-spice" + }, + { + "name": "query-vnc" + }, + { + "name": "query-mice" + }, + { + "name": "query-status" + }, + { + "name": "query-kvm" + }, + { + "name": "query-pci" + }, + { + "name": "query-cpus" + }, + { + "name": "query-blockstats" + }, + { + "name": "query-block" + }, + { + "name": "query-chardev" + }, + { + "name": "query-events" + }, + { + "name": "query-commands" + }, + { + "name": "query-version" + }, + { + "name": "human-monitor-command" + }, + { + "name": "qmp_capabilities" + }, + { + "name": "add_client" + }, + { + "name": "expire_password" + }, + { + "name": "set_password" + }, + { + "name": "block_set_io_throttle" + }, + { + "name": "block_passwd" + }, + { + "name": "query-fdsets" + }, + { + "name": "remove-fd" + }, + { + "name": "add-fd" + }, + { + "name": "closefd" + }, + { + "name": "getfd" + }, + { + "name": "set_link" + }, + { + "name": "balloon" + }, + { + "name": "drive-mirror" + }, + { + "name": "blockdev-snapshot-delete-internal-sync" + }, + { + "name": "blockdev-snapshot-internal-sync" + }, + { + "name": "blockdev-snapshot-sync" + }, + { + "name": "transaction" + }, + { + "name": "block-job-complete" + }, + { + "name": "block-job-resume" + }, + { + "name": "block-job-pause" + }, + { + "name": "block-job-cancel" + }, + { + "name": "block-job-set-speed" + }, + { + "name": "drive-backup" + }, + { + "name": "block-commit" + }, + { + "name": "block-stream" + }, + { + "name": "block_resize" + }, + { + "name": "netdev_del" + }, + { + "name": "netdev_add" + }, + { + "name": "dump-guest-memory" + }, + { + "name": "client_migrate_info" + }, + { + "name": "migrate_set_downtime" + }, + { + "name": "migrate_set_speed" + }, + { + "name": "query-migrate-cache-size" + }, + { + "name": "migrate-set-cache-size" + }, + { + "name": "migrate_cancel" + }, + { + "name": "migrate" + }, + { + "name": "xen-set-global-dirty-log" + }, + { + "name": "xen-save-devices-state" + }, + { + "name": "ringbuf-read" + }, + { + "name": "ringbuf-write" + }, + { + "name": "inject-nmi" + }, + { + "name": "pmemsave" + }, + { + "name": "memsave" + }, + { + "name": "cpu-add" + }, + { + "name": "cpu" + }, + { + "name": "send-key" + }, + { + "name": "device_del" + }, + { + "name": "device_add" + }, + { + "name": "system_powerdown" + }, + { + "name": "system_reset" + }, + { + "name": "system_wakeup" + }, + { + "name": "cont" + }, + { + "name": "stop" + }, + { + "name": "screendump" + }, + { + "name": "change" + }, + { + "name": "eject" + }, + { + "name": "quit" + } + ], + "id": "libvirt-4" +} + +{ + "return": { + "fd": 11, + "fdset-id": 0 + }, + "id": "libvirt-5" +} + +{ + "id": "libvirt-6", + "error": { + "class": "GenericError", + "desc": "Parameter 'top' is missing" + } +} + +{ + "return": [ + { + "name": "BLOCK_IMAGE_CORRUPTED" + }, + { + "name": "GUEST_PANICKED" + }, + { + "name": "SPICE_MIGRATE_COMPLETED" + }, + { + "name": "BALLOON_CHANGE" + }, + { + "name": "WAKEUP" + }, + { + "name": "SUSPEND_DISK" + }, + { + "name": "SUSPEND" + }, + { + "name": "NIC_RX_FILTER_CHANGED" + }, + { + "name": "DEVICE_TRAY_MOVED" + }, + { + "name": "DEVICE_DELETED" + }, + { + "name": "BLOCK_JOB_READY" + }, + { + "name": "BLOCK_JOB_ERROR" + }, + { + "name": "BLOCK_JOB_CANCELLED" + }, + { + "name": "BLOCK_JOB_COMPLETED" + }, + { + "name": "SPICE_DISCONNECTED" + }, + { + "name": "SPICE_INITIALIZED" + }, + { + "name": "SPICE_CONNECTED" + }, + { + "name": "WATCHDOG" + }, + { + "name": "RTC_CHANGE" + }, + { + "name": "BLOCK_IO_ERROR" + }, + { + "name": "VNC_DISCONNECTED" + }, + { + "name": "VNC_INITIALIZED" + }, + { + "name": "VNC_CONNECTED" + }, + { + "name": "RESUME" + }, + { + "name": "STOP" + }, + { + "name": "POWERDOWN" + }, + { + "name": "RESET" + }, + { + "name": "SHUTDOWN" + } + ], + "id": "libvirt-7" +} + +{ + "return": [ + { + "name": "virtio-blk-device" + }, + { + "name": "ib700" + }, + { + "name": "ICH9 LPC" + }, + { + "name": "port92" + }, + { + "name": "i6300esb" + }, + { + "name": "kvm-pci-assign" + }, + { + "name": "virtio-scsi-device" + }, + { + "name": "apic" + }, + { + "name": "pc-testdev" + }, + { + "name": "fusbh200-ehci-usb" + }, + { + "name": "virtio-scsi-pci" + }, + { + "name": "usb-ehci" + }, + { + "name": "exynos4210-ehci-usb" + }, + { + "name": "xlnx,ps7-usb" + }, + { + "name": "virtio-balloon-pci" + }, + { + "name": "usb-host" + }, + { + "name": "ich9-usb-ehci2" + }, + { + "name": "ich9-ahci" + }, + { + "name": "ich9-usb-ehci1" + }, + { + "name": "isa-ide" + }, + { + "name": "ICH9 SMB" + }, + { + "name": "piix4-usb-uhci" + }, + { + "name": "vt82c686b-usb-uhci" + }, + { + "name": "i82558b" + }, + { + "name": "i82558a" + }, + { + "name": "isa-fdc" + }, + { + "name": "isabus-bridge" + }, + { + "name": "sb16" + }, + { + "name": "i2c-bus" + }, + { + "name": "piix3-ide" + }, + { + "name": "ioapic" + }, + { + "name": "pci-bridge" + }, + { + "name": "HDA" + }, + { + "name": "am53c974" + }, + { + "name": "hpet" + }, + { + "name": "vmmouse" + }, + { + "name": "i82801b11-bridge" + }, + { + "name": "nvme" + }, + { + "name": "lsi53c810" + }, + { + "name": "vmxnet3" + }, + { + "name": "isa-cirrus-vga" + }, + { + "name": "dc390" + }, + { + "name": "vmware-svga" + }, + { + "name": "smbus-eeprom" + }, + { + "name": "i82801" + }, + { + "name": "ccid-card-passthru" + }, + { + "name": "fw_cfg" + }, + { + "name": "x86_64-cpu" + }, + { + "name": "piix3-usb-uhci" + }, + { + "name": "usb-audio" + }, + { + "name": "virtio-9p-device" + }, + { + "name": "i82557c" + }, + { + "name": "i82557b" + }, + { + "name": "i82557a" + }, + { + "name": "IndustryPack" + }, + { + "name": "qxl" + }, + { + "name": "pvscsi" + }, + { + "name": "rtl8139" + }, + { + "name": "isa-applesmc" + }, + { + "name": "container" + }, + { + "name": "virtio-mmio" + }, + { + "name": "vfio-pci" + }, + { + "name": "cfi.pflash01" + }, + { + "name": "usb-kbd" + }, + { + "name": "ich9-usb-uhci5" + }, + { + "name": "isa-vga" + }, + { + "name": "pci-testdev" + }, + { + "name": "usb-tablet" + }, + { + "name": "vmport" + }, + { + "name": "virtio-rng-pci" + }, + { + "name": "kvmvapic" + }, + { + "name": "usb-bt-dongle" + }, + { + "name": "sysbus-fdc" + }, + { + "name": "piix4-ide" + }, + { + "name": "e1000" + }, + { + "name": "kvm-apic" + }, + { + "name": "AC97" + }, + { + "name": "ich9-usb-uhci6" + }, + { + "name": "ipoctal232" + }, + { + "name": "mch" + }, + { + "name": "mc146818rtc" + }, + { + "name": "ivshmem" + }, + { + "name": "usb-ccid" + }, + { + "name": "sysbus-ahci" + }, + { + "name": "kvmclock" + }, + { + "name": "i82562" + }, + { + "name": "hda-output" + }, + { + "name": "pci-serial-4x" + }, + { + "name": "ccid-bus" + }, + { + "name": "i82559er" + }, + { + "name": "virtio-balloon-device" + }, + { + "name": "megasas" + }, + { + "name": "i8042" + }, + { + "name": "intel-hda" + }, + { + "name": "hda-duplex" + }, + { + "name": "virtio-serial-pci" + }, + { + "name": "ne2k_pci" + }, + { + "name": "ich9-usb-uhci2" + }, + { + "name": "ich9-usb-uhci3" + }, + { + "name": "virtconsole" + }, + { + "name": "ich9-usb-uhci4" + }, + { + "name": "isa-parallel" + }, + { + "name": "pci-serial" + }, + { + "name": "ich9-usb-uhci1" + }, + { + "name": "PCI" + }, + { + "name": "adlib" + }, + { + "name": "SUNW,fdtwo" + }, + { + "name": "ide-cd" + }, + { + "name": "isa-debugcon" + }, + { + "name": "usb-bot" + }, + { + "name": "i82551" + }, + { + "name": "i82550" + }, + { + "name": "isa-serial" + }, + { + "name": "PCIE" + }, + { + "name": "kvm-ioapic" + }, + { + "name": "nec-usb-xhci" + }, + { + "name": "System" + }, + { + "name": "qemu-console" + }, + { + "name": "ich9-intel-hda" + }, + { + "name": "virtio-net-device" + }, + { + "name": "q35-pcihost" + }, + { + "name": "usb-wacom-tablet" + }, + { + "name": "PIIX4_PM" + }, + { + "name": "kvm-i8259" + }, + { + "name": "usb-redir" + }, + { + "name": "scsi-cd" + }, + { + "name": "pci-ohci" + }, + { + "name": "i440FX" + }, + { + "name": "usb-braille" + }, + { + "name": "virtserialport" + }, + { + "name": "pci-serial-2x" + }, + { + "name": "icc-bridge" + }, + { + "name": "xio3130-downstream" + }, + { + "name": "rng-random" + }, + { + "name": "hda-micro" + }, + { + "name": "scsi-disk" + }, + { + "name": "vhost-scsi" + }, + { + "name": "lsi53c895a" + }, + { + "name": "SCSI" + }, + { + "name": "pcnet" + }, + { + "name": "scsi-generic" + }, + { + "name": "pvpanic" + }, + { + "name": "virtio-serial-device" + }, + { + "name": "virtio-serial-bus" + }, + { + "name": "vhost-scsi-pci" + }, + { + "name": "usb-bus" + }, + { + "name": "ne2k_isa" + }, + { + "name": "IDE" + }, + { + "name": "ccid-card-emulated" + }, + { + "name": "tegra2-ehci-usb" + }, + { + "name": "usb-net" + }, + { + "name": "virtio-mmio-bus" + }, + { + "name": "usb-hub" + }, + { + "name": "i440FX-pcihost" + }, + { + "name": "usb-mouse" + }, + { + "name": "ISA" + }, + { + "name": "cs4231a" + }, + { + "name": "usb-serial" + }, + { + "name": "scsi-block" + }, + { + "name": "isa-i8259" + }, + { + "name": "sga" + }, + { + "name": "virtio-net-pci" + }, + { + "name": "isa-debug-exit" + }, + { + "name": "virtio-rng-device" + }, + { + "name": "ioh3420" + }, + { + "name": "ES1370" + }, + { + "name": "PIIX3" + }, + { + "name": "isa-pcspk" + }, + { + "name": "ide-hd" + }, + { + "name": "rng-egd" + }, + { + "name": "cirrus-vga" + }, + { + "name": "kvm-pit" + }, + { + "name": "virtio-9p-pci" + }, + { + "name": "icc-bus" + }, + { + "name": "ide-drive" + }, + { + "name": "x3130-upstream" + }, + { + "name": "virtio-pci-bus" + }, + { + "name": "qxl-vga" + }, + { + "name": "usb-uas" + }, + { + "name": "virtio-blk-pci" + }, + { + "name": "sysbus-ohci" + }, + { + "name": "esp" + }, + { + "name": "piix3-ide-xen" + }, + { + "name": "i82559c" + }, + { + "name": "i82559b" + }, + { + "name": "i82559a" + }, + { + "name": "scsi-hd" + }, + { + "name": "PIIX3-xen" + }, + { + "name": "usb-storage" + }, + { + "name": "isa-pit" + }, + { + "name": "tpci200" + }, + { + "name": "gus" + }, + { + "name": "VGA" + } + ], + "id": "libvirt-8" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "scsi", + "type": "on/off" + }, + { + "name": "config-wce", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "secs", + "type": "uint32" + }, + { + "name": "heads", + "type": "uint32" + }, + { + "name": "cyls", + "type": "uint32" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "x-data-plane", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + }, + { + "name": "class", + "type": "hex32" + } + ], + "id": "libvirt-9" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "tx", + "type": "string" + }, + { + "name": "x-txburst", + "type": "int32" + }, + { + "name": "x-txtimer", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "netdev", + "type": "netdev" + }, + { + "name": "vlan", + "type": "vlan" + }, + { + "name": "mac", + "type": "macaddr" + }, + { + "name": "mq", + "type": "on/off" + }, + { + "name": "ctrl_guest_offloads", + "type": "on/off" + }, + { + "name": "ctrl_mac_addr", + "type": "on/off" + }, + { + "name": "ctrl_rx_extra", + "type": "on/off" + }, + { + "name": "ctrl_vlan", + "type": "on/off" + }, + { + "name": "ctrl_rx", + "type": "on/off" + }, + { + "name": "ctrl_vq", + "type": "on/off" + }, + { + "name": "status", + "type": "on/off" + }, + { + "name": "mrg_rxbuf", + "type": "on/off" + }, + { + "name": "host_ufo", + "type": "on/off" + }, + { + "name": "host_ecn", + "type": "on/off" + }, + { + "name": "host_tso6", + "type": "on/off" + }, + { + "name": "host_tso4", + "type": "on/off" + }, + { + "name": "guest_ufo", + "type": "on/off" + }, + { + "name": "guest_ecn", + "type": "on/off" + }, + { + "name": "guest_tso6", + "type": "on/off" + }, + { + "name": "guest_tso4", + "type": "on/off" + }, + { + "name": "gso", + "type": "on/off" + }, + { + "name": "guest_csum", + "type": "on/off" + }, + { + "name": "csum", + "type": "on/off" + }, + { + "name": "any_layout", + "type": "on/off" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + } + ], + "id": "libvirt-10" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "cmd_per_lun", + "type": "uint32" + }, + { + "name": "max_sectors", + "type": "uint32" + }, + { + "name": "num_queues", + "type": "uint32" + }, + { + "name": "param_change", + "type": "on/off" + }, + { + "name": "hotplug", + "type": "on/off" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + }, + { + "name": "vectors", + "type": "uint32" + }, + { + "name": "ioeventfd", + "type": "on/off" + } + ], + "id": "libvirt-11" +} + +{ + "id": "libvirt-12", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-ccw' not found" + } +} + +{ + "id": "libvirt-13", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-ccw' not found" + } +} + +{ + "id": "libvirt-14", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-scsi-ccw' not found" + } +} + +{ + "id": "libvirt-15", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-blk-s390' not found" + } +} + +{ + "id": "libvirt-16", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-net-s390' not found" + } +} + +{ + "id": "libvirt-17", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'pci-assign' not found" + } +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "configfd", + "type": "string" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "share_intx", + "type": "on/off" + }, + { + "name": "prefer_msi", + "type": "on/off" + }, + { + "name": "host", + "type": "pci-host-devaddr" + } + ], + "id": "libvirt-18" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "x-vga", + "type": "on/off" + }, + { + "name": "x-intx-mmap-timeout-ms", + "type": "uint32" + }, + { + "name": "host", + "type": "pci-host-devaddr" + } + ], + "id": "libvirt-19" +} + +{ + "return": [ + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "wwn", + "type": "hex64" + }, + { + "name": "dpofua", + "type": "on/off" + }, + { + "name": "removable", + "type": "on/off" + }, + { + "name": "product", + "type": "string" + }, + { + "name": "vendor", + "type": "string" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "ver", + "type": "string" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-20" +} + +{ + "return": [ + { + "name": "unit", + "type": "uint32" + }, + { + "name": "model", + "type": "string" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "wwn", + "type": "hex64" + }, + { + "name": "ver", + "type": "string" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-21" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "s4_val", + "type": "uint8" + }, + { + "name": "disable_s4", + "type": "uint8" + }, + { + "name": "disable_s3", + "type": "uint8" + }, + { + "name": "smb_io_base", + "type": "uint32" + } + ], + "id": "libvirt-22" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "filter", + "type": "string" + }, + { + "name": "debug", + "type": "uint8" + }, + { + "name": "chardev", + "type": "chr" + } + ], + "id": "libvirt-23" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "pipeline", + "type": "on/off" + }, + { + "name": "loglevel", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "isobsize", + "type": "uint32" + }, + { + "name": "isobufs", + "type": "uint32" + }, + { + "name": "productid", + "type": "hex32" + }, + { + "name": "vendorid", + "type": "hex32" + }, + { + "name": "hostport", + "type": "string" + }, + { + "name": "hostaddr", + "type": "uint32" + }, + { + "name": "hostbus", + "type": "uint32" + } + ], + "id": "libvirt-24" +} + +{ + "return": [ + { + "name": "lun", + "type": "uint32" + }, + { + "name": "scsi-id", + "type": "uint32" + }, + { + "name": "channel", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-25" +} + +{ + "return": [ + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { + "name": "short_root_bus", + "type": "uint32" + }, + { + "name": "pci-hole64-size", + "type": "size" + }, + { + "name": "MCFG", + "type": "uint64" + } + ], + "id": "libvirt-27" +} + +{ + "return": [ + { + "name": "full-path", + "type": "on/off" + }, + { + "name": "serial", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "removable", + "type": "on/off" + }, + { + "name": "discard_granularity", + "type": "uint32" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "opt_io_size", + "type": "uint32" + }, + { + "name": "min_io_size", + "type": "uint16" + }, + { + "name": "physical_block_size", + "type": "blocksize" + }, + { + "name": "logical_block_size", + "type": "blocksize" + }, + { + "name": "drive", + "type": "drive" + } + ], + "id": "libvirt-28" +} + +{ + "return": [ + { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-29" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "mmio", + "type": "on/off" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-30" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-32" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "surfaces", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "vram64_size_mb", + "type": "uint32" + }, + { + "name": "vram_size_mb", + "type": "uint32" + }, + { + "name": "ram_size_mb", + "type": "uint32" + }, + { + "name": "cmdlog", + "type": "uint32" + }, + { + "name": "guestdebug", + "type": "uint32" + }, + { + "name": "debug", + "type": "uint32" + }, + { + "name": "revision", + "type": "uint32" + }, + { + "name": "vram_size", + "type": "uint32" + }, + { + "name": "ram_size", + "type": "uint32" + } + ], + "id": "libvirt-33" +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-gpu-pci' not found" + } +} + +{ + "id": "libvirt-35", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'ICH9-LPC' not found" + } +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "class", + "type": "hex32" + }, + { + "name": "event_idx", + "type": "on/off" + }, + { + "name": "indirect_desc", + "type": "on/off" + } + ], + "id": "libvirt-36" +} + +{ + "id": "libvirt-37", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'virtio-balloon-ccw' not found" + } +} + +{ + "return": [ + ], + "id": "libvirt-38" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { + "name": "p3", + "type": "uint32" + }, + { + "name": "p2", + "type": "uint32" + }, + { + "name": "slots", + "type": "uint32" + }, + { + "name": "intrs", + "type": "uint32" + }, + { + "name": "msix", + "type": "on/off" + }, + { + "name": "msi", + "type": "on/off" + } + ], + "id": "libvirt-39" +} + +{ + "return": [ + { + "name": "pc-q35-1.4", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.5", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.6", + "cpu-max": 255 + }, + { + "name": "pc-q35-1.7", + "cpu-max": 255, + "alias": "q35" + }, + { + "name": "isapc", + "cpu-max": 1 + }, + { + "name": "pc-0.10", + "cpu-max": 255 + }, + { + "name": "pc-0.11", + "cpu-max": 255 + }, + { + "name": "pc-0.12", + "cpu-max": 255 + }, + { + "name": "pc-0.13", + "cpu-max": 255 + }, + { + "name": "pc-0.14", + "cpu-max": 255 + }, + { + "name": "pc-0.15", + "cpu-max": 255 + }, + { + "name": "pc-1.0", + "cpu-max": 255 + }, + { + "name": "pc-1.1", + "cpu-max": 255 + }, + { + "name": "pc-1.2", + "cpu-max": 255 + }, + { + "name": "pc-1.3", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.4", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.5", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.6", + "cpu-max": 255 + }, + { + "name": "pc-i440fx-1.7", + "is-default": true, + "cpu-max": 255, + "alias": "pc" + }, + { + "name": "none", + "cpu-max": 1 + } + ], + "id": "libvirt-40" +} + +{ + "return": [ + { + "name": "Opteron_G5" + }, + { + "name": "Opteron_G4" + }, + { + "name": "Opteron_G3" + }, + { + "name": "Opteron_G2" + }, + { + "name": "Opteron_G1" + }, + { + "name": "Haswell" + }, + { + "name": "SandyBridge" + }, + { + "name": "Westmere" + }, + { + "name": "Nehalem" + }, + { + "name": "Penryn" + }, + { + "name": "Conroe" + }, + { + "name": "n270" + }, + { + "name": "athlon" + }, + { + "name": "pentium3" + }, + { + "name": "pentium2" + }, + { + "name": "pentium" + }, + { + "name": "486" + }, + { + "name": "coreduo" + }, + { + "name": "kvm32" + }, + { + "name": "qemu32" + }, + { + "name": "kvm64" + }, + { + "name": "core2duo" + }, + { + "name": "phenom" + }, + { + "name": "qemu64" + } + ], + "id": "libvirt-41" +} + +{ + "return": { + "enabled": false, + "present": true + }, + "id": "libvirt-42" +} + +{ + "return": [ + ], + "id": "libvirt-43" +} + +{ + "return": [ + ], + "id": "libvirt-44" +} + +{ + "return": [ + { + "parameters": [ + { + "name": "initiator-name", + "help": "Initiator iqn name to use when connecting", + "type": "string" + }, + { + "name": "header-digest", + "help": "HeaderDigest setting. {CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", + "type": "string" + }, + { + "name": "password", + "help": "password for CHAP authentication to target", + "type": "string" + }, + { + "name": "user", + "help": "username for CHAP authentication to target", + "type": "string" + } + ], + "option": "iscsi" + }, + { + "parameters": [ + ], + "option": "smbios" + }, + { + "parameters": [ + { + "name": "seamless-migration", + "type": "boolean" + }, + { + "name": "playback-compression", + "type": "boolean" + }, + { + "name": "agent-mouse", + "type": "boolean" + }, + { + "name": "streaming-video", + "type": "string" + }, + { + "name": "zlib-glz-wan-compression", + "type": "string" + }, + { + "name": "jpeg-wan-compression", + "type": "string" + }, + { + "name": "image-compression", + "type": "string" + }, + { + "name": "plaintext-channel", + "type": "string" + }, + { + "name": "tls-channel", + "type": "string" + }, + { + "name": "tls-ciphers", + "type": "string" + }, + { + "name": "x509-dh-key-file", + "type": "string" + }, + { + "name": "x509-cacert-file", + "type": "string" + }, + { + "name": "x509-cert-file", + "type": "string" + }, + { + "name": "x509-key-password", + "type": "string" + }, + { + "name": "x509-key-file", + "type": "string" + }, + { + "name": "x509-dir", + "type": "string" + }, + { + "name": "sasl", + "type": "boolean" + }, + { + "name": "disable-agent-file-xfer", + "type": "boolean" + }, + { + "name": "disable-copy-paste", + "type": "boolean" + }, + { + "name": "disable-ticketing", + "type": "boolean" + }, + { + "name": "password", + "type": "string" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "addr", + "type": "string" + }, + { + "name": "tls-port", + "type": "number" + }, + { + "name": "port", + "type": "number" + } + ], + "option": "spice" + }, + { + "parameters": [ + ], + "option": "acpi" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "mount_tag", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "virtfs" + }, + { + "parameters": [ + { + "name": "sock_fd", + "type": "number" + }, + { + "name": "socket", + "type": "string" + }, + { + "name": "readonly", + "type": "boolean" + }, + { + "name": "writeout", + "type": "string" + }, + { + "name": "security_model", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "fsdriver", + "type": "string" + } + ], + "option": "fsdev" + }, + { + "parameters": [ + { + "name": "timestamp", + "type": "boolean" + } + ], + "option": "msg" + }, + { + "parameters": [ + { + "name": "mlock", + "type": "boolean" + } + ], + "option": "realtime" + }, + { + "parameters": [ + ], + "option": "tpmdev" + }, + { + "parameters": [ + ], + "option": "object" + }, + { + "parameters": [ + { + "name": "opaque", + "help": "free-form string used to describe fd", + "type": "string" + }, + { + "name": "set", + "help": "ID of the fd set to add fd to", + "type": "number" + }, + { + "name": "fd", + "help": "file descriptor of which a duplicate is added to fd set", + "type": "number" + } + ], + "option": "add-fd" + }, + { + "parameters": [ + { + "name": "enable", + "type": "boolean" + } + ], + "option": "sandbox" + }, + { + "parameters": [ + { + "name": "strict", + "type": "string" + }, + { + "name": "reboot-timeout", + "type": "string" + }, + { + "name": "splash-time", + "type": "string" + }, + { + "name": "splash", + "type": "string" + }, + { + "name": "menu", + "type": "boolean" + }, + { + "name": "once", + "type": "string" + }, + { + "name": "order", + "type": "string" + } + ], + "option": "boot-opts" + }, + { + "parameters": [ + { + "name": "maxcpus", + "type": "number" + }, + { + "name": "threads", + "type": "number" + }, + { + "name": "cores", + "type": "number" + }, + { + "name": "sockets", + "type": "number" + }, + { + "name": "cpus", + "type": "number" + } + ], + "option": "smp-opts" + }, + { + "parameters": [ + { + "name": "usb", + "help": "Set on/off to enable/disable usb", + "type": "boolean" + }, + { + "name": "mem-merge", + "help": "enable/disable memory merge support", + "type": "boolean" + }, + { + "name": "dump-guest-core", + "help": "Include guest memory in a core dump", + "type": "boolean" + }, + { + "name": "dt_compatible", + "help": "Overrides the \"compatible\" property of the dt root node", + "type": "string" + }, + { + "name": "phandle_start", + "help": "The first phandle ID we may generate dynamically", + "type": "number" + }, + { + "name": "dumpdtb", + "help": "Dump current dtb to a file and quit", + "type": "string" + }, + { + "name": "dtb", + "help": "Linux kernel device tree file", + "type": "string" + }, + { + "name": "append", + "help": "Linux kernel command line", + "type": "string" + }, + { + "name": "initrd", + "help": "Linux initial ramdisk file", + "type": "string" + }, + { + "name": "kernel", + "help": "Linux kernel image file", + "type": "string" + }, + { + "name": "kvm_shadow_mem", + "help": "KVM shadow MMU size", + "type": "size" + }, + { + "name": "kernel_irqchip", + "help": "use KVM in-kernel irqchip", + "type": "boolean" + }, + { + "name": "accel", + "help": "accelerator list", + "type": "string" + }, + { + "name": "type", + "help": "emulated machine", + "type": "string" + } + ], + "option": "machine" + }, + { + "parameters": [ + { + "name": "romfile", + "type": "string" + }, + { + "name": "bootindex", + "type": "number" + } + ], + "option": "option-rom" + }, + { + "parameters": [ + { + "name": "file", + "type": "string" + }, + { + "name": "events", + "type": "string" + } + ], + "option": "trace" + }, + { + "parameters": [ + { + "name": "pretty", + "type": "boolean" + }, + { + "name": "default", + "type": "boolean" + }, + { + "name": "chardev", + "type": "string" + }, + { + "name": "mode", + "type": "string" + } + ], + "option": "mon" + }, + { + "parameters": [ + { + "name": "value", + "type": "string" + }, + { + "name": "property", + "type": "string" + }, + { + "name": "driver", + "type": "string" + } + ], + "option": "global" + }, + { + "parameters": [ + { + "name": "driftfix", + "type": "string" + }, + { + "name": "clock", + "type": "string" + }, + { + "name": "base", + "type": "string" + } + ], + "option": "rtc" + }, + { + "parameters": [ + ], + "option": "net" + }, + { + "parameters": [ + ], + "option": "netdev" + }, + { + "parameters": [ + ], + "option": "device" + }, + { + "parameters": [ + { + "name": "chardev", + "type": "string" + }, + { + "name": "size", + "type": "size" + }, + { + "name": "debug", + "type": "number" + }, + { + "name": "name", + "type": "string" + }, + { + "name": "signal", + "type": "boolean" + }, + { + "name": "mux", + "type": "boolean" + }, + { + "name": "rows", + "type": "number" + }, + { + "name": "cols", + "type": "number" + }, + { + "name": "height", + "type": "number" + }, + { + "name": "width", + "type": "number" + }, + { + "name": "telnet", + "type": "boolean" + }, + { + "name": "delay", + "type": "boolean" + }, + { + "name": "server", + "type": "boolean" + }, + { + "name": "wait", + "type": "boolean" + }, + { + "name": "ipv6", + "type": "boolean" + }, + { + "name": "ipv4", + "type": "boolean" + }, + { + "name": "to", + "type": "number" + }, + { + "name": "localport", + "type": "string" + }, + { + "name": "localaddr", + "type": "string" + }, + { + "name": "port", + "type": "string" + }, + { + "name": "host", + "type": "string" + }, + { + "name": "path", + "type": "string" + }, + { + "name": "backend", + "type": "string" + } + ], + "option": "chardev" + }, + { + "parameters": [ + { + "name": "copy-on-read", + "help": "copy read data from backing file into image file", + "type": "boolean" + }, + { + "name": "read-only", + "help": "open drive file as read-only", + "type": "boolean" + }, + { + "name": "addr", + "help": "pci address (virtio only)", + "type": "string" + }, + { + "name": "boot", + "help": "(deprecated, ignored)", + "type": "boolean" + }, + { + "name": "trans", + "help": "chs translation (auto, lba, none)", + "type": "string" + }, + { + "name": "secs", + "help": "number of sectors (ide disk geometry)", + "type": "number" + }, + { + "name": "heads", + "help": "number of heads (ide disk geometry)", + "type": "number" + }, + { + "name": "cyls", + "help": "number of cylinders (ide disk geometry)", + "type": "number" + }, + { + "name": "if", + "help": "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)", + "type": "string" + }, + { + "name": "media", + "help": "media type (disk, cdrom)", + "type": "string" + }, + { + "name": "index", + "help": "index number", + "type": "number" + }, + { + "name": "unit", + "help": "unit number (i.e. lun for scsi)", + "type": "number" + }, + { + "name": "bus", + "help": "bus number", + "type": "number" + }, + { + "name": "throttling.iops-size", + "help": "when limiting by iops max size of an I/O in bytes", + "type": "number" + }, + { + "name": "throttling.bps-write-max", + "help": "total bytes write burst", + "type": "number" + }, + { + "name": "throttling.bps-read-max", + "help": "total bytes read burst", + "type": "number" + }, + { + "name": "throttling.bps-total-max", + "help": "total bytes burst", + "type": "number" + }, + { + "name": "throttling.iops-write-max", + "help": "I/O operations write burst", + "type": "number" + }, + { + "name": "throttling.iops-read-max", + "help": "I/O operations read burst", + "type": "number" + }, + { + "name": "throttling.iops-total-max", + "help": "I/O operations burst", + "type": "number" + }, + { + "name": "throttling.bps-write", + "help": "limit write bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-read", + "help": "limit read bytes per second", + "type": "number" + }, + { + "name": "throttling.bps-total", + "help": "limit total bytes per second", + "type": "number" + }, + { + "name": "throttling.iops-write", + "help": "limit write operations per second", + "type": "number" + }, + { + "name": "throttling.iops-read", + "help": "limit read operations per second", + "type": "number" + }, + { + "name": "throttling.iops-total", + "help": "limit total I/O operations per second", + "type": "number" + }, + { + "name": "werror", + "help": "write error action", + "type": "string" + }, + { + "name": "rerror", + "help": "read error action", + "type": "string" + }, + { + "name": "serial", + "help": "disk serial number", + "type": "string" + }, + { + "name": "format", + "help": "disk format (raw, qcow2, ...)", + "type": "string" + }, + { + "name": "aio", + "help": "host AIO implementation (threads, native)", + "type": "string" + }, + { + "name": "cache.no-flush", + "help": "ignore any flush requests for the device", + "type": "boolean" + }, + { + "name": "cache.direct", + "help": "enables use of O_DIRECT (bypass the host page cache)", + "type": "boolean" + }, + { + "name": "cache.writeback", + "help": "enables writeback mode for any caches", + "type": "boolean" + }, + { + "name": "discard", + "help": "discard operation (ignore/off, unmap/on)", + "type": "string" + }, + { + "name": "file", + "help": "disk image", + "type": "string" + }, + { + "name": "snapshot", + "help": "enable/disable snapshot mode", + "type": "boolean" + } + ], + "option": "drive" + } + ], + "id": "libvirt-45" +} + +{ + "return": [ + { + "state": false, + "capability": "xbzrle" + }, + { + "state": false, + "capability": "x-rdma-pin-all" + }, + { + "state": false, + "capability": "auto-converge" + }, + { + "state": false, + "capability": "zero-blocks" + } + ], + "id": "libvirt-46" +} diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml new file mode 100644 index 0000000..db0d000 --- /dev/null +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -0,0 +1,200 @@ +<qemuCaps> + <qemuctime>0</qemuctime> + <selfctime>0</selfctime> + <selfvers>0</selfvers> + <usedQMP/> + <flag name='mem-path'/> + <flag name='drive-serial'/> + <flag name='chardev'/> + <flag name='enable-kvm'/> + <flag name='monitor-json'/> + <flag name='sdl'/> + <flag name='smp-topology'/> + <flag name='netdev'/> + <flag name='rtc'/> + <flag name='vhost-net'/> + <flag name='no-hpet'/> + <flag name='no-kvm-pit'/> + <flag name='pci-configfd'/> + <flag name='nodefconfig'/> + <flag name='boot-menu'/> + <flag name='fsdev'/> + <flag name='name-process'/> + <flag name='smbios-type'/> + <flag name='vga-qxl'/> + <flag name='spice'/> + <flag name='vga-none'/> + <flag name='boot-index'/> + <flag name='hda-duplex'/> + <flag name='drive-aio'/> + <flag name='pci-multibus'/> + <flag name='pci-bootindex'/> + <flag name='ccid-emulated'/> + <flag name='ccid-passthru'/> + <flag name='chardev-spicevmc'/> + <flag name='virtio-tx-alg'/> + <flag name='device-qxl-vga'/> + <flag name='pci-multifunction'/> + <flag name='virtio-blk-pci.ioeventfd'/> + <flag name='sga'/> + <flag name='virtio-blk-pci.event_idx'/> + <flag name='virtio-net-pci.event_idx'/> + <flag name='cache-directsync'/> + <flag name='piix3-usb-uhci'/> + <flag name='piix4-usb-uhci'/> + <flag name='usb-ehci'/> + <flag name='ich9-usb-ehci1'/> + <flag name='vt82c686b-usb-uhci'/> + <flag name='pci-ohci'/> + <flag name='usb-redir'/> + <flag name='usb-hub'/> + <flag name='no-shutdown'/> + <flag name='cache-unsafe'/> + <flag name='ich9-ahci'/> + <flag name='no-acpi'/> + <flag name='fsdev-readonly'/> + <flag name='virtio-blk-pci.scsi'/> + <flag name='drive-copy-on-read'/> + <flag name='fsdev-writeout'/> + <flag name='drive-iotune'/> + <flag name='system_wakeup'/> + <flag name='scsi-disk.channel'/> + <flag name='scsi-block'/> + <flag name='transaction'/> + <flag name='block-job-async'/> + <flag name='scsi-cd'/> + <flag name='ide-cd'/> + <flag name='no-user-config'/> + <flag name='hda-micro'/> + <flag name='dump-guest-memory'/> + <flag name='nec-usb-xhci'/> + <flag name='balloon-event'/> + <flag name='bridge'/> + <flag name='lsi'/> + <flag name='virtio-scsi-pci'/> + <flag name='blockio'/> + <flag name='disable-s3'/> + <flag name='disable-s4'/> + <flag name='usb-redir.filter'/> + <flag name='ide-drive.wwn'/> + <flag name='scsi-disk.wwn'/> + <flag name='seccomp-sandbox'/> + <flag name='reboot-timeout'/> + <flag name='dump-guest-core'/> + <flag name='seamless-migration'/> + <flag name='block-commit'/> + <flag name='vnc'/> + <flag name='drive-mirror'/> + <flag name='usb-redir.bootindex'/> + <flag name='usb-host.bootindex'/> + <flag name='blockdev-snapshot-sync'/> + <flag name='qxl'/> + <flag name='VGA'/> + <flag name='cirrus-vga'/> + <flag name='vmware-svga'/> + <flag name='device-video-primary'/> + <flag name='usb-serial'/> + <flag name='usb-net'/> + <flag name='add-fd'/> + <flag name='nbd-server'/> + <flag name='virtio-rng'/> + <flag name='rng-random'/> + <flag name='rng-egd'/> + <flag name='dtb'/> + <flag name='megasas'/> + <flag name='ipv6-migration'/> + <flag name='machine-opt'/> + <flag name='machine-usb-opt'/> + <flag name='pci-bridge'/> + <flag name='vfio-pci'/> + <flag name='vfio-pci.bootindex'/> + <flag name='scsi-generic'/> + <flag name='scsi-generic.bootindex'/> + <flag name='mem-merge'/> + <flag name='vnc-websocket'/> + <flag name='drive-discard'/> + <flag name='mlock'/> + <flag name='vnc-share-policy'/> + <flag name='device-del-event'/> + <flag name='dmi-to-pci-bridge'/> + <flag name='i440fx-pci-hole64-size'/> + <flag name='q35-pci-hole64-size'/> + <flag name='usb-storage'/> + <flag name='usb-storage.removable'/> + <flag name='virtio-mmio'/> + <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> + <flag name='boot-strict'/> + <flag name='pvpanic'/> + <flag name='spice-file-xfer-disable'/> + <flag name='spiceport'/> + <flag name='usb-kbd'/> + <flag name='host-pci-multidomain'/> + <flag name='msg-timestamp'/> + <flag name='usb-audio'/> + <flag name='splash-timeout'/> + <flag name='ivshmem'/> + <flag name='drive-iotune-max'/> + <flag name='VGA.vgamem_mb'/> + <flag name='vmware-svga.vgamem_mb'/> + <flag name='qxl.vgamem_mb'/> + <flag name='qxl-vga.vgamem_mb'/> + <flag name='pci-serial'/> + <flag name='ioh3420'/> + <flag name='x3130-upstream'/> + <flag name='xio3130-downstream'/> + <flag name='rtl8139'/> + <flag name='e1000'/> + <flag name='virtio-net'/> + <flag name='qxl.vram64_size_mb'/> + <flag name='qxl-vga.vram64_size_mb'/> + <flag name='device-tray-moved-event'/> + <flag name='nec-usb-xhci-ports'/> + <version>1007000</version> + <kvmVersion>0</kvmVersion> + <package></package> + <arch>x86_64</arch> + <cpu name='Opteron_G5'/> + <cpu name='Opteron_G4'/> + <cpu name='Opteron_G3'/> + <cpu name='Opteron_G2'/> + <cpu name='Opteron_G1'/> + <cpu name='Haswell'/> + <cpu name='SandyBridge'/> + <cpu name='Westmere'/> + <cpu name='Nehalem'/> + <cpu name='Penryn'/> + <cpu name='Conroe'/> + <cpu name='n270'/> + <cpu name='athlon'/> + <cpu name='pentium3'/> + <cpu name='pentium2'/> + <cpu name='pentium'/> + <cpu name='486'/> + <cpu name='coreduo'/> + <cpu name='kvm32'/> + <cpu name='qemu32'/> + <cpu name='kvm64'/> + <cpu name='core2duo'/> + <cpu name='phenom'/> + <cpu name='qemu64'/> + <machine name='pc-i440fx-1.7' alias='pc' maxCpus='255'/> + <machine name='pc-q35-1.4' maxCpus='255'/> + <machine name='pc-q35-1.5' maxCpus='255'/> + <machine name='pc-q35-1.6' maxCpus='255'/> + <machine name='pc-q35-1.7' alias='q35' maxCpus='255'/> + <machine name='isapc' maxCpus='1'/> + <machine name='pc-0.10' maxCpus='255'/> + <machine name='pc-0.11' maxCpus='255'/> + <machine name='pc-0.12' maxCpus='255'/> + <machine name='pc-0.13' maxCpus='255'/> + <machine name='pc-0.14' maxCpus='255'/> + <machine name='pc-0.15' maxCpus='255'/> + <machine name='pc-1.0' maxCpus='255'/> + <machine name='pc-1.1' maxCpus='255'/> + <machine name='pc-1.2' maxCpus='255'/> + <machine name='pc-1.3' maxCpus='255'/> + <machine name='pc-i440fx-1.4' maxCpus='255'/> + <machine name='pc-i440fx-1.5' maxCpus='255'/> + <machine name='pc-i440fx-1.6' maxCpus='255'/> +</qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 058ad8c..3d55006 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -165,7 +165,7 @@ mymain(void) DO_TEST("x86_64", "caps_1.4.2"); DO_TEST("x86_64", "caps_1.5.3"); DO_TEST("x86_64", "caps_1.6.0"); - DO_TEST("x86_64", "caps_1.6.50"); + DO_TEST("x86_64", "caps_1.7.0"); DO_TEST("x86_64", "caps_2.1.1"); DO_TEST("x86_64", "caps_2.4.0"); DO_TEST("x86_64", "caps_2.5.0"); -- 2.8.3

2 1

[libvirt] [PATCH 00/11] qemu: Erradicate use of virDomainLiveConfigHelperMethod
by Peter Krempa 25 May '16

25 May '16

Don't use that terrible function in the qemu driver and a few relevant refactors. Peter Krempa (11): qemu: monitor: Remove 'supportMaxOptions' argument from qemuMonitorGetBlockIoThrottle qemu: Replace virDomainLiveConfigHelperMethod in qemuDomainGetBlockIoTune qemu: Refactor typed params assignment in qemuDomainGetBlockIoTune qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetMemoryParameters qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetBlkioParameters qemu: Refactor qemuDomainGetBlkioParameters qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainGetSchedulerParametersFlags conf: Change virDomainCputune member 'shares' to unsigned long long qemu: Refactor qemuDomainGetSchedulerParametersFlags qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetBlockIoTune qemu: Remove virDomainLiveConfigHelperMethod from qemuDomainSetSchedulerParametersFlags src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_driver.c | 896 ++++++++++++------------------------------- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 24 +- src/qemu/qemu_monitor_json.h | 3 +- src/vmx/vmx.c | 6 +- tests/qemumonitorjsontest.c | 2 +- 10 files changed, 261 insertions(+), 688 deletions(-) -- 2.8.2

2 13

[libvirt] [PATCH] libxl: default to qemu driver for network disks
by Jim Fehlig 25 May '16

25 May '16

Xen only supports network-based disks with the qemu (aka qdisk) driver. Set the driverName to 'qemu' in libxlDomainDeviceDefPostParse() if not already set. When starting a domain with network-based disks, ensure the driverName is 'qemu'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 11 +++++++---- src/libxl/libxl_domain.c | 12 ++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 13e56ac..78e9ee9 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1058,13 +1058,18 @@ libxlMakeNetworkDiskSrc(virStorageSourcePtr src, char **srcstr) int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { - const char *driver; - int format; + const char *driver = virDomainDiskGetDriver(l_disk); + int format = virDomainDiskGetFormat(l_disk); int actual_type = virStorageSourceGetActualType(l_disk->src); libxl_device_disk_init(x_disk); if (actual_type == VIR_STORAGE_TYPE_NETWORK) { + if (driver && STRNEQ(driver, "qemu")) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("only the 'qemu' driver can be used with network disks")); + return -1; + } if (libxlMakeNetworkDiskSrc(l_disk->src, &x_disk->pdev_path) < 0) return -1; } else { @@ -1075,8 +1080,6 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) if (VIR_STRDUP(x_disk->vdev, l_disk->dst) < 0) return -1; - driver = virDomainDiskGetDriver(l_disk); - format = virDomainDiskGetFormat(l_disk); if (driver) { if (STREQ(driver, "tap") || STREQ(driver, "tap2")) { switch (format) { diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 113942b..8a3866f 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -364,6 +364,18 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, } } + /* for network-based disks, set 'qemu' as the default driver */ + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + virDomainDiskDefPtr disk = dev->data.disk; + int actual_type = virStorageSourceGetActualType(disk->src); + + if (actual_type == VIR_STORAGE_TYPE_NETWORK) { + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + return -1; + } + } + return 0; } -- 2.1.4

3 4

[libvirt] [PATCH v2] Call qemuDomainObjEndJob when qemuCaps is null during hotplug
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 249393a..cd53d3c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8237,7 +8237,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8366,7 +8366,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8490,7 +8490,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */

2 1

Re: [libvirt] [Qemu-devel] [Bug 1585533] [NEW] cache-miss-rate / Invalid JSON
by Eric Blake 25 May '16

25 May '16

On 05/25/2016 02:46 AM, Marc Brothier wrote: > Public bug reported: > > Hi, > > We have VMs which were started with an older version than qemu 2.1 which > added "cache-miss-rate" property for XBZRLECacheStats. While trying to > migrate the VM to a new host which is running a higher version (2.3) of > Qemu we got an exception: > > virJSONValueFromString:1642 : internal error: cannot parse json {"return": {"expected-downtime": 1, "xbzrle-cache": {"bytes": 0, "cache-size": 67108864, "cache-miss-rate": -nan, "pages": 0, "overflow": 0, "cache-miss": 8933}, "status": "active", "disk": {"total": 429496729600, "dirty-sync-count": 0, "remaining": 193896382464, "mbps": 0, "transferred": 235600347136, "duplicate": 0, "dirty-pages-rate": 0, "skipped": 0, "normal-bytes": 0, "normal": 0}, "setup-time": 13, "total-time": 1543124, "ram": {"total": 8599183360, "dirty-sync-count": 4, "remaining": 30695424, "mbps": 830.636997, "transferred": 3100448901, "duplicate": 1358341, "dirty-pages-rate": 7, "skipped": 0, "normal-bytes": 3082199040, "normal": 752490}}, "id": "libvirt-186200"}: lexical error: malformed number, a digit is required after the minus sign. > 67108864, "cache-miss-rate": -nan, "pages": 0, "overflow": 0 > (right here) ------^ > > virNetClientStreamRaiseError:191 : stream aborted at client request Wow - I've known we have a problem with qemu emitting non-compliant JSON, but this proves that it is fatal to libvirt. I guess my series on improving the JSON parser [1] should consider doing a fallback to s/NaN/0/ and s/Inf/DBL_MAX/ rather than completely erroring out when a client tries to request it. Meanwhile, it's an easy patch to qemu to avoid division by zero when generating cache-miss-rate. [1] https://lists.gnu.org/archive/html/qemu-devel/2016-05/msg03424.html > > > Would it be possible to improve the JSON parser to skip the key if the value is incorrect Libvirt uses libyajl to parse JSON, and libyajl has an outstanding bug request to support extensions to JSON such as parsing non-finite floats. Since there has been no upstream reaction to the bug request, I seriously doubt it will happen any time soon, so any change to tolerate NaN in libvirt would have to be a one-off patch. It sounds like the better fix is to make qemu emit valid JSON in the first place, rather than making libvirt deal with broken JSON from qemu. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH 0/3] qemu: Allow update of certain disk options during runtime
by Peter Krempa 25 May '16

25 May '16

Until this series it was possible to update floppies and cdroms only. With this you can update startup policy and snapshot behavior for regular disks too. Peter Krempa (3): qemu: driver: Move around code to avoid need to rollback qemu: driver: Remove unnecessary cleanup label from qemuDomainChangeDiskLive qemu: driver: Allow disk update of startupPolicy/snapshot for all disks src/qemu/qemu_driver.c | 74 ++++++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 48 deletions(-) -- 2.8.2

2 5

[libvirt] [PATCH/RFC] Add missing delta from Ubuntu to apparmor profiles
by Stefan Bader 25 May '16

25 May '16

This had been on the Debian package list before but its time to take this onwards. So the goal would be to have one set to rule them all (when using apparmor) and drop the seperate set of definitions which exist at least in the Ubuntu packaging. Right now the patch would be at a state which adds all missing files and rules to the current examples in libvirt and installs them when using --with-apparmor-profiles. One problem seems to be that some of the definitions might cause parse failures on certain versions of apparmor. I checked this morning and this looks a bit hairy. So some apparmor 2.8 versions potentially have issues, but not all apparmor 2.8 are the same (gah). I could imagine (but John, we really could use some guidance here ;)) that at least some changes could be related to version 2.8.95~2430: + debian/patches/mediate-signals.patch, debian/patches/change-signal-syntax.patch: Parse signal rules with apparmor_parser. See the apparmor.d(5) man page for syntax details. + debian/patches/change-ptrace-syntax.patch, debian/patches/mediate-ptrace.patch: Parse ptrace rules with apparmor_parser. See the apparmor.d(5) man page for syntax details. But, regardless of the when, the apparmor rules maybe need a way to handle versioned features of the parser. One proposal was to comment out problematic rules and allow the packager to re-enable things. Maybe going one step further and have some pre-processing that handles version based sections (like #if (APPARMOR_VERSION >= xxx)). So that is where we stand. Ideas are very welcome. -Stefan --- >From aec5cf8cc30c80492a37856626264c3d4c27a31f Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 18 Sep 2014 14:15:17 +0200 Subject: [PATCH] Add missing delta from Ubuntu to apparmor profiles This fixes up the upstream profiles and would allow to drop apparmor related delta from the Ubuntu package. Thanks to Serge Hallyn for the Makefile.am install hook that allows to rename the local file. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- examples/apparmor/Makefile.am | 10 ++++++++ examples/apparmor/libvirt-lxc | 15 +++++++++++- examples/apparmor/libvirt-qemu | 31 +++++++++++++++++++++++- examples/apparmor/local-usr.sbin.libvirtd | 2 ++ examples/apparmor/usr.lib.libvirt.virt-aa-helper | 25 ++++++++++++++++--- examples/apparmor/usr.sbin.libvirtd | 17 ++++++++++++- 6 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 examples/apparmor/local-usr.sbin.libvirtd diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index 7a20e16..aa46cb9 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST= \ libvirt-qemu \ libvirt-lxc \ usr.lib.libvirt.virt-aa-helper \ + local-usr.sbin.libvirtd \ usr.sbin.libvirtd if WITH_APPARMOR_PROFILES @@ -29,6 +30,15 @@ apparmor_DATA = \ usr.sbin.libvirtd \ $(NULL) +localdir = $(apparmordir)/local +local_DATA = \ + local-usr.sbin.libvirtd \ + $(NULL) + +install-data-hook: + mv $(DESTDIR)$(localdir)/local-usr.sbin.libvirtd \ + $(DESTDIR)$(localdir)/usr.sbin.libvirtd + abstractionsdir = $(apparmordir)/abstractions abstractions_DATA = \ libvirt-qemu \ diff --git a/examples/apparmor/libvirt-lxc b/examples/apparmor/libvirt-lxc index 4bfb503..4705e0a 100644 --- a/examples/apparmor/libvirt-lxc +++ b/examples/apparmor/libvirt-lxc @@ -1,12 +1,18 @@ -# Last Modified: Fri Feb 7 13:01:36 2014 +# Last Modified: Thu, 18 Sep 2014 13:56:49 +0200 #include <abstractions/base> umount, + dbus, + signal, + ptrace, # ignore DENIED message on / remount deny mount options=(ro, remount) -> /, + # support use of cgmanager proxy + mount options=(move) /sys/fs/cgroup/cgmanager/ -> /sys/fs/cgroup/cgmanager.lower/, + # allow tmpfs mounts everywhere mount fstype=tmpfs, @@ -33,8 +39,15 @@ mount fstype=fusectl -> /sys/fs/fuse/connections/, mount fstype=securityfs -> /sys/kernel/security/, mount fstype=debugfs -> /sys/kernel/debug/, + deny mount fstype=debugfs -> /var/lib/ureadahead/debugfs/, mount fstype=proc -> /proc/, mount fstype=sysfs -> /sys/, + + mount options=(rw nosuid nodev noexec remount) -> /sys/, + mount options=(rw remount) -> /sys/kernel/security/, + mount options=(rw remount) -> /sys/fs/pstore/, + mount options=(ro remount) -> /sys/fs/pstore/, + deny /sys/firmware/efi/efivars/** rwklx, deny /sys/kernel/security/** rwklx, diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index c6de6dd..b69e64c 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -1,4 +1,4 @@ -# Last Modified: Wed Sep 3 21:52:03 2014 +# Last Modified: Thu, 18 Sep 2014 16:41:21 +0200 #include <abstractions/base> #include <abstractions/consoles> @@ -13,15 +13,22 @@ capability setgid, capability setuid, + # this is needed with libcap-ng support, however it breaks a lot of things + # atm, so just silence the denial until libcap-ng works right. LP: #522845 + deny capability setpcap, + network inet stream, network inet6 stream, /dev/net/tun rw, + /dev/tap* rw, /dev/kvm rw, /dev/ptmx rw, /dev/kqemu rw, @{PROC}/*/status r, @{PROC}/sys/kernel/cap_last_cap r, + owner @{PROC}/*/auxv r, + @{PROC}/sys/vm/overcommit_memory r, # For hostdev access. The actual devices will be added dynamically /sys/bus/usb/devices/ r, @@ -38,6 +45,9 @@ /dev/snd/* rw, capability ipc_lock, # spice + /usr/bin/qemu-system-i386-spice rmix, + /usr/bin/qemu-system-x86_64-spice rmix, + /{dev,run}/shm/ r, owner /{dev,run}/shm/spice.* rw, # 'kill' is not required for sound and is a security risk. Do not enable # unless you absolutely need it. @@ -73,6 +83,7 @@ # the various binaries /usr/bin/kvm rmix, /usr/bin/qemu rmix, + /usr/bin/qemu-system-aarch64 rmix, /usr/bin/qemu-system-arm rmix, /usr/bin/qemu-system-cris rmix, /usr/bin/qemu-system-i386 rmix, @@ -91,6 +102,7 @@ /usr/bin/qemu-system-sparc rmix, /usr/bin/qemu-system-sparc64 rmix, /usr/bin/qemu-system-x86_64 rmix, + /usr/bin/qemu-system-x86_64-spice rmix, /usr/bin/qemu-alpha rmix, /usr/bin/qemu-arm rmix, /usr/bin/qemu-armeb rmix, @@ -117,6 +129,16 @@ /bin/dash rmix, /bin/dd rmix, /bin/cat rmix, + /etc/pki/CA/ r, + /etc/pki/CA/* r, + /etc/pki/libvirt/ r, + /etc/pki/libvirt/** r, + + # for rbd + /etc/ceph/ceph.conf r, + + # for access to hugepages + owner "/run/hugepages/kvm/libvirt/qemu/**" rw, # for usb access /dev/bus/usb/ r, @@ -124,6 +146,13 @@ /sys/bus/ r, /sys/class/ r, + signal (receive) peer=/usr/sbin/libvirtd, + ptrace (tracedby) peer=/usr/sbin/libvirtd, + + # for ppc device-tree access + @{PROC}/device-tree/ r, + @{PROC}/device-tree/** r, + /usr/{lib,libexec}/qemu-bridge-helper Cx -> qemu_bridge_helper, # child profile for bridge helper process profile qemu_bridge_helper { diff --git a/examples/apparmor/local-usr.sbin.libvirtd b/examples/apparmor/local-usr.sbin.libvirtd new file mode 100644 index 0000000..6e19f20 --- /dev/null +++ b/examples/apparmor/local-usr.sbin.libvirtd @@ -0,0 +1,2 @@ +# Site-specific additions and overrides for usr.sbin.libvirtd. +# For more details, please see /etc/apparmor.d/local/README. diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper index bceaaff..4df86b0 100644 --- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/examples/apparmor/usr.lib.libvirt.virt-aa-helper @@ -1,8 +1,9 @@ -# Last Modified: Mon Apr 5 15:10:27 2010 +# Last Modified: Thu, 18 Sep 2014 14:05:36 +0200 #include <tunables/global> /usr/lib/libvirt/virt-aa-helper { #include <abstractions/base> + #include <abstractions/user-tmp> # needed for searching directories capability dac_override, @@ -19,6 +20,12 @@ # for hostdev /sys/devices/ r, /sys/devices/** r, + /sys/bus/usb/devices/ r, + /sys/bus/usb/devices/** r, + deny /dev/sd* r, + deny /dev/dm-* r, + deny /dev/mapper/ r, + deny /dev/mapper/* r, /usr/lib/libvirt/virt-aa-helper mr, /sbin/apparmor_parser Ux, @@ -26,8 +33,11 @@ /etc/apparmor.d/libvirt/* r, /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw, - # for backingstore -- allow access to non-hidden files in @{HOME} as well - # as storage pools + # For backingstore, virt-aa-helper needs to peek inside the disk image, so + # allow access to non-hidden files in @{HOME} as well as storage pools, and + # removable media and filesystems, and certain file extentions. A + # virt-aa-helper failure when checking a disk for backinsgstore is non-fatal + # (but obviously the backingstore won't be added). audit deny @{HOME}/.* mrwkl, audit deny @{HOME}/.*/ rw, audit deny @{HOME}/.*/** mrwkl, @@ -35,8 +45,17 @@ audit deny @{HOME}/bin/** mrwkl, @{HOME}/ r, @{HOME}/** r, + @{HOME}/.Private/** mrwlk, + @{HOMEDIRS}/.ecryptfs/*/.Private/** mrwlk, + /var/lib/libvirt/images/ r, /var/lib/libvirt/images/** r, + /var/lib/nova/images/** r, + /var/lib/nova/instances/_base/** r, + /var/lib/nova/instances/snapshots/** r, + /var/lib/eucalyptus/instances/**/disk* r, + /var/lib/eucalyptus/instances/**/loader* r, + /var/lib/uvtool/libvirt/images/** r, /{media,mnt,opt,srv}/** r, /**.img r, diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 3011eff..814b4d81 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -1,10 +1,12 @@ -# Last Modified: Mon Apr 5 15:03:58 2010 +# Last Modified: Tue, 23 Sep 2014 09:28:07 +0200 #include <tunables/global> @{LIBVIRT}="libvirt" /usr/sbin/libvirtd { #include <abstractions/base> #include <abstractions/dbus> + # Site-specific additions and overrides. See local/README for details. + #include <local/usr.sbin.libvirtd> capability kill, capability net_admin, @@ -23,6 +25,7 @@ capability setpcap, capability mknod, capability fsetid, + capability ipc_lock, capability audit_write, # Needed for vfio @@ -33,6 +36,12 @@ network inet6 stream, network inet6 dgram, network packet dgram, + network netlink, + + dbus bus=system, + signal, + ptrace, + unix, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. @@ -45,6 +54,12 @@ /usr/sbin/* PUx, /lib/udev/scsi_id PUx, /usr/lib/xen-common/bin/xen-toolstack PUx, + /usr/lib/xen-*/bin/pygrub PUx, + /usr/lib/xen-*/bin/libxl-save-helper PUx, + + # Required by nwfilter_ebiptables_driver.c:ebiptablesWriteToTempFile() to + # write and run an ebtables script. + /var/lib/libvirt/virtd* ixr, # force the use of virt-aa-helper audit deny /sbin/apparmor_parser rwxl, -- 1.9.1

5 17

[libvirt] [PATCH] Call qemuDomainObjEndJob when qemuCaps is null during hotplug
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 249393a..3f26f1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8237,7 +8237,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ @@ -8490,7 +8490,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, if (priv->qemuCaps) qemuCaps = virObjectRef(priv->qemuCaps); else if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, vm->def->emulator))) - goto cleanup; + goto endjob; if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */

3 2

[libvirt] [PATCH] xenconfig: xm: check for driver on disk format
by Joao Martins 25 May '16

25 May '16

When reviewing libxl vif typename series[0] I found out a bug on xen-xm formatter where this "virsh domxml-to-native xen-xm file.xml" can lead to a NULL dereference if the disk driver isn't specified. Fix this by checking for driver before writing/testing it down. [0] https://www.redhat.com/archives/libvir-list/2016-April/msg01434.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/xenconfig/xen_xm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 34d57de..3658c59 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -297,9 +297,12 @@ xenFormatXMDisk(virConfValuePtr list, type = "aio"; else type = virStorageFileFormatTypeToString(format); - virBufferAsprintf(&buf, "%s:", driver); - if (STREQ(driver, "tap")) - virBufferAsprintf(&buf, "%s:", type); + + if (driver) { + virBufferAsprintf(&buf, "%s:", driver); + if (STREQ(driver, "tap")) + virBufferAsprintf(&buf, "%s:", type); + } } else { switch (virDomainDiskGetType(disk)) { case VIR_STORAGE_TYPE_FILE: -- 2.1.4

2 2

[libvirt] [PATCH] Unref the cfg in qemuDomainAttachHostPCIDevice()
by Shivaprasad G Bhat 25 May '16

25 May '16

Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 807aaf8..41a0e4f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1164,7 +1164,7 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, unsigned int flags = 0; if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0) - return -1; + goto cleanup; if (!cfg->relaxedACS) flags |= VIR_HOSTDEV_STRICT_ACS_CHECK;

2 1

[libvirt] [PATCH v2 0/2] Don't crash in virNodeDeviceDefFormat()
by Andrea Bolognani 25 May '16

25 May '16

Changes from [v1]: * fix all callers of virPCIGetPhysicalFunction() * document virPCIGetPhysicalFunction() [v1] https://www.redhat.com/archives/libvir-list/2016-May/msg01681.html Andrea Bolognani (2): Document virPCIGetPhysicalFunction() and fix its callers conf: nodedev: Set PCI_PHYSICAL_FUNCTION flag more carefully src/conf/node_device_conf.c | 4 ++-- src/node_device/node_device_linux_sysfs.c | 10 ++++++++-- src/util/virpci.c | 18 ++++++++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) -- 2.5.5

2 5

[libvirt] [PATCH v2 0/3] Fix a couple of recently found coverity issues
by John Ferlan 25 May '16

25 May '16

v1: http://www.redhat.com/archives/libvir-list/2016-May/msg01611.html Although initially ACK'd by Erik, Jan pointed out something with one of the patches and well this just lagged on my todo list. Since then a change was made to lxc_driver.c (commit id '306b3a850') which caused a merge conflict. So rather than push without checking first, I figure I'll make a v2. Patch 1 was already ACK'd Patch 2 is new to remove persistentAddrs from qemu Patch 3 is altered... I think the return from virDomainObjListRemove will cause the 'vm' to be NULL anyway; however, since the next called API virDomainObjEndAPI checks for that - it seems that making that call won't hurt. I also moved the check to after endjob, so that some sort of "failure" and goto cleanup doesn't unexpectedly remove a transient domain. John Ferlan (3): qemu: Remove dead code qemu: Remove unused persistentAddrs lxc: Fix lxcDomainDestroyFlags endjob processing src/lxc/lxc_driver.c | 6 ++---- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_domain_address.c | 17 ++++------------- src/qemu/qemu_process.c | 18 ++++++++---------- 4 files changed, 14 insertions(+), 28 deletions(-) -- 2.5.5

3 7

[libvirt] [PATCH 0/7] qemu: Fix removable devices without a tray
by Peter Krempa 25 May '16

25 May '16

Peter Krempa (7): qemu: Move struct qemuDomainDiskInfo to qemu_domain.h qemu: Extract more information about qemu drives qemu: Move and rename qemuDomainCheckEjectableMedia to qemuProcessRefreshDisks qemu: process: Fix and improve disk data extraction qemu: hotplug: Extract code for waiting for tray eject qemu: hotplug: Fix error reported when cdrom tray is locked qemu: hotplug: wait for the tray to eject only for drives with a tray src/qemu/qemu_conf.h | 7 --- src/qemu/qemu_domain.h | 13 ++++ src/qemu/qemu_hotplug.c | 141 ++++++++++++++++--------------------------- src/qemu/qemu_hotplug.h | 3 - src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_monitor.c | 18 ------ src/qemu/qemu_monitor.h | 3 - src/qemu/qemu_monitor_json.c | 12 ++-- src/qemu/qemu_process.c | 58 +++++++++++++++++- src/qemu/qemu_process.h | 5 ++ tests/qemumonitorjsontest.c | 25 +++++++- 11 files changed, 157 insertions(+), 130 deletions(-) -- 2.8.2

2 11