- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/4] qemu: use FD passing for chardev UNIX sockets
by Daniel P. Berrangé 23 Apr '18

23 Apr '18

This series makes use of the chardev fd passing arriving in QEMU 2.12 to get rid of the startup race wrt opening the QEMU monitor. It is actually enabled in all chardev UNIX sockets for sake of having the same codepath everywhere, but is only important for the monitor socket. Daniel P. Berrangé (4): qemu: probe for -chardev 'fd' parameter for FD passing qemu: support passing pre-opened UNIX socket listen FD qemu: don't retry connect() if doing FD passing qemu: remove pointless connect retry logic in agent src/qemu/qemu_agent.c | 84 ++-------------------- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 54 +++++++++++++- src/qemu/qemu_monitor.c | 54 ++++++++------ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_process.c | 27 +++++-- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemumonitortestutils.c | 1 + 12 files changed, 121 insertions(+), 109 deletions(-) -- 2.14.3

3 8

[libvirt] [qemu RFC v2] qapi: add "firmware.json"
by Laszlo Ersek 23 Apr '18

23 Apr '18

Add a schema that describes the different uses and properties of virtual machine firmware. Each firmware executable installed on a host system should come with at least one JSON file that conforms to this schema. Each file informs the management applications about the firmware's properties and one possible use case / feature set. In addition, a configuration directory with symlinks to the JSON files should exist, with the symlinks carefully named to reflect a priority order. Management applications can then search this directory in priority order for the first firmware description that satisfies their search criteria. The found JSON file provides the management layer with domain configuration bits that are required to run the firmware binary for a certain use case or feature set. Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: Alexander Graf <agraf(a)suse.de> Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: David Gibson <dgibson(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Cc: Gary Ching-Pang Lin <glin(a)suse.com> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Kashyap Chamarthy <kchamart(a)redhat.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Michael Roth <mdroth(a)linux.vnet.ibm.com> Cc: Michal Privoznik <mprivozn(a)redhat.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Cc: Peter Maydell <peter.maydell(a)linaro.org> Cc: Thomas Huth <thuth(a)redhat.com> Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- Notes: RFCv2: - previous version (RFCv1) was posted at <http://mid.mail-archive.com/20180407000117.25640-1-lersek@redhat.com> - v2 is basically a rewrite from scratch, starting out with Dan's definitions from <http://mid.mail-archive.com/20180410102033.GL5155@redhat.com> and <http://mid.mail-archive.com/20180410110357.GP5155@redhat.com>, hopefully addressing others' feedback as well RFCv1: - Folks on the CC list, please try to see if the suggested schema is flexible enough to describe the virtual firmware(s) that you are familiar with. Thanks! Makefile | 9 + Makefile.objs | 4 + qapi/firmware.json | 503 ++++++++++++++++++++++++++++++++++++++++++++++++++ qapi/qapi-schema.json | 1 + qmp.c | 5 + .gitignore | 4 + 6 files changed, 526 insertions(+) create mode 100644 qapi/firmware.json diff --git a/Makefile b/Makefile index d71dd5bea416..32034abe1583 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ GENERATED_FILES += qapi/qapi-types-block.h qapi/qapi-types-block.c GENERATED_FILES += qapi/qapi-types-char.h qapi/qapi-types-char.c GENERATED_FILES += qapi/qapi-types-common.h qapi/qapi-types-common.c GENERATED_FILES += qapi/qapi-types-crypto.h qapi/qapi-types-crypto.c +GENERATED_FILES += qapi/qapi-types-firmware.h qapi/qapi-types-firmware.c GENERATED_FILES += qapi/qapi-types-introspect.h qapi/qapi-types-introspect.c GENERATED_FILES += qapi/qapi-types-migration.h qapi/qapi-types-migration.c GENERATED_FILES += qapi/qapi-types-misc.h qapi/qapi-types-misc.c @@ -115,6 +116,7 @@ GENERATED_FILES += qapi/qapi-visit-block.h qapi/qapi-visit-block.c GENERATED_FILES += qapi/qapi-visit-char.h qapi/qapi-visit-char.c GENERATED_FILES += qapi/qapi-visit-common.h qapi/qapi-visit-common.c GENERATED_FILES += qapi/qapi-visit-crypto.h qapi/qapi-visit-crypto.c +GENERATED_FILES += qapi/qapi-visit-firmware.h qapi/qapi-visit-firmware.c GENERATED_FILES += qapi/qapi-visit-introspect.h qapi/qapi-visit-introspect.c GENERATED_FILES += qapi/qapi-visit-migration.h qapi/qapi-visit-migration.c GENERATED_FILES += qapi/qapi-visit-misc.h qapi/qapi-visit-misc.c @@ -132,6 +134,7 @@ GENERATED_FILES += qapi/qapi-commands-block.h qapi/qapi-commands-block.c GENERATED_FILES += qapi/qapi-commands-char.h qapi/qapi-commands-char.c GENERATED_FILES += qapi/qapi-commands-common.h qapi/qapi-commands-common.c GENERATED_FILES += qapi/qapi-commands-crypto.h qapi/qapi-commands-crypto.c +GENERATED_FILES += qapi/qapi-commands-firmware.h qapi/qapi-commands-firmware.c GENERATED_FILES += qapi/qapi-commands-introspect.h qapi/qapi-commands-introspect.c GENERATED_FILES += qapi/qapi-commands-migration.h qapi/qapi-commands-migration.c GENERATED_FILES += qapi/qapi-commands-misc.h qapi/qapi-commands-misc.c @@ -149,6 +152,7 @@ GENERATED_FILES += qapi/qapi-events-block.h qapi/qapi-events-block.c GENERATED_FILES += qapi/qapi-events-char.h qapi/qapi-events-char.c GENERATED_FILES += qapi/qapi-events-common.h qapi/qapi-events-common.c GENERATED_FILES += qapi/qapi-events-crypto.h qapi/qapi-events-crypto.c +GENERATED_FILES += qapi/qapi-events-firmware.h qapi/qapi-events-firmware.c GENERATED_FILES += qapi/qapi-events-introspect.h qapi/qapi-events-introspect.c GENERATED_FILES += qapi/qapi-events-migration.h qapi/qapi-events-migration.c GENERATED_FILES += qapi/qapi-events-misc.h qapi/qapi-events-misc.c @@ -581,6 +585,7 @@ qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json $(SRC_PATH)/qapi/common.json \ $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ $(SRC_PATH)/qapi/char.json \ $(SRC_PATH)/qapi/crypto.json \ + $(SRC_PATH)/qapi/firmware.json \ $(SRC_PATH)/qapi/introspect.json \ $(SRC_PATH)/qapi/migration.json \ $(SRC_PATH)/qapi/misc.json \ @@ -600,6 +605,7 @@ qapi/qapi-types-block.c qapi/qapi-types-block.h \ qapi/qapi-types-char.c qapi/qapi-types-char.h \ qapi/qapi-types-common.c qapi/qapi-types-common.h \ qapi/qapi-types-crypto.c qapi/qapi-types-crypto.h \ +qapi/qapi-types-firmware.c qapi/qapi-types-firmware.h \ qapi/qapi-types-introspect.c qapi/qapi-types-introspect.h \ qapi/qapi-types-migration.c qapi/qapi-types-migration.h \ qapi/qapi-types-misc.c qapi/qapi-types-misc.h \ @@ -618,6 +624,7 @@ qapi/qapi-visit-block.c qapi/qapi-visit-block.h \ qapi/qapi-visit-char.c qapi/qapi-visit-char.h \ qapi/qapi-visit-common.c qapi/qapi-visit-common.h \ qapi/qapi-visit-crypto.c qapi/qapi-visit-crypto.h \ +qapi/qapi-visit-firmware.c qapi/qapi-visit-firmware.h \ qapi/qapi-visit-introspect.c qapi/qapi-visit-introspect.h \ qapi/qapi-visit-migration.c qapi/qapi-visit-migration.h \ qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \ @@ -635,6 +642,7 @@ qapi/qapi-commands-block.c qapi/qapi-commands-block.h \ qapi/qapi-commands-char.c qapi/qapi-commands-char.h \ qapi/qapi-commands-common.c qapi/qapi-commands-common.h \ qapi/qapi-commands-crypto.c qapi/qapi-commands-crypto.h \ +qapi/qapi-commands-firmware.c qapi/qapi-commands-firmware.h \ qapi/qapi-commands-introspect.c qapi/qapi-commands-introspect.h \ qapi/qapi-commands-migration.c qapi/qapi-commands-migration.h \ qapi/qapi-commands-misc.c qapi/qapi-commands-misc.h \ @@ -652,6 +660,7 @@ qapi/qapi-events-block.c qapi/qapi-events-block.h \ qapi/qapi-events-char.c qapi/qapi-events-char.h \ qapi/qapi-events-common.c qapi/qapi-events-common.h \ qapi/qapi-events-crypto.c qapi/qapi-events-crypto.h \ +qapi/qapi-events-firmware.c qapi/qapi-events-firmware.h \ qapi/qapi-events-introspect.c qapi/qapi-events-introspect.h \ qapi/qapi-events-migration.c qapi/qapi-events-migration.h \ qapi/qapi-events-misc.c qapi/qapi-events-misc.h \ diff --git a/Makefile.objs b/Makefile.objs index c6c9b8fc2177..6ed4e0010b10 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -9,6 +9,7 @@ util-obj-y += qapi/qapi-types-block.o util-obj-y += qapi/qapi-types-char.o util-obj-y += qapi/qapi-types-common.o util-obj-y += qapi/qapi-types-crypto.o +util-obj-y += qapi/qapi-types-firmware.o util-obj-y += qapi/qapi-types-introspect.o util-obj-y += qapi/qapi-types-migration.o util-obj-y += qapi/qapi-types-misc.o @@ -27,6 +28,7 @@ util-obj-y += qapi/qapi-visit-block.o util-obj-y += qapi/qapi-visit-char.o util-obj-y += qapi/qapi-visit-common.o util-obj-y += qapi/qapi-visit-crypto.o +util-obj-y += qapi/qapi-visit-firmware.o util-obj-y += qapi/qapi-visit-introspect.o util-obj-y += qapi/qapi-visit-migration.o util-obj-y += qapi/qapi-visit-misc.o @@ -44,6 +46,7 @@ util-obj-y += qapi/qapi-events-block.o util-obj-y += qapi/qapi-events-char.o util-obj-y += qapi/qapi-events-common.o util-obj-y += qapi/qapi-events-crypto.o +util-obj-y += qapi/qapi-events-firmware.o util-obj-y += qapi/qapi-events-introspect.o util-obj-y += qapi/qapi-events-migration.o util-obj-y += qapi/qapi-events-misc.o @@ -139,6 +142,7 @@ common-obj-y += qapi/qapi-commands-block.o common-obj-y += qapi/qapi-commands-char.o common-obj-y += qapi/qapi-commands-common.o common-obj-y += qapi/qapi-commands-crypto.o +common-obj-y += qapi/qapi-commands-firmware.o common-obj-y += qapi/qapi-commands-introspect.o common-obj-y += qapi/qapi-commands-migration.o common-obj-y += qapi/qapi-commands-misc.o diff --git a/qapi/firmware.json b/qapi/firmware.json new file mode 100644 index 000000000000..3653b4628a5b --- /dev/null +++ b/qapi/firmware.json @@ -0,0 +1,503 @@ +# -*- Mode: Python -*- +# +# Copyright (C) 2018 Red Hat, Inc. +# +# Authors: +# Daniel P. Berrange <berrange(a)redhat.com> +# Laszlo Ersek <lersek(a)redhat.com> +# +# This work is licensed under the terms of the GNU GPL, version 2 or later. See +# the COPYING file in the top-level directory. + +## +# = Firmware +## + +{ 'include' : 'block-core.json' } + +## +# @FirmwareType: +# +# Lists firmware types commonly used with QEMU virtual machines. +# +# @bios: The firmware was built from the SeaBIOS project. +# +# @slof: The firmware was built from the Slimline Open Firmware project. +# +# @uboot: The firmware was built from the U-Boot project. +# +# @uefi: The firmware was built from the edk2 (EFI Development Kit II) project. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareType', + 'data' : [ 'bios', 'slof', 'uboot', 'uefi' ] } + +## +# @FirmwareDevice: +# +# Defines the device types that firmware can be mapped into. +# +# @flash: The firmware executable and its accompanying NVRAM file are to be +# mapped into a pflash chip each. +# +# @kernel: The firmware is to be loaded like a Linux kernel. This is similar to +# @memory but may imply additional processing that is specific to the +# target architecture and machine type. +# +# @memory: The firmware is to be mapped into memory. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareDevice', + 'data' : [ 'flash', 'kernel', 'memory' ] } + +## +# @FirmwareArchitecture: +# +# Defines the target architectures (emulator binaries) that firmware may +# execute on. +# +# @aarch64: The firmware can be executed by the qemu-system-aarch64 emulator. +# +# @arm: The firmware can be executed by the qemu-system-arm emulator. +# +# @i386: The firmware can be executed by the qemu-system-i386 emulator. +# +# @x86_64: The firmware can be executed by the qemu-system-x86_64 emulator. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareArchitecture', + 'data' : [ 'aarch64', 'arm', 'i386', 'x86_64' ] } + +## +# @FirmwareTarget: +# +# Defines the machine types that firmware may execute on. +# +# @architecture: Determines the emulation target (the QEMU system emulator) +# that can execute the firmware. +# +# @machines: Lists the machine types (known by the emulator that is specified +# through @architecture) that can execute the firmware. Elements of +# @machines are not supposed to be versioned; if a machine type is +# versioned in QEMU (e.g. "pc-i440fx-2.12"), then its unversioned +# variant, which typically refers to the latest version (e.g. "pc"), +# should be listed in @machines. On the QEMU command line, "-machine +# type=..." specifies the requested machine type. +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareTarget', + 'data' : { 'architecture' : 'FirmwareArchitecture', + 'machines' : [ 'str' ] } } + +## +# @FirmwareFeature: +# +# Defines the features that firmware may support, and the platform requirements +# that firmware may present. +# +# @acpi-s3: The firmware supports S3 sleep (suspend to RAM), as defined in the +# ACPI specification. On the "pc" machine type of the @i386 and +# @x86_64 emulation targets, S3 can be enabled with "-global +# PIIX4_PM.disable_s3=0" and disabled with "-global +# PIIX4_PM.disable_s3=1". On the "q35" machine type of the @i386 and +# @x86_64 emulation targets, S3 can be enabled with "-global +# ICH9-LPC.disable_s3=0" and disabled with "-global +# ICH9-LPC.disable_s3=1". +# +# @acpi-s4: The firmware supports S4 hibernation (suspend to disk), as defined +# in the ACPI specification. On the "pc" machine type of the @i386 +# and @x86_64 emulation targets, S4 can be enabled with "-global +# PIIX4_PM.disable_s4=0" and disabled with "-global +# PIIX4_PM.disable_s4=1". On the "q35" machine type of the @i386 and +# @x86_64 emulation targets, S4 can be enabled with "-global +# ICH9-LPC.disable_s4=0" and disabled with "-global +# ICH9-LPC.disable_s4=1". +# +# @amd-sev: The firmware supports running under AMD Secure Encrypted +# Virtualization, as specified in the AMD64 Architecture Programmer's +# Manual. QEMU command line options related to this feature are +# documented in "docs/amd-memory-encryption.txt". +# +# @requires-smm: The firmware requires the platform to emulate SMM (System +# Management Mode), as defined in the AMD64 Architecture +# Programmer's Manual, and in the Intel(R)64 and IA-32 +# Architectures Software Developer's Manual. On the "q35" +# machine type of the @i386 and @x86_64 emulation targets, SMM +# emulation can be enabled with "-machine smm=on". (On the "q35" +# machine type of the @i386 emulation target, @requires-smm +# presents further CPU requirements; one combination known to +# work is "-cpu coreduo,-nx".) If the firmware is marked as both +# @secure-boot and @requires-smm, then write accesses to the +# pflash chip (NVRAM) that holds the UEFI variable store must be +# restricted to code that executes in SMM, using the additional +# option "-global driver=cfi.pflash01,property=secure,value=on". +# Furthermore, a large guest-physical address space (comprising +# guest RAM, memory hotplug range, and 64-bit PCI MMIO +# aperture), and/or a high VCPU count, may present high SMRAM +# requirements from the firmware. On the "q35" machine type of +# the @i386 and @x86_64 emulation targets, the SMRAM size may be +# increased above the default 16MB with the "-global +# mch.extended-tseg-mbytes=uint16" option. As a rule of thumb, +# the default 16MB size suffices for 1TB of guest-phys address +# space and a few tens of VCPUs; for every further TB of +# guest-phys address space, add 8MB of SMRAM. 48MB should +# suffice for 4TB of guest-phys address space and 2-3 hundred +# VCPUs. +# +# @secure-boot: The firmware implements the software interfaces for UEFI Secure +# Boot, as defined in the UEFI specification. Note that without +# @requires-smm, guest code running with kernel privileges can +# undermine the security of Secure Boot. +# +# @secure-boot-enrolled-keys: The variable store (NVRAM) template associated +# with the firmware binary has the Secure Boot +# operational mode enabled, and -- at least -- the +# following certificates enrolled. (1) As Platform +# Key (PK), and as one Key Exchange Key (KEK), a +# self-signed certificate issued by the firmware +# distributor is enrolled. (2) As another Key +# Exchange Key (KEK), the "Microsoft Corporation +# KEK CA 2011" certificate is enrolled. The UEFI +# Forum releases updates for the Secure Boot +# Signature/Certificate Blacklist ("dbx") +# periodically at +# <http://www.uefi.org/revocationlistfile>, signed +# with a certificate chain anchored in this +# certificate. (3) As one Secure Boot +# Signature/Certificate ("db"), the "Microsoft +# Windows Production PCA 2011" certificate is +# enrolled. This certificate verifies Windows 8, +# Windows Server 2012 R2, etc boot loaders. (4) As +# another Secure Boot Signature/Certificate ("db"), +# the "Microsoft Corporation UEFI CA 2011" +# certificate is enrolled. This certificate +# verifies the "shim" UEFI application, and PCI +# expansion ROMs. @secure-boot-enrolled-keys is +# only valid if the firmware also supports +# @secure-boot. +# +# @verbose-dynamic: When firmware log capture is enabled, the firmware logs a +# large amount of debug messages, which may impact boot +# performance. With log capture disabled, there is no boot +# performance impact. On the "pc" and "q35" machine types of +# the @i386 and @x86_64 emulation targets, firmware log +# capture can be enabled with the QEMU command line options +# "-chardev file,id=fwdebug,path=LOGFILEPATH -device +# isa-debugcon,iobase=0x402,chardev=fwdebug". +# @verbose-dynamic is mutually exclusive with +# @verbose-static. +# +# @verbose-static: The firmware unconditionally produces a large amount of +# debug messages, which may impact boot performance. This +# feature may typically be carried by certain UEFI firmware +# for the "virt" machine type of the @arm and @aarch64 +# emulation targets, where the debug messages are written to +# the first (always present) PL011 UART. @verbose-static is +# mutually exclusive with @verbose-dynamic. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareFeature', + 'data' : [ 'acpi-s3', 'acpi-s4', 'amd-sev', 'requires-smm', 'secure-boot', + 'secure-boot-enrolled-keys', 'verbose-dynamic', + 'verbose-static' ] } + +## +# @FirmwareFlashFile: +# +# Defines common properties that are necessary for loading a firmware file into +# a pflash chip. The corresponding QEMU command line option is "-drive +# file=@pathname,format=@format". Note however that the option-argument shown +# here is incomplete; it is completed under @FirmwareMappingFlash. +# +# @pathname: Specifies the pathname on the host filesystem where the firmware +# file can be found. +# +# @format: Specifies the block format of the file pointed-to by @pathname, such +# as @raw or @qcow2. +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareFlashFile', + 'data' : { 'pathname' : 'str', + 'format' : 'BlockdevDriver' } } + +## +# @FirmwareMappingFlash: +# +# Describes loading and mapping properties for the firmware executable and its +# accompanying NVRAM file, when @FirmwareDevice is @flash. +# +# @executable: Identifies the firmware executable. The firmware executable may +# be shared by multiple virtual machine definitions. The +# corresponding QEMU command line option is "-drive +# if=pflash,unit=0,readonly=on,file=@executable.@pathname,format=@executable.@format". +# +# @nvram_template: Identifies the NVRAM template compatible with @executable. +# Management software instantiates an individual copy -- a +# specific NVRAM file -- from @nvram_template.@pathname for +# each new virtual machine definition created. +# @nvram_template.@pathname itself is never mapped into +# virtual machines, only individual copies of it are. An NVRAM +# file is typically used for persistently storing the +# non-volatile UEFI variables of a virtual machine definition. +# The corresponding QEMU command line option is "-drive +# if=pflash,unit=1,readonly=off,file=PATHNAME_OF_PRIVATE_NVRAM_FILE,format=@nvram_template.@format". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingFlash', + 'data' : { 'executable' : 'FirmwareFlashFile', + 'nvram_template' : 'FirmwareFlashFile' } } + +## +# @FirmwareMappingKernel: +# +# Describes loading and mapping properties for the firmware executable, when +# @FirmwareDevice is @kernel. +# +# @pathname: Identifies the firmware executable. The firmware executable may be +# shared by multiple virtual machine definitions. The corresponding +# QEMU command line option is "-kernel @pathname". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingKernel', + 'data' : { 'pathname' : 'str' } } + +## +# @FirmwareMappingMemory: +# +# Describes loading and mapping properties for the firmware executable, when +# @FirmwareDevice is @memory. +# +# @pathname: Identifies the firmware executable. The firmware executable may be +# shared by multiple virtual machine definitions. The corresponding +# QEMU command line option is "-bios @pathname". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingMemory', + 'data' : { 'pathname' : 'str' } } + +## +# @FirmwareMapping: +# +# Provides a discriminated structure for firmware to describe its loading / +# mapping properties. +# +# @device: Selects the device type that the firmware must be mapped into. +# +# Since: 2.13 +## +{ 'union' : 'FirmwareMapping', + 'base' : { 'device' : 'FirmwareDevice' }, + 'discriminator' : 'device', + 'data' : { 'flash' : 'FirmwareMappingFlash', + 'kernel' : 'FirmwareMappingKernel', + 'memory' : 'FirmwareMappingMemory' } } + +## +# @Firmware: +# +# Describes a firmware (or a firmware use case) to management software. +# +# @description: Provides a human-readable description of the firmware. +# Management software may or may not display @description. +# +# @type: Exposes the type of the firmware. @type is generally the primary key +# for which management software looks when picking a firmware for a new +# virtual machine definition. +# +# @mapping: Describes the loading / mapping properties of the firmware. +# +# @targets: Collects the target architectures (QEMU system emulators) and their +# machine types that may execute the firmware. +# +# @features: Lists the features that the firmware supports, and the platform +# requirements it presents. +# +# @tags: A list of auxiliary strings associated with the firmware for which +# @description is not approprite, due to the latter's possible exposure +# to the end-user. @tags serves development and debugging purposes only, +# and management software shall explicitly ignore it. +# +# Since: 2.13 +# +# Examples: +# +# { +# "description": "SeaBIOS", +# "type": "bios", +# "mapping": { +# "device": "memory", +# "pathname": "/usr/share/seabios/bios-256k.bin" +# }, +# "targets": [ +# { +# "architecture": "i386", +# "machines": [ +# "pc", +# "q35" +# ] +# }, +# { +# "architecture": "x86_64", +# "machines": [ +# "pc", +# "q35" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "acpi-s4" +# ], +# "tags": [ +# "CONFIG_BOOTSPLASH=n", +# "CONFIG_ROM_SIZE=256", +# "CONFIG_USE_SMM=n" +# ] +# } +# +# { +# "description": "OVMF with SB+SMM, empty varstore", +# "type": "uefi", +# "mapping": { +# "device": "flash", +# "executable": { +# "pathname": "/usr/share/OVMF/OVMF_CODE.secboot.fd", +# "format": "raw" +# }, +# "nvram_template": { +# "pathname": "/usr/share/OVMF/OVMF_VARS.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "x86_64", +# "machines": [ +# "q35" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "amd-sev", +# "requires-smm", +# "secure-boot", +# "verbose-dynamic" +# ], +# "tags": [ +# "-a IA32", +# "-a X64", +# "-p OvmfPkg/OvmfPkgIa32X64.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D SMM_REQUIRE", +# "-D SECURE_BOOT_ENABLE", +# "-D FD_SIZE_4MB" +# ] +# } +# +# { +# "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled", +# "type": "uefi", +# "mapping": { +# "device": "flash", +# "executable": { +# "pathname": "/usr/share/OVMF/OVMF_CODE.secboot.fd", +# "format": "raw" +# }, +# "nvram_template": { +# "pathname": "/usr/share/OVMF/OVMF_VARS.secboot.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "x86_64", +# "machines": [ +# "q35" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "amd-sev", +# "requires-smm", +# "secure-boot", +# "secure-boot-enrolled-keys", +# "verbose-dynamic" +# ], +# "tags": [ +# "-a IA32", +# "-a X64", +# "-p OvmfPkg/OvmfPkgIa32X64.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D SMM_REQUIRE", +# "-D SECURE_BOOT_ENABLE", +# "-D FD_SIZE_4MB" +# ] +# } +# +# { +# "description": "UEFI firmware for ARM64 virtual machines", +# "type": "uefi", +# "mapping": { +# "device": "flash", +# "executable": { +# "pathname": "/usr/share/AAVMF/AAVMF_CODE.fd", +# "format": "raw" +# }, +# "nvram_template": { +# "pathname": "/usr/share/AAVMF/AAVMF_VARS.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "aarch64", +# "machines": [ +# "virt" +# ] +# } +# ], +# "features": [ +# +# ], +# "tags": [ +# "-a AARCH64", +# "-p ArmVirtPkg/ArmVirtQemu.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D DEBUG_PRINT_ERROR_LEVEL=0x80000000" +# ] +# } +## +{ 'struct' : 'Firmware', + 'data' : { 'description' : 'str', + 'type' : 'FirmwareType', + 'mapping' : 'FirmwareMapping', + 'targets' : [ 'FirmwareTarget' ], + 'features' : [ 'FirmwareFeature' ], + 'tags' : [ 'str' ] } } + +## +# @x-check-firmware: +# +# Accept a @Firmware object and do nothing, successfully. This command can be +# used in the QMP shell to validate @Firmware JSON against the schema. +# +# @fw: ignored +# +# Since: 2.13 +## +{ 'command' : 'x-check-firmware', + 'data' : { 'fw' : 'Firmware' } } diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 25bce78352b8..2d6339ca8c99 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -92,4 +92,5 @@ { 'include': 'transaction.json' } { 'include': 'trace.json' } { 'include': 'introspect.json' } +{ 'include': 'firmware.json' } { 'include': 'misc.json' } diff --git a/qmp.c b/qmp.c index f72261667f92..2141ebe6f027 100644 --- a/qmp.c +++ b/qmp.c @@ -34,6 +34,7 @@ #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-ui.h" +#include "qapi/qapi-commands-firmware.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" @@ -781,3 +782,7 @@ void qmp_x_oob_test(bool lock, Error **errp) qemu_sem_post(&x_oob_test_sem); } } + +void qmp_x_check_firmware(Firmware *fw, Error **errp) +{ +} diff --git a/.gitignore b/.gitignore index 4055e12ee85d..1d8d1066d3d1 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ /qapi/qapi-commands-char.[ch] /qapi/qapi-commands-common.[ch] /qapi/qapi-commands-crypto.[ch] +/qapi/qapi-commands-firmware.[ch] /qapi/qapi-commands-introspect.[ch] /qapi/qapi-commands-migration.[ch] /qapi/qapi-commands-misc.[ch] @@ -52,6 +53,7 @@ /qapi/qapi-events-char.[ch] /qapi/qapi-events-common.[ch] /qapi/qapi-events-crypto.[ch] +/qapi/qapi-events-firmware.[ch] /qapi/qapi-events-introspect.[ch] /qapi/qapi-events-migration.[ch] /qapi/qapi-events-misc.[ch] @@ -70,6 +72,7 @@ /qapi/qapi-types-char.[ch] /qapi/qapi-types-common.[ch] /qapi/qapi-types-crypto.[ch] +/qapi/qapi-types-firmware.[ch] /qapi/qapi-types-introspect.[ch] /qapi/qapi-types-migration.[ch] /qapi/qapi-types-misc.[ch] @@ -87,6 +90,7 @@ /qapi/qapi-visit-char.[ch] /qapi/qapi-visit-common.[ch] /qapi/qapi-visit-crypto.[ch] +/qapi/qapi-visit-firmware.[ch] /qapi/qapi-visit-introspect.[ch] /qapi/qapi-visit-migration.[ch] /qapi/qapi-visit-misc.[ch] -- 2.14.1.3.gb7cf6e02401b

9 51

[libvirt] [RFC PATCH 00/30] qemu: Add generators and tests for format block node layers (blockdev-add saga)
by Peter Krempa 23 Apr '18

23 Apr '18

To adopt -blockdev we will need to fully convert virStorageSource into the format accepted by qemu. This series adds the format layer (qcow2/raw/etc ...) since the protocol layer is already implemented. The goal is that we do the equivalent thing with blockdev to what we did with -drive. This series also adds a lot of tests to make sure that we generate the right things. Note that this series is also a precursor to the NBD+TLS migration series, although only a small part of the code will be excercised. Please have a look at the tests. I've anotated them by putting the equivalent command line which would be used by libvirt into the commit message. Note that I've been looking at those JSON snippets for such a long time that I probably stopped being able to see any differences. Kevin, please look whether the configurations make sense (specifically I'm not really sure about patch 14/30, but that resulted from my poking in qemu.). All JSON documents were validated according to the qemu schema. The only known missing piece is the ability to use authentication with RBD, since that is missing from qemu. Peter Krempa (30): storage: Properly track that backing chain members are readonly qemu: domain: Format storage source node names into private data util: storage: Add shadow copies of few disk properties to virStorageSource qemu: domain: Carefuly transfer configuration from disk to storage source qemu: block: Extract formatting of props for 'file' backend qemu: block: Handle iomode property for json 'file' driver utils: storage: Mark that a virStorageSource is going to be used as a floppy qemu: Move virtual FAT disk validation from command line builder qemu: block: Add support for accessing directories via the 'vvfat' driver qemu: block: Propagate 'legacy' parameter when formatting disk backing qemu: block: Validate node-names for use with qemu qemu: block: Format cache modes for disk storage backends qemu: block: Format 'read-only' attribute for JSON disk protocol [RFC] qemu: block: Always set discard for storage nodes qemu: block: Add support for creating 'format' layer for blockdev-add tests: qemublock: Rename variables in anticipation of new tests tests: Makefile: Sanitize entry for qemublocktest qemu: domain: Export qemuDomainDeviceDefValidateDisk qemu: domain: Tolerate NULL 'cfg' in qemuDomainPrepareDiskSourceChain tests: qemublock: Add testing of blockdev JSON property generator tests: qemublock: Add basic 'raw' file test tests: qemublock: Add tests for all other format without special options tests: qemublock: Add tests for basic backing chain formats tests: qemublock: Add test-case for the 'vvfat' driver in qemu tests: qemublock: Add test cases for 'aio' options of 'file' storage tests: qemublock: Add test for raw luks disk format tests: qemublock: basic qcow2 tests tests: qemublock: Add test combining authentication and encryption tests: qemublock: Test handling of 'unmap' and 'detect-zeroes' options tests: qemublock: Test handling of all cache modes src/conf/domain_conf.c | 3 + src/qemu/qemu_block.c | 422 ++++++++++++++++++++- src/qemu/qemu_block.h | 6 +- src/qemu/qemu_command.c | 16 +- src/qemu/qemu_domain.c | 53 ++- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 3 + src/util/virstoragefile.c | 5 + src/util/virstoragefile.h | 11 + tests/Makefile.am | 11 +- tests/qemublocktest.c | 312 ++++++++++++++- .../qemublocktestdata/xml2json/dir-fat-cache.json | 22 ++ tests/qemublocktestdata/xml2json/dir-fat-cache.xml | 10 + .../qemublocktestdata/xml2json/dir-fat-floppy.json | 14 + .../qemublocktestdata/xml2json/dir-fat-floppy.xml | 11 + .../xml2json/dir-fat-readonly.json | 14 + .../xml2json/dir-fat-readonly.xml | 10 + .../xml2json/file-backing_basic-aio_threads.json | 62 +++ .../xml2json/file-backing_basic-aio_threads.xml | 35 ++ .../file-backing_basic-cache-directsync.json | 91 +++++ .../file-backing_basic-cache-directsync.xml | 35 ++ .../xml2json/file-backing_basic-cache-none.json | 91 +++++ .../xml2json/file-backing_basic-cache-none.xml | 35 ++ .../xml2json/file-backing_basic-cache-unsafe.json | 91 +++++ .../xml2json/file-backing_basic-cache-unsafe.xml | 35 ++ .../file-backing_basic-cache-writeback.json | 91 +++++ .../file-backing_basic-cache-writeback.xml | 35 ++ .../file-backing_basic-cache-writethrough.json | 91 +++++ .../file-backing_basic-cache-writethrough.xml | 35 ++ .../xml2json/file-backing_basic-detect.json | 60 +++ .../xml2json/file-backing_basic-detect.xml | 35 ++ .../xml2json/file-backing_basic-noopts.json | 51 +++ .../xml2json/file-backing_basic-noopts.xml | 34 ++ .../xml2json/file-backing_basic-unmap-detect.json | 64 ++++ .../xml2json/file-backing_basic-unmap-detect.xml | 35 ++ .../xml2json/file-backing_basic-unmap-discard.json | 0 .../xml2json/file-backing_basic-unmap-ignore.json | 64 ++++ .../xml2json/file-backing_basic-unmap-ignore.xml | 35 ++ .../xml2json/file-backing_basic-unmap.json | 63 +++ .../xml2json/file-backing_basic-unmap.xml | 35 ++ .../xml2json/file-bochs-noopts.json | 12 + .../xml2json/file-bochs-noopts.xml | 9 + .../xml2json/file-cloop-noopts.json | 12 + .../xml2json/file-cloop-noopts.xml | 9 + .../xml2json/file-dmg-noopts.json | 12 + .../qemublocktestdata/xml2json/file-dmg-noopts.xml | 9 + .../xml2json/file-ploop-noopts.json | 12 + .../xml2json/file-ploop-noopts.xml | 9 + .../file-qcow2-backing-chain-encryption.json | 34 ++ .../file-qcow2-backing-chain-encryption.xml | 25 ++ .../xml2json/file-qcow2-backing-chain-noopts.json | 130 +++++++ .../xml2json/file-qcow2-backing-chain-noopts.xml | 83 ++++ .../file-qcow2-backing-chain-unterminated.json | 25 ++ .../file-qcow2-backing-chain-unterminated.xml | 18 + .../xml2json/file-raw-aio_native.json | 21 + .../xml2json/file-raw-aio_native.xml | 9 + .../qemublocktestdata/xml2json/file-raw-luks.json | 13 + tests/qemublocktestdata/xml2json/file-raw-luks.xml | 12 + .../xml2json/file-raw-noopts.json | 12 + .../qemublocktestdata/xml2json/file-raw-noopts.xml | 9 + .../xml2json/file-vdi-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vdi-noopts.xml | 9 + .../xml2json/file-vhd-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vhd-noopts.xml | 9 + .../xml2json/file-vpc-noopts.json | 12 + .../qemublocktestdata/xml2json/file-vpc-noopts.xml | 9 + .../network-qcow2-backing-chain-cache-unsafe.json | 57 +++ .../network-qcow2-backing-chain-cache-unsafe.xml | 25 ++ ...etwork-qcow2-backing-chain-encryption_auth.json | 51 +++ ...network-qcow2-backing-chain-encryption_auth.xml | 34 ++ .../xml2json/nodename-long-format.xml | 9 + .../xml2json/nodename-long-protocol.xml | 9 + 72 files changed, 2816 insertions(+), 36 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-cache.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-cache.xml create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-floppy.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-floppy.xml create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-readonly.json create mode 100644 tests/qemublocktestdata/xml2json/dir-fat-readonly.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-aio_threads.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-detect.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-detect.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-detect.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-discard.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap-ignore.xml create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap.json create mode 100644 tests/qemublocktestdata/xml2json/file-backing_basic-unmap.xml create mode 100644 tests/qemublocktestdata/xml2json/file-bochs-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-bochs-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-cloop-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-cloop-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-dmg-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-dmg-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-ploop-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-ploop-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-encryption.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.json create mode 100644 tests/qemublocktestdata/xml2json/file-qcow2-backing-chain-unterminated.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-aio_native.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-aio_native.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-luks.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-luks.xml create mode 100644 tests/qemublocktestdata/xml2json/file-raw-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-raw-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vdi-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vdi-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vhd-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vhd-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/file-vpc-noopts.json create mode 100644 tests/qemublocktestdata/xml2json/file-vpc-noopts.xml create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.xml create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.json create mode 100644 tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-encryption_auth.xml create mode 100644 tests/qemublocktestdata/xml2json/nodename-long-format.xml create mode 100644 tests/qemublocktestdata/xml2json/nodename-long-protocol.xml -- 2.14.3

2 44

[libvirt] [PATCH v2 0/2] Rename/remove virDomainObjListFindBy{UUID|ID}Ref
by John Ferlan 20 Apr '18

20 Apr '18

These were actually posted before as part of a larger series to rework/rename virDomainObjListFindBy{UUID|ID}Ref as patches 19 and 20: https://www.redhat.com/archives/libvir-list/2018-March/msg00508.html https://www.redhat.com/archives/libvir-list/2018-March/msg00509.html Even though it's only 6 weeks ago, attempting to remember what (if anything) has changed is challenging. In the long run, the point is that the *Ref specific functions are now removed. This makes it much easier for the next step which will be to modify the Add/Remove logic to be simpler and more realistic w/r/t expectations as well as remove a few comments in the code that indicate some day we need to fix this crazy problem (some day is getting closer). John Ferlan (2): conf: Rework/rename virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByIDRef src/bhyve/bhyve_driver.c | 6 ++-- src/conf/virdomainobjlist.c | 66 ++++++++++---------------------------------- src/conf/virdomainobjlist.h | 4 --- src/libvirt_private.syms | 2 -- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 6 ++-- src/lxc/lxc_driver.c | 7 ++--- src/openvz/openvz_driver.c | 4 +-- src/qemu/qemu_driver.c | 9 +++--- src/test/test_driver.c | 6 ++-- src/uml/uml_driver.c | 6 ++-- src/util/virclosecallbacks.c | 4 +-- src/vmware/vmware_driver.c | 4 +-- src/vz/vz_driver.c | 6 ++-- src/vz/vz_sdk.c | 14 +++++----- src/vz/vz_utils.c | 2 +- 16 files changed, 51 insertions(+), 97 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] git: add config file telling git-publish how to send patches
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

The "git-publish" tool is a useful git extension for sending patch series for code review. It automatically creates versioned tags each time code on a branch is sent, so that there is a record of each version. It also remembers the cover letter so it does not need re-entering each time the series is reposted. With this config file present it is now sufficient[1] to run $ git publish to send all patches in a branch to the list for review [1] Assuming your $HOME/.gitconfig has an SMTP server listed at least e.g. [sendemail] smtpserver = smtp.example.com Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitpublish diff --git a/.gitpublish b/.gitpublish new file mode 100644 index 0000000000..857f0d552c --- /dev/null +++ b/.gitpublish @@ -0,0 +1,3 @@ +[gitpublishprofile "default"] +base = master +to = libvir-list(a)redhat.com -- 2.14.3

3 7

[libvirt] [dbus PATCH] Fix GError memory leaks
by Pavel Hrdina 20 Apr '18

20 Apr '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/gdbus.c | 8 ++++---- src/main.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gdbus.c b/src/gdbus.c index cb06813..3407116 100644 --- a/src/gdbus.c +++ b/src/gdbus.c @@ -86,7 +86,7 @@ virtDBusGDBusHandlePropertyGet(GVariant *parameters, const gchar *interface; const gchar *name; GVariant *value = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_get(parameters, "(&s&s)", &interface, &name); @@ -128,7 +128,7 @@ virtDBusGDBusHandlePropertySet(GVariant *parameters, const gchar *interface; const gchar *name; g_autoptr(GVariant) value = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_get(parameters, "(&s&sv)", &interface, &name, &value); @@ -162,7 +162,7 @@ virtDBusGDBusHandlePropertyGetAll(GDBusMethodInvocation *invocation, { GVariant *value; g_auto(GVariantBuilder) builder; - GError *error = NULL; + g_autoptr(GError) error = NULL; g_variant_builder_init(&builder, G_VARIANT_TYPE("(a{sv})")); @@ -202,7 +202,7 @@ virtDBusGDBusHandleMethod(GVariant *parameters, GUnixFDList *inFDs = NULL; GVariant *outArgs = NULL; GUnixFDList *outFDs = NULL; - GError *error = NULL; + g_autoptr(GError) error = NULL; for (gint i = 0; data->methods[i].name; i++) { if (g_str_equal(methodName, data->methods[i].name)) { diff --git a/src/main.c b/src/main.c index b3baf76..eb30ef8 100644 --- a/src/main.c +++ b/src/main.c @@ -52,7 +52,7 @@ virtDBusAcquired(GDBusConnection *connection, gpointer opaque) { virtDBusRegisterData *data = opaque; - GError *error = NULL; + g_autoptr(GError) error = NULL; for (gsize i = 0; i < data->ndrivers; i += 1) { virtDBusConnectNew(&data->connectList[i], connection, -- 2.14.3

2 1

[libvirt] [dbus PATCH 0/3] Introduce GVariant to TypedParams helper
by Pavel Hrdina 20 Apr '18

20 Apr '18

Pavel Hrdina (3): util: Introduce virtDBusUtilTypedParams util: Introduce virtDBusUtilGVariantToTypedParams domain: Implement SetPerfEvents method data/org.libvirt.Domain.xml | 6 +++ src/domain.c | 31 ++++++++++++++++ src/util.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 17 +++++++++ 4 files changed, 143 insertions(+) -- 2.14.3

2 6

[libvirt] --disable-nls is ignored in master
by Olaf Hering 20 Apr '18

20 Apr '18

It seems some of the recent changes for 'po' broke the --disable-nls configure option. I expect no locales will be installed with --disable-nls, but they are installed anyway. This leads to the well known "error: Installed (but unpackaged) file(s) found:" failure. I tested libvirt-20180420T081114.3c66d5108. Olaf

2 1

[libvirt] [dbus PATCH v2] Implement GetAllDomainStats method for Connect Interface
by Katerina Koukiou 20 Apr '18

20 Apr '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Connect.xml | 7 +++++++ src/connect.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 14e66e4..ee7bfdc 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -94,6 +94,13 @@ <arg name="flags" type="u" direction="in"/> <arg name="storagePoolSources" type="s" direction="out"/> </method> + <method name="GetAllDomainStats"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetAllDomain…"/> + <arg name="stats" type="u" direction="in"/> + <arg name="flags" type="u" direction="in"/> + <arg name="records" type="a(sa{sv})" direction="out"/> + </method> <method name="GetCapabilities"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetCapabilities"/> diff --git a/src/connect.c b/src/connect.c index 1ef5c93..48db724 100644 --- a/src/connect.c +++ b/src/connect.c @@ -503,6 +503,52 @@ virtDBusConnectFindStoragePoolSources(GVariant *inArgs, *outArgs = g_variant_new("(s)", ret); } +static void +virtDBusConnectGetAllDomainStats(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomainStatsRecordPtr) records = NULL; + guint stats; + gint nstats; + guint flags; + GVariant *gret; + GVariantBuilder builder; + + g_variant_get(inArgs, "(uu)", &stats, &flags); + + if (!virtDBusConnectOpen(connect, error)) + return; + + nstats = virConnectGetAllDomainStats(connect->connection, + stats, &records, flags); + if (nstats < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sa{sv})")); + + for (gint i = 0; i < nstats; i++) { + const gchar* name; + GVariant *grecords; + + g_variant_builder_open(&builder, G_VARIANT_TYPE("(sa{sv})")); + name = virDomainGetName(records[i]->dom); + grecords = virtDBusUtilTypedParamsToGVariant(records[i]->params, + records[i]->nparams); + g_variant_builder_add(&builder, "s", name); + g_variant_builder_add_value(&builder, grecords); + g_variant_builder_close(&builder); + } + gret = g_variant_builder_end(&builder); + + *outArgs = g_variant_new_tuple(&gret, 1); +} + static void virtDBusConnectGetCPUModelNames(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -808,6 +854,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DomainRestore", virtDBusConnectDomainRestoreFlags }, { "DomainSaveImageDefineXML", virtDBusConnectDomainSaveImageDefineXML }, { "FindStoragePoolSources", virtDBusConnectFindStoragePoolSources }, + { "GetAllDomainStats", virtDBusConnectGetAllDomainStats }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetCPUModelNames", virtDBusConnectGetCPUModelNames }, { "GetDomainCapabilities", virtDBusConnectGetDomainCapabilities }, -- 2.15.0

2 1

[libvirt] [PATCH] remote: remove obsolete & incorrect comment from libvirtd.conf
by Daniel P. Berrangé 20 Apr '18

20 Apr '18

The libvirtd.conf file has a comment pointing people to format.html which has nothing todo with the configuration file format. It also has a comment about tests/daemon-conf which no longer exists, and even if it did exist such comment is not relevant to end users when this file is installed in /etc/. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/libvirtd.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/remote/libvirtd.conf b/src/remote/libvirtd.conf index 7d823cf1ad..28df4021aa 100644 --- a/src/remote/libvirtd.conf +++ b/src/remote/libvirtd.conf @@ -1,10 +1,5 @@ # Master libvirt daemon configuration file # -# For further information consult https://libvirt.org/format.html -# -# NOTE: the tests/daemon-conf regression test script requires -# that each "PARAMETER = VALUE" line in this file have the parameter -# name just after a leading "#". ################################################################# # -- 2.14.3

2 1