August 2016 - Devel - libvirt List Archives

[libvirt] [libvirt-glib/libvirt-gconfig 00/17] Graphics: Introduce the new Remote and Local classes (and also implement a few missing methods).
by Fabiano Fidêncio 06 Sep '16

06 Sep '16

While trying to use libvirt-gobject and libvirt-gconfig for accessing VMs and looking at their config, instead of using libvirt and parsing XML directly, I found out that a few methods have been missing and that libvirt-gconfig is not exactly thought for the "reading their config" use case (see more explanations on the 10th and 14th commits. This series, unfortunately, introduces an ABI breakage. Fabiano Fidêncio (17): gconfig: Implement gvir_config_domain_graphics_vnc_get_autoport() gconfig: Implement gvir_config_domain_graphics_spice_get_autoport() gconfig: Implement gvir_config_domain_graphics_rdp_get_autoport() gconfig: Implement gvir_config_domain_graphics_sdl_get_display() gconfig: Implement gvir_config_domain_graphics_sdl_get_fullscreen() gconfig: Implement gvir_config_domain_graphics_spice_get_tls_port() gconfig: Implement gvir_config_domain_graphics_spice_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_vnc_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_rdp_{get,set}_host() gconfig: Add GVirCofigDomainGraphicsRemote class gconfig: Adapt GVirConfigDomainGraphicsSpice to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsRdp to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsVnc to GVirConfigDomainGraphicsRemote gconfig: Add GVirCofigDomainGraphicsLocal class gconfig: Adapt GVirConfigDomainGraphicsSdl to GVirConfigDomainGraphicsLocal gconfig: Adapt GVirConfigDomainGraphicsDesktop to GVirConfigDomainGraphicsLocal gconfig,graphics: Avoid crash when gvir_config_object_new_from_xml() returns NULL libvirt-gconfig/Makefile.am | 4 + .../libvirt-gconfig-domain-graphics-desktop.c | 14 ++- .../libvirt-gconfig-domain-graphics-desktop.h | 4 +- .../libvirt-gconfig-domain-graphics-local.c | 97 +++++++++++++++++++ .../libvirt-gconfig-domain-graphics-local.h | 68 ++++++++++++++ .../libvirt-gconfig-domain-graphics-rdp.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-rdp.h | 9 +- .../libvirt-gconfig-domain-graphics-remote.c | 103 +++++++++++++++++++++ .../libvirt-gconfig-domain-graphics-remote.h | 70 ++++++++++++++ .../libvirt-gconfig-domain-graphics-sdl.c | 19 +++- .../libvirt-gconfig-domain-graphics-sdl.h | 6 +- .../libvirt-gconfig-domain-graphics-spice.c | 40 +++++++- .../libvirt-gconfig-domain-graphics-spice.h | 10 +- .../libvirt-gconfig-domain-graphics-vnc.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-vnc.h | 9 +- libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 20 ++++ po/POTFILES.in | 2 + 18 files changed, 513 insertions(+), 28 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.h -- 2.5.0

2 30

[libvirt] [PATCH] conf: Fix initialization value of 'multi' in PCI address
by Xian Han Yu 04 Sep '16

04 Sep '16

The 'multi' element in PCI address struct used as 'virTristateSwitch', and its default value is 'VIR_TRISTATE_SWITCH_ABSENT'. Current PCI process use 'false' to initialization 'multi', which is ambiguously for assignment or comparison. This patch use '{0}' to initialize the whole PCI address struct, which fix the 'multi' initialization and makes code more simplify and explicitly. Signed-off-by: Xian Han Yu <xhyubj(a)linux.vnet.ibm.com> --- src/conf/domain_addr.c | 2 +- src/conf/node_device_conf.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a0c2f88..cf6b73d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -569,7 +569,7 @@ virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs, /* default to starting the search for a free slot from * the first slot of domain 0 bus 0... */ - virPCIDeviceAddress a = { 0, 0, 0, 0, false }; + virPCIDeviceAddress a = {0}; char *addrStr = NULL; if (addrs->nbuses == 0) { diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a23d8ef..c8e30d9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1163,7 +1163,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, goto cleanup; for (i = 0; i < nAddrNodes; i++) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, 0 }; + virPCIDeviceAddress addr = {0}; if (virPCIDeviceAddressParseXML(addrNodes[i], &addr) < 0) goto cleanup; if (VIR_ALLOC(pciAddr) < 0) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 3d52d72..bb16738 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1096,7 +1096,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* USB2 needs special handling to put all companions in the same slot */ if (IS_USB2_CONTROLLER(def->controllers[i])) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, false }; + virPCIDeviceAddress addr = {0}; bool foundAddr = false; memset(&tmp_addr, 0, sizeof(tmp_addr)); -- 2.5.5

2 4

[libvirt] [PATCH v3 1/4] libxl: support serial list
by Bob Liu 02 Sep '16

02 Sep '16

Add support for multi serial devices, after this patch virsh can be used to connect different serial devices of running domains. E.g. vish # console <xxx> --devname serial<xxx> Note: This depends on a xen/libxl bug fix to have libxl_console_get_tty(...) correctly returning the tty path (as opposed to always returning the first one). [0] https://lists.xen.org/archives/html/xen-devel/2016-08/msg00438.html Signed-off-by: Bob Liu <bob.liu(a)oracle.com> --- v3: Comments from Jim. v2: Add #ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST. --- src/libxl/libxl_conf.c | 23 ++++++++++++++++++++--- src/libxl/libxl_domain.c | 29 ++++++++++++++++++++++++++--- src/libxl/libxl_driver.c | 17 +++++++++-------- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 146e08a..32db975 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -431,14 +431,31 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } if (def->nserials) { - if (def->nserials > 1) { + if (def->nserials == 1) { + if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) < + 0) + return -1; + } else { +#ifdef LIBXL_HAVE_BUILDINFO_SERIAL_LIST + if (VIR_ALLOC_N(b_info->u.hvm.serial_list, def->nserials + 1) < + 0) + return -1; + for (i = 0; i < def->nserials; i++) { + if (libxlMakeChrdevStr(def->serials[i], + &b_info->u.hvm.serial_list[i]) < 0) + { + libxl_string_list_dispose(&b_info->u.hvm.serial_list); + return -1; + } + } + b_info->u.hvm.serial_list[i] = NULL; +#else virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only one serial device is supported by libxl")); return -1; +#endif } - if (libxlMakeChrdevStr(def->serials[0], &b_info->u.hvm.serial) < 0) - return -1; } if (def->nparallels) { diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 0e26b91..f529a2e 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -960,18 +960,20 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) { virDomainObjPtr vm = for_callback; size_t i; + virDomainChrDefPtr chr; + char *console = NULL; + int ret; virObjectLock(vm); for (i = 0; i < vm->def->nconsoles; i++) { - virDomainChrDefPtr chr = vm->def->consoles[i]; + chr = vm->def->consoles[i]; + if (i == 0 && chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) chr = vm->def->serials[0]; if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { libxl_console_type console_type; - char *console = NULL; - int ret; console_type = (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL ? @@ -989,6 +991,27 @@ libxlConsoleCallback(libxl_ctx *ctx, libxl_event *ev, void *for_callback) VIR_FREE(console); } } + for (i = 0; i < vm->def->nserials; i++) { + chr = vm->def->serials[i]; + + ignore_value(virAsprintf(&chr->info.alias, "serial%zd", i)); + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { + if (chr->source.data.file.path) + continue; + ret = libxl_console_get_tty(ctx, ev->domid, + chr->target.port, + LIBXL_CONSOLE_TYPE_SERIAL, + &console); + if (!ret) { + VIR_FREE(chr->source.data.file.path); + if (console && console[0] != '\0') { + ignore_value(VIR_STRDUP(chr->source.data.file.path, + console)); + } + } + VIR_FREE(console); + } + } virObjectUnlock(vm); libxl_event_free(ctx, ev); } diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index f153f69..a34eb02 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4450,13 +4450,6 @@ libxlDomainOpenConsole(virDomainPtr dom, virCheckFlags(VIR_DOMAIN_CONSOLE_FORCE, -1); - if (dev_name) { - /* XXX support device aliases in future */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Named device aliases are not supported")); - goto cleanup; - } - if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -4472,8 +4465,16 @@ libxlDomainOpenConsole(virDomainPtr dom, } priv = vm->privateData; + if (dev_name) { + size_t i; - if (vm->def->nconsoles) { + for (i = 0; !chr && i < vm->def->nserials; i++) { + if (STREQ(dev_name, vm->def->serials[i]->info.alias)) { + chr = vm->def->serials[i]; + break; + } + } + } else if (vm->def->nconsoles) { chr = vm->def->consoles[0]; if (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL) chr = vm->def->serials[0]; -- 2.6.5

2 6

[libvirt] [PATCH V2] virpci: support driver_override sysfs interface
by Jim Fehlig 02 Sep '16

02 Sep '16

libvirt uses the new_id PCI sysfs interface to bind a PCI stub driver to a PCI device. The new_id interface is known to be buggy and racey, hence a more deterministic interface was introduced in the 3.12 kernel: driver_override. For more details see https://www.redhat.com/archives/libvir-list/2016-June/msg02124.html This patch adds support for the driver_override interface by - adding new virPCIDevice{BindTo,UnbindFrom}StubWithOverride functions that use the driver_override interface - renames the existing virPCIDevice{BindTo,UnbindFrom}Stub functions to virPCIDevice{BindTo,UnbindFrom}StubWithNewid to perserve existing behavior on new_id interface - changes virPCIDevice{BindTo,UnbindFrom}Stub function to call one of the above depending on availability of driver_override The patch includes a bit of duplicate code, but allows for easily dropping the new_id code once support for older kernels is no longer desired. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V1: https://www.redhat.com/archives/libvir-list/2016-July/msg00370.html Changes since V1: - drop patch1 - change patch2 to preserve the existing new_id code and add new functions to implement the driver_override interface src/util/virpci.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 149 insertions(+), 2 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 132948d..6c8174a 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1089,8 +1089,54 @@ virPCIDeviceUnbind(virPCIDevicePtr dev) return ret; } +/* + * Bind a PCI device to a driver using driver_override sysfs interface. + * E.g. + * + * echo driver-name > /sys/bus/pci/devices/0000:03:00.0/driver_override + * echo 0000:03:00.0 > /sys/bus/pci/devices/0000:03:00.0/driver/unbind + * echo 0000:03:00.0 > /sys/bus/pci/drivers_probe + * + * An empty driverName will cause the device to be bound to its + * preferred driver. + */ static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) +virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev, + const char *driverName) +{ + int ret = -1; + char *path; + + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileWriteStr(path, driverName, 0) < 0) { + virReportSystemError(errno, + _("Failed to add driver '%s' to driver_override " + " interface of PCI device '%s'"), + driverName, dev->name); + goto cleanup; + } + + if (virPCIDeviceUnbind(dev) < 0) + goto cleanup; + + if (virFileWriteStr(PCI_SYSFS "drivers_probe", dev->name, 0) < 0) { + virReportSystemError(errno, + _("Failed to trigger a probe for PCI device '%s'"), + dev->name); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(path); + return ret; +} + +static int +virPCIDeviceUnbindFromStubWithNewid(virPCIDevicePtr dev) { int result = -1; char *drvdir = NULL; @@ -1191,9 +1237,41 @@ virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) return result; } +static int +virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) +{ + if (!dev->unbind_from_stub) { + VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name); + return 0; + } + + return virPCIDeviceBindWithDriverOverride(dev, "\n"); +} + +static int +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) +{ + int ret; + char *path; + + /* + * Prefer using the device's driver_override interface, falling back + * to the unpleasant new_id interface. + */ + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileExists(path)) + ret = virPCIDeviceUnbindFromStubWithOverride(dev); + else + ret = virPCIDeviceUnbindFromStubWithNewid(dev); + + VIR_FREE(path); + return ret; +} static int -virPCIDeviceBindToStub(virPCIDevicePtr dev) +virPCIDeviceBindToStubWithNewid(virPCIDevicePtr dev) { int result = -1; bool reprobe = false; @@ -1345,6 +1423,75 @@ virPCIDeviceBindToStub(virPCIDevicePtr dev) return result; } +static int +virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) +{ + int ret = -1; + const char *stubDriverName; + char *stubDriverPath = NULL; + char *driverLink = NULL; + + /* Check the device is configured to use one of the known stub drivers */ + if (dev->stubDriver == VIR_PCI_STUB_DRIVER_NONE) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("No stub driver configured for PCI device %s"), + dev->name); + return -1; + } else if (!(stubDriverName = virPCIStubDriverTypeToString(dev->stubDriver))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown stub driver configured for PCI device %s"), + dev->name); + return -1; + } + + if (!(stubDriverPath = virPCIDriverDir(stubDriverName)) || + !(driverLink = virPCIFile(dev->name, "driver"))) + goto cleanup; + + if (virFileExists(driverLink)) { + if (virFileLinkPointsTo(driverLink, stubDriverPath)) { + /* The device is already bound to the correct driver */ + VIR_DEBUG("Device %s is already bound to %s", + dev->name, stubDriverName); + ret = 0; + goto cleanup; + } + } + + if (virPCIDeviceBindWithDriverOverride(dev, stubDriverName) < 0) + goto cleanup; + + dev->unbind_from_stub = true; + ret = 0; + + cleanup: + VIR_FREE(stubDriverPath); + VIR_FREE(driverLink); + return ret; +} + +static int +virPCIDeviceBindToStub(virPCIDevicePtr dev) +{ + int ret; + char *path; + + /* + * Prefer using the device's driver_override interface, falling back + * to the unpleasant new_id interface. + */ + if (!(path = virPCIFile(dev->name, "driver_override"))) + return -1; + + if (virFileExists(path)) + ret = virPCIDeviceBindToStubWithOverride(dev); + else + ret = virPCIDeviceBindToStubWithNewid(dev); + + VIR_FREE(path); + return ret; +} + /* virPCIDeviceDetach: * * Detach this device from the host driver, attach it to the stub -- 2.1.4

2 4

[libvirt] [PATCH V2 0/2] libxl USB vendor/product support
by Jim Fehlig 02 Sep '16

02 Sep '16

V2 of Cedric's patches to allow specifying USB hostdevs by vendor/product in the libxl driver https://www.redhat.com/archives/libvir-list/2016-August/msg00305.html Cédric Bosdonnat (2): Add virHostdevFindUSBDevice to private symbols libxl: allow vendor/product addressing for USB hostdevs src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 33 +++++++++++++++++++++++---------- src/util/virhostdev.c | 2 +- src/util/virhostdev.h | 6 ++++++ 4 files changed, 31 insertions(+), 11 deletions(-) -- 2.1.4

3 6

[libvirt] wiki accounts for GSOC submissions
by Cole Robinson 02 Sep '16

02 Sep '16

Next week is the time for GSOC students to submit their Final Evaluations. Work needs to be hosted/linked from a public URL. Cedric suggested using the libvirt wiki for these pages, so something like: http://wiki.libvirt.org/page/Google_Summer_of_Code_2016/My_Page_Title And then we can link it from the top level Google_Summer_of_Code_2016 as well. But this means GSOC students will need wiki accounts which needs admin intervention. GSOC students: if you don't already have libvirt wiki accounts, please respond here with your desired username and email and one of the wiki admins will set you up. Thanks, Cole

7 10

[libvirt] [PATCH] libxl: add memory attach support
by Bob Liu 02 Sep '16

02 Sep '16

Support for VIR_DOMAIN_DEVICE_MEMORY on domainAttachDeviceFlags API in libxl driver, using libxl_set_memory_target in xen libxl. With "virsh attach-device" command we can then hotplug memory to a domain: <memory model='dimm'> <target> <size unit='MiB'>128</size> <node>0</node> </target> </memory> $ virsh attach-device domain_name this.xml --live Signed-off-by: Bob Liu <bob.liu(a)oracle.com> --- src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index f529a2e..3924ba0 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -414,6 +414,7 @@ virDomainDefParserConfig libxlDomainDefParserConfig = { .macPrefix = { 0x00, 0x16, 0x3e }, .devicesPostParseCallback = libxlDomainDeviceDefPostParse, .domainPostParseCallback = libxlDomainDefPostParse, + .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a34eb02..541ea3b 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3085,6 +3085,30 @@ libxlDomainAttachHostUSBDevice(libxlDriverPrivatePtr driver, #endif static int +libxlDomainAttachMemory(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virDomainMemoryDefPtr mem) +{ + int res = 0; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + + if (mem->targetNode != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unsupport non-zero target node for memory device")); + return -1; + } + + res = libxl_set_memory_target(cfg->ctx, vm->def->id, mem->size, 1, 1); + if (res < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to attach %lluKB memory for domain %d"), + mem->size, vm->def->id); + return -1; + } + return 0; +} + +static int libxlDomainAttachHostDevice(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev) @@ -3284,6 +3308,11 @@ libxlDomainAttachDeviceLive(libxlDriverPrivatePtr driver, dev->data.hostdev = NULL; break; + case VIR_DOMAIN_DEVICE_MEMORY: + ret = libxlDomainAttachMemory(driver, vm, dev->data.memory); + dev->data.memory = NULL; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("device type '%s' cannot be attached"), -- 2.6.5

3 6

[libvirt] Entering freeze for libvirt-2.2.0
by Daniel Veillard 02 Sep '16

02 Sep '16

Nearly that the time scheduled, I just tagged 2.2.0 release candidate 1 in git and masigned talbal and rpms at the usual place: ftp://libvirt.org/libvirt/ Seems to be working fine with my limited testing, it's also the first time I see *everything* green in ci.centos.org/view/libvirt-project/ ! :-) Nonetheless this should get some more serious testing, for example on other architectures, and assuming everything goes fine, rc2 will go out on Tuesday and 2.2.0 final should be available on Sep 1st, so thanks in advance for your testing ! 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/

3 3

[libvirt] [PATCH v5 0/8] perf: add more perf events support
by John Ferlan 02 Sep '16

02 Sep '16

v4: http://www.redhat.com/archives/libvir-list/2016-July/msg00607.html Reworked/reworded the series slightly. The end result is mostly the same as the original, but with the suggested tweaks. John Ferlan (3): virsh: Add a forward reference to perf command from domstats --perf virsh: Rework the perf event names into a table. util: Move virPerfNew and virPerfFree Qiaowei Ren (5): perf: rename qemuDomainGetStatsPerfRdt() perf: Remove the switch from qemuDomainGetStatsPerf util: Add some comment details for virPerfEventType perf: Adjust the perf initialization perf: add more perf events support docs/formatdomain.html.in | 24 +++ docs/schemas/domaincommon.rng | 4 + include/libvirt/libvirt-domain.h | 39 +++++ src/libvirt-domain.c | 9 ++ src/qemu/qemu_driver.c | 23 ++- src/util/virperf.c | 230 +++++++++++++++++----------- src/util/virperf.h | 14 +- tests/genericxml2xmlindata/generic-perf.xml | 4 + tools/virsh.pod | 40 +++-- 9 files changed, 275 insertions(+), 112 deletions(-) -- 2.7.4

2 11

[libvirt] [PATCH v2] virsh: use virConnectGetDomainCapabilities with maxvcpus
by Shivaprasad G Bhat 01 Sep '16

01 Sep '16

virsh maxvcpus --type kvm output is useless on PPC. Also, in commit e6806d79 we documented not rely on virConnectGetMaxVcpus output. Fix the maxvcpus to use virConnectGetDomainCapabilities now to make it useful. The call is made to use the default emulator binary and to check for the host machine and arch which is what the command intends to show anyway. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- tools/virsh-host.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 57f0c0e..dd6ff4e 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -606,15 +606,37 @@ static bool cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { const char *type = NULL; - int vcpus; + int vcpus = -1; + char *caps = NULL; + const unsigned int flags = 0; /* No flags so far */ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) return false; + caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, type, flags); + if (!caps) + goto fallback; + + xml = virXMLParseStringCtxt(caps, _("(domainCapabilities)"), &ctxt); + if (!xml) { + VIR_FREE(caps); + goto fallback; + } + + virXPathInt("string(./vcpu[1]/@max)", ctxt, &vcpus); + + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + if (vcpus > 0) + goto exit; + + fallback: if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) return false; - + exit: vshPrint(ctl, "%d\n", vcpus); return true;

2 1