- Devel - libvirt List Archives

[PATCH V5 4/4] cpu_map: Introduce ARM cpu models
by Zhenyu Zheng 15 May '20

15 May '20

Introduce vendors and some commonly used models for ARM arch, these will be used for virConnectionGetCapabilities for ARM CPUs. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu_map/Makefile.inc.am | 7 +++++++ src/cpu_map/arm_Falkor.xml | 6 ++++++ src/cpu_map/arm_Kunpeng-920.xml | 6 ++++++ src/cpu_map/arm_ThunderX299xx.xml | 6 ++++++ src/cpu_map/arm_cortex-a53.xml | 6 ++++++ src/cpu_map/arm_cortex-a57.xml | 6 ++++++ src/cpu_map/arm_cortex-a72.xml | 6 ++++++ src/cpu_map/arm_vendors.xml | 14 ++++++++++++++ src/cpu_map/index.xml | 15 +++++++++++++++ 9 files changed, 72 insertions(+) create mode 100644 src/cpu_map/arm_Falkor.xml create mode 100644 src/cpu_map/arm_Kunpeng-920.xml create mode 100644 src/cpu_map/arm_ThunderX299xx.xml create mode 100644 src/cpu_map/arm_cortex-a53.xml create mode 100644 src/cpu_map/arm_cortex-a57.xml create mode 100644 src/cpu_map/arm_cortex-a72.xml create mode 100644 src/cpu_map/arm_vendors.xml diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am index be64c9a0d4..5d9190e27d 100644 --- a/src/cpu_map/Makefile.inc.am +++ b/src/cpu_map/Makefile.inc.am @@ -2,7 +2,14 @@ cpumapdir = $(pkgdatadir)/cpu_map cpumap_DATA = \ + cpu_map/arm_cortex-a53.xml \ + cpu_map/arm_cortex-a57.xml \ + cpu_map/arm_cortex-a72.xml \ cpu_map/arm_features.xml \ + cpu_map/arm_Kunpeng-920.xml \ + cpu_map/arm_ThunderX299xx.xml \ + cpu_map/arm_Falkor.xml \ + cpu_map/arm_vendors.xml \ cpu_map/index.xml \ cpu_map/ppc64_vendors.xml \ cpu_map/ppc64_POWER7.xml \ diff --git a/src/cpu_map/arm_Falkor.xml b/src/cpu_map/arm_Falkor.xml new file mode 100644 index 0000000000..b8f34bbc02 --- /dev/null +++ b/src/cpu_map/arm_Falkor.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Falkor'> + <vendor name='Qualcomm'/> + <pvr value='0xc00'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Kunpeng-920.xml b/src/cpu_map/arm_Kunpeng-920.xml new file mode 100644 index 0000000000..e06d4744fc --- /dev/null +++ b/src/cpu_map/arm_Kunpeng-920.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Kunpeng-920'> + <vendor name='HiSilicon'/> + <pvr value='0xd01'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_ThunderX299xx.xml b/src/cpu_map/arm_ThunderX299xx.xml new file mode 100644 index 0000000000..6c0864f601 --- /dev/null +++ b/src/cpu_map/arm_ThunderX299xx.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='ThunderX2 99xx'> + <vendor name='Cavium'/> + <pvr value='0x0af'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a53.xml b/src/cpu_map/arm_cortex-a53.xml new file mode 100644 index 0000000000..3580236253 --- /dev/null +++ b/src/cpu_map/arm_cortex-a53.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='cortex-a53'> + <vendor name='ARM'/> + <pvr value='0xd03'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a57.xml b/src/cpu_map/arm_cortex-a57.xml new file mode 100644 index 0000000000..3bc4324173 --- /dev/null +++ b/src/cpu_map/arm_cortex-a57.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='cortex-a57'> + <vendor name='ARM'/> + <pvr value='0xd07'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_cortex-a72.xml b/src/cpu_map/arm_cortex-a72.xml new file mode 100644 index 0000000000..c509a40567 --- /dev/null +++ b/src/cpu_map/arm_cortex-a72.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='cortex-a72'> + <vendor name='ARM'/> + <pvr value='0xd08'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml new file mode 100644 index 0000000000..703c2112b1 --- /dev/null +++ b/src/cpu_map/arm_vendors.xml @@ -0,0 +1,14 @@ +<cpus> + <vendor name="ARM" value="0x41"/> + <vendor name="Broadcom" value="0x42"/> + <vendor name="Cavium" value="0x43"/> + <vendor name="DigitalEquipment" value="0x44"/> + <vendor name="HiSilicon" value="0x48"/> + <vendor name="Infineon" value="0x49"/> + <vendor name="Freescale" value="0x4D"/> + <vendor name="NVIDIA" value="0x4E"/> + <vendor name="APM" value="0x50"/> + <vendor name="Qualcomm" value="0x51"/> + <vendor name="Marvell" value="0x56"/> + <vendor name="Intel" value="0x69"/> +</cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index 50b030de29..20646a031c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -85,6 +85,21 @@ </arch> <arch name='arm'> + <include filename="arm_vendors.xml"/> <include filename='arm_features.xml'/> + +  + <include filename="arm_cortex-a53.xml"/> + <include filename="arm_cortex-a57.xml"/> + <include filename="arm_cortex-a72.xml"/> + +  + <include filename='arm_Falkor.xml'/> + +  + <include filename='arm_ThunderX299xx.xml'/> + +  + <include filename="arm_Kunpeng-920.xml"/> </arch> </cpus> -- 2.20.1

3 2

[PATCH V5 3/4] cpu: Introduce getHost support for ARM CPU driver
by Zhenyu Zheng 15 May '20

15 May '20

Introduce getHost support for ARM CPU driver, read CPU vendor_id, part_id and flags from registers directly. These codes will only be compiled on aarch64 hardware. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu/cpu_arm.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index c7a6abfb22..6aef568503 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -21,6 +21,10 @@ */ #include <config.h> +#if defined(__aarch64__) +# include <asm/hwcap.h> +# include <sys/auxv.h> +#endif #include "viralloc.h" #include "cpu.h" @@ -31,6 +35,13 @@ #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU +#if defined(__aarch64__) +/* Shift bit mask for parsing cpu flags */ +# define BIT_SHIFTS(n) (1UL << (n)) +/* The current max number of cpu flags on ARM is 32 */ +# define MAX_CPU_FLAGS 32 +#endif + VIR_LOG_INIT("cpu.cpu_arm"); @@ -486,11 +497,162 @@ virCPUarmValidateFeatures(virCPUDefPtr cpu) return 0; } +#if defined(__aarch64__) +/* Generate human readable flag list according to the order of */ +/* AT_HWCAP bit map */ +const char *aarch64_cpu_flags[MAX_CPU_FLAGS] = { + "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", + "crc32", "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", + "jscvt", "fcma", "lrcpc", "dcpop", "sha3", "sm3", "sm4", + "asimddp", "sha512", "sve", "asimdfhm", "dit", "uscat", + "ilrcpc", "flagm", "ssbs", "sb", "paca", "pacg"}; +/** + * virCPUarmCpuDataFromRegs: + * + * @data: 64-bit arm CPU specific data + * + * Fetches CPU vendor_id and part_id from MIDR_EL1 register, parse CPU + * flags from AT_HWCAP. There are currently 32 valid flags on ARM arch + * represented by each bit. + */ +static int +virCPUarmCpuDataFromRegs(virCPUarmData *data) +{ + unsigned long cpuid; + unsigned long hwcaps; + VIR_AUTOSTRINGLIST features = NULL; + int cpu_feature_index = 0; + size_t i; + + if (!(getauxval(AT_HWCAP) & HWCAP_CPUID)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("CPUID registers unavailable")); + return -1; + } + + /* read the cpuid data from MIDR_EL1 register */ + asm("mrs %0, MIDR_EL1" : "=r" (cpuid)); + VIR_DEBUG("CPUID read from register: 0x%016lx", cpuid); + + /* parse the coresponding part_id bits */ + data->pvr = (cpuid >> 4) & 0xfff; + /* parse the coresponding vendor_id bits */ + data->vendor_id = (cpuid >> 24) & 0xff; + + hwcaps = getauxval(AT_HWCAP); + VIR_DEBUG("CPU flags read from register: 0x%016lx", hwcaps); + + features = g_new0(char *, MAX_CPU_FLAGS + 1); + + /* shift bit map mask to parse for CPU flags */ + for (i = 0; i < MAX_CPU_FLAGS; i++) { + if (hwcaps & BIT_SHIFTS(i)) { + features[cpu_feature_index] = g_strdup(aarch64_cpu_flags[i]); + cpu_feature_index++; + } + } + + if (cpu_feature_index > 0) { + data->features = g_steal_pointer(&features); + data->nfeatures = cpu_feature_index; + } + + return 0; +} + +static int +virCPUarmDecode(virCPUDefPtr cpu, + const virCPUarmData *cpuData, + virDomainCapsCPUModelsPtr models) +{ + size_t i; + virCPUarmMapPtr map; + virCPUarmModelPtr model; + virCPUarmVendorPtr vendor = NULL; + + if (!cpuData || !(map = virCPUarmGetMap())) + return -1; + + if (!(model = virCPUarmModelFindByPVR(map, cpuData->pvr))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Cannot find CPU model with PVR 0x%03lx"), + cpuData->pvr); + return -1; + } + + if (!virCPUModelIsAllowed(model->name, models)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CPU model %s is not supported by hypervisor"), + model->name); + return -1; + } + + cpu->model = g_strdup(model->name); + + if (cpuData->vendor_id && + !(vendor = virCPUarmVendorFindByID(map, cpuData->vendor_id))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Cannot find CPU vendor with vendor id 0x%02lx"), + cpuData->vendor_id); + return -1; + } + + if (vendor) + cpu->vendor = g_strdup(vendor->name); + + if (cpuData->nfeatures) { + cpu->nfeatures = cpuData->nfeatures; + if (VIR_ALLOC_N(cpu->features, cpu->nfeatures) < 0) + goto error; + for (i = 0; i < cpu->nfeatures; i++) { + cpu->features[i].policy = VIR_CPU_FEATURE_REQUIRE; + cpu->features[i].name = g_strdup(cpuData->features[i]); + } + } + + return 0; + + error: + for (i = 0; i < cpu->nfeatures; i++) + VIR_FREE(cpu->features[i].name); + VIR_FREE(cpu->features); + cpu->nfeatures = 0; + return -1; +} + +static int +virCPUarmGetHost(virCPUDefPtr cpu, + virDomainCapsCPUModelsPtr models) +{ + virCPUDataPtr cpuData = NULL; + int ret = -1; + + if (virCPUarmDriverInitialize() < 0) + goto cleanup; + + if (!(cpuData = virCPUDataNew(archs[0]))) + goto cleanup; + + if (virCPUarmCpuDataFromRegs(&cpuData->data.arm) < 0) + goto cleanup; + + ret = virCPUarmDecode(cpu, &cpuData->data.arm, models); + + cleanup: + virCPUarmDataFree(cpuData); + return ret; +} +#endif + + struct cpuArchDriver cpuDriverArm = { .name = "arm", .arch = archs, .narch = G_N_ELEMENTS(archs), .compare = virCPUarmCompare, +#if defined(__aarch64__) + .getHost = virCPUarmGetHost, +#endif .decode = NULL, .encode = NULL, .dataFree = virCPUarmDataFree, -- 2.20.1

2 1

[PATCH V5 2/4] cpu: Add helper functions to parse vendor and model
by Zhenyu Zheng 15 May '20

15 May '20

Add helper functions to parse vendor and model for ARM CPUs, and use them as callbacks when load cpu maps. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu/cpu_arm.c | 159 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 158 insertions(+), 1 deletion(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 1bb0afb762..c7a6abfb22 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -165,6 +165,7 @@ virCPUarmMapFree(virCPUarmMapPtr map) virCPUarmVendorFree(map->vendors[i]); g_free(map->vendors); + g_ptr_array_free(map->features, TRUE); g_free(map); @@ -210,6 +211,160 @@ virCPUarmMapFeatureParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, return 0; } +static virCPUarmVendorPtr +virCPUarmVendorFindByID(virCPUarmMapPtr map, + unsigned long vendor_id) +{ + size_t i; + + for (i = 0; i < map->nvendors; i++) { + if (map->vendors[i]->value == vendor_id) + return map->vendors[i]; + } + + return NULL; +} + + +static virCPUarmVendorPtr +virCPUarmVendorFindByName(virCPUarmMapPtr map, + const char *name) +{ + size_t i; + + for (i = 0; i < map->nvendors; i++) { + if (STREQ(map->vendors[i]->name, name)) + return map->vendors[i]; + } + + return NULL; +} + + +static int +virCPUarmVendorParse(xmlXPathContextPtr ctxt, + const char *name, + void *data) +{ + virCPUarmMapPtr map = data; + g_autoptr(virCPUarmVendor) vendor = NULL; + + vendor = g_new0(virCPUarmVendor, 1); + vendor->name = g_strdup(name); + + if (virCPUarmVendorFindByName(map, vendor->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor %s already defined"), + vendor->name); + return -1; + } + + if (virXPathULongHex("string(@value)", ctxt, &vendor->value) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing CPU vendor value")); + return -1; + } + + if (virCPUarmVendorFindByID(map, vendor->value)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU vendor value 0x%2lx already defined"), + vendor->value); + return -1; + } + + if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0) + return -1; + + return 0; +} + +static virCPUarmModelPtr +virCPUarmModelFind(virCPUarmMapPtr map, + const char *name) +{ + size_t i; + + for (i = 0; i < map->nmodels; i++) { + if (STREQ(map->models[i]->name, name)) + return map->models[i]; + } + + return NULL; +} + +#if defined(__aarch64__) +static virCPUarmModelPtr +virCPUarmModelFindByPVR(virCPUarmMapPtr map, + unsigned long pvr) +{ + size_t i; + + for (i = 0; i < map->nmodels; i++) { + if (map->models[i]->data.pvr == pvr) + return map->models[i]; + } + + return NULL; +} +#endif + +static int +virCPUarmModelParse(xmlXPathContextPtr ctxt, + const char *name, + void *data) +{ + virCPUarmMapPtr map = data; + virCPUarmModel *model; + g_autofree xmlNodePtr *nodes = NULL; + g_autofree char *vendor = NULL; + + model = g_new0(virCPUarmModel, 1); + model->name = g_strdup(name); + + if (virCPUarmModelFind(map, model->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU model %s already defined"), + model->name); + return -1; + } + + if (virXPathBoolean("boolean(./vendor)", ctxt)) { + vendor = virXPathString("string(./vendor/@name)", ctxt); + if (!vendor) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid vendor element in CPU model %s"), + model->name); + return -1; + } + + if (!(model->vendor = virCPUarmVendorFindByName(map, vendor))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown vendor %s referenced by CPU model %s"), + vendor, model->name); + return -1; + } + } + + if (!virXPathBoolean("boolean(./pvr)", ctxt)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing PVR information for CPU model %s"), + model->name); + return -1; + } + + if (virXPathULongHex("string(./pvr/@value)", ctxt, &model->data.pvr) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing or invalid PVR value in CPU model %s"), + model->name); + return -1; + } + + if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0) + return -1; + + return 0; +} + static virCPUarmMapPtr virCPUarmLoadMap(void) { @@ -217,7 +372,8 @@ virCPUarmLoadMap(void) map = virCPUarmMapNew(); - if (cpuMapLoad("arm", NULL, virCPUarmMapFeatureParse, NULL, map) < 0) + if (cpuMapLoad("arm", virCPUarmVendorParse, virCPUarmMapFeatureParse, + virCPUarmModelParse, map) < 0) return NULL; return g_steal_pointer(&map); @@ -279,6 +435,7 @@ virCPUarmUpdate(virCPUDefPtr guest, return ret; } + static virCPUDefPtr virCPUarmBaseline(virCPUDefPtr *cpus, unsigned int ncpus G_GNUC_UNUSED, -- 2.20.1

2 1

[PATCH V5 1/4] cpu: Introduce virCPUarmData and related struts
by Zhenyu Zheng 15 May '20

15 May '20

Introduce virCPUarmData to virCPUData and related structs to cpu_arm.c for ARM cpus. Signed-off-by: Zhenyu Zheng <zheng.zhenyu(a)outlook.com> --- src/cpu/Makefile.inc.am | 1 + src/cpu/cpu.h | 2 ++ src/cpu/cpu_arm.c | 80 ++++++++++++++++++++++++++++++++++++++++- src/cpu/cpu_arm_data.h | 32 +++++++++++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/cpu/cpu_arm_data.h diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am index 0abeee87b6..228112a3c6 100644 --- a/src/cpu/Makefile.inc.am +++ b/src/cpu/Makefile.inc.am @@ -9,6 +9,7 @@ CPU_SOURCES = \ cpu/cpu_s390.h \ cpu/cpu_s390.c \ cpu/cpu_arm.h \ + cpu/cpu_arm_data.h \ cpu/cpu_arm.c \ cpu/cpu_ppc64.h \ cpu/cpu_ppc64.c \ diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index f779d2be17..ec22a183a1 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -27,6 +27,7 @@ #include "cpu_conf.h" #include "cpu_x86_data.h" #include "cpu_ppc64_data.h" +#include "cpu_arm_data.h" typedef struct _virCPUData virCPUData; @@ -36,6 +37,7 @@ struct _virCPUData { union { virCPUx86Data x86; virCPUppc64Data ppc64; + virCPUarmData arm; /* generic driver needs no data */ } data; }; diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index ee5802198f..1bb0afb762 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -1,6 +1,7 @@ /* * cpu_arm.c: CPU driver for arm CPUs * + * Copyright (C) 2020 Huawei Technologies Co., Ltd. * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) Canonical Ltd. 2012 * @@ -23,12 +24,16 @@ #include "viralloc.h" #include "cpu.h" +#include "cpu_arm.h" #include "cpu_map.h" +#include "virlog.h" #include "virstring.h" #include "virxml.h" #define VIR_FROM_THIS VIR_FROM_CPU +VIR_LOG_INIT("cpu.cpu_arm"); + static const virArch archs[] = { VIR_ARCH_ARMV6L, VIR_ARCH_ARMV7B, @@ -36,6 +41,21 @@ static const virArch archs[] = { VIR_ARCH_AARCH64, }; +typedef struct _virCPUarmVendor virCPUarmVendor; +typedef virCPUarmVendor *virCPUarmVendorPtr; +struct _virCPUarmVendor { + char *name; + unsigned long value; +}; + +typedef struct _virCPUarmModel virCPUarmModel; +typedef virCPUarmModel *virCPUarmModelPtr; +struct _virCPUarmModel { + char *name; + virCPUarmVendorPtr vendor; + virCPUarmData data; +}; + typedef struct _virCPUarmFeature virCPUarmFeature; typedef virCPUarmFeature *virCPUarmFeaturePtr; struct _virCPUarmFeature { @@ -64,6 +84,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmFeature, virCPUarmFeatureFree); typedef struct _virCPUarmMap virCPUarmMap; typedef virCPUarmMap *virCPUarmMapPtr; struct _virCPUarmMap { + size_t nvendors; + virCPUarmVendorPtr *vendors; + size_t nmodels; + virCPUarmModelPtr *models; GPtrArray *features; }; @@ -81,12 +105,66 @@ virCPUarmMapNew(void) return map; } +static void +virCPUarmDataClear(virCPUarmData *data) +{ + if (!data) + return; + + virStringListFree(data->features); +} + +static void +virCPUarmDataFree(virCPUDataPtr cpuData) +{ + if (!cpuData) + return; + + virCPUarmDataClear(&cpuData->data.arm); + g_free(cpuData); +} + +static void +virCPUarmModelFree(virCPUarmModelPtr model) +{ + if (!model) + return; + + virCPUarmDataClear(&model->data); + g_free(model->name); + g_free(model); +} + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmModel, virCPUarmModelFree); + +static void +virCPUarmVendorFree(virCPUarmVendorPtr vendor) +{ + if (!vendor) + return; + + g_free(vendor->name); + g_free(vendor); +} + +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmVendor, virCPUarmVendorFree); + static void virCPUarmMapFree(virCPUarmMapPtr map) { + size_t i; + if (!map) return; + for (i = 0; i < map->nmodels; i++) + virCPUarmModelFree(map->models[i]); + g_free(map->models); + + for (i = 0; i < map->nvendors; i++) + virCPUarmVendorFree(map->vendors[i]); + g_free(map->vendors); + g_ptr_array_free(map->features, TRUE); g_free(map); @@ -201,7 +279,6 @@ virCPUarmUpdate(virCPUDefPtr guest, return ret; } - static virCPUDefPtr virCPUarmBaseline(virCPUDefPtr *cpus, unsigned int ncpus G_GNUC_UNUSED, @@ -259,6 +336,7 @@ struct cpuArchDriver cpuDriverArm = { .compare = virCPUarmCompare, .decode = NULL, .encode = NULL, + .dataFree = virCPUarmDataFree, .baseline = virCPUarmBaseline, .update = virCPUarmUpdate, .validateFeatures = virCPUarmValidateFeatures, diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h new file mode 100644 index 0000000000..9b931cb8aa --- /dev/null +++ b/src/cpu/cpu_arm_data.h @@ -0,0 +1,32 @@ +/* + * cpu_arm_data.h: 64-bit arm CPU specific data + * + * Copyright (C) 2020 Huawei Technologies Co., Ltd. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#pragma once + +#define VIR_CPU_ARM_DATA_INIT { 0 } + +typedef struct _virCPUarmData virCPUarmData; +struct _virCPUarmData { + unsigned long vendor_id; + unsigned long pvr; + char **features; + size_t nfeatures; +}; -- 2.20.1

2 1

[libvirt-ci PATCH 0/6] guests: more projects defined for GitLab CI containers
by Daniel P. Berrangé 15 May '20

15 May '20

The changes here enable GitLab CI container builds for ruby-libvirt, libvirt-java, libvirt-csharp, libvirt-publican and libvirt-appdev-guide-python projects. It also fixes a problem with the libvirt-php build missing packages if "libvirt+devel" project is not enabled. Daniel P. Berrangé (6): guests: add ruby-libvirt project packages guests: add libvirt-java project packages guests: add libvirt-csharp project packages guests: pull in the full JDK, not merely the JRE guests: include libxml2 explicitly for libvirt-php guests: add libvirt-publican and libvirt-appdev-guide-python projects guests/vars/mappings.yml | 50 ++++++++++++++++++- .../projects/libvirt-appdev-guide-python.yml | 3 ++ guests/vars/projects/libvirt-csharp.yml | 4 ++ guests/vars/projects/libvirt-java.yml | 7 +++ guests/vars/projects/libvirt-php.yml | 1 + guests/vars/projects/libvirt-publican.yml | 3 ++ guests/vars/projects/libvirt-ruby.yml | 5 ++ 7 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 guests/vars/projects/libvirt-appdev-guide-python.yml create mode 100644 guests/vars/projects/libvirt-csharp.yml create mode 100644 guests/vars/projects/libvirt-java.yml create mode 100644 guests/vars/projects/libvirt-publican.yml create mode 100644 guests/vars/projects/libvirt-ruby.yml -- 2.26.2

2 13

[libvirt PATCH] cpu: Properly define g_autoptr for virCPUData
by Jiri Denemark 15 May '20

15 May '20

The structure is not specific to x86 and thus its cleanup function should be defined in cpu.h and be available to all users. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.h | 1 + src/cpu/cpu_x86.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index f779d2be17..1d7900a829 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -182,6 +182,7 @@ virCPUDataNew(virArch arch); void virCPUDataFree(virCPUDataPtr data); +G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUDataFree); bool virCPUGetHostIsSupported(virArch arch); diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 9183259bce..e3c553e943 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -495,7 +495,6 @@ virCPUx86DataFree(virCPUDataPtr data) virCPUx86DataClear(&data->data.x86); VIR_FREE(data); } -G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUx86DataFree); static void -- 2.26.2

2 1

[PATCH v2 0/6] qemu: Support iSCSI iSER
by Han Han 15 May '20

15 May '20

The iSER[1](iSCSI Extensions for RDMA) transport is introduced since QEMU 2.9 [2]. It is only valid in iscsi network disk. Note that for the legacy uri of iscsi iser transport, it will start with 'iser' instead of 'iscsi'. Diff from v1: Use iser element of the source to enable iSER instead of the transport attribute. [1]: https://tools.ietf.org/html/rfc5046#section-1.7 [2]: https://github.com/qemu/qemu/blob/ee573f5326046223b6eef4ae7fbfec31d274e093/… git repo: https://gitlab.com/hhan2/libvirt/-/commits/iser-v2 v1: https://www.redhat.com/archives/libvir-list/2020-April/msg01247.html Han Han (6): qemu_capabilities: Introduce iSCSI iSER flag conf: Parse the iser element qemu: Implement the iSCSI iSER docs: Support iSCSI iser tests: unit tests for iSCSI iSER news: Support iSCSI iSER docs/formatdomain.html.in | 5 +++ docs/news.xml | 10 +++++ docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 10 +++++ src/qemu/qemu_block.c | 11 ++++- src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_domain.c | 9 ++++ src/util/virstoragefile.c | 17 +++++-- src/util/virstoragefile.h | 2 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../qemuxml2argvdata/disk-network-iscsi.args | 8 +++- .../disk-network-iscsi.x86_64-2.12.0.args | 7 ++- .../disk-network-iscsi.x86_64-latest.args | 45 +++++++++++-------- tests/qemuxml2argvdata/disk-network-iscsi.xml | 9 ++++ tests/qemuxml2argvtest.c | 5 ++- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 +++++ tests/qemuxml2xmltest.c | 4 +- tests/virstoragetest.c | 16 +++++++ 55 files changed, 190 insertions(+), 29 deletions(-) -- 2.25.0

3 9

[libvirt-csharp 0/3] Enable use of GitLab CI and merge requests
by Daniel P. Berrangé 14 May '20

14 May '20

This introduces support for GitLab CI, and then recommends use of merge requests for contribution. Daniel P. Berrangé (3): Update to target newer 4.0 .NET framework version gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 96 +++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 ++++++ ci/README.rst | 14 +++ ci/libvirt-debian-9.Dockerfile | 58 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 52 ++++++++++ ci/libvirt-fedora-32.Dockerfile | 61 ++++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 53 ++++++++++ ci/refresh | 27 ++++++ .../virConnectOpen/virConnectOpen.csproj | 4 +- .../virConnectOpenAuth.csproj | 4 +- .../virConnectSetErrorFunc.csproj | 4 +- .../virDomainStats/virDomainStats.csproj | 57 ++++++++++- .../virEventRegisterImpl.csproj | 4 +- projects/MonoDevelop/LibvirtBindings.csproj | 6 +- projects/MonoDevelop/LibvirtBindings.sln | 6 +- 16 files changed, 454 insertions(+), 24 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 7

[libvirt-appdev-guide-python 0/2] Enable use of GitLab CI and merge requests
by Daniel P. Berrangé 14 May '20

14 May '20

This introduces support for GitLab CI, and then recommends use of merge requests for contribution. Daniel P. Berrangé (2): gitlab: introduce CI jobs for building content gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 125 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 ++++++ Makefile | 7 +- ci/libvirt-centos-7.Dockerfile | 83 ++++++++++++++++++ ci/libvirt-debian-10.Dockerfile | 53 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 56 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 53 ++++++++++++ ci/libvirt-fedora-31.Dockerfile | 50 +++++++++++ ci/libvirt-fedora-32.Dockerfile | 50 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 51 +++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 56 ++++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 53 ++++++++++++ ci/refresh | 22 +++++ 14 files changed, 684 insertions(+), 7 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[ruby-libvirt 0/3] Add support for GitLab CI and merge requests
by Daniel P. Berrangé 14 May '20

14 May '20

This introduces support for GitLab CI, and then recommends use of merge requests for contribution. Daniel P. Berrangé (3): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests Remove obsolete mercurial ignore file .gitlab-ci.yml | 168 +++++++++++++++++++++++++++ .gitpublish | 4 - .hgignore | 7 -- CONTRIBUTING.rst | 28 +++++ ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 86 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 64 ++++++++++ ci/libvirt-debian-10.Dockerfile | 56 +++++++++ ci/libvirt-debian-9.Dockerfile | 59 ++++++++++ ci/libvirt-debian-sid.Dockerfile | 56 +++++++++ ci/libvirt-fedora-31.Dockerfile | 53 +++++++++ ci/libvirt-fedora-32.Dockerfile | 53 +++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 54 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 55 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 59 ++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 56 +++++++++ ci/refresh | 27 +++++ 17 files changed, 888 insertions(+), 11 deletions(-) delete mode 100644 .gitpublish delete mode 100644 .hgignore create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 6

[libvirt-java PATCH 0/6] Enable GitLab CI and merge requests
by Daniel P. Berrangé 14 May '20

14 May '20

This fixes a bugs from bit-rot and then enables GitLab CI and use of merge requests for contribution. Daniel P. Berrangé (6): Fix test driver connection type Add workaround for broken screenshot API on Ubuntu 18.04 vintage Remove reference to test.java file that was deleted rpm: skip junit tests in RHEL-8 build gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 170 ++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++ README.in | 16 +- ci/README.rst | 14 ++ ci/libvirt-centos-7.Dockerfile | 88 +++++++++ ci/libvirt-centos-8.Dockerfile | 55 ++++++ ci/libvirt-debian-10.Dockerfile | 58 ++++++ ci/libvirt-debian-9.Dockerfile | 61 +++++++ ci/libvirt-debian-sid.Dockerfile | 58 ++++++ ci/libvirt-fedora-31.Dockerfile | 55 ++++++ ci/libvirt-fedora-32.Dockerfile | 64 +++++++ ci/libvirt-fedora-rawhide.Dockerfile | 56 ++++++ ci/libvirt-opensuse-151.Dockerfile | 57 ++++++ ci/libvirt-ubuntu-1804.Dockerfile | 61 +++++++ ci/libvirt-ubuntu-2004.Dockerfile | 58 ++++++ ci/refresh | 27 +++ libvirt-java.spec.in | 6 +- .../java/org/libvirt/TestJavaBindings.java | 13 +- 19 files changed, 927 insertions(+), 22 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 10

[libvirt PATCH] xenconfig: Add feature gfx_passthru
by Artur Puzio 14 May '20

14 May '20

gfx_passthru xl.cfg option enables GPU specific quirks required for working Intel GPU passthru. Qemu (used for device model by xen) will refuse to start a VM when an IGD is passed, but this option was not set in Xen. Signed-off-by: Artur Puzio <contact(a)puzio.waw.pl> --- docs/formatdomain.html.in | 7 +++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 1 + src/libxl/libxl_conf.c | 13 +++++++++++++ 5 files changed, 30 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 91d6f6c0d3..5307844a23 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2064,6 +2064,7 @@ <xen> <e820_host state='on'/> <passthrough state='on' mode='share_pt'/> + <gfx_passthru state='on'/> </xen> <pvspinlock state='on'/> <gic version='2'/> @@ -2270,6 +2271,12 @@ <td>on, off; mode - optional string sync_pt or share_pt</td> <td><span class="since">6.3.0</span></td> </tr> + <tr> + <td>gfx_passthru</td> + <td>Enable Intel GPU specific quirks. Required and allowed only when passing an IGD.</td> + <td>on, off</td> + <td><span class="since">6.3.0</span></td> + </tr> </table> </dd> <dt><code>pmu</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 9d60b090f3..7d8ea879a1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -6409,6 +6409,11 @@ </optional> </element> </optional> + <optional> + <element name="gfx_passthru"> + <ref name="featurestate"/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8a87586936..75f72ff64c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -214,6 +214,7 @@ VIR_ENUM_IMPL(virDomainXen, VIR_DOMAIN_XEN_LAST, "e820_host", "passthrough", + "gfx_passthru" ); VIR_ENUM_IMPL(virDomainXenPassthroughMode, @@ -19649,6 +19650,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, switch ((virDomainXen) feature) { case VIR_DOMAIN_XEN_E820_HOST: + case VIR_DOMAIN_XEN_GFX_PASSTHRU: break; case VIR_DOMAIN_XEN_PASSTHROUGH: @@ -23579,6 +23581,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, } switch ((virDomainXen) i) { case VIR_DOMAIN_XEN_E820_HOST: + case VIR_DOMAIN_XEN_GFX_PASSTHRU: break; case VIR_DOMAIN_XEN_PASSTHROUGH: @@ -29235,6 +29238,7 @@ virDomainDefFormatFeatures(virBufferPtr buf, switch ((virDomainXen) j) { case VIR_DOMAIN_XEN_E820_HOST: + case VIR_DOMAIN_XEN_GFX_PASSTHRU: virBufferAddLit(&childBuf, "/>\n"); break; case VIR_DOMAIN_XEN_PASSTHROUGH: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4afd8f04bc..f28f0741ac 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1867,6 +1867,7 @@ typedef enum { typedef enum { VIR_DOMAIN_XEN_E820_HOST = 0, VIR_DOMAIN_XEN_PASSTHROUGH, + VIR_DOMAIN_XEN_GFX_PASSTHRU, VIR_DOMAIN_XEN_LAST } virDomainXen; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 458dfc2399..a5605f6200 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -679,6 +679,19 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } #endif + if (def->features[VIR_DOMAIN_FEATURE_XEN] == VIR_TRISTATE_SWITCH_ON) { + switch ((virTristateSwitch) def->xen_features[VIR_DOMAIN_XEN_GFX_PASSTHRU]) { + case VIR_TRISTATE_SWITCH_ON: + libxl_defbool_set(&b_info->u.hvm.gfx_passthru, true); + break; + case VIR_TRISTATE_SWITCH_OFF: + libxl_defbool_set(&b_info->u.hvm.gfx_passthru, false); + break; + case VIR_TRISTATE_SWITCH_ABSENT: + case VIR_TRISTATE_SWITCH_LAST: + break; + } + } } else if (pvh) { b_info->cmdline = g_strdup(def->os.cmdline); b_info->kernel = g_strdup(def->os.kernel); -- 2.26.2

3 5

[PATCH 0/2] qemu: Couple of memleak fixes
by Michal Privoznik 14 May '20

14 May '20

*** BLURB HERE *** Michal Prívozník (2): qemuDomainStorageSourcePrivateDispose: Free httpcookie qemuBlockJobDataDisposeJobdata: Free data.commit.disabledBitmapsBase src/qemu/qemu_blockjob.c | 5 +++++ src/qemu/qemu_domain.c | 1 + 2 files changed, 6 insertions(+) -- 2.26.2

2 3

[libvirt-ci PATCH v2 00/13] Introduce a new global YAML config file for lcitool
by Erik Skultety 14 May '20

14 May '20

This series is trying to consolidate the number of config files we currently recognize under ~/.config/lcitool to a single global YAML config file. Thanks to this effort we can expose more seetings than we previously could which will come handy in terms of generating cloudinit images for OpenStack. Patches 1-4 (ACKed) Since RFC: - replaced TOML with YAML which simplified some aspects of the code, thanks Andrea - instead of hardcoding the default values, the config within the repo is used as a template and overriden with user-selected options Since v1: - uncommented the mandatory options in the default template YAML config so that we know about all the supported keys which is useful for validating the user config - removed guests/group_vars/all/install.yaml in patch 11 (which I forgot in v1) - added checks for value types we get from the config - use yaml.safe_load instead of yaml.load - added code snippet to delete keys we don't recognize so as not to introduce a security issue, because we essentially just take the config and pass it to ansible, we don't want users to use to re-define some of Ansible's variables - added the last patch just to demonstrate a number of test cases I used as a proof for correctness of this revision (feel free to add more cases), but this is not the right series to add pytest support into lcitool Erik Skultety (13): requirements: Introduce a requirements.txt file lcitool: Decrease the indent when creating a tempdir for initrd injection lcitool: Prefer tempfile's native wrappers over low level primitives lcitool: Use a temporary JSON file to pass extra variables config: Introduce a new global config.yaml configuration file lcitool: Introduce methods to load and validate the YAML config lcitool: Update the config values with internal playbook settings lcitool: Drop the get_flavor() method lcitool: Drop the get_root_password_file() method lcitool: Drop the gitlab-related getter methods config: Move the virt-install settings from install.yml to the config guests: README: Document the existence and usage of config.yaml DO NOT MERGE: Demonstrate functionality with pytest unit tests guests/README.markdown | 18 +- guests/config.yaml | 42 +++++ guests/group_vars/all/install.yml | 11 -- guests/{lcitool => lcitool.py} | 209 +++++++++++----------- guests/playbooks/build/main.yml | 2 +- guests/playbooks/update/main.yml | 6 +- guests/playbooks/update/tasks/gitlab.yml | 4 +- guests/playbooks/update/tasks/kludges.yml | 2 +- guests/playbooks/update/tasks/users.yml | 42 ++--- guests/requirements.txt | 4 + guests/test_config.py | 165 +++++++++++++++++ 11 files changed, 353 insertions(+), 152 deletions(-) create mode 100644 guests/config.yaml delete mode 100644 guests/group_vars/all/install.yml rename guests/{lcitool => lcitool.py} (88%) create mode 100644 guests/requirements.txt create mode 100644 guests/test_config.py -- 2.25.3

2 19

[PATCH v2 0/8] Introducing TPM Proxy device support for PPC64
by Daniel Henrique Barboza 13 May '20

13 May '20

Changes in v2: In this second spin, instead of adding a new Libvirt device, the pSeries TPM Proxy device is at its core a regular TPM passthrough device. What makes it different is that it has its own domain pointer called 'tpmproxy' and it has its own restriction of 'only one TPM Proxy per domain'. This means that the combination of TPM Proxy and another TPM model/type is supported. No changes to the existing non-proxy TPM support was made. This change of design affected all patches but patch 02. Other changes: - even more unit tests added to make sure we're not messing with things we shouldn't - more descriptive commit messages to make it clearer the intention/use case of the TPM Proxy device and how it interacts with the existing TPM models. v1 link: https://www.redhat.com/archives/libvir-list/2020-May/msg00351.html Daniel Henrique Barboza (8): docs: documentation and schema for the new TPM Proxy model qemu: Extend QEMU capabilities with 'spapr-tpm-proxy' conf, qemu: adding 'tpmproxy' in domain definition domain_conf.c: XML parsing for VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY tests: add XML schema tests for the TPM Proxy device qemu: build command line for the TPM Proxy device tests/qemuxml2argvtest.c: add TPM Proxy command line tests docs/news.xml: update for the new TPM Proxy device docs/formatdomain.html.in | 16 ++++- docs/news.xml | 15 +++++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_audit.c | 3 + src/conf/domain_conf.c | 65 +++++++++++++++++-- src/conf/domain_conf.h | 2 + src/qemu/qemu_alias.c | 16 +++++ src/qemu/qemu_capabilities.c | 4 ++ src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_cgroup.c | 12 +++- src/qemu/qemu_command.c | 21 ++++++ src/qemu/qemu_domain.c | 9 +-- src/qemu/qemu_validate.c | 12 ++++ src/security/security_dac.c | 14 ++++ src/security/security_selinux.c | 11 ++++ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/ppc64-tpm-double.xml | 34 ++++++++++ .../ppc64-tpmproxy-double.xml | 38 +++++++++++ .../ppc64-tpmproxy-single.ppc64-latest.args | 34 ++++++++++ .../ppc64-tpmproxy-single.xml | 33 ++++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 37 +++++++++++ .../ppc64-tpmproxy-with-tpm.xml | 36 ++++++++++ tests/qemuxml2argvtest.c | 15 +++++ .../ppc64-tpmproxy-single.ppc64-latest.xml | 42 ++++++++++++ .../ppc64-tpmproxy-with-tpm.ppc64-latest.xml | 46 +++++++++++++ tests/qemuxml2xmltest.c | 2 + 27 files changed, 511 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/ppc64-tpm-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-double.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-single.xml create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml -- 2.26.2

2 20

[PATCH 0/2] qemu: Switch to new -numa memdev=
by Michal Privoznik 13 May '20

13 May '20

In a way, libvirt already uses -numa memdev= in a few cases. In fact, in as few cases as possible - only configurations which can not be configured with -numa mem=, because these two ways are incompatible when it comes to migration. My approach to solve this is to have a privateData flag which tells which directs libvirt to generate old or new cmd line. And then this flag is saved into migration cookie so that the destination is directed the same way. Problem with this approach is that, while migration 6.3.0 -> 6.4.0 -> 6.3.0 works, migration where the machine is started on newer libvirt 6.4.0 and then migrated back to 6.3.0 won't work (in fact is explicitly denied by 2/2) even though there is nothing visible that should prevent the migration. I am not sure whether we have a good move here, because even if we waited until QEMU removes the old way, it won't help us really. We would be just leaving the problem for future us. Michal Prívozník (2): qemu: Switch to new -numa memdev= qemu: Disallow migration to older -numa if newer is used src/qemu/qemu_command.c | 20 ++--- src/qemu/qemu_domain.c | 38 +++++++++- src/qemu/qemu_domain.h | 3 + src/qemu/qemu_migration.c | 18 ++++- src/qemu/qemu_migration_cookie.c | 73 +++++++++++++++++++ src/qemu/qemu_migration_cookie.h | 12 +++ src/qemu/qemu_process.c | 25 ++++++- .../qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../disk-secinfo-upgrade-in.xml | 1 + .../disk-secinfo-upgrade-out.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-in.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + .../hugepages-numa-default-2M.args | 10 ++- .../hugepages-numa-default-dimm.args | 8 +- .../hugepages-numa-default.args | 6 +- .../memory-hotplug-dimm-addr.args | 3 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- .../numatune-auto-prefer.args | 4 +- .../qemuxml2argvdata/pages-dimm-discard.args | 3 +- .../pages-discard-hugepages.args | 11 ++- tests/qemuxml2argvdata/pages-discard.args | 12 ++- 36 files changed, 236 insertions(+), 47 deletions(-) -- 2.26.2

3 7

[libvirt PATCH] tools: mention srve-update-tls supports virtproxyd
by Daniel P. Berrangé 13 May '20

13 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/manpages/virt-admin.rst | 3 ++- tools/virt-admin.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virt-admin.rst b/docs/manpages/virt-admin.rst index 3e0d127790..d5cb23a1c5 100644 --- a/docs/manpages/virt-admin.rst +++ b/docs/manpages/virt-admin.rst @@ -455,7 +455,8 @@ Update tls context on *server*. - *server* - Available servers on a daemon. Currently only supports 'libvirtd'. + Available servers on a daemon. Currently only supports 'libvirtd' or + 'virtproxyd'. CLIENT COMMANDS diff --git a/tools/virt-admin.c b/tools/virt-admin.c index a8e5e0a5af..6ff9729f66 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -978,7 +978,7 @@ static const vshCmdOptDef opts_srv_update_tls_file[] = { .type = VSH_OT_DATA, .flags = VSH_OFLAG_REQ, .help = N_("Available servers on a daemon. " - "Currently only supports 'libvirtd'.") + "Currently only supports 'libvirtd' or 'virtproxyd'.") }, {.name = NULL} }; -- 2.26.2

2 2

[libvirt-ci PATCH] containers: add a standard container for running cargo fmt
by Daniel P. Berrangé 13 May '20

13 May '20

The "cargo fmt" code style checking tool is something we wish to run on all Rust code, so it is useful to have a common container that can be used by all relevant projects. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 5 +++++ containers/cargo-fmt/Dockerfile | 11 +++++++++++ containers/cargo-fmt/README.rst | 20 ++++++++++++++++++++ containers/cargo-fmt/cargo-fmt.sh | 22 ++++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 containers/cargo-fmt/Dockerfile create mode 100644 containers/cargo-fmt/README.rst create mode 100755 containers/cargo-fmt/cargo-fmt.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 080c8d1..e5f121f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,11 @@ go-fmt-container: variables: NAME: go-fmt +cargo-fmt-container: + <<: *build_container_definition + variables: + NAME: cargo-fmt + # Check that all commits are signed-off for the DCO. Skip # on master branch and -maint branches, since we only need # to test developer's personal branches. diff --git a/containers/cargo-fmt/Dockerfile b/containers/cargo-fmt/Dockerfile new file mode 100644 index 0000000..0ed1c46 --- /dev/null +++ b/containers/cargo-fmt/Dockerfile @@ -0,0 +1,11 @@ +FROM rust:1.43 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + diffstat && \ + apt-get autoclean -y + +RUN rustup component add rustfmt + +COPY cargo-fmt.sh /cargo-fmt diff --git a/containers/cargo-fmt/README.rst b/containers/cargo-fmt/README.rst new file mode 100644 index 0000000..00f50a2 --- /dev/null +++ b/containers/cargo-fmt/README.rst @@ -0,0 +1,20 @@ +================================================ +Container for running cargo fmt code style check +================================================ + +This container provides a simple way to invoke ``cargo fmt`` to validate code +style across a Rust codebase. It should be integrated into CI by adding +the following snippet to ``.gitlab-ci.yml`` + +:: + + cargo-fmt: + stage: prebuild + image: registry.gitlab.com/libvirt/libvirt-ci/cargo-fmt:master + script: + - /cargo-fmt + artifacts: + paths: + - cargo-fmt.patch + expire_in: 1 week + when: on_failure diff --git a/containers/cargo-fmt/cargo-fmt.sh b/containers/cargo-fmt/cargo-fmt.sh new file mode 100755 index 0000000..53fb0df --- /dev/null +++ b/containers/cargo-fmt/cargo-fmt.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +cargo fmt -v -- --check > cargo-fmt.patch + +if test -s cargo-fmt.patch +then + echo + echo "❌ ERROR: some files failed cargo fmt code style check" + echo + diffstat cargo-fmt.patch + echo + echo "See the cargo-fmt patch artifact for full details of mistakes." + echo + echo "For guidance on how to configure Emacs or Vim to automatically" + echo "run cargo fmt when saving files read" + echo + echo " https://github.com/rust-lang/rustfmt" + echo + exit 1 +fi + +echo "✔ OK: all files passed cargo fmt code style check" -- 2.26.2

2 1

[libvirt-go-xml PATCH] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Daniel P. Berrangé 13 May '20

13 May '20

With the introduction of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index 5f10b75..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-go-xml PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..fb02729 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +============================== +Contributing to libvirt-go-xml +============================== + +The libvirt Go API binding accepts code contributions via merge requests +on the GitLab project: + +https://gitlab.com/libvirt/libvirt-go-xml/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + +https://gitlab.com/libvirt/libvirt-go-xml/pipelines + +CI pipeline results for merge requests will be visible via the contributors' +own private repository fork: + +https://gitlab.com/yourusername/libvirt-go-xml/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 1

[PATCH 0/5] Couple of trivial improvements to virnetdevopenvswitch.c
by Michal Privoznik 13 May '20

13 May '20

In fact, so trivial I've pushed them directly. Michal Prívozník (5): virNetDevOpenvswitchConstructVlans: Use g_auto() for virBuffer virNetDevOpenvswitchConstructVlans: Bring @i into the block where it's used virNetDevOpenvswitchConstructVlans: return void virNetDevOpenvswitchGetVhostuserIfname: Fix const correctness virNetDevOpenvswitchGetVhostuserIfname: Drop cleanup label src/util/virnetdevopenvswitch.c | 41 +++++++++++---------------------- 1 file changed, 13 insertions(+), 28 deletions(-) -- 2.26.2

1 5

[PATCH v2 00/40] convert virObjects to GObject
by Rafael Fonseca 13 May '20

13 May '20

This patch series convert various simple instances of virObject to a GObject equivalent. virLockableObject and virObjects which are subclassed will be covered in future patchsets. New in v2: - use *Dispose for unreffing objects and *Finalize for freeing data, as suggested in the GLib documentation - use `g_clear_object` instead of `if + g_object_unref` - properly update gendispatch as types are converted - virDomain is now converted to GObject too - added a helper function for freeing array of GObjects - added previously missed conversion spots Rafael Fonseca (40): util: virresctrl: convert classes to GObject conf: capabilities: convert virCaps to GOBject qemu: convert virQEMUCaps to GObject util: add function to unref array of GObjects rpc: convert virNetClientProgram to GObject rpc: convert virNetServerProgram to GObject conf: convert virDomainXMLOption to GObject bhyve: convert bhyveMonitor to GObject bhyve: convert virBhyveDriverConfig to GObject rpc: convert virNetServerService to GObject conf: convert virDomainCapsCPUModels to GObject util: convert dnsmasqCaps to GObject conf: convert virDomainChrSourceDef to GObject rpc: gendispatch: prepare for GObject conversion admin: convert virAdmServer to GObject admin: convert virAdmClient to GObject datatypes: convert virDomainCheckpoint to GObject datatypes: convert virDomainSnapshot to GObject datatypes: convert virNWFilter to GObject datatypes: convert virNWFilterBinding to GObject datatypes: convert virNetwork to GObject datatypes: convert virNetworkPort to GObject datatypes: convert virInterface to GObject datatypes: convert virStoragePool to GObject datatypes: convert virStorageVol to GObject datatypes: convert virNodeDevice to GObject datatypes: convert virSecret to GObject datatypes: convert virStream to GObject datatypes: convert virDomain to GObject rpc: gendispatch: use g_autoptr where possible conf: convert virNetworkXMLOption to GObject lxc: convert virLXCDriverConfig to GObject libxl: convert libxlDriverConfig to GObject hypervisor: convert virHostdevManager to GObject libxl: convert libxlMigrationDstArgs to GObject qemu: convert qemuBlockJobData to GObject qemu: convert virQEMUDriverConfig to GObject conf: convert virDomain*Private to GObject conf: convert virSaveCookie to GObject util: convert virStorageSource to GObject src/admin/admin_remote.c | 9 +- src/admin/libvirt-admin.c | 4 +- src/admin/libvirt_admin_private.syms | 4 +- src/bhyve/bhyve_capabilities.c | 19 +- src/bhyve/bhyve_conf.c | 36 +- src/bhyve/bhyve_driver.c | 33 +- src/bhyve/bhyve_monitor.c | 48 +- src/bhyve/bhyve_monitor.h | 3 +- src/bhyve/bhyve_utils.h | 11 +- src/conf/capabilities.c | 51 +- src/conf/capabilities.h | 6 +- src/conf/domain_capabilities.c | 48 +- src/conf/domain_capabilities.h | 10 +- src/conf/domain_conf.c | 129 ++-- src/conf/domain_conf.h | 36 +- src/conf/domain_event.c | 58 +- src/conf/network_conf.c | 24 +- src/conf/network_conf.h | 12 +- src/conf/network_event.c | 7 +- src/conf/node_device_event.c | 11 +- src/conf/node_device_util.c | 4 +- src/conf/secret_event.c | 15 +- src/conf/snapshot_conf.c | 2 +- src/conf/snapshot_conf.h | 2 +- src/conf/storage_capabilities.c | 4 +- src/conf/storage_event.c | 15 +- src/conf/virchrdev.c | 4 +- src/conf/virconftypes.h | 3 +- src/conf/virdomaincheckpointobjlist.c | 7 +- src/conf/virdomainsnapshotobjlist.c | 7 +- src/conf/virinterfaceobj.c | 5 +- src/conf/virnetworkobj.c | 10 +- src/conf/virnodedeviceobj.c | 3 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virnwfilterobj.c | 7 +- src/conf/virsavecookie.c | 10 +- src/conf/virsavecookie.h | 14 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/datatypes.c | 977 ++++++++++++++++-------- src/datatypes.h | 219 +++--- src/esx/esx_driver.c | 33 +- src/hyperv/hyperv_driver.c | 8 +- src/hypervisor/virhostdev.c | 49 +- src/hypervisor/virhostdev.h | 13 +- src/interface/interface_backend_netcf.c | 7 +- src/interface/interface_backend_udev.c | 8 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain-snapshot.c | 7 +- src/libvirt-domain.c | 6 +- src/libvirt-interface.c | 6 +- src/libvirt-network.c | 14 +- src/libvirt-nodedev.c | 6 +- src/libvirt-nwfilter.c | 14 +- src/libvirt-secret.c | 7 +- src/libvirt-storage.c | 12 +- src/libvirt-stream.c | 7 +- src/libvirt_private.syms | 35 +- src/libxl/libxl_capabilities.c | 19 +- src/libxl/libxl_conf.c | 65 +- src/libxl/libxl_conf.h | 12 +- src/libxl/libxl_driver.c | 175 ++--- src/libxl/libxl_migration.c | 103 +-- src/libxl/xen_common.c | 3 +- src/locking/lock_daemon.c | 28 +- src/locking/lock_driver_lockd.c | 19 +- src/locking/sanlock_helper.c | 5 +- src/logging/log_daemon.c | 28 +- src/logging/log_manager.c | 15 +- src/lxc/lxc_conf.c | 46 +- src/lxc/lxc_conf.h | 10 +- src/lxc/lxc_controller.c | 20 +- src/lxc/lxc_driver.c | 98 +-- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_process.c | 35 +- src/network/bridge_driver.c | 24 +- src/nwfilter/nwfilter_driver.c | 3 +- src/openvz/openvz_conf.c | 8 +- src/qemu/qemu_blockjob.c | 130 ++-- src/qemu/qemu_blockjob.h | 15 +- src/qemu/qemu_capabilities.c | 176 +++-- src/qemu/qemu_capabilities.h | 9 +- src/qemu/qemu_conf.c | 42 +- src/qemu/qemu_conf.h | 19 +- src/qemu/qemu_domain.c | 441 +++++------ src/qemu/qemu_domain.h | 157 ++-- src/qemu/qemu_driver.c | 34 +- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_migration.c | 34 +- src/qemu/qemu_process.c | 20 +- src/qemu/qemu_virtiofs.c | 12 +- src/remote/remote_daemon.c | 52 +- src/remote/remote_daemon_dispatch.c | 188 ++--- src/remote/remote_daemon_stream.c | 6 +- src/remote/remote_driver.c | 178 ++--- src/rpc/gendispatch.pl | 90 ++- src/rpc/virnetclient.c | 7 +- src/rpc/virnetclientprogram.c | 29 +- src/rpc/virnetclientprogram.h | 10 +- src/rpc/virnetclientstream.c | 4 +- src/rpc/virnetserver.c | 21 +- src/rpc/virnetserverprogram.c | 30 +- src/rpc/virnetserverprogram.h | 17 +- src/rpc/virnetserverservice.c | 103 ++- src/security/virt-aa-helper.c | 9 +- src/storage/storage_backend.c | 3 +- src/storage/storage_driver.c | 7 +- src/storage/storage_util.c | 4 +- src/test/test_driver.c | 33 +- src/util/virdnsmasq.c | 56 +- src/util/virdnsmasq.h | 6 +- src/util/virfdstream.c | 4 +- src/util/virfilecache.c | 43 +- src/util/virfilecache.h | 12 +- src/util/virobject.c | 24 + src/util/virobject.h | 4 + src/util/virresctrl.c | 164 ++-- src/util/virresctrl.h | 15 +- src/util/virsecret.c | 3 +- src/util/virstoragefile.c | 45 +- src/util/virstoragefile.h | 9 +- src/vbox/vbox_common.c | 19 +- src/vmware/vmware_conf.c | 13 +- src/vz/vz_driver.c | 33 +- src/vz/vz_sdk.c | 22 +- tests/bhyveargv2xmltest.c | 4 +- tests/bhyvexml2argvtest.c | 4 +- tests/bhyvexml2xmltest.c | 4 +- tests/cputest.c | 48 +- tests/domaincapstest.c | 5 +- tests/domainconftest.c | 4 +- tests/genericxml2xmltest.c | 4 +- tests/networkxml2conftest.c | 10 +- tests/networkxml2xmltest.c | 3 +- tests/openvzutilstest.c | 4 +- tests/qemublocktest.c | 3 +- tests/qemucapabilitiestest.c | 9 +- tests/qemucaps2xmltest.c | 29 +- tests/qemucapsprobe.c | 4 +- tests/qemuhotplugtest.c | 6 +- tests/qemumemlocktest.c | 3 +- tests/testutils.c | 4 +- tests/testutilslxc.c | 22 +- tests/testutilsqemu.c | 31 +- tests/testutilsxen.c | 7 +- tests/vircaps2xmltest.c | 6 +- tests/vircapstest.c | 14 +- tests/virfilecachetest.c | 69 +- tests/virnetdaemontest.c | 4 +- tests/virresctrltest.c | 6 +- tests/vmx2xmltest.c | 10 +- tests/xml2vmxtest.c | 12 +- 152 files changed, 2804 insertions(+), 2712 deletions(-) -- 2.25.3

3 47

[PATCH V3 0/5] Introduce getHost support for ARM CPU driver
by ZhengZhenyu 13 May '20

13 May '20

Introduce getHost support for ARM CPU driver. First add some data about commonly used ARM CPU models, and their vendors into cpu_map, then added some helper methods as callbacks to load them. Read and parse vendor_id, part_id and CPU flags of local CPU from corresponding registers. Signed-off-by: Zhenyu Zheng <zhengzhenyulixi(a)gmail.com> ZhengZhenyu (5): cpu_map: Introduce ARM cpu models cpu: Introduce virCPUarmData to virCPUData cpu: Introduce ARM related structs cpu: Add helper funtions to parse vendor and model cpu: Introduce getHost support for ARM CPU driver src/cpu/Makefile.inc.am | 1 + src/cpu/cpu.h | 2 + src/cpu/cpu_arm.c | 450 +++++++++++++++++++++++++++++- src/cpu/cpu_arm_data.h | 31 ++ src/cpu_map/Makefile.inc.am | 7 + src/cpu_map/arm_Falkor.xml | 16 ++ src/cpu_map/arm_Kunpeng-920.xml | 24 ++ src/cpu_map/arm_ThunderX299xx.xml | 16 ++ src/cpu_map/arm_cortex-a53.xml | 16 ++ src/cpu_map/arm_cortex-a57.xml | 15 + src/cpu_map/arm_cortex-a72.xml | 15 + src/cpu_map/arm_vendors.xml | 14 + src/cpu_map/index.xml | 15 + 13 files changed, 619 insertions(+), 3 deletions(-) create mode 100644 src/cpu/cpu_arm_data.h create mode 100644 src/cpu_map/arm_Falkor.xml create mode 100644 src/cpu_map/arm_Kunpeng-920.xml create mode 100644 src/cpu_map/arm_ThunderX299xx.xml create mode 100644 src/cpu_map/arm_cortex-a53.xml create mode 100644 src/cpu_map/arm_cortex-a57.xml create mode 100644 src/cpu_map/arm_cortex-a72.xml create mode 100644 src/cpu_map/arm_vendors.xml -- 2.26.0.windows.1

3 25

[PATCH] util: virnetdevopenvswitch: Delete unused code
by Yan Wang 13 May '20

13 May '20

It was never used since commit @57b5e27d3d7 introduced it. Signed-off-by: Yan Wang <wangyan122(a)huawei.com> --- src/util/virnetdevopenvswitch.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index f961777411..d16af72bdf 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -491,8 +491,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) { char *tmpIfname = NULL; - char **tokens = NULL; - size_t ntokens = 0; int status; int ret = -1; g_autoptr(virCommand) cmd = NULL; @@ -524,7 +522,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, ret = 1; cleanup: - virStringListFreeCount(tokens, ntokens); return ret; } -- 2.23.0

2 1

[PATCH v1 0/5] qemu: Support iSER transport of iscsi
by Han Han 13 May '20

13 May '20

The iSER(iSCSI Extensions for RDMA) transport is introduced since QEMU 2.9 [1]. It is only valid in iscsi network disk. Note that for the legacy uri of iscsi iser transport, it will start with 'iser' instead of 'iscsi'. [1]: https://github.com/qemu/qemu/blob/ee573f5326046223b6eef4ae7fbfec31d274e093/… git branch: https://gitlab.com/hhan2/libvirt/-/tree/iser Han Han (5): qemu_capabilities: Introduce iSER transport flag qemu: Support iser transport in iscsi docs: Support iser transport of iscsi tests: unit tests for iser transport news: qemu: Support iSER transport of iscsi docs/formatdomain.html.in | 10 +++-- docs/news.xml | 10 +++++ docs/schemas/domaincommon.rng | 1 + src/qemu/qemu_backup.c | 1 + src/qemu/qemu_block.c | 16 +++++-- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 17 +++++++ src/qemu/qemu_monitor_json.c | 1 + src/storage/storage_file_gluster.c | 7 +++ src/util/virstoragefile.c | 26 +++++++---- src/util/virstoragefile.h | 1 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../qemuxml2argvdata/disk-network-iscsi.args | 8 +++- .../disk-network-iscsi.x86_64-2.12.0.args | 7 ++- .../disk-network-iscsi.x86_64-latest.args | 45 +++++++++++-------- tests/qemuxml2argvdata/disk-network-iscsi.xml | 9 +++- tests/qemuxml2argvtest.c | 5 ++- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 10 ++++- tests/qemuxml2xmltest.c | 4 +- tests/virstoragetest.c | 14 ++++++ 54 files changed, 188 insertions(+), 41 deletions(-) -- 2.25.0

2 7

[libvirt PATCH v2 0/4] qemu: Add support for VMware paravirtual SCSI controller
by Chris Jester-Young 13 May '20

13 May '20

QEMU has supported pvscsi, the VMware paravirtual SCSI controller, since 2013, but libvirt does not currently expose support for it. Adding such support is straightforward. I have tested it with a Windows 10 guest, and the official VMware driver supports it with no issues. However, booting only works with SeaBIOS (tested) and the pre-release version of OVMF (not tested yet). Chris Jester-Young (4): qemu: pvscsi: Add capability qemu: pvscsi: Add support for vmpvscsi controller model tests: qemuxml2xmltest: Convert disk-scsi to DO_TEST_CAPS_LATEST tests: qemuxml2argvtest: Add vmpvscsi to disk-scsi test src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +- src/qemu/qemu_validate.c | 9 ++++- .../caps_1.5.3.x86_64.xml | 1 + .../caps_1.6.0.x86_64.xml | 1 + .../caps_1.7.0.x86_64.xml | 1 + .../caps_2.1.1.x86_64.xml | 1 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.4.0.x86_64.xml | 1 + .../caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + .../caps_2.6.0.x86_64.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../disk-scsi.x86_64-latest.args | 37 +++++++++++-------- tests/qemuxml2argvdata/disk-scsi.xml | 6 +++ ...k-scsi.xml => disk-scsi.x86_64-latest.xml} | 20 ++++++++-- tests/qemuxml2xmltest.c | 3 +- 46 files changed, 97 insertions(+), 23 deletions(-) rename tests/qemuxml2xmloutdata/{disk-scsi.xml => disk-scsi.x86_64-latest.xml} (83%) -- 2.25.1

2 5

[libvirt PATCH] qemu: only stop external devices after the domain
by Ján Tomko 13 May '20

13 May '20

A failure in qemuProcessLaunch would lead to qemuExtStopDevices being called twice - once in the cleanup section and then again in qemuProcessStop. However, the first one is called while the QEMU process is still running, which is too soon for the swtpm process, because the swtmp_ioctl command can lock up:: https://bugzilla.redhat.com/show_bug.cgi?id=1822523 Remove the first call and only leave the one in qemuProcessStop, which is called after the QEMU process is killed. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_process.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dee3f3fb63..f7f6793113 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6992,8 +6992,6 @@ qemuProcessLaunch(virConnectPtr conn, ret = 0; cleanup: - if (ret < 0) - qemuExtDevicesStop(driver, vm); qemuDomainSecretDestroy(vm); return ret; } -- 2.25.4

3 4

Status of iSER support.
by David Schweizer 13 May '20

13 May '20

After searching the official documentation, wiki and the code on gitlab, i still can not find any useful information about how to handle iSER targets with libvirt. I did find some RFCs for patches on this mailing list, but it seems none of them have been merged. There is also a somewhat related issue open on gitlab (https://gitlab.com/libvirt/libvirt/-/issues/16) So effectively my question is the following: Is libvirt currently capable of supporting iSER targets as either storage pools or as virtio device and if not, is an implementation of such support planned? Thanks in advance for your responses, David Schweizer

2 4

[libvirt PATCH] qemu: Support vmpvscsi controller model
by Chris Jester-Young 13 May '20

13 May '20

Signed-off-by: Chris Jester-Young <cky(a)cky.nz> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +++- src/qemu/qemu_validate.c | 9 ++++++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 42 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c6e36685e..e3f5121174 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -580,6 +580,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.cap-sbbc", "machine.pseries.cap-ibs", "tcg", + "pvscsi", ); @@ -1301,6 +1302,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR }, { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS }, { "tcg-accel", QEMU_CAPS_TCG }, + { "pvscsi", QEMU_CAPS_SCSI_PVSCSI }, }; static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cdeaf09cce..96a719c0f8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -561,6 +561,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, /* -machine pseries.cap-sbbc */ QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, /* -machine pseries.cap-ibs */ QEMU_CAPS_TCG, /* QEMU does support TCG */ + QEMU_CAPS_SCSI_PVSCSI, /* -device pvscsi */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 269bdbaf56..9f60727b78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2911,9 +2911,11 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: virBufferAddLit(&buf, "megasas"); break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: + virBufferAddLit(&buf, "pvscsi"); + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(def->model)); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 9debac6b30..3d9fc237b3 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2050,9 +2050,16 @@ qemuValidateCheckSCSIControllerModel(virQEMUCapsPtr qemuCaps, return false; } break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_PVSCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support " + "the pvscsi (VMware paravirtual SCSI) controller")); + return false; + } + break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(model)); diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 2ba184cdda..a4f6c3aa09 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -86,6 +86,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index fb160dfd4c..9e5501bed9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -91,6 +91,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 732af17233..28eb61b38c 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -93,6 +93,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 22b4817e4e..cfe79fef46 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -109,6 +109,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 8c2f8be55d..cfa1962e98 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -141,6 +141,7 @@ <flag name='egl-headless'/> <flag name='iothread.poll-max-ns'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index cec361b60c..0eee26c3ac 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -141,6 +141,7 @@ <flag name='iothread.poll-max-ns'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 4a8bc42778..205a0675db 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -184,6 +184,7 @@ <flag name='x86-max-cpu'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100287</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 03ba191bc2..15f59774f3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -190,6 +190,7 @@ <flag name='x86-max-cpu'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2011000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100288</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 025130c378..94a0344b1a 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -157,6 +157,7 @@ <flag name='arm-max-cpu'/> <flag name='drive-nvme'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2012000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 06ee1f4ec4..3bf0e20c9b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -158,6 +158,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 3e86df890b..c249525547 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -199,6 +199,7 @@ <flag name='drive-nvme'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100289</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index a11659d617..6eebad8b03 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -135,6 +135,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 432e3a5af4..662140e657 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -141,6 +141,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100243</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 389f7af1d6..f8f57a7eaa 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -124,6 +124,7 @@ <flag name='sdl-gl'/> <flag name='hda-output'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index cdf9450f4a..52592ad138 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -120,6 +120,7 @@ <flag name='hda-output'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4b6b840496..77297fff36 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -153,6 +153,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100244</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 1fa9a37102..e7d9808e28 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -158,6 +158,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100245</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 2847ad711f..bfeb9c9b40 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -161,6 +161,7 @@ <flag name='mch'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100246</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 539b5e042d..f32e233549 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -133,6 +133,7 @@ <flag name='iothread.poll-max-ns'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 765e469205..75e9905df7 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -178,6 +178,7 @@ <flag name='x86-max-cpu'/> <flag name='i8042'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100247</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index c9c2ac4a0b..a66008b0de 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -160,6 +160,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>2012050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 2f318640d8..f5f1d5b466 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -205,6 +205,7 @@ <flag name='i8042'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>3000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100239</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index 18fba375fb..ca9ff82e28 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -165,6 +165,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>3000091</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 6a05b3e719..11009a2f80 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml @@ -208,6 +208,7 @@ <flag name='i8042'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>3000092</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 2e8460f829..c9199df261 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml @@ -171,6 +171,7 @@ <flag name='drive-nvme'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 978fad0ba6..f4294436a8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -179,6 +179,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 4322ca3593..f5c9d7f83e 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml @@ -172,6 +172,7 @@ <flag name='drive-nvme'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 8df0e1eb79..538ce225f8 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml @@ -172,6 +172,7 @@ <flag name='drive-nvme'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 4285bec2bf..9f45fe6359 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml @@ -213,6 +213,7 @@ <flag name='i8042'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100240</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 1c960faa6c..9ad50bc2b5 100644 --- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml @@ -219,6 +219,7 @@ <flag name='i8042'/> <flag name='storage.werror'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4001000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 418b5937a0..7aca4fe022 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -183,6 +183,7 @@ <flag name='fsdev.multidevs'/> <flag name='virtio.packed'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 796ed0a2bc..a68786ddc8 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -184,6 +184,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4001050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 0d4d6e71d5..3935be4813 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -227,6 +227,7 @@ <flag name='fsdev.multidevs'/> <flag name='virtio.packed'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>4002000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 1f743aaa11..cadd64ac18 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -191,6 +191,7 @@ <flag name='virtio.packed'/> <flag name='pcie-root-port.hotplug'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>61700241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index a5f0bb538b..4dea15a466 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -199,6 +199,7 @@ <flag name='machine.pseries.cap-sbbc'/> <flag name='machine.pseries.cap-ibs'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>42900241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index e9651ca581..e8087143de 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -187,6 +187,7 @@ <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>0</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index f127f38bcc..0a069643b2 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -232,6 +232,7 @@ <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>5000000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 9611549bd7..e055251e70 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -232,6 +232,7 @@ <flag name='pcie-root-port.hotplug'/> <flag name='aio.io_uring'/> <flag name='tcg'/> + <flag name='pvscsi'/> <version>5000050</version> <kvmVersion>0</kvmVersion> <microcodeVersion>43100242</microcodeVersion> -- 2.25.1

3 5

[PATCH v1 0/8] Introducing TPM Proxy device support
by Daniel Henrique Barboza 13 May '20

13 May '20

Hello, This series implements a new device type for Libvirt called "TPM Proxy". This device acts as a proxy for TPM requisitions that the guest can make for an existing TPM Resource Manager in the host. The TPM Resource Manager multiplexes TPM access to multiple processes, allowing more than one process (guest) to use the host TPM at the same time. A guest using a TPM Proxy device does not have access to all possible TPM features. In that case the guest will need to assign a vTPM device (tpm-spapr for PPC64). There is no restrictions of using both a vTPM and a TPM Proxy device at the same time, but only one TPM Proxy is allowed per guest. At this moment, this device exists only for QEMU pSeries guests. A "model" field was added device to allow more models to be added when/if other architectures implements it. Daniel Henrique Barboza (8): docs: documentation and schema for the new TPM Proxy device qemu: Extend QEMU capabilities with 'spapr-tpm-proxy' conf, qemu: adding VIR_DOMAIN_DEVICE_TPMPROXY device domain_conf.c: XML parsing for VIR_DOMAIN_DEVICE_TPMPROXY tests: add test for domain XML with TPM Proxy device model qemu: build command line for the TPM Proxy device tests/qemuxml2argvtest.c: add TPM Proxy command line test docs/news.xml: update for the new TPM Proxy device docs/formatdomain.html.in | 42 +++++ docs/news.xml | 14 ++ docs/schemas/domaincommon.rng | 18 ++ src/conf/domain_capabilities.c | 1 + src/conf/domain_conf.c | 160 ++++++++++++++++++ src/conf/domain_conf.h | 18 ++ src/conf/virconftypes.h | 3 + src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 16 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 21 +++ src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain_address.c | 2 + src/qemu/qemu_driver.c | 5 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_validate.c | 37 ++++ .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/ppc64-tpmproxy.args | 28 +++ tests/qemuxml2argvdata/ppc64-tpmproxy.xml | 31 ++++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmloutdata/ppc64-tpmproxy.xml | 37 ++++ tests/qemuxml2xmltest.c | 4 + 24 files changed, 465 insertions(+) create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy.args create mode 100644 tests/qemuxml2argvdata/ppc64-tpmproxy.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-tpmproxy.xml -- 2.26.2

4 30

[PATCH] security: do not log password
by Zhang Bo 12 May '20

12 May '20

It's insecure to log password, nomatter the password is encrypted or not. And do not log it even in debug mode, in the consideration of resilience, surposing that the log mode has been modified by the attacker. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/libvirt-domain.c | 3 +-- src/qemu/qemu_monitor.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a12809c2d5..e2a57c178b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11340,8 +11340,7 @@ virDomainSetUserPassword(virDomainPtr dom, const char *password, unsigned int flags) { - VIR_DOMAIN_DEBUG(dom, "user=%s, password=%s, flags=0x%x", - NULLSTR(user), NULLSTR(password), flags); + VIR_DOMAIN_DEBUG(dom, "user=%s, flags=0x%x", NULLSTR(user), flags); virResetLastError(); diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 9c853ccb93..9bfaf53b65 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2241,8 +2241,7 @@ qemuMonitorSetPassword(qemuMonitorPtr mon, if (!protocol) return -1; - VIR_DEBUG("protocol=%s, password=%p, action_if_connected=%s", - protocol, password, action_if_connected); + VIR_DEBUG("protocol=%s, action_if_connected=%s", protocol, action_if_connected); QEMU_CHECK_MONITOR(mon); -- 2.23.0.windows.1

2 1

[PATCH 0/5] qemu: Allow snapshots and blockcopy of read-only disks
by Peter Krempa 11 May '20

11 May '20

First one doesn't make much sense but oVirt used it before, so we should allow it now as well. Block copy makes sense and thus should be fixed either way. Last patch is for actually validating that it works. Peter Krempa (5): storage_file: create: Create new images with write permission bit qemuBlockStorageSourceCreateFormat: Force write access when formatting images qemu: snapshot: Allow snapshots of read-only disks when we can create them qemu: blockcopy: Allow copy of read-only disks with -blockdev HACK: qemu: caps: enable blockdev reopen src/qemu/qemu_block.c | 12 ++++++++++++ src/qemu/qemu_blockjob.c | 5 +++++ src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_driver.c | 11 ++++++++++- src/qemu/qemu_monitor_json.c | 2 +- src/storage/storage_file_fs.c | 6 +----- src/storage/storage_file_gluster.c | 6 +----- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + 23 files changed, 47 insertions(+), 12 deletions(-) -- 2.26.2

2 10

[libvirt-ci PATCH 00/12] Introduce a new global YAML config file for lcitool
by Erik Skultety 11 May '20

11 May '20

This series is trying to consolidate the number of config files we currently recognize under ~/.config/lcitool to a single global YAML config file. Thanks to this effort we can expose more seetings than we previously could which will come handy in terms of generating cloudinit images for OpenStack. Patches 1-4 patches are just a little extra - not heavily related to the series Patches 1-3 (ACKed) only cosmetical changes (like moving requirements.txt) Since RFC: - replaced TOML with YAML which simplified some aspects of the code, thanks Andrea - instead of hardcoding the default values, the config within the repo is used as a template and overriden with user-selected options Erik Skultety (12): requirements: Introduce a requirements.txt file lcitool: Decrease the indent when creating a tempdir for initrd injection lcitool: Prefer tempfile's native wrappers over low level primitives lcitool: Use a temporary JSON file to pass extra variables config: Introduce a new global config.yaml configuration file lcitool: Introduce methods to load and validate the YAML config lcitool: Update the config values with internal playbook settings lcitool: Drop the get_flavor() method lcitool: Drop the get_root_password_file() method lcitool: Drop the gitlab-related getter methods config: Move the virt-install settings from install.yml to the config guests: README: Document the existence and usage of config.toml guests/README.markdown | 18 +- guests/config.yaml | 40 +++++ guests/lcitool | 192 +++++++++------------- guests/playbooks/build/main.yml | 2 +- guests/playbooks/update/main.yml | 6 +- guests/playbooks/update/tasks/gitlab.yml | 4 +- guests/playbooks/update/tasks/kludges.yml | 2 +- guests/playbooks/update/tasks/users.yml | 42 ++--- guests/requirements.txt | 2 + 9 files changed, 159 insertions(+), 149 deletions(-) create mode 100644 guests/config.yaml create mode 100644 guests/requirements.txt -- 2.25.3

2 28

[libvirt-ci PATCH] lcitool: Catch exceptions earlier
by Andrea Bolognani 11 May '20

11 May '20

Right now we catch and report properly only those exceptions that are raised by the Application.run() method: basically, we work under the assumption that nothing before that point can possibly fail. That's of course unrealistic: even now, creating an Inventory or Projects object can raise an exception, in which case we simply display a stack trace instead of a reasonable error message. This commit introduces a CommandLine class which takes over command line handling from the Application class, and moves all exception handling to the main() method so that, short of something going horribly wrong while parsing the command line, we will always manage to hide stack traces from the user. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 56 ++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index ab3b95f..ff58829 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -390,15 +390,9 @@ class Projects: return self._packages[project] -class Application: +class CommandLine: def __init__(self): - self._config = Config() - self._inventory = Inventory() - self._projects = Projects() - - self._native_arch = Util.get_native_arch() - self._parser = argparse.ArgumentParser( conflict_handler="resolve", description="libvirt CI guest management tool", @@ -444,14 +438,14 @@ class Application: installparser = subparsers.add_parser( "install", help="perform unattended host installation") - installparser.set_defaults(func=self._action_install) + installparser.set_defaults(action="install") add_hosts_arg(installparser) add_wait_arg(installparser) updateparser = subparsers.add_parser( "update", help="prepare hosts and keep them updated") - updateparser.set_defaults(func=self._action_update) + updateparser.set_defaults(action="update") add_hosts_arg(updateparser) add_projects_arg(updateparser) @@ -459,7 +453,7 @@ class Application: buildparser = subparsers.add_parser( "build", help="build projects on hosts") - buildparser.set_defaults(func=self._action_build) + buildparser.set_defaults(action="build") add_hosts_arg(buildparser) add_projects_arg(buildparser) @@ -467,20 +461,33 @@ class Application: hostsparser = subparsers.add_parser( "hosts", help="list all known hosts") - hostsparser.set_defaults(func=self._action_hosts) + hostsparser.set_defaults(action="hosts") projectsparser = subparsers.add_parser( "projects", help="list all known projects") - projectsparser.set_defaults(func=self._action_projects) + projectsparser.set_defaults(action="projects") dockerfileparser = subparsers.add_parser( "dockerfile", help="generate Dockerfile (doesn't access the host)") - dockerfileparser.set_defaults(func=self._action_dockerfile) + dockerfileparser.set_defaults(action="dockerfile") add_hosts_arg(dockerfileparser) add_projects_arg(dockerfileparser) add_cross_arch_arg(dockerfileparser) + def parse(self): + return self._parser.parse_args() + + +class Application: + + def __init__(self): + self._config = Config() + self._inventory = Inventory() + self._projects = Projects() + + self._native_arch = Util.get_native_arch() + def _execute_playbook(self, playbook, hosts, projects, git_revision): base = Util.get_base() @@ -1011,17 +1018,18 @@ class Application: varmap = self._dockerfile_build_varmap(facts, mappings, pip_mappings, projects, cross_arch) self._dockerfile_format(facts, cross_arch, varmap) - def run(self): - args = self._parser.parse_args() - if args.debug: - args.func(args) - else: - try: - args.func(args) - except Exception as err: - sys.stderr.write("{}: {}\n".format(sys.argv[0], err)) - sys.exit(1) + def run(self, args): + getattr(self, "_action_" + args.action)(args) if __name__ == "__main__": - Application().run() + args = CommandLine().parse() + + if args.debug: + Application().run(args) + else: + try: + Application().run(args) + except Exception as err: + sys.stderr.write("{}: {}\n".format(sys.argv[0], err)) + sys.exit(1) -- 2.25.4

2 2

[libvirt PATCH v2 0/3] docs: Some reStructuredText tweaks
by Andrea Bolognani 11 May '20

11 May '20

Changes from [v1]: * convert simple tables to definition lists; * drop glib-adoption.rst entirely instead of tweaking it. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg00292.html Andrea Bolognani (3): docs: Drop glib-adoption.rst docs: Use definition list instead of table in coding style docs: Document list-tables as recommended docs/coding-style.rst | 47 ++++++++++++--------- docs/glib-adoption.rst | 96 ------------------------------------------ docs/hacking.rst | 1 - docs/styleguide.rst | 20 +++++++++ 4 files changed, 46 insertions(+), 118 deletions(-) delete mode 100644 docs/glib-adoption.rst -- 2.25.4

3 7

[PATCH] virDevMapperGetTargetsImpl: quit early if device is not a devmapper target
by Michal Privoznik 11 May '20

11 May '20

As suggested in the linked bug, libvirt should firstly check whether the major number of the device is device mapper major. Because if it isn't subsequent DM_DEVICE_DEPS task may not only fail, but also yield different results. In the bugzilla this is demonstrated by creating a devmapper target named 'loop0' and then creating loop target /dev/loop0. When the latter is then passed to a domain, our virDevMapperGetTargetsImpl() function blindly asks devmapper to provide target dependencies for /dev/loop0 and because of the way devmapper APIs work, it will 'sanitize' the input by using the last component only which is 'loop0' and thus return different results than expected. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1823976 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virdevmapper.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index feb5982315..ee026d502e 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -64,6 +64,7 @@ virDevMapperGetTargetsImpl(const char *path, char ***devPaths_ret, unsigned int ttl) { + struct stat sb; struct dm_task *dmt = NULL; struct dm_deps *deps; struct dm_info info; @@ -82,6 +83,15 @@ virDevMapperGetTargetsImpl(const char *path, return ret; } + if (stat(path, &sb) < 0) { + if (errno == ENOENT) + ret = 0; + return ret; + } + + if (!dm_is_dm_major(major(sb.st_dev))) + return 0; + if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) { if (errno == ENOENT || errno == ENODEV) { /* It's okay. Kernel is probably built without -- 2.26.2

2 1

[libvirt-ci PATCH] lcitool: Set make parallelism dynamically
by Andrea Bolognani 11 May '20

11 May '20

We're about to make some changes to lcitool that would make it more annoying to get access to the number of install-time vCPUs from 'lcitool update', so let's use getconf instead. As a side effect, this also copes better with the situation where the builder was installed with a certain number of vCPUs but the amount has since been modified. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/update/templates/bashrc.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/playbooks/update/templates/bashrc.j2 b/guests/playbooks/update/templates/bashrc.j2 index 8775864..05a86a1 100644 --- a/guests/playbooks/update/templates/bashrc.j2 +++ b/guests/playbooks/update/templates/bashrc.j2 @@ -4,7 +4,7 @@ export MAKE="{{ paths.make }}" export NINJA="{{ paths.ninja }}" export PYTHON="{{ paths.python }}" -export MAKEFLAGS="-j{{ install_vcpus|int + 1 }}" +export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)" export CCACHE_MAXSIZE="2G" export VIRT_PREFIX="$HOME/build/libvirt" -- 2.25.4

2 4

[libvirt PATCH v2] docs: introduce a page showing a overall CI dashboard
by Daniel P. Berrangé 11 May '20

11 May '20

With the move to GitLab CI one of the things we miss from Jenkins is a single page dashboard showing CI status across all projects. This is a very simple replacement that uses badges for CI pipeline status. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/ci.rst | 230 ++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 3 + docs/libvirt.css | 5 + 3 files changed, 238 insertions(+) create mode 100644 docs/ci.rst diff --git a/docs/ci.rst b/docs/ci.rst new file mode 100644 index 0000000000..fe59b98923 --- /dev/null +++ b/docs/ci.rst @@ -0,0 +1,230 @@ +============================== +Libvirt Continuous Integration +============================== + +.. contents:: + +The libvirt project primarily uses GitLab CI for automated testing of Linux +builds, and cross-compiled Windows builds. `Travis <https://travis-ci.org/libvirt/libvirt>`_ +is used for validating macOS builds, and `Jenkins <https://ci.centos.org/view/libvirt>`_ +is temporarily used for validating FreeBSD builds. + +GitLab CI Dashboard +=================== + +The dashboard below shows the current status of the GitLab CI jobs for each +repository: + +Core project +------------ + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + + * - libvirt + - .. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt/pipelines + :alt: libvirt pipeline status + + +Language bindings +----------------- + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + + * - libvirt-csharp + - .. image:: https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-csharp/pipelines + :alt: libvirt-csharp pipeline status + + * - libvirt-go + - .. image:: https://gitlab.com/libvirt/libvirt-go/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-go/pipelines + :alt: libvirt-go pipeline status + + * - libvirt-java + - .. image:: https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-java/pipelines + :alt: libvirt-java pipeline status + + * - libvirt-ocaml + - .. image:: https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-ocaml/pipelines + :alt: libvirt-ocaml pipeline status + + * - libvirt-perl + - .. image:: https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-perl/pipelines + :alt: libvirt-perl pipeline status + + * - libvirt-php + - .. image:: https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-php/pipelines + :alt: libvirt-php pipeline status + + * - libvirt-python + - .. image:: https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-python/pipelines + :alt: libvirt-python pipeline status + + * - libvirt-rust + - .. image:: https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-rust/pipelines + :alt: libvirt-rust pipeline status + + * - ruby-libvirt + - .. image:: https://gitlab.com/libvirt/ruby-libvirt/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/ruby-libvirt/pipelines + :alt: ruby-libvirt pipeline status + + +Object mappings +--------------- + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + + * - libvirt-cim + - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-cim/pipelines + :alt: libvirt-cim pipeline status + + * - libvirt-dbus + - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines + :alt: libvirt-dbus pipeline status + + * - libvirt-glib + - .. image:: https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-glib/pipelines + :alt: libvirt-glib pipeline status + + * - libvirt-go-xml + - .. image:: https://gitlab.com/libvirt/libvirt-go-xml/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-go-xml/pipelines + :alt: libvirt-go-xml pipeline status + + * - libvirt-snmp + - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines + :alt: libvirt-snmp pipeline status + + +Testing +------- + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + + * - libvirt-ci + - .. image:: https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-ci/pipelines + :alt: libvirt-ci pipeline status + + * - libvirt-dockerfiles + - .. image:: https://gitlab.com/libvirt/libvirt-dockerfiles/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-dockerfiles/pipelines + :alt: libvirt-dockerfiles pipeline status + + * - libvirt-test-API + - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines + :alt: libvirt-test-API pipeline status + + * - libvirt-tck + - .. image:: https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-tck/pipelines + :alt: libvirt-tck pipeline status + + +Documentation / websites +------------------------ + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + * - libvirt-publican + - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-publican/pipelines + :alt: libvirt-publican pipeline status + + * - libvirt-appdev-guide-python + - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeli… + :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines + :alt: libvirt-appdev-guide-python pipeline status + + * - libvirt-wiki + - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines + :alt: libvirt-wiki pipeline status + + * - virttools-planet + - .. image:: https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/virttools-planet/pipelines + :alt: virttools-planet pipeline status + + * - virttools-web + - .. image:: https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/virttools-web/pipelines + :alt: virttools-web pipeline status + + +Miscellaneous +------------- + +.. list-table:: + :widths: 80 20 + :header-rows: 1 + + * - Project + - Pipeline + + * - libvirt-console-proxy + - .. image:: https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines + :alt: libvirt-console-proxy pipeline status + + * - libvirt-designer + - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-designer/pipelines + :alt: libvirt-designer pipeline status + + * - libvirt-devaddr + - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines + :alt: libvirt-devaddr pipeline status + + * - libvirt-sandbox + - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines + :alt: libvirt-sandbox pipeline status + + * - libvirt-sandbox-image + - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg + :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines + :alt: libvirt-sandbox-image pipeline status + + * - libvirt-security-notice + - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.s… + :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines + :alt: libvirt-security-notice pipeline status diff --git a/docs/docs.html.in b/docs/docs.html.in index 6bdf0c32b8..f1d44fadc0 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -142,6 +142,9 @@ <dt><a href="strategy.html">Project strategy</a></dt> <dd>Sets a vision for future direction & technical choices</dd> + <dt><a href="ci.html">CI Testing</a></dt> + <dd>Details of the Continuous Integration testing strategy</dd> + <dt><a href="bugs.html">Bug reports</a></dt> <dd>How and where to report bugs and request features</dd> diff --git a/docs/libvirt.css b/docs/libvirt.css index 94d0b9058c..a2c9778e03 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -592,3 +592,8 @@ td.gitmirror { td.gitmirror a { color: inherit; } + +th p, td p { + margin-top: 0px; + margin-bottom: 0px; +} -- 2.26.2

2 3

[PATCH] qemuDomainCleanupRun: Actually run cleanup callbacks in reverse order
by Michal Privoznik 11 May '20

11 May '20

We have a framework to register cleanup callbacks that are run when a domain is shut down. The idea is to run callbacks in reverse order than they were registered. However, looking at the code this is not the case. Fortunately, this framework is used to register a single callback and a single callback only - qemuMigrationDstPrepareCleanup() - therefore there was no problem just yet. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9c629c31a3..7c71b797bc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8032,18 +8032,14 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; - size_t i; VIR_DEBUG("driver=%p, vm=%s", driver, vm->def->name); /* run cleanup callbacks in reverse order */ - for (i = 0; i < priv->ncleanupCallbacks; i++) { - if (priv->cleanupCallbacks[priv->ncleanupCallbacks - (i + 1)]) - priv->cleanupCallbacks[i](driver, vm); - } + while (priv->ncleanupCallbacks) + priv->cleanupCallbacks[--priv->ncleanupCallbacks](driver, vm); VIR_FREE(priv->cleanupCallbacks); - priv->ncleanupCallbacks = 0; priv->ncleanupCallbacks_max = 0; } -- 2.26.2

2 1

device hotplug & file handles
by Gerd Hoffmann 11 May '20

11 May '20

Hi, For usb device pass-through (aka -device usb-host) it would be very useful to pass file handles from libvirt to qemu. The workflow would change from ... (1) libvirt enables access to /dev/usb/$bus/$dev (2) libvirt passes $bus + $dev (using hostbus + hostaddr properties) to qemu. (3) qemu opens /dev/usb/$bus/$dev ... to ... (1) libvirt opens /dev/usb/$bus/$dev (2) libvirt passes filehandle to qemu. Question is how can we pass the file descriptor best? My idea would be to simply add an fd property to usb-host: * Coldplug would be "-device usb-host,fd=<nr>" (cmd line). * Hotplug would be "device_add usb-host,fd=<getfd-name>" (monitor). Will that work from libvirt point of view? Or does anyone have an better idea? thanks, Gerd PS: background: https://bugzilla.redhat.com/show_bug.cgi?id=1595525

4 3

[libvirt PATCH 0/2] network: force re-creation of iptables private chains on firewalld restart
by Laine Stump 11 May '20

11 May '20

Details are in the commit log of patch 2. Essentially, we've been careful to only create the iptables chains once per run, because it's very expensive, but when firewalld is restarted, it removes our chains, so we need to put them back. I think this may have been a problem as far back as libvirt 5.1.0, when we began putting our iptables rules into private chains. Laine Stump (2): network: make it safe to call networkSetupPrivateChains() multiple times network: force re-creation of iptables private chains on firewalld restart src/network/bridge_driver.c | 16 +++--- src/network/bridge_driver_linux.c | 77 ++++++++++++++++++---------- src/network/bridge_driver_nop.c | 3 +- src/network/bridge_driver_platform.h | 2 +- 4 files changed, 62 insertions(+), 36 deletions(-) -- 2.25.4

2 3

[libvirt-ci PATCH] lcitool: Make Python 3 only
by Andrea Bolognani 11 May '20

11 May '20

All platforms we care about have Python 3 available. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index ab3b95f..a30187b 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # lcitool - libvirt CI guest management tool # Copyright (C) 2017-2018 Andrea Bolognani <abologna(a)redhat.com> @@ -17,6 +17,7 @@ # with this program. If not, see <https://www.gnu.org/licenses/>. import argparse +import configparser import distutils.spawn import fnmatch import json @@ -31,12 +32,6 @@ import tempfile import textwrap import yaml -# This is necessary to maintain Python 2.7 compatibility -try: - from configparser import ConfigParser -except ImportError: - from ConfigParser import SafeConfigParser as ConfigParser - class Util: @@ -263,7 +258,7 @@ class Inventory: ansible_cfg_path = os.path.join(base, "ansible.cfg") try: - parser = ConfigParser() + parser = configparser.ConfigParser() parser.read(ansible_cfg_path) inventory_path = parser.get("defaults", "inventory") except Exception as ex: -- 2.25.4

2 1

[GSoC] Introduction
by Prathamesh Chavan 10 May '20

10 May '20

Hello everyone, I'm Prathamesh Chavan, a GSoC student this year, from IIT Kharagpur. I'll be working along with my mentors: Erik Skultety, Martin Kletzander, and Michal Prívozník on the project: 'Introducing Job Control to Storage Driver'. This is the first time I'm contributing to Libvirt as a GSoC student. Any suggestions and comments regarding the project will be appreciated. Thanks, Prathamesh Chavan

1 0

[PATCH v4 00/34] Configurable policy for handling deprecated interfaces
by Markus Armbruster 08 May '20

08 May '20

This series extends QMP introspection to cover deprecation. Additionally, new option -compat lets you configure what to do when deprecated interfaces get used. This is intended for testing users of the management interfaces. It is experimental. -compat deprecated-input=<in-policy> configures what to do when deprecated input is received. Available policies: * accept: Accept deprecated commands and arguments (default) * reject: Reject them * crash: Crash -compat deprecated-output=<out-policy> configures what to do when deprecated output is sent. Available output policies: * accept: Emit deprecated command results and events (default) * hide: Suppress them For now, -compat covers only deprecated syntactic aspects of QMP. We may want to extend it to cover semantic aspects, CLI, and experimental features. PATCH 01-04: Documentation fixes PATCH 05-10: Test improvements PATCH 11-24: Add feature flags to remaining user-defined types and to struct members PATCH 25-26: New special feature 'deprecated', visible in introspection PATCH 27-34: New -compat to set policy for handling stuff marked with feature 'deprecated' v4: PATCH 05+07: Temporary memory leak plugged [Marc-André] PATCH 23: Rewritten [Marc-André] PATCH 24: Comment typo [Marc-André] PATCH 30: Memory leaks plugged v3: * Rebased, non-trivial conflicts in PATCH 01+26+27+34 due to RST conversion and code motion * PATCH 28-29: Old PATCH 28 split up to ease review * PATCH 30-31: New * PATCH 32-33: Old PATCH 29 split up to ease review Comparison to RFC (24 Oct 2019): * Cover arguments and results in addition to commands and events * Half-baked "[RFC PATCH 18/19] qapi: Include a warning in the response to a deprecated command" dropped See also last item of Subject: Minutes of KVM Forum BoF on deprecating stuff Date: Fri, 26 Oct 2018 16:03:51 +0200 Message-ID: <87mur0ls8o.fsf(a)dusky.pond.sub.org> https://lists.nongnu.org/archive/html/qemu-devel/2018-10/msg05828.html Cc: Lukáš Doktor <ldoktor(a)redhat.com> Cc: libguestfs(a)redhat.com Cc: libvir-list(a)redhat.com Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Cc: Kevin Wolf <kwolf(a)redhat.com> Markus Armbruster (34): qemu-doc: Belatedly document QMP command arg & result deprecation qapi: Belatedly update doc comment for @wait deprecation docs/devel/qapi-code-gen: Clarify allow-oob introspection docs/devel/qapi-code-gen: Document 'features' introspection tests/test-qmp-cmds: Factor out qmp_dispatch() test helpers tests/test-qmp-cmds: Check responses more thoroughly tests/test-qmp-cmds: Simplify test data setup tests/test-qmp-event: Simplify test data setup tests/test-qmp-event: Use qobject_is_equal() tests/test-qmp-event: Check event is actually emitted qapi/schema: Clean up around QAPISchemaEntity.connect_doc() qapi: Add feature flags to remaining definitions qapi: Consistently put @features parameter right after @ifcond qapi/introspect: Rename *qlit* to reduce confusion qapi/introspect: Factor out _make_tree() qapi/schema: Change _make_features() to a take feature list qapi/schema: Reorder classes so related ones are together qapi/schema: Rename QAPISchemaObjectType{Variant,Variants} qapi/schema: Call QAPIDoc.connect_member() in just one place qapi: Add feature flags to struct members qapi: Inline do_qmp_dispatch() into qmp_dispatch() qapi: Simplify how qmp_dispatch() deals with QCO_NO_SUCCESS_RESP qapi: Simplify how qmp_dispatch() gets the request ID qapi: Replace qmp_dispatch()'s TODO comment by an explanation qapi: New special feature flag "deprecated" qapi: Mark deprecated QMP parts with feature 'deprecated' qemu-options: New -compat to set policy for deprecated interfaces qapi: Implement deprecated-output=hide for QMP command results qapi: Implement deprecated-output=hide for QMP events qapi: Implement deprecated-output=hide for QMP event data qapi: Implement deprecated-output=hide for QMP introspection qapi: Implement deprecated-input=reject for QMP commands qapi: Implement deprecated-input=reject for QMP command arguments qapi: New -compat deprecated-input=crash docs/devel/qapi-code-gen.txt | 79 ++- docs/system/deprecated.rst | 48 +- tests/qapi-schema/doc-good.texi | 32 ++ qapi/block-core.json | 48 +- qapi/block.json | 30 +- qapi/char.json | 1 + qapi/compat.json | 52 ++ qapi/control.json | 11 +- qapi/introspect.json | 28 +- qapi/machine.json | 34 +- qapi/migration.json | 36 +- qapi/misc.json | 13 +- qapi/qapi-schema.json | 1 + include/qapi/compat-policy.h | 20 + include/qapi/qmp/dispatch.h | 1 + include/qapi/qobject-input-visitor.h | 9 + include/qapi/qobject-output-visitor.h | 9 + include/qapi/visitor-impl.h | 3 + include/qapi/visitor.h | 9 + monitor/monitor-internal.h | 3 - monitor/misc.c | 2 - monitor/qmp-cmds-control.c | 102 +++- qapi/qapi-visit-core.c | 9 + qapi/qmp-dispatch.c | 149 +++--- qapi/qobject-input-visitor.c | 29 ++ qapi/qobject-output-visitor.c | 20 + qemu-storage-daemon.c | 2 - softmmu/vl.c | 17 + tests/test-qmp-cmds.c | 249 +++++---- tests/test-qmp-event.c | 203 +++----- qapi/Makefile.objs | 8 +- qapi/trace-events | 1 + qemu-options.hx | 22 + scripts/qapi/commands.py | 20 +- scripts/qapi/doc.py | 16 +- scripts/qapi/events.py | 24 +- scripts/qapi/expr.py | 14 +- scripts/qapi/introspect.py | 104 ++-- scripts/qapi/schema.py | 488 ++++++++++-------- scripts/qapi/types.py | 8 +- scripts/qapi/visit.py | 28 +- tests/Makefile.include | 1 + tests/qapi-schema/alternate-base.err | 2 +- tests/qapi-schema/doc-good.json | 22 +- tests/qapi-schema/doc-good.out | 18 + .../qapi-schema/features-deprecated-type.err | 2 + .../qapi-schema/features-deprecated-type.json | 3 + .../qapi-schema/features-deprecated-type.out | 0 tests/qapi-schema/qapi-schema-test.json | 51 +- tests/qapi-schema/qapi-schema-test.out | 48 +- tests/qapi-schema/test-qapi.py | 26 +- 51 files changed, 1393 insertions(+), 762 deletions(-) create mode 100644 qapi/compat.json create mode 100644 include/qapi/compat-policy.h create mode 100644 tests/qapi-schema/features-deprecated-type.err create mode 100644 tests/qapi-schema/features-deprecated-type.json create mode 100644 tests/qapi-schema/features-deprecated-type.out -- 2.21.1

3 5

[libvirt PATCH] Revert "tests: Use qemu:///embed to simplify fakerootdir management"
by Andrea Bolognani 08 May '20

08 May '20

Turns out that it's not enough to pass the qemu:///embed root to virQEMUDriverConfigNew(), you also have to make sure the same string is copied into the virQEMUDriver structure yourself, and not doing so in our case resulted in the cleanup never happening and in distcheck failing because of that. On the other hand, actually setting config->embeddedRoot would result in different paths being generated for each test run, which would obviously break qemuxml2argvtest, so that's not an option either. This reverts commit d98cc1968e7961cb02ed07406451a7b710cc2f24. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI fix yesterday, forgot to forward it to the list. tests/qemuhotplugtest.c | 15 ++++++++++++++ tests/qemumemlocktest.c | 20 ++++++++++++++++++- tests/qemuxml2argvtest.c | 16 +++++++++++++++ tests/qemuxml2xmltest.c | 16 +++++++++++++++ tests/testutilsqemu.c | 43 ++++++++++++++++++++++++++-------------- 5 files changed, 94 insertions(+), 16 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index a67b6ce607..cf87de187f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -594,6 +594,8 @@ testQemuHotplugCpuIndividual(const void *opaque) return ret; } +#define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" + static int mymain(void) @@ -602,8 +604,18 @@ mymain(void) int ret = 0; struct qemuHotplugTestData data = {0}; struct testQemuHotplugCpuParams cpudata; + g_autofree char *fakerootdir = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL; + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); + + if (!g_mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + abort(); + } + + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); + if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -879,6 +891,9 @@ mymain(void) DO_TEST_CPU_INDIVIDUAL("ppc64-modern-individual", "16-22", true, true, true); DO_TEST_CPU_INDIVIDUAL("ppc64-modern-individual", "17", true, true, true); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + virFileDeleteTree(fakerootdir); + qemuTestDriverFree(&driver); virObjectUnref(data.vm); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 4813c7beb0..3f18fed1c3 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -51,14 +51,28 @@ testCompareMemLock(const void *data) return ret; } +# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" + static int mymain(void) { int ret = 0; + char *fakerootdir; virQEMUCapsPtr qemuCaps = NULL; - if (qemuTestDriverInit(&driver) < 0) + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); + + if (!g_mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + abort(); + } + + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); + + if (qemuTestDriverInit(&driver) < 0) { + VIR_FREE(fakerootdir); return EXIT_FAILURE; + } driver.privileged = true; @@ -136,7 +150,11 @@ mymain(void) cleanup: virObjectUnref(qemuCaps); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + virFileDeleteTree(fakerootdir); + qemuTestDriverFree(&driver); + VIR_FREE(fakerootdir); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8bd6102d26..04febd1b0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -609,12 +609,24 @@ testInfoSetPaths(struct testQemuInfo *info, abs_srcdir, info->name, suffix ? suffix : ""); } +# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" + static int mymain(void) { int ret = 0; + char *fakerootdir; virHashTablePtr capslatest = NULL; + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); + + if (!g_mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + abort(); + } + + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); + /* Set the timezone because we are mocking the time() function. * If we don't do that, then localtime() may return unpredictable * results. In order to detect things that just work by a blind @@ -3220,8 +3232,12 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + virFileDeleteTree(fakerootdir); + VIR_FREE(driver.config->nbdTLSx509certdir); qemuTestDriverFree(&driver); + VIR_FREE(fakerootdir); virHashFree(capslatest); virFileWrapperClearPrefixes(); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 6a0adab603..86f3d2c1f3 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -126,10 +126,13 @@ testInfoSetStatusPaths(struct testQemuInfo *info) } +# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" + static int mymain(void) { int ret = 0; + char *fakerootdir; virQEMUDriverConfigPtr cfg = NULL; virHashTablePtr capslatest = NULL; @@ -137,6 +140,15 @@ mymain(void) if (!capslatest) return EXIT_FAILURE; + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); + + if (!g_mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + abort(); + } + + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); + /* Required for tpm-emulator tests */ virFileWrapperAddPrefix(SYSCONFDIR "/qemu/firmware", @@ -1466,8 +1478,12 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + virFileDeleteTree(fakerootdir); + virHashFree(capslatest); qemuTestDriverFree(&driver); + VIR_FREE(fakerootdir); virFileWrapperClearPrefixes(); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index c7983f0014..9f9eb4033c 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -307,10 +307,11 @@ qemuTestParseCapabilitiesArch(virArch arch, void qemuTestDriverFree(virQEMUDriver *driver) { - if (g_getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(driver->embeddedRoot); - virMutexDestroy(&driver->lock); + if (driver->config) { + virFileDeleteTree(driver->config->stateDir); + virFileDeleteTree(driver->config->configDir); + } virObjectUnref(driver->qemuCapsCache); virObjectUnref(driver->xmlopt); virObjectUnref(driver->caps); @@ -369,21 +370,14 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache, } -# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" +# define STATEDIRTEMPLATE abs_builddir "/qemustatedir-XXXXXX" +# define CONFIGDIRTEMPLATE abs_builddir "/qemuconfigdir-XXXXXX" int qemuTestDriverInit(virQEMUDriver *driver) { virSecurityManagerPtr mgr = NULL; - g_autofree char *fakerootdir = NULL; - - fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); - - if (!g_mkdtemp(fakerootdir)) { - fprintf(stderr, "Cannot create fakerootdir"); - abort(); - } - - g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); + char statedir[] = STATEDIRTEMPLATE; + char configdir[] = CONFIGDIRTEMPLATE; memset(driver, 0, sizeof(*driver)); @@ -397,16 +391,35 @@ int qemuTestDriverInit(virQEMUDriver *driver) return -1; driver->hostarch = virArchFromHost(); - driver->config = virQEMUDriverConfigNew(false, fakerootdir); + driver->config = virQEMUDriverConfigNew(false, NULL); if (!driver->config) goto error; + /* Do this early so that qemuTestDriverFree() doesn't see (unlink) the real + * dirs. */ + VIR_FREE(driver->config->stateDir); + VIR_FREE(driver->config->configDir); + /* Overwrite some default paths so it's consistent for tests. */ VIR_FREE(driver->config->libDir); VIR_FREE(driver->config->channelTargetDir); driver->config->libDir = g_strdup("/tmp/lib"); driver->config->channelTargetDir = g_strdup("/tmp/channel"); + if (!g_mkdtemp(statedir)) { + fprintf(stderr, "Cannot create fake stateDir"); + goto error; + } + + driver->config->stateDir = g_strdup(statedir); + + if (!g_mkdtemp(configdir)) { + fprintf(stderr, "Cannot create fake configDir"); + goto error; + } + + driver->config->configDir = g_strdup(configdir); + driver->caps = testQemuCapsInit(); if (!driver->caps) goto error; -- 2.25.4

1 0

[libvirt PATCH] qemu: Skip pre-creation of NVME disk
by Han Han 08 May '20

08 May '20

Unlike the file based disk, NVME disk cannot be pre-created by libvirt. So skip the step of pre-creation. https://bugzilla.redhat.com/show_bug.cgi?id=1823639 Signed-off-by: Han Han <hhan(a)redhat.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 02e8271e..e4bd9077 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -221,13 +221,13 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn, break; case VIR_STORAGE_TYPE_NETWORK: - VIR_DEBUG("Skipping creation of network disk '%s'", + case VIR_STORAGE_TYPE_NVME: + VIR_DEBUG("Skipping creation of disk '%s'", disk->dst); return 0; case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: - case VIR_STORAGE_TYPE_NVME: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.25.0

2 2

[RFC] Faster libvirtd restart with nwfilter rules, one more time
by nshirokovskiy 08 May '20

08 May '20

Hi, all. Some time ago I posted RFC [1] concerning an issue of unresponsive libvird during restart if there is large number of VMs that have network filters on their interfaces. It was identified that in most cases we don't need actually to reinstall network filter rules on daemon restart. Thus I proposed patches [2] that check whether we need to reapply rules or not. The first version has a drawback that daemon won't reapply rules if someone mangled them between daemon stop and start (and this can be done just by restarting firewalld). The second one is just ugly :) Around that time Florian Westphal in a letter off the mailing list suggested to use {iptables|ebtables}-restore to apply rules in one binary call. These binaries has --noflush option so that we won't reset current state of tables. We also need one more -L call for iptables/ebtables to query current filter state to be able to construct input for restore binaries. I wonder can we use this approach? I see currently only one issue - we won't use firealld to spawn rules. But why we need to spawn rules through firewalld if it present? We use passthrough mode anyway. I tried to dig history for hints but didn't found anything. Patch [3] introduced spawning rules thru firewalld-cmd. Nikolay [1] [RFC] Faster libvirtd restart with nwfilter rules https://www.redhat.com/archives/libvir-list/2018-September/msg01206.html [2] nwfilter: don't reinstantiate filters if they are not changed v1: https://www.redhat.com/archives/libvir-list/2018-October/msg00904.html v2: https://www.redhat.com/archives/libvir-list/2018-October/msg01317.html [3] network: use firewalld instead of iptables, when available v0: https://www.redhat.com/archives/libvir-list/2012-April/msg01236.html v1: https://www.redhat.com/archives/libvir-list/2012-August/msg00447.html ... v4: https://www.redhat.com/archives/libvir-list/2012-August/msg01097.html

5 7

[libvirt PATCH] libxl: vga.kind none when no device specified
by Artur Puzio 08 May '20

08 May '20

When no video device is specified in config we should set both hvm.nographic to 1 and hvm.vga.kind to NONE. Without hvm.vga.kind=LIBXL_VGA_INTERFACE_TYPE_NONE both -nographic and -device 'cirrus-vga' are on qemu cmdline. --- src/libxl/libxl_conf.c | 1 + tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 3 +++ tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 458dfc2399..a0059fc2a7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -2404,6 +2404,7 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) b_info->video_memkb = def->videos[0]->vram; } else { libxl_defbool_set(&b_info->u.hvm.nographic, 1); + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE; } return 0; diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json index e804389fea..f16b4a971a 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json @@ -20,6 +20,9 @@ "acpi": "True", "acpi_firmware": "/path/to/slic.dat", "nographic": "True", + "vga": { + "kind": "none" + }, "vnc": { "enable": "False" }, diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json index d46b464642..ddc423bca7 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json @@ -27,6 +27,9 @@ "apic": "True", "acpi": "True", "nographic": "True", + "vga": { + "kind": "none" + }, "vnc": { "enable": "False" }, -- 2.26.2

3 5

[PATCH] tests: Fix the libxl xml2domconfig test
by Jim Fehlig 08 May '20

08 May '20

Commit a13b2905f7 missed an adjustment to a test that is only run when building against xen <= 4.9, where LIBXL_HAVE_BUILDINFO_NESTED_HVM is not defined. Adjust fullvirt-cpuid-legacy-nest test similar to the others. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the build-breaker rule. tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json index cdc8b9867d..0944476151 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json @@ -27,6 +27,9 @@ "acpi": "True", "nested_hvm": "False", "nographic": "True", + "vga": { + "kind": "none" + }, "vnc": { "enable": "False" }, -- 2.26.0

1 0

[libvirt PATCH v2] libxl: vga.kind none when no device specified
by Artur Puzio 07 May '20

07 May '20

When no video device is specified in config we should set both hvm.nographic to 1 and hvm.vga.kind to NONE. Without hvm.vga.kind=LIBXL_VGA_INTERFACE_TYPE_NONE both -nographic and -device 'cirrus-vga' are on qemu cmdline. Signed-off-by: Artur Puzio <contact(a)puzio.waw.pl> --- src/libxl/libxl_conf.c | 1 + tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json | 3 +++ tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 458dfc2399..a0059fc2a7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -2404,6 +2404,7 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) b_info->video_memkb = def->videos[0]->vram; } else { libxl_defbool_set(&b_info->u.hvm.nographic, 1); + b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE; } return 0; diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json index e804389fea..f16b4a971a 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json +++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json @@ -20,6 +20,9 @@ "acpi": "True", "acpi_firmware": "/path/to/slic.dat", "nographic": "True", + "vga": { + "kind": "none" + }, "vnc": { "enable": "False" }, diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json index d46b464642..ddc423bca7 100644 --- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json +++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json @@ -27,6 +27,9 @@ "apic": "True", "acpi": "True", "nographic": "True", + "vga": { + "kind": "none" + }, "vnc": { "enable": "False" }, -- 2.26.2

2 2

[PATCH 00/20] qemu: Remove one of last two instances of -drive if=none usage
by Peter Krempa 07 May '20

07 May '20

QEMU want's to deprecate -drive if=none. Stop clearing QEMU_CAPS_BLOCKDEV when SD cards are used. Please see 17/20 and 20/20 for more explanation. Obviously few cleanups snuck in as well. Peter Krempa (20): qemuxml2(argv|xml): Modernize 'blkdeviotune' tests qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests qemuValidateDomainDeviceDefDisk: Separate disk frontend config validation qemu: validate: Validate blkdeviotune settings in the validator qemu: Move disk config validation to qemuValidateDomainDeviceDefDiskFrontend qemuCheckDiskConfig: Remove and untangle callers qemu: Rename qemuDiskBusNeedsDriveArg to qemuDiskBusIsSD qemuBuildDiskCommandLine: Clarify logic around building -device for disks qemuBuildDriveStr: Refactor formatting of command line for 'sd' cards qemuBuildDiskDeviceStr: Use XML disk bus type names in error message qemu: command: Remove 'virDomainDiskQEMUBus' enum converters qemuDomainSetBlockThreshold: Call qemuBlockNodeNamesDetect only without blockdev qemuDomainValidateStorageSource: Extract check for BLOCKDEV capability qemuDomainValidateStorageSource: Allow masking out blockdev support tests: Add tests for a virtio and sd disk in a single machine qemu: Forbid 'cdrom' on 'sd' bus qemu: Refuse blockjobs on disk bus='sd' with -blockdev qemu: Handle cases when 'qomName' isn't present qemu: Prepare for 'sd' card use together with blockdev qemu: process: Don't clear QEMU_CAPS_BLOCKDEV when SD card is present src/qemu/qemu_backup.c | 3 + src/qemu/qemu_checkpoint.c | 3 + src/qemu/qemu_command.c | 404 ++---------------- src/qemu/qemu_command.h | 7 +- src/qemu/qemu_domain.c | 65 ++- src/qemu/qemu_domain.h | 7 +- src/qemu/qemu_driver.c | 46 +- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_process.c | 17 +- src/qemu/qemu_validate.c | 383 +++++++++++++++-- src/qemu/qemu_validate.h | 1 + tests/qemublocktest.c | 7 +- ... blkdeviotune-group-num.x86_64-4.1.0.args} | 26 +- .../blkdeviotune-group-num.x86_64-latest.args | 50 +++ .../blkdeviotune-group-num.xml | 5 +- ...blkdeviotune-max-length.x86_64-4.1.0.args} | 26 +- ...blkdeviotune-max-length.x86_64-latest.args | 50 +++ .../blkdeviotune-max-length.xml | 5 +- ...rgs => blkdeviotune-max.x86_64-4.1.0.args} | 26 +- .../blkdeviotune-max.x86_64-latest.args | 50 +++ tests/qemuxml2argvdata/blkdeviotune-max.xml | 5 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 39 ++ .../disk-arm-virtio-sd.aarch64-latest.args | 43 ++ tests/qemuxml2argvdata/disk-arm-virtio-sd.xml | 36 ++ .../disk-cdrom-bus-other.x86_64-latest.args | 13 +- .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 11 - .../disk-detect-zeroes.x86_64-2.12.0.args | 1 + tests/qemuxml2argvdata/disk-detect-zeroes.xml | 5 +- ...rd.args => disk-discard.x86_64-4.1.0.args} | 22 +- .../disk-discard.x86_64-latest.args | 46 ++ tests/qemuxml2argvtest.c | 26 +- ... blkdeviotune-group-num.x86_64-latest.xml} | 0 ...blkdeviotune-max-length.x86_64-latest.xml} | 0 ...xml => blkdeviotune-max.x86_64-latest.xml} | 0 ...une.xml => blkdeviotune.x86_64-latest.xml} | 7 +- .../disk-arm-virtio-sd.aarch64-latest.xml | 41 ++ .../disk-cdrom-bus-other.xml | 11 - ...l => disk-detect-zeroes.x86_64-latest.xml} | 0 ...ard.xml => disk-discard.x86_64-latest.xml} | 7 +- tests/qemuxml2xmltest.c | 14 +- 40 files changed, 958 insertions(+), 557 deletions(-) rename tests/qemuxml2argvdata/{blkdeviotune-group-num.args => blkdeviotune-group-num.x86_64-4.1.0.args} (69%) create mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args rename tests/qemuxml2argvdata/{blkdeviotune-max-length.args => blkdeviotune-max-length.x86_64-4.1.0.args} (71%) create mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args rename tests/qemuxml2argvdata/{blkdeviotune-max.args => blkdeviotune-max.x86_64-4.1.0.args} (67%) create mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.xml rename tests/qemuxml2argvdata/{disk-discard.args => disk-discard.x86_64-4.1.0.args} (59%) create mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-latest.args rename tests/qemuxml2xmloutdata/{blkdeviotune-group-num.xml => blkdeviotune-group-num.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{blkdeviotune-max-length.xml => blkdeviotune-max-length.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{blkdeviotune-max.xml => blkdeviotune-max.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{blkdeviotune.xml => blkdeviotune.x86_64-latest.xml} (88%) create mode 100644 tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml rename tests/qemuxml2xmloutdata/{disk-detect-zeroes.xml => disk-detect-zeroes.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-discard.xml => disk-discard.x86_64-latest.xml} (87%) -- 2.26.2

2 21

[libvirt PATCH] tests: Use qemu:///embed to simplify fakerootdir management
by Andrea Bolognani 07 May '20

07 May '20

Now that the QEMU driver natively supports storing all its runtime data inside an arbitrary directory, we can avoid having multiple copies of this same logic in the test suite. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuhotplugtest.c | 15 -------------- tests/qemumemlocktest.c | 17 ---------------- tests/qemuxml2argvtest.c | 16 --------------- tests/qemuxml2xmltest.c | 16 --------------- tests/testutilsqemu.c | 43 ++++++++++++++-------------------------- 5 files changed, 15 insertions(+), 92 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 9a215ab303..e7443ff4b7 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -594,8 +594,6 @@ testQemuHotplugCpuIndividual(const void *opaque) return ret; } -#define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" - static int mymain(void) @@ -604,18 +602,8 @@ mymain(void) int ret = 0; struct qemuHotplugTestData data = {0}; struct testQemuHotplugCpuParams cpudata; - g_autofree char *fakerootdir = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL; - fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); - - if (!g_mkdtemp(fakerootdir)) { - fprintf(stderr, "Cannot create fakerootdir"); - abort(); - } - - g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -891,9 +879,6 @@ mymain(void) DO_TEST_CPU_INDIVIDUAL("ppc64-modern-individual", "16-22", true, true, true); DO_TEST_CPU_INDIVIDUAL("ppc64-modern-individual", "17", true, true, true); - if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(fakerootdir); - qemuTestDriverFree(&driver); virObjectUnref(data.vm); return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 3f18fed1c3..0e254bb3ce 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -51,26 +51,13 @@ testCompareMemLock(const void *data) return ret; } -# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" - static int mymain(void) { int ret = 0; - char *fakerootdir; virQEMUCapsPtr qemuCaps = NULL; - fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); - - if (!g_mkdtemp(fakerootdir)) { - fprintf(stderr, "Cannot create fakerootdir"); - abort(); - } - - g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); - if (qemuTestDriverInit(&driver) < 0) { - VIR_FREE(fakerootdir); return EXIT_FAILURE; } @@ -150,11 +137,7 @@ mymain(void) cleanup: virObjectUnref(qemuCaps); - if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(fakerootdir); - qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 04febd1b0c..8bd6102d26 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -609,24 +609,12 @@ testInfoSetPaths(struct testQemuInfo *info, abs_srcdir, info->name, suffix ? suffix : ""); } -# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" - static int mymain(void) { int ret = 0; - char *fakerootdir; virHashTablePtr capslatest = NULL; - fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); - - if (!g_mkdtemp(fakerootdir)) { - fprintf(stderr, "Cannot create fakerootdir"); - abort(); - } - - g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); - /* Set the timezone because we are mocking the time() function. * If we don't do that, then localtime() may return unpredictable * results. In order to detect things that just work by a blind @@ -3232,12 +3220,8 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); - if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(fakerootdir); - VIR_FREE(driver.config->nbdTLSx509certdir); qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); virHashFree(capslatest); virFileWrapperClearPrefixes(); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 86f3d2c1f3..6a0adab603 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -126,13 +126,10 @@ testInfoSetStatusPaths(struct testQemuInfo *info) } -# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" - static int mymain(void) { int ret = 0; - char *fakerootdir; virQEMUDriverConfigPtr cfg = NULL; virHashTablePtr capslatest = NULL; @@ -140,15 +137,6 @@ mymain(void) if (!capslatest) return EXIT_FAILURE; - fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); - - if (!g_mkdtemp(fakerootdir)) { - fprintf(stderr, "Cannot create fakerootdir"); - abort(); - } - - g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); - /* Required for tpm-emulator tests */ virFileWrapperAddPrefix(SYSCONFDIR "/qemu/firmware", @@ -1478,12 +1466,8 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); - if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) - virFileDeleteTree(fakerootdir); - virHashFree(capslatest); qemuTestDriverFree(&driver); - VIR_FREE(fakerootdir); virFileWrapperClearPrefixes(); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 9f9eb4033c..c7983f0014 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -307,11 +307,10 @@ qemuTestParseCapabilitiesArch(virArch arch, void qemuTestDriverFree(virQEMUDriver *driver) { + if (g_getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + virFileDeleteTree(driver->embeddedRoot); + virMutexDestroy(&driver->lock); - if (driver->config) { - virFileDeleteTree(driver->config->stateDir); - virFileDeleteTree(driver->config->configDir); - } virObjectUnref(driver->qemuCapsCache); virObjectUnref(driver->xmlopt); virObjectUnref(driver->caps); @@ -370,14 +369,21 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache, } -# define STATEDIRTEMPLATE abs_builddir "/qemustatedir-XXXXXX" -# define CONFIGDIRTEMPLATE abs_builddir "/qemuconfigdir-XXXXXX" +# define FAKEROOTDIRTEMPLATE abs_builddir "/fakerootdir-XXXXXX" int qemuTestDriverInit(virQEMUDriver *driver) { virSecurityManagerPtr mgr = NULL; - char statedir[] = STATEDIRTEMPLATE; - char configdir[] = CONFIGDIRTEMPLATE; + g_autofree char *fakerootdir = NULL; + + fakerootdir = g_strdup(FAKEROOTDIRTEMPLATE); + + if (!g_mkdtemp(fakerootdir)) { + fprintf(stderr, "Cannot create fakerootdir"); + abort(); + } + + g_setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, TRUE); memset(driver, 0, sizeof(*driver)); @@ -391,35 +397,16 @@ int qemuTestDriverInit(virQEMUDriver *driver) return -1; driver->hostarch = virArchFromHost(); - driver->config = virQEMUDriverConfigNew(false, NULL); + driver->config = virQEMUDriverConfigNew(false, fakerootdir); if (!driver->config) goto error; - /* Do this early so that qemuTestDriverFree() doesn't see (unlink) the real - * dirs. */ - VIR_FREE(driver->config->stateDir); - VIR_FREE(driver->config->configDir); - /* Overwrite some default paths so it's consistent for tests. */ VIR_FREE(driver->config->libDir); VIR_FREE(driver->config->channelTargetDir); driver->config->libDir = g_strdup("/tmp/lib"); driver->config->channelTargetDir = g_strdup("/tmp/channel"); - if (!g_mkdtemp(statedir)) { - fprintf(stderr, "Cannot create fake stateDir"); - goto error; - } - - driver->config->stateDir = g_strdup(statedir); - - if (!g_mkdtemp(configdir)) { - fprintf(stderr, "Cannot create fake configDir"); - goto error; - } - - driver->config->configDir = g_strdup(configdir); - driver->caps = testQemuCapsInit(); if (!driver->caps) goto error; -- 2.25.4

2 1

[PATCH 0/2] conf: Properly handle placement of <auth> and <encryption> after blockjobs
by Peter Krempa 07 May '20

07 May '20

Peter Krempa (2): conf: Sanitize handling of <auth> and <encryption> placement for disks conf: Store 'diskElementAuth' and 'diskElementEnc' properties in status XML src/conf/backup_conf.c | 3 +- src/conf/domain_conf.c | 117 +++++++++++----------- src/conf/domain_conf.h | 6 +- src/conf/snapshot_conf.c | 4 +- src/qemu/qemu_domain.c | 6 +- src/util/virstoragefile.c | 1 - src/util/virstoragefile.h | 2 - tests/qemublocktest.c | 4 +- tests/qemustatusxml2xmldata/modern-in.xml | 4 + tests/virstoragetest.c | 3 +- 10 files changed, 81 insertions(+), 69 deletions(-) -- 2.26.2

2 3

[PATCH 0/2] qemu: Restrict valid configurations for disk type='lun'
by Peter Krempa 07 May '20

07 May '20

Please see justification in the commits. This series applies on top of some of the refactors from https://www.redhat.com/archives/libvir-list/2020-May/msg00188.html Peter Krempa (2): qemu: Forbid non-raw images for disk type='lun' with vitio-blk frontend qemu: domain: Forbid slice/encryption/copy_on_read with disk type='lun' src/qemu/qemu_domain.c | 19 +++++++++++++++++++ src/qemu/qemu_validate.c | 9 ++++----- tests/qemuxml2argvdata/virtio-lun.args | 4 ++-- tests/qemuxml2argvdata/virtio-lun.xml | 4 ++-- tests/qemuxml2xmloutdata/virtio-lun.xml | 4 ++-- 5 files changed, 29 insertions(+), 11 deletions(-) -- 2.26.2

2 3

[GSoC] Introduction
by Radostin Stoyanov 07 May '20

07 May '20

Hello everyone, As a quick introduction, I’m Radostin Stoyanov, a Google Summer of Code student from University of Cambridge. In the next few months I’ll be working with my mentors Cédric Bosdonnat, Pavel Hrdina and Tyler Johnson (Akmod) on the project "Take migration in Salt virt module to the next level". In short, the project aim is to refactor some of the existing Salt migration functions to use the python-libvirt API, as well as to make available more of the libvirt migration options. You can find me in IRC as rst0irc. - Radostin

2 1

[PATCH 0/8] qemu: caps: Add detection of default device property values and remove deprecated 'scsi=off'
by Peter Krempa 07 May '20

07 May '20

First part focuses on allowing the device property code to detect the default values for the properties and the second part then uses it to remove formatting of the deprecated 'scsi=off' for virti-blk-pci. Peter Krempa (8): virQEMUCapsProbeQMPDevices: Split up into logical chunks virQEMUCapsProbeQMPDeviceProperties: Switch to local implementation virQEMUCapsProbeQMPObjectTypes: Fold in virQEMUCapsProbeQMPGenericProps qemuMonitorJSONGetDeviceProps: Refactor to modern standards qemuMonitorGetDeviceProps: Return data in a hash table virQEMUCapsProbeQMPDeviceProperties: Add per-property callbacks qemu: capabilities: Introduce QEMU_CAPS_VIRTIO_BLK_SCSI_DEFAULT_DISABLED qemu: command: Stop formatting of 'scsi=off' for virtio-blk-pci src/qemu/qemu_capabilities.c | 347 ++++++++++-------- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 4 +- src/qemu/qemu_monitor.c | 11 +- src/qemu/qemu_monitor.h | 5 +- src/qemu/qemu_monitor_json.c | 58 ++- src/qemu/qemu_monitor_json.h | 7 +- .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 2 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 12 +- .../disk-cache.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 2 +- .../disk-copy_on_read.x86_64-latest.args | 2 +- .../disk-detect-zeroes.x86_64-latest.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 6 +- .../disk-network-http.x86_64-latest.args | 8 +- .../disk-network-iscsi.x86_64-latest.args | 8 +- .../disk-network-nbd.x86_64-latest.args | 10 +- .../disk-network-rbd.x86_64-latest.args | 12 +- .../disk-network-sheepdog.x86_64-latest.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 4 +- .../disk-network-tlsx509.x86_64-latest.args | 8 +- .../disk-nvme.x86_64-latest.args | 8 +- .../disk-shared.x86_64-latest.args | 4 +- .../disk-slices.x86_64-latest.args | 6 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- ...luks-disks-source-qcow2.x86_64-latest.args | 12 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../riscv64-virt-graphics.riscv64-latest.args | 2 +- .../riscv64-virt-headless.riscv64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...virtio-non-transitional.x86_64-latest.args | 2 +- ...virtio-options-disk-ats.x86_64-latest.args | 8 +- ...rtio-options-disk-iommu.x86_64-latest.args | 4 +- ...tio-options-disk-packed.x86_64-latest.args | 8 +- .../virtio-options.x86_64-latest.args | 4 +- .../virtio-transitional.x86_64-latest.args | 4 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- 60 files changed, 356 insertions(+), 270 deletions(-) -- 2.26.2

2 9

[libvirt PATCH 0/2] docs: Use list-tables in reStructuredText
by Andrea Bolognani 07 May '20

07 May '20

It's easier to modify than the ASCII-art alternative. Andrea Bolognani (2): docs: Convert existing tables to list-table docs: Document list-tables as recommended docs/coding-style.rst | 53 +++++++++++------- docs/glib-adoption.rst | 123 +++++++++++++++++++++++++++-------------- docs/styleguide.rst | 20 +++++++ 3 files changed, 134 insertions(+), 62 deletions(-) -- 2.25.4

3 9

[libvirt-ci PATCH 0/2] add a 'go fmt' container for code style checks
by Daniel P. Berrangé 07 May '20

07 May '20

This common container will be used across all our Go based projects Daniel P. Berrangé (2): gitlab: rename job for building check-dco container containers: add a standard container for running go fmt .gitlab-ci.yml | 7 ++++++- containers/go-fmt/Dockerfile | 9 +++++++++ containers/go-fmt/README.rst | 20 ++++++++++++++++++++ containers/go-fmt/go-fmt.sh | 24 ++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 containers/go-fmt/Dockerfile create mode 100644 containers/go-fmt/README.rst create mode 100755 containers/go-fmt/go-fmt.sh -- 2.25.4

3 7

[perl PATCH v4 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 07 May '20

07 May '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. v1: https://www.redhat.com/archives/libvir-list/2020-April/msg01157.html v2: https://www.redhat.com/archives/libvir-list/2020-April/msg01408.html This is a different approach from v1, because we don't inherit from the main libvirt container images. Instead we use the libvirt-minimal project as a dependancy. The cost is that the container build stage is more expensive, but the main project build stage is cheaper. This is a net win because the container build stage is cached so is only a penalty the first time, or when the distro parent image has changes to pull in. It also makes the CI process of the binding more self-contained avoiding by avoiding a dep on the container image for libvirt. Daniel P. Berrangé (3): gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 170 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 97 +++++++++++++++ ci/libvirt-centos-8.Dockerfile | 68 +++++++++++ ci/libvirt-debian-10.Dockerfile | 68 +++++++++++ ci/libvirt-debian-9.Dockerfile | 71 +++++++++++ ci/libvirt-debian-sid.Dockerfile | 68 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-32.Dockerfile | 66 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 67 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 66 +++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 71 +++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 68 +++++++++++ ci/refresh | 22 ++++ 16 files changed, 1008 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 13

[libvirt PATCH] docs: introduce a page showing a overall CI dashboard
by Daniel P. Berrangé 07 May '20

07 May '20

With the move to GitLab CI one of the things we miss from Jenkins is a single page dashboard showing CI status across all projects. This is a very simple replacement that uses badges for CI pipeline status. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/ci.rst | 408 ++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 3 + 2 files changed, 411 insertions(+) create mode 100644 docs/ci.rst diff --git a/docs/ci.rst b/docs/ci.rst new file mode 100644 index 0000000000..2b997a9115 --- /dev/null +++ b/docs/ci.rst @@ -0,0 +1,408 @@ +============================== +Libvirt Continuous Integration +============================== + +The libvirt project primarily uses GitLab CI for automated testing of Linux +builds, and cross-compiled Windows builds. `Travis <https://travis-ci.org/libvirt/libvirt>`_ +is used for validating macOS builds, and `Jenkins <https://ci.centos.org/view/libvirt>`_ +is temporarily used for validating FreeBSD builds. + +GitLab CI Dashboard +=================== + +The dashboard below shows the current status of the GitLab CI jobs for each +repository: + +.. raw:: html + + <table> + <thead> + <tr> + <th>Project</th> + <th>Pipeline</th> + </tr> + </thead> + <tbody> + <tr> + <th colspan="2">Core</th> + </tr> + <tr> + <td>libvirt</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Language bindings</th> + </tr> + <tr> + <td>libvirt-csharp</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-csharp/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-go</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-go/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-java</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-java/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-ocaml</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-ocaml/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-perl</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-perl/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-php</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-php/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-python</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-python/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-rust</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-rust/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>ruby-libvirt</td> + <td> + <a href="https://gitlab.com/libvirt/ruby-libvirt/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/ruby-libvirt/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Object mappings</th> + </tr> + <tr> + <td>libvirt-cim</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-cim/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-dbus</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dbus/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-glib</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-glib/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-go-xml</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-go-xml/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-go-xml/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-snmp</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-snmp/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Testing</th> + </tr> + <tr> + <td>libvirt-ci</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-ci/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-dockerfiles</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dockerfiles/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-dockerfiles/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-test-API</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-test-API/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-tck</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-tck/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Docs / web</th> + </tr> + <tr> + <td>libvirt-publican</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-publican/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-appdev-guide-python</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeli…"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-wiki</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-wiki/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>virttools-planet</td> + <td> + <a href="https://gitlab.com/libvirt/virttools-planet/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>virttools-web</td> + <td> + <a href="https://gitlab.com/libvirt/virttools-web/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Misc</th> + </tr> + <tr> + <td>libvirt-console-proxy</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-console-proxy/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-designer</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-designer/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-devaddr</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-devaddr/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-sandbox</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-sandbox/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-sandbox-image</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-security-notice</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-security-notice/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.s…"/> + </a> + </td> + </tr> + <tr> + <td>test</td> + <td> + <a href="https://gitlab.com/libvirt/test/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/test/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <th colspan="2">Archived</th> + </tr> + <tr> + <td>autotest</td> + <td> + <a href="https://gitlab.com/libvirt/autotest/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/autotest/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>cimtest</td> + <td> + <a href="https://gitlab.com/libvirt/cimtest/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/cimtest/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>hooks</td> + <td> + <a href="https://gitlab.com/libvirt/hooks/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/hooks/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libcmpiutil</td> + <td> + <a href="https://gitlab.com/libvirt/libcmpiutil/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libcmpiutil/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-appdev-guide</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-appdev-guide/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-appdev-guide/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-autobuild</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-autobuild/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-autobuild/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-builder</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-builder/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-builder/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-kube</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-kube/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-kube/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-media</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-media/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-media/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-qpid</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-qpid/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-qpid/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>libvirt-virshcmdref</td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-virshcmdref/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/libvirt-virshcmdref/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>patchchecker</td> + <td> + <a href="https://gitlab.com/libvirt/patchchecker/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/patchchecker/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>php-virt-control</td> + <td> + <a href="https://gitlab.com/libvirt/php-virt-control/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/php-virt-control/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + <tr> + <td>scripts</td> + <td> + <a href="https://gitlab.com/libvirt/scripts/pipelines"> + <img alt="pipeline status" src="https://gitlab.com/libvirt/scripts/badges/master/pipeline.svg"/> + </a> + </td> + </tr> + </tbody> + </table> diff --git a/docs/docs.html.in b/docs/docs.html.in index 6bdf0c32b8..f1d44fadc0 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -142,6 +142,9 @@ <dt><a href="strategy.html">Project strategy</a></dt> <dd>Sets a vision for future direction & technical choices</dd> + <dt><a href="ci.html">CI Testing</a></dt> + <dd>Details of the Continuous Integration testing strategy</dd> + <dt><a href="bugs.html">Bug reports</a></dt> <dd>How and where to report bugs and request features</dd> -- 2.26.2

2 2

Google Summer of Code 2020 Student self introduction
by GUOQING LI 07 May '20

07 May '20

Hi there I am Lee, an undergraduate student from Thailand (currently based in Japan) and I will be working as a Student Developer under Google Summer of Code 2020 program. The host organisation is *Libivirt <https://summerofcode.withgoogle.com/projects/#6371688154923008>**.* I will be contributing to *virt* module under *Saltstack* project. I proposed <https://docs.google.com/document/d/1oDGs8eszMreVQhaUrD8yVPOPyBIw-AQyPsaOJsr…> to make CPU tuning, CPU model and topology, Memory tuning, NUMA Node Tuning available. Looking forward to this learning journey. Any suggestions and comments will be appreciated [image: :slightly_smiling_face:] I would be nice if you want to connect me on *LinkedIn <https://www.linkedin.com/in/guoqing-li-538061a7/>* as well. 🙏 Best regards, Lee

2 1

[perl PATCH v2 0/3] gitlab: introduce CI coverage
by Daniel P. Berrangé 07 May '20

07 May '20

This series introduces CI jobs for the Perl binding, enabling the switch over to use of Merge Requests with pre-merge build validation. Daniel P. Berrangé (3): gitlab: add CI jobs for validating build across platforms gitlab: add a simple job that publishes the API docs as HTML gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 173 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 97 +++++++++++++++ ci/libvirt-centos-8.Dockerfile | 68 +++++++++++ ci/libvirt-debian-10.Dockerfile | 68 +++++++++++ ci/libvirt-debian-9.Dockerfile | 71 +++++++++++ ci/libvirt-debian-sid.Dockerfile | 68 +++++++++++ ci/libvirt-fedora-31.Dockerfile | 66 ++++++++++ ci/libvirt-fedora-32.Dockerfile | 66 ++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 67 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 66 ++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 71 +++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 68 +++++++++++ ci/refresh | 22 ++++ 16 files changed, 1013 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[go PATCH 0/3] introduce GitLab CI jobs and merge requests
by Daniel P. Berrangé 07 May '20

07 May '20

This introduces GitLab CI jobs for the Go bindings and indicates that contributors should submit merge requests. Daniel P. Berrangé (3): Fix tests on Ubuntu 18.04 / Debian 9 with missing screenshot file gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 168 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 12 ++ ci/libvirt-centos-7.Dockerfile | 84 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 62 ++++++++++ ci/libvirt-debian-10.Dockerfile | 54 +++++++++ ci/libvirt-debian-9.Dockerfile | 57 +++++++++ ci/libvirt-debian-sid.Dockerfile | 54 +++++++++ ci/libvirt-fedora-31.Dockerfile | 51 ++++++++ ci/libvirt-fedora-32.Dockerfile | 51 ++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 52 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 53 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 57 +++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 54 +++++++++ ci/refresh | 27 +++++ domain_test.go | 5 + 17 files changed, 869 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 6

[PATCH] conf: Add qemu_job_wait_time option
by MIKI Nobuhiro 07 May '20

07 May '20

The waiting time to acquire the lock times out, which leads to a segment fault. In essence we should make improvements around locks, but as a workaround we will change the timeout to allow the user to increase it. This value was defined as 30 seconds, so use it as the default value. The logs are as follows: ``` Timed out during operation: cannot acquire state change lock \ (held by monitor=remoteDispatchDomainCreateWithFlags) libvirtd.service: main process exited, code=killed,status=11/SEGV ``` Signed-off-by: MIKI Nobuhiro <nmiki(a)yahoo-corp.jp> --- docs/news.xml | 9 +++++++++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 3 +++ src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 7 ++----- src/qemu/test_libvirtd_qemu.aug.in | 1 + 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 80819ae..3755c49 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -119,6 +119,15 @@ Bounds Checking) and IBS (Indirect Branch Speculation). </description> </change> + <change> + <summary> + conf: Add job wait time setting to qemu.conf + </summary> + <description> + How many seconds the new job waits for the existing job to finish. + This only affects if you are using qemu as driver. + </description> + </change> </section> <section title="Improvements"> </section> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 404498b..76c896e 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -97,6 +97,7 @@ module Libvirtd_qemu = | bool_entry "dump_guest_core" | str_entry "stdio_handler" | int_entry "max_threads_per_process" + | int_entry "qemu_job_wait_time" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index abdbf07..a05aaa5 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -612,6 +612,9 @@ # #max_threads_per_process = 0 +# How many seconds the new job waits for the existing job to finish. +#qemu_job_wait_time = 30 + # If max_core is set to a non-zero integer, then QEMU will be # permitted to create core dumps when it crashes, provided its # RAM size is smaller than the limit set. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c598240..34d29ec 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -272,6 +272,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, cfg->keepAliveInterval = 5; cfg->keepAliveCount = 5; cfg->seccompSandbox = -1; + cfg->qemuJobWaitTime = 30; cfg->logTimestamp = true; cfg->glusterDebugLevel = 4; @@ -655,6 +656,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, return -1; if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0) return -1; + if (virConfGetValueUInt(conf, "qemu_job_wait_time", &cfg->qemuJobWaitTime) < 0) + return -1; if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { if (virConfGetValueString(conf, "max_core", &corestr) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index b9ef455..49dd7b6 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -218,6 +218,8 @@ struct _virQEMUDriverConfig { gid_t swtpm_group; char **capabilityfilters; + + unsigned int qemuJobWaitTime; }; G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d63ec23..4badc0f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6212,9 +6212,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6225,7 +6222,7 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, * * Acquires job for a domain object which must be locked before * calling. If there's already a job running waits up to - * QEMU_JOB_WAIT_TIME after which the functions fails reporting + * cfg->qemuJobWaitTime after which the functions fails reporting * an error unless @nowait is set. * * If @nowait is true this function tries to acquire job and if @@ -6272,7 +6269,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, return -1; priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + 1000ull * cfg->qemuJobWaitTime; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 19da591..b2886df 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,6 +76,7 @@ module Test_libvirtd_qemu = { "max_processes" = "0" } { "max_files" = "0" } { "max_threads_per_process" = "0" } +{ "qemu_job_wait_time" = "30" } { "max_core" = "unlimited" } { "dump_guest_core" = "1" } { "mac_filter" = "1" } -- 1.8.3.1

4 3

Release of libvirt-6.3.0
by Daniel Veillard 07 May '20

07 May '20

It's out, tagged in git and the signed sources tarball and rpm are available from the usual place: https://libvirt.org/sources/ I have also pushed the python bindings 6.3.0 release at their usual place https://libvirt.org/sources/python/ Among the things to note is the revamp of the vbox support, deprecating old 5.x versions but adding new 6.x API to control the hypervisor. New features: - qemu: support disabling hotplug/unplug of PCIe devices libvirt can now set the "hotplug" option for pcie-root-ports and pcie-switch-downstream-ports, which can be used to disable hotplug/unplug of devices from these ports (default behavior is for these controllers to accept all hotplug/unplug attempts, but this is often undesireable). - vbox: added support for version 6.0 and 6.1 APIs libvirt can now support use of the VirtualBox 6.0 and 6.1 APIs. This is compile tested only, so we are looking for feedback from users on how well it works in practice. - xen: Add support for 'e820_host' hypervisor feature e820_host is a Xen-specific option only available for PV guests. When enabled it provides the guest with a virtual e820 memory map based on the host one. It must be enabled to allow hotplugging PCI devices to PV guests, particularly when memory ballooning is enabled. - xen: Add support for 'passthrough' hypervisor feature passthrough is a Xen-specific option new to Xen 4.13 that enables PCI passthrough for guests. It must be enabled to allow hotplugging PCI devices. - qemu: support async IO mode 'io_uring' Linux 5.1 introduces a fast and efficient async IO interface io_uring, then qemu implements that in version 5.0. It could be used in file, host device and host cdrom backend by io='io_uring' of disk XML. - Lease time option included for network DHCP settings Users can now configure expiry time for leases for networks where libvirt manages DHCP. The time can be specified for whole range and/or fine tuned per individual host. - qemu: Implement pSeries Spectre mitigation features Users can now setup the following capabilities of pSeries guests: CFPC (Cache Flush on Privilege Change), SBBC (Speculation Barrier Bounds Checking) and IBS (Indirect Branch Speculation). Improvements: - qemu: Allow checkpoint redefine for offline VMs Skip the liveness and capability checks when redefining checkpoints as we don't need QEMU interactions to update the metadata. - daemons: Improve timeout handling Daemons now support --timeout 0 which suppresses daemon killing after given time of inactivity. - qemu: Add support for 'multidevs' option This option prevents misbehaviours on guest if a QEMU 9pfs export contains multiple devices, due to the potential file ID collisions this otherwise may cause. Bug fixes: - qemu: Various embed driver fixes When using shared resources from embed driver (e.g. hugepages, machined, etc.) libvirt now generates an unique handler that is not conflicting with other embed drivers or system or session daemons. - cpu: Distinguish Cascadelake-Server from Skylake-Server Libvirt now properly detects Cascadelake-Server and Skylake-Server processors which differ only in stepping. - qemu: Fix domain restore from a block device When using namespaces, libvirt was unable to restore a domain from a block device because libvirt tried to relabel the device inside the namespace while QEMU was given FD to the block device in the host. - node_device_udev: Handle move events Libvirt now handles move event which is emitted on a NIC rename. - qemu: Fix capabilities probing with TCG Libvirt no long assumes TCG is always available. It now detects whether QEMU supports TCG and reports it accordingly. Removed features: - vbox: removed support for version 5.0 and 5.1 APIs libvirt no longer supports use of VirtualBox 5.0 and 5.1 since these versions reached their end of life on 2017/05 and 2018/04 respectively. Thanks everybody for your help with this release, stay safe, enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt-ocaml PATCH 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

Add GitLab CI jobs for the build and basic test, along with use of merge requests for contributions. Daniel P. Berrangé (2): gitlab: introduce CI jobs testing git master & distro libvirt gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 172 +++++++++++++++++++++++++++ CONTRIBUTING.rst | 28 +++++ MANIFEST | 1 + Makefile.in | 2 +- ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 85 +++++++++++++ ci/libvirt-centos-8.Dockerfile | 63 ++++++++++ ci/libvirt-debian-10.Dockerfile | 55 +++++++++ ci/libvirt-debian-9.Dockerfile | 58 +++++++++ ci/libvirt-debian-sid.Dockerfile | 55 +++++++++ ci/libvirt-fedora-31.Dockerfile | 52 ++++++++ ci/libvirt-fedora-32.Dockerfile | 52 ++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 58 +++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++ ci/refresh | 27 +++++ 17 files changed, 883 insertions(+), 1 deletion(-) create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[libvirt-php 0/6] introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

This series introduces use of GitLab CI and merge requests. In doing so several current build problems are fixes. Daniel P. Berrangé (6): m4: ignore --php-binary if it doesn't exist src: don't declare global variables in header files tests: mark skipped tests with exit status 77 tests: skip test if not running on host with running libvirtd gitlab: add CI jobs for validating build across platforms gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 146 +++++++++++++++++++++++++++ .gitpublish | 4 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 12 +++ ci/libvirt-centos-7.Dockerfile | 92 +++++++++++++++++ ci/libvirt-debian-10.Dockerfile | 64 ++++++++++++ ci/libvirt-debian-9.Dockerfile | 67 ++++++++++++ ci/libvirt-debian-sid.Dockerfile | 64 ++++++++++++ ci/libvirt-fedora-31.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-32.Dockerfile | 60 +++++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 61 +++++++++++ ci/libvirt-opensuse-151.Dockerfile | 62 ++++++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 67 ++++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 64 ++++++++++++ ci/refresh | 22 ++++ m4/virt-php-extension.m4 | 2 +- src/libvirt-connection.c | 2 + src/libvirt-connection.h | 2 +- src/libvirt-domain.c | 2 + src/libvirt-domain.h | 2 +- src/libvirt-network.c | 2 + src/libvirt-network.h | 2 +- src/libvirt-nodedev.c | 2 + src/libvirt-nodedev.h | 2 +- src/libvirt-nwfilter.c | 2 + src/libvirt-nwfilter.h | 2 +- src/libvirt-php.c | 2 + src/libvirt-php.h | 2 +- src/libvirt-snapshot.c | 2 + src/libvirt-snapshot.h | 2 +- src/libvirt-storage.c | 3 + src/libvirt-storage.h | 4 +- src/libvirt-stream.c | 2 + src/libvirt-stream.h | 2 +- tests/functions.phpt.in | 2 +- tests/runtests.sh | 2 +- tests/test-get-models.phpt | 4 +- 37 files changed, 903 insertions(+), 19 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

3 9

[libvirt-rust 0/2] Introduce GitLab CI and merge requests
by Daniel P. Berrangé 06 May '20

06 May '20

Add GitLab CI jobs for the build and basic test, along with use of merge requests for contributions. Daniel P. Berrangé (2): gitlab: introduce GitLab CI job for build gitlab: add CONTRIBUTING.rst file to indicate use of merge requests .gitlab-ci.yml | 166 +++++++++++++++++++++++++++ .gitpublish | 5 - CONTRIBUTING.rst | 28 +++++ ci/README.rst | 14 +++ ci/libvirt-centos-7.Dockerfile | 85 ++++++++++++++ ci/libvirt-centos-8.Dockerfile | 63 ++++++++++ ci/libvirt-debian-10.Dockerfile | 55 +++++++++ ci/libvirt-debian-9.Dockerfile | 58 ++++++++++ ci/libvirt-debian-sid.Dockerfile | 55 +++++++++ ci/libvirt-fedora-31.Dockerfile | 52 +++++++++ ci/libvirt-fedora-32.Dockerfile | 52 +++++++++ ci/libvirt-fedora-rawhide.Dockerfile | 53 +++++++++ ci/libvirt-opensuse-151.Dockerfile | 54 +++++++++ ci/libvirt-ubuntu-1804.Dockerfile | 58 ++++++++++ ci/libvirt-ubuntu-2004.Dockerfile | 55 +++++++++ ci/refresh | 27 +++++ 16 files changed, 875 insertions(+), 5 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst create mode 100644 ci/README.rst create mode 100644 ci/libvirt-centos-7.Dockerfile create mode 100644 ci/libvirt-centos-8.Dockerfile create mode 100644 ci/libvirt-debian-10.Dockerfile create mode 100644 ci/libvirt-debian-9.Dockerfile create mode 100644 ci/libvirt-debian-sid.Dockerfile create mode 100644 ci/libvirt-fedora-31.Dockerfile create mode 100644 ci/libvirt-fedora-32.Dockerfile create mode 100644 ci/libvirt-fedora-rawhide.Dockerfile create mode 100644 ci/libvirt-opensuse-151.Dockerfile create mode 100644 ci/libvirt-ubuntu-1804.Dockerfile create mode 100644 ci/libvirt-ubuntu-2004.Dockerfile create mode 100755 ci/refresh -- 2.26.2

2 4

[libvirt PATCH] keycodemapdb: update submodule for win32 keycode fix
by Daniel P. Berrangé 06 May '20

06 May '20

Fix win32 keycode for VK_OEM_102 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/keycodemapdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/keycodemapdb b/src/keycodemapdb index 317d3eeb96..27acf0ef82 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 317d3eeb963a515e15a63fa356d8ebcda7041a51 +Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd -- 2.26.2

2 1

[PATCH v2] Improve blockpull man entry
by Sebastian Mitterle 06 May '20

06 May '20

1. Fix usage of bandwidth, base arguments. 2. Explain valid arguments for `base`. 3. Move explanation for `--keep-relative` to end considering it's not a very frequent use case. 4. Add reference to documentation for relative paths in backing chains. Signed-off-by: Sebastian Mitterle <smitterl(a)redhat.com> --- docs/manpages/virsh.rst | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index dc404ddfe8..71bd968fab 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -1345,7 +1345,7 @@ blockpull .. code-block:: - blockpull domain path [bandwidth] [--bytes] [base] + blockpull domain path [bandwidth [--bytes] [base]] [--wait [--verbose] [--timeout seconds] [--async]] [--keep-relative] @@ -1356,6 +1356,12 @@ the new backing file and only the intermediate portion of the chain is pulled. Once all requested data from the backing image chain has been pulled, the disk no longer depends on that portion of the backing chain. +*base* can be specified in two ways: either as indexed target name 'name[i]' +where 'name' corresponds to the disk target name (<target dev='name'/>) and +'i' corresponds to the 'index' of the '<backingStore>'; or as the file name +of the backing file (<source file='name'/>). + + By default, this command returns as soon as possible, and data for the entire disk is pulled in the background; the progress of the operation can be checked with ``blockjob``. However, if *--wait* is @@ -1367,16 +1373,19 @@ is triggered, *--async* will return control to the user as fast as possible, otherwise the command may continue to block a little while longer until the job is done cleaning up. -Using the *--keep-relative* flag will keep the backing chain names -relative. - *path* specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to *domain* (see also ``domblklist`` for listing these names). + *bandwidth* specifies copying bandwidth limit in MiB/s. For further information on the *bandwidth* argument see the corresponding section for the ``blockjob`` -command. +command. Using *--bytes* flag indicates the value in *bandwidth* is given in +bytes. + +Using the *--keep-relative* flag will keep the backing chain names +relative (details on `https://www.libvirt.org/kbase/backing_chains.html +<https://www.libvirt.org/kbase/backing_chains.html>`__). blockresize -- 2.25.2

2 1

[libvirt PATCH v2 0/1] tests: Introduce virhostdevmock
by Andrea Bolognani 06 May '20

06 May '20

Changes from [v1]: * move function to a separate mock library; * load mock library for all tests that use virHostdevManager. [v1] https://www.redhat.com/archives/libvir-list/2020-May/msg00020.html Andrea Bolognani (1): tests: Introduce virhostdevmock tests/Makefile.am | 7 +++++++ tests/qemuhotplugtest.c | 1 + tests/virhostdevmock.c | 29 +++++++++++++++++++++++++++++ tests/virhostdevtest.c | 4 +++- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tests/virhostdevmock.c -- 2.25.4

2 3

[PATCH 0/4] bhyve: framebuffer resolution and VNC password
by Fabian Freyer 06 May '20

06 May '20

Add support for setting the bhyve framebuffer resolution and probe whether bhyve supports VNC password authentication. If it does, allow setting the password. While we're here, also add support for parsing bhyve's framebuffer argument string. Fabian Freyer (4): bhyve: support parsing fbuf PCI device bhyve: add support for setting fbuf resolution bhyve: probe for VNC password capability bhyve: add VNC password support docs/formatdomain.html.in | 2 +- docs/news.xml | 20 +++ src/bhyve/bhyve_capabilities.c | 16 ++- src/bhyve/bhyve_capabilities.h | 1 + src/bhyve/bhyve_command.c | 36 ++++-- src/bhyve/bhyve_parse_command.c | 116 +++++++++++++++++- src/libvirt_private.syms | 1 + .../bhyveargv2xml-vnc-listen.args | 10 ++ .../bhyveargv2xml-vnc-listen.xml | 22 ++++ .../bhyveargv2xml-vnc-password.args | 10 ++ .../bhyveargv2xml-vnc-password.xml | 22 ++++ .../bhyveargv2xml-vnc-resolution.args | 10 ++ .../bhyveargv2xml-vnc-resolution.xml | 24 ++++ .../bhyveargv2xml-vnc-vga-io.args | 10 ++ .../bhyveargv2xml-vnc-vga-io.xml | 22 ++++ .../bhyveargv2xml-vnc-vga-off.args | 10 ++ .../bhyveargv2xml-vnc-vga-off.xml | 23 ++++ .../bhyveargv2xml-vnc-vga-on.args | 10 ++ .../bhyveargv2xml-vnc-vga-on.xml | 23 ++++ .../bhyveargv2xmldata/bhyveargv2xml-vnc.args | 10 ++ tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml | 22 ++++ tests/bhyveargv2xmltest.c | 9 +- .../bhyvexml2argv-vnc-password-comma.xml | 26 ++++ .../bhyvexml2argv-vnc-password.args | 12 ++ .../bhyvexml2argv-vnc-password.ldargs | 1 + .../bhyvexml2argv-vnc-password.xml | 26 ++++ .../bhyvexml2argv-vnc-resolution.args | 10 ++ .../bhyvexml2argv-vnc-resolution.ldargs | 1 + .../bhyvexml2argv-vnc-resolution.xml | 20 +++ tests/bhyvexml2argvtest.c | 8 +- .../bhyvexml2xmlout-vnc-password.xml | 41 +++++++ .../bhyvexml2xmlout-vnc-resolution.xml | 28 +++++ tests/bhyvexml2xmltest.c | 2 + 33 files changed, 588 insertions(+), 16 deletions(-) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password-comma.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-password.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-resolution.xml -- 2.19.2

2 6

[libvirt PATCH] cputest: Add data for AMD Ryzen 9 3900X 12-Core Processor
by Jiri Denemark 06 May '20

06 May '20

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/cputest.c | 1 + ...4-cpuid-Ryzen-9-3900X-12-Core-disabled.xml | 8 + ...64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml | 10 + ...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 28 + ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 29 + ...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 24 + .../x86_64-cpuid-Ryzen-9-3900X-12-Core.json | 1838 +++++++++++++++++ .../x86_64-cpuid-Ryzen-9-3900X-12-Core.sig | 4 + .../x86_64-cpuid-Ryzen-9-3900X-12-Core.xml | 66 + 9 files changed, 2008 insertions(+) create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml diff --git a/tests/cputest.c b/tests/cputest.c index 21f47a6853..2bef3eb52f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -1252,6 +1252,7 @@ mymain(void) DO_TEST_CPUID(VIR_ARCH_X86_64, "Pentium-P6100", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST); DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST); + DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-9-3900X-12-Core", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS); DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS); diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml new file mode 100644 index 0000000000..7feb55f0b7 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml @@ -0,0 +1,8 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x08000008' edx='0x10000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00001000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01423408' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml new file mode 100644 index 0000000000..def2fed823 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml @@ -0,0 +1,10 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7f83203' edx='0x078bfbff'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x219c01ab' ecx='0x00000004' edx='0xa8000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x008003f7' edx='0x2e500800'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x03001201' ecx='0x00000000' edx='0x00000000'/> + <msr index='0x10a' edx='0x00000000' eax='0x00000029'/> +</cpudata> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml new file mode 100644 index 0000000000..717e2fbfae --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml @@ -0,0 +1,28 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature policy='require' name='ht'/> + <feature policy='require' name='osxsave'/> + <feature policy='require' name='cmt'/> + <feature policy='require' name='clwb'/> + <feature policy='require' name='umip'/> + <feature policy='require' name='xsaves'/> + <feature policy='require' name='mbm_total'/> + <feature policy='require' name='mbm_local'/> + <feature policy='require' name='cmp_legacy'/> + <feature policy='require' name='extapic'/> + <feature policy='require' name='ibs'/> + <feature policy='require' name='skinit'/> + <feature policy='require' name='wdt'/> + <feature policy='require' name='tce'/> + <feature policy='require' name='topoext'/> + <feature policy='require' name='perfctr_core'/> + <feature policy='require' name='perfctr_nb'/> + <feature policy='require' name='invtsc'/> + <feature policy='require' name='clzero'/> + <feature policy='require' name='wbnoinvd'/> + <feature policy='require' name='amd-ssbd'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> + <feature policy='require' name='mds-no'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml new file mode 100644 index 0000000000..81930a84e7 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml @@ -0,0 +1,29 @@ +<cpu> + <arch>x86_64</arch> + <model>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature name='ht'/> + <feature name='osxsave'/> + <feature name='cmt'/> + <feature name='clwb'/> + <feature name='umip'/> + <feature name='xsaves'/> + <feature name='mbm_total'/> + <feature name='mbm_local'/> + <feature name='cmp_legacy'/> + <feature name='extapic'/> + <feature name='ibs'/> + <feature name='skinit'/> + <feature name='wdt'/> + <feature name='tce'/> + <feature name='topoext'/> + <feature name='perfctr_core'/> + <feature name='perfctr_nb'/> + <feature name='invtsc'/> + <feature name='clzero'/> + <feature name='wbnoinvd'/> + <feature name='amd-ssbd'/> + <feature name='rdctl-no'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='mds-no'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml new file mode 100644 index 0000000000..5f495e0452 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml @@ -0,0 +1,24 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>EPYC-IBPB</model> + <vendor>AMD</vendor> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='require' name='clwb'/> + <feature policy='require' name='umip'/> + <feature policy='require' name='stibp'/> + <feature policy='require' name='arch-capabilities'/> + <feature policy='require' name='ssbd'/> + <feature policy='require' name='xsaves'/> + <feature policy='require' name='cmp_legacy'/> + <feature policy='require' name='perfctr_core'/> + <feature policy='require' name='clzero'/> + <feature policy='require' name='wbnoinvd'/> + <feature policy='require' name='amd-ssbd'/> + <feature policy='require' name='virt-ssbd'/> + <feature policy='require' name='rdctl-no'/> + <feature policy='require' name='skip-l1dfl-vmentry'/> + <feature policy='require' name='mds-no'/> + <feature policy='disable' name='monitor'/> +</cpu> diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json new file mode 100644 index 0000000000..fbdf1a794a --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.json @@ -0,0 +1,1838 @@ +{ + "return": { + "model": { + "name": "base", + "props": { + "vmx-entry-load-rtit-ctl": false, + "phys-bits": 0, + "core-id": -1, + "xlevel": 2147483679, + "cmov": true, + "ia64": false, + "ssb-no": false, + "aes": true, + "vmx-apicv-xapic": false, + "mmx": true, + "arat": true, + "rdpid": true, + "vmx-page-walk-5": false, + "vmx-page-walk-4": false, + "vmx-desc-exit": false, + "gfni": false, + "ibrs-all": false, + "pause-filter": false, + "xsavec": true, + "intel-pt": false, + "vmx-cr8-store-exit": false, + "hv-frequencies": false, + "tsc-frequency": 0, + "vmx-rdseed-exit": false, + "xd": true, + "x-intel-pt-auto-level": true, + "hv-vendor-id": "", + "vmx-eptp-switching": false, + "kvm_asyncpf": true, + "kvm-asyncpf": true, + "perfctr_core": true, + "perfctr-core": true, + "mpx": false, + "avx512cd": false, + "pbe": false, + "decodeassists": false, + "vmx-exit-clear-bndcfgs": false, + "vmx-exit-load-efer": false, + "sse4_1": true, + "sse4-1": true, + "sse4.1": true, + "family": 23, + "legacy-cache": true, + "vmx-vmwrite-vmexit-fields": false, + "vmx-vnmi": false, + "vmx-true-ctls": false, + "host-phys-bits-limit": 0, + "vmx-ept-execonly": false, + "vmx-exit-save-efer": false, + "vmx-invept-all-context": false, + "vmware-cpuid-freq": true, + "wbnoinvd": true, + "avx512f": false, + "xcrypt": false, + "hv-runtime": false, + "hv-stimer-direct": false, + "mce": true, + "mca": true, + "msr": true, + "thread-id": -1, + "vmx-exit-load-pat": false, + "vmx-intr-exit": false, + "min-level": 16, + "vmx-flexpriority": false, + "xgetbv1": true, + "cid": false, + "hv-relaxed": false, + "avx512-bf16": false, + "ds": false, + "hv-crash": false, + "fxsr": true, + "vmx-cr8-load-exit": false, + "xsaveopt": true, + "vmx-apicv-vid": false, + "vmx-exit-save-pat": false, + "tsx-ctrl": false, + "xtpr": false, + "vmx-ple": false, + "hv-evmcs": false, + "avx512-vpopcntdq": false, + "phe": false, + "avx512vl": false, + "extapic": false, + "vmx-vmfunc": false, + "3dnowprefetch": true, + "vmx-activity-shutdown": false, + "avx512vbmi2": false, + "cr8legacy": true, + "vmx-encls-exit": false, + "stibp": true, + "vmx-msr-bitmap": false, + "cpuid-0xb": true, + "xcrypt-en": false, + "vmx-mwait-exit": false, + "kvm_pv_eoi": true, + "vmx-pml": false, + "apic-id": 4294967295, + "vmx-nmi-exit": false, + "vmx-invept-single-context-noglobals": false, + "pn": false, + "rsba": false, + "dca": false, + "vmx-unrestricted-guest": false, + "vendor": "AuthenticAMD", + "hv-ipi": false, + "vmx-cr3-store-noexit": false, + "pku": false, + "smx": false, + "cmp-legacy": true, + "cmp_legacy": true, + "node-id": -1, + "avx512-4fmaps": false, + "vmcb_clean": false, + "vmcb-clean": false, + "hle": false, + "amd-no-ssb": false, + "3dnowext": false, + "npt": true, + "rdctl-no": true, + "vmx-invvpid": false, + "memory": "/machine/unattached/system[0]", + "clwb": true, + "lbrv": false, + "adx": true, + "ss": false, + "pni": true, + "svm_lock": false, + "svm-lock": false, + "pfthreshold": false, + "smap": true, + "smep": true, + "vmx-invpcid-exit": false, + "x2apic": true, + "avx512vnni": false, + "avx512vbmi": false, + "vmx-apicv-x2apic": false, + "hv-stimer": false, + "kvm-pv-sched-yield": true, + "vmx-invlpg-exit": false, + "x-hv-synic-kvm-only": false, + "vmx-invvpid-all-context": false, + "i64": true, + "vmx-activity-hlt": false, + "flushbyasid": false, + "f16c": true, + "vmx-exit-ack-intr": false, + "ace2-en": false, + "pae": true, + "pat": true, + "sse": true, + "die-id": -1, + "vmx-tsc-offset": false, + "phe-en": false, + "kvm_nopiodelay": true, + "kvm-nopiodelay": true, + "tm": false, + "kvmclock-stable-bit": true, + "vmx-rdtsc-exit": false, + "hypervisor": true, + "vmx-rdtscp-exit": false, + "socket-id": -1, + "mds-no": true, + "pcommit": false, + "vmx-vpid": false, + "syscall": true, + "level": 16, + "avx512dq": false, + "x-migrate-smi-count": true, + "svm": true, + "full-cpuid-auto-level": true, + "hv-reset": false, + "invtsc": false, + "vmx-monitor-exit": false, + "sse3": true, + "sse2": true, + "ssbd": true, + "vmx-wbinvd-exit": false, + "est": false, + "kvm-poll-control": true, + "kvm_poll_control": true, + "avx512ifma": false, + "tm2": false, + "kvm-pv-eoi": true, + "kvm-pv-ipi": true, + "cx8": true, + "vmx-invvpid-single-addr": false, + "waitpkg": false, + "cldemote": false, + "vmx-ept": false, + "hv-reenlightenment": false, + "kvm_mmu": false, + "kvm-mmu": false, + "sse4-2": true, + "sse4.2": true, + "sse4_2": true, + "pge": true, + "fill-mtrr-mask": true, + "avx512bitalg": false, + "vmx-entry-load-bndcfgs": false, + "nodeid_msr": false, + "pdcm": false, + "vmx-exit-clear-rtit-ctl": false, + "model": 113, + "movbe": true, + "nrip_save": true, + "nrip-save": true, + "vmx-pause-exit": false, + "ssse3": true, + "kvm_pv_unhalt": true, + "sse4a": true, + "invpcid": false, + "pdpe1gb": true, + "tsc-deadline": true, + "skip-l1dfl-vmentry": true, + "vmx-exit-load-perf-global-ctrl": false, + "fma": true, + "cx16": true, + "de": true, + "enforce": false, + "stepping": 0, + "xsave": true, + "clflush": true, + "skinit": false, + "tsc": true, + "tce": false, + "fpu": true, + "ds-cpl": false, + "ds_cpl": false, + "ibs": false, + "fma4": false, + "host-phys-bits": false, + "vmx-exit-nosave-debugctl": false, + "vmx-invept": false, + "la57": false, + "osvw": true, + "check": true, + "hv-spinlocks": 4294967295, + "vmx-eptad": false, + "pmu": false, + "vmx-entry-noload-debugctl": false, + "pmm": false, + "apic": true, + "spec-ctrl": false, + "vmx-posted-intr": false, + "vmx-apicv-register": false, + "min-xlevel2": 0, + "tsc-adjust": true, + "tsc_adjust": true, + "kvm-steal-time": true, + "kvm_steal_time": true, + "kvmclock": true, + "vmx-zero-len-inject": false, + "l3-cache": true, + "pschange-mc-no": true, + "vmx-rdrand-exit": false, + "lwp": false, + "hv-passthrough": false, + "amd-ssbd": true, + "ibpb": true, + "xop": false, + "core-capability": false, + "avx": true, + "vmx-invept-single-context": false, + "movdiri": false, + "avx512bw": false, + "acpi": false, + "ace2": false, + "fsgsbase": true, + "hv-vapic": false, + "vmx-ept-1gb": false, + "vmx-ept-2mb": false, + "ht": false, + "vmx-io-exit": false, + "nx": true, + "pclmulqdq": true, + "mmxext": true, + "popcnt": true, + "vaes": false, + "xsaves": true, + "movdir64b": false, + "vmx-shadow-vmcs": false, + "tcg-cpuid": true, + "lm": true, + "vmx-exit-save-preemption-timer": false, + "vmx-entry-load-pat": false, + "vmx-entry-load-perf-global-ctrl": false, + "vmx-io-bitmap": false, + "vmx-store-lma": false, + "umip": true, + "vmx-movdr-exit": false, + "avx2": true, + "pse": true, + "pclmuldq": true, + "sep": true, + "vmx-cr3-load-noexit": false, + "virt-ssbd": true, + "x-hv-max-vps": -1, + "nodeid-msr": false, + "md-clear": false, + "split-lock-detect": false, + "kvm": true, + "misalignsse": true, + "min-xlevel": 2147483679, + "realized": false, + "kvm-pv-unhalt": true, + "bmi2": true, + "bmi1": true, + "tsc_scale": false, + "tsc-scale": false, + "topoext": false, + "hv-vpindex": false, + "hv-no-nonarch-coresharing": "off", + "vmx-preemption-timer": false, + "xlevel2": 0, + "clflushopt": true, + "vmx-vnmi-pending": false, + "kvm-no-smi-migration": false, + "monitor": false, + "vmx-vintr-pending": false, + "avx512er": false, + "pmm-en": false, + "taa-no": false, + "pcid": false, + "vmx-secondary-ctls": false, + "arch-capabilities": true, + "vmx-xsaves": false, + "clzero": true, + "3dnow": false, + "erms": false, + "x-force-features": false, + "vmx-entry-ia32e-mode": false, + "lahf-lm": true, + "lahf_lm": true, + "vmx-ins-outs": false, + "vpclmulqdq": false, + "xstore": false, + "fxsr-opt": true, + "fxsr_opt": true, + "hv-synic": false, + "rtm": false, + "kvm-hint-dedicated": false, + "lmce": false, + "hv-time": false, + "perfctr_nb": false, + "perfctr-nb": false, + "hv-tlbflush": false, + "ffxsr": true, + "rdrand": true, + "rdseed": true, + "avx512-4vnniw": false, + "vme": true, + "vmx": false, + "dtes64": false, + "mtrr": true, + "rdtscp": true, + "xsaveerptr": true, + "pse36": true, + "kvm-pv-tlb-flush": true, + "vmx-activity-wait-sipi": false, + "tbm": false, + "vmx-rdpmc-exit": false, + "wdt": false, + "vmx-entry-load-efer": false, + "level-func7": 0, + "vmx-mtf": false, + "pause_filter": false, + "model-id": "AMD Ryzen 9 3900X 12-Core Processor ", + "sha-ni": true, + "abm": true, + "vmx-ept-advanced-exitinfo": false, + "avx512pf": false, + "vmx-hlt-exit": false, + "xstore-en": false + } + } + }, + "id": "model-expansion" +} + +{ + "return": [ + { + "name": "max", + "typename": "max-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": false + }, + { + "name": "host", + "typename": "host-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": false + }, + { + "name": "base", + "typename": "base-x86_64-cpu", + "unavailable-features": [], + "static": true, + "migration-safe": true + }, + { + "name": "qemu64-v1", + "typename": "qemu64-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "qemu64", + "typename": "qemu64-x86_64-cpu", + "unavailable-features": [], + "alias-of": "qemu64-v1", + "static": false, + "migration-safe": true + }, + { + "name": "qemu32-v1", + "typename": "qemu32-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "qemu32", + "typename": "qemu32-x86_64-cpu", + "unavailable-features": [], + "alias-of": "qemu32-v1", + "static": false, + "migration-safe": true + }, + { + "name": "phenom-v1", + "typename": "phenom-v1-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "static": false, + "migration-safe": true + }, + { + "name": "phenom", + "typename": "phenom-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "alias-of": "phenom-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium3-v1", + "typename": "pentium3-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium3", + "typename": "pentium3-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium3-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium2-v1", + "typename": "pentium2-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium2", + "typename": "pentium2-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium2-v1", + "static": false, + "migration-safe": true + }, + { + "name": "pentium-v1", + "typename": "pentium-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "pentium", + "typename": "pentium-x86_64-cpu", + "unavailable-features": [], + "alias-of": "pentium-v1", + "static": false, + "migration-safe": true + }, + { + "name": "n270-v1", + "typename": "n270-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "n270", + "typename": "n270-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "n270-v1", + "static": false, + "migration-safe": true + }, + { + "name": "kvm64-v1", + "typename": "kvm64-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "kvm64", + "typename": "kvm64-x86_64-cpu", + "unavailable-features": [], + "alias-of": "kvm64-v1", + "static": false, + "migration-safe": true + }, + { + "name": "kvm32-v1", + "typename": "kvm32-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "kvm32", + "typename": "kvm32-x86_64-cpu", + "unavailable-features": [], + "alias-of": "kvm32-v1", + "static": false, + "migration-safe": true + }, + { + "name": "coreduo-v1", + "typename": "coreduo-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "coreduo", + "typename": "coreduo-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "coreduo-v1", + "static": false, + "migration-safe": true + }, + { + "name": "core2duo-v1", + "typename": "core2duo-v1-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "static": false, + "migration-safe": true + }, + { + "name": "core2duo", + "typename": "core2duo-x86_64-cpu", + "unavailable-features": [ + "ss" + ], + "alias-of": "core2duo-v1", + "static": false, + "migration-safe": true + }, + { + "name": "athlon-v1", + "typename": "athlon-v1-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "static": false, + "migration-safe": true + }, + { + "name": "athlon", + "typename": "athlon-x86_64-cpu", + "unavailable-features": [ + "3dnowext", + "3dnow" + ], + "alias-of": "athlon-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-v2", + "typename": "Westmere-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-v1", + "typename": "Westmere-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Westmere-IBRS", + "typename": "Westmere-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "Westmere-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Westmere", + "typename": "Westmere-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Westmere-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge-v2", + "typename": "Snowridge-v2-x86_64-cpu", + "unavailable-features": [ + "erms", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "split-lock-detect" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge-v1", + "typename": "Snowridge-v1-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "mpx", + "mpx", + "split-lock-detect" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Snowridge", + "typename": "Snowridge-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "gfni", + "cldemote", + "movdiri", + "movdir64b", + "spec-ctrl", + "core-capability", + "mpx", + "mpx", + "split-lock-detect" + ], + "alias-of": "Snowridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v3", + "typename": "Skylake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v2", + "typename": "Skylake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-v1", + "typename": "Skylake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-noTSX-IBRS", + "typename": "Skylake-Server-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server-IBRS", + "typename": "Skylake-Server-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Server", + "typename": "Skylake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Skylake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v3", + "typename": "Skylake-Client-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v2", + "typename": "Skylake-Client-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-v1", + "typename": "Skylake-Client-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-noTSX-IBRS", + "typename": "Skylake-Client-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Skylake-Client-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client-IBRS", + "typename": "Skylake-Client-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Skylake-Client-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Skylake-Client", + "typename": "Skylake-Client-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Skylake-Client-v1", + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-v2", + "typename": "SandyBridge-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-v1", + "typename": "SandyBridge-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge-IBRS", + "typename": "SandyBridge-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "SandyBridge-v2", + "static": false, + "migration-safe": true + }, + { + "name": "SandyBridge", + "typename": "SandyBridge-x86_64-cpu", + "unavailable-features": [], + "alias-of": "SandyBridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Penryn-v1", + "typename": "Penryn-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Penryn", + "typename": "Penryn-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Penryn-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G5-v1", + "typename": "Opteron_G5-v1-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4", + "tbm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G5", + "typename": "Opteron_G5-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4", + "tbm" + ], + "alias-of": "Opteron_G5-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G4-v1", + "typename": "Opteron_G4-v1-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G4", + "typename": "Opteron_G4-x86_64-cpu", + "unavailable-features": [ + "xop", + "fma4" + ], + "alias-of": "Opteron_G4-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G3-v1", + "typename": "Opteron_G3-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G3", + "typename": "Opteron_G3-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G3-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G2-v1", + "typename": "Opteron_G2-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G2", + "typename": "Opteron_G2-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G2-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G1-v1", + "typename": "Opteron_G1-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Opteron_G1", + "typename": "Opteron_G1-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Opteron_G1-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-v2", + "typename": "Nehalem-v2-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-v1", + "typename": "Nehalem-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem-IBRS", + "typename": "Nehalem-IBRS-x86_64-cpu", + "unavailable-features": [ + "spec-ctrl" + ], + "alias-of": "Nehalem-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Nehalem", + "typename": "Nehalem-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Nehalem-v1", + "static": false, + "migration-safe": true + }, + { + "name": "KnightsMill-v1", + "typename": "KnightsMill-v1-x86_64-cpu", + "unavailable-features": [ + "ss", + "erms", + "avx512f", + "avx512pf", + "avx512er", + "avx512cd", + "avx512-vpopcntdq", + "avx512-4vnniw", + "avx512-4fmaps", + "avx512f", + "avx512f", + "avx512f" + ], + "static": false, + "migration-safe": true + }, + { + "name": "KnightsMill", + "typename": "KnightsMill-x86_64-cpu", + "unavailable-features": [ + "ss", + "erms", + "avx512f", + "avx512pf", + "avx512er", + "avx512cd", + "avx512-vpopcntdq", + "avx512-4vnniw", + "avx512-4fmaps", + "avx512f", + "avx512f", + "avx512f" + ], + "alias-of": "KnightsMill-v1", + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-v2", + "typename": "IvyBridge-v2-x86_64-cpu", + "unavailable-features": [ + "erms", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-v1", + "typename": "IvyBridge-v1-x86_64-cpu", + "unavailable-features": [ + "erms" + ], + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge-IBRS", + "typename": "IvyBridge-IBRS-x86_64-cpu", + "unavailable-features": [ + "erms", + "spec-ctrl" + ], + "alias-of": "IvyBridge-v2", + "static": false, + "migration-safe": true + }, + { + "name": "IvyBridge", + "typename": "IvyBridge-x86_64-cpu", + "unavailable-features": [ + "erms" + ], + "alias-of": "IvyBridge-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-v2", + "typename": "Icelake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-v1", + "typename": "Icelake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server-noTSX", + "typename": "Icelake-Server-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Icelake-Server-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Server", + "typename": "Icelake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "la57", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Icelake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-v2", + "typename": "Icelake-Client-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-v1", + "typename": "Icelake-Client-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client-noTSX", + "typename": "Icelake-Client-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "alias-of": "Icelake-Client-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Icelake-Client", + "typename": "Icelake-Client-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512vbmi", + "pku", + "avx512vbmi2", + "gfni", + "vaes", + "vpclmulqdq", + "avx512vnni", + "avx512bitalg", + "avx512-vpopcntdq", + "spec-ctrl", + "pku" + ], + "alias-of": "Icelake-Client-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v4", + "typename": "Haswell-v4-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v3", + "typename": "Haswell-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v2", + "typename": "Haswell-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-v1", + "typename": "Haswell-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-noTSX-IBRS", + "typename": "Haswell-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Haswell-v4", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-noTSX", + "typename": "Haswell-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "alias-of": "Haswell-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell-IBRS", + "typename": "Haswell-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Haswell-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Haswell", + "typename": "Haswell-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Haswell-v1", + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-v2", + "typename": "EPYC-v2-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-v1", + "typename": "EPYC-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "EPYC-IBPB", + "typename": "EPYC-IBPB-x86_64-cpu", + "unavailable-features": [], + "alias-of": "EPYC-v2", + "static": false, + "migration-safe": true + }, + { + "name": "EPYC", + "typename": "EPYC-x86_64-cpu", + "unavailable-features": [], + "alias-of": "EPYC-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Dhyana-v1", + "typename": "Dhyana-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Dhyana", + "typename": "Dhyana-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Dhyana-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Denverton-v1", + "typename": "Denverton-v1-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "spec-ctrl", + "mpx", + "mpx" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Denverton", + "typename": "Denverton-x86_64-cpu", + "unavailable-features": [ + "erms", + "mpx", + "spec-ctrl", + "mpx", + "mpx" + ], + "alias-of": "Denverton-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Conroe-v1", + "typename": "Conroe-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "Conroe", + "typename": "Conroe-x86_64-cpu", + "unavailable-features": [], + "alias-of": "Conroe-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v3", + "typename": "Cascadelake-Server-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v2", + "typename": "Cascadelake-Server-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-v1", + "typename": "Cascadelake-Server-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server-noTSX", + "typename": "Cascadelake-Server-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku", + "ibrs-all" + ], + "alias-of": "Cascadelake-Server-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Cascadelake-Server", + "typename": "Cascadelake-Server-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "avx512f", + "avx512dq", + "avx512cd", + "avx512bw", + "avx512vl", + "pku", + "avx512vnni", + "spec-ctrl", + "avx512f", + "avx512f", + "avx512f", + "pku" + ], + "alias-of": "Cascadelake-Server-v1", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v4", + "typename": "Broadwell-v4-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v3", + "typename": "Broadwell-v3-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v2", + "typename": "Broadwell-v2-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-v1", + "typename": "Broadwell-v1-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-noTSX-IBRS", + "typename": "Broadwell-noTSX-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid", + "spec-ctrl" + ], + "alias-of": "Broadwell-v4", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-noTSX", + "typename": "Broadwell-noTSX-x86_64-cpu", + "unavailable-features": [ + "pcid", + "erms", + "invpcid" + ], + "alias-of": "Broadwell-v2", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell-IBRS", + "typename": "Broadwell-IBRS-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm", + "spec-ctrl" + ], + "alias-of": "Broadwell-v3", + "static": false, + "migration-safe": true + }, + { + "name": "Broadwell", + "typename": "Broadwell-x86_64-cpu", + "unavailable-features": [ + "pcid", + "hle", + "erms", + "invpcid", + "rtm" + ], + "alias-of": "Broadwell-v1", + "static": false, + "migration-safe": true + }, + { + "name": "486-v1", + "typename": "486-v1-x86_64-cpu", + "unavailable-features": [], + "static": false, + "migration-safe": true + }, + { + "name": "486", + "typename": "486-x86_64-cpu", + "unavailable-features": [], + "alias-of": "486-v1", + "static": false, + "migration-safe": true + } + ], + "id": "definitions" +} diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig new file mode 100644 index 0000000000..522d6a5be2 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.sig @@ -0,0 +1,4 @@ +870f10 +family: 23 (0x17) +model: 113 (0x71) +stepping: 0 (0x00) diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml new file mode 100644 index 0000000000..c8db5e3e10 --- /dev/null +++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core.xml @@ -0,0 +1,66 @@ + +<cpudata arch='x86'> + <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000010' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00870f10' ebx='0x10180800' ecx='0x7ed8320b' edx='0x178bfbff'/> + <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000011'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x219c91a9' ecx='0x00400004' edx='0x00000000'/> + <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000100' edx='0x00000010'/> + <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000007' ebx='0x00000018' ecx='0x00000201' edx='0x00000010'/> + <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000207' ebx='0x00000340' ecx='0x00000380' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000d' ecx_in='0x09' eax='0x00000040' ebx='0x00000340' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x000000ff' ecx='0x00000000' edx='0x00000002'/> + <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000040' ecx='0x000000ff' edx='0x00000007'/> + <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000010' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000004' edx='0x0000000f'/> + <cpuid eax_in='0x20000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000020' ebx='0x68747541' ecx='0x444d4163' edx='0x69746e65'/> + <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00870f10' ebx='0x20000000' ecx='0x75c237ff' edx='0x2fd3fbff'/> + <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x20444d41' ebx='0x657a7952' ecx='0x2039206e' edx='0x30303933'/> + <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x32312058' ebx='0x726f432d' ecx='0x72502065' edx='0x7365636f'/> + <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x20726f73' ebx='0x20202020' ecx='0x20202020' edx='0x00202020'/> + <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0xff40ff40' ebx='0xff40ff40' ecx='0x20080140' edx='0x20080140'/> + <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x48006400' ebx='0x68006400' ecx='0x02006140' edx='0x02009140'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x0000001b' ecx='0x00000000' edx='0x00006799'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003030' ebx='0x010cb657' ecx='0x00007017' edx='0x00010000'/> + <cpuid eax_in='0x80000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000a' ecx_in='0x00' eax='0x00000001' ebx='0x00008000' ecx='0x00000000' edx='0x0013bcff'/> + <cpuid eax_in='0x8000000b' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000d' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000014' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000015' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000016' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000017' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000018' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000019' ecx_in='0x00' eax='0xf040f040' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001a' ecx_in='0x00' eax='0x00000006' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001b' ecx_in='0x00' eax='0x000003ff' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x00' eax='0x00004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x01' eax='0x00004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/> + <cpuid eax_in='0x8000001d' ecx_in='0x02' eax='0x00004143' ebx='0x01c0003f' ecx='0x000003ff' edx='0x00000002'/> + <cpuid eax_in='0x8000001d' ecx_in='0x03' eax='0x00014163' ebx='0x03c0003f' ecx='0x00003fff' edx='0x00000001'/> + <cpuid eax_in='0x8000001e' ecx_in='0x00' eax='0x00000010' ebx='0x00000108' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x8000001f' ecx_in='0x00' eax='0x0001000f' ebx='0x0000016f' ecx='0x000001fd' edx='0x00000001'/> + <cpuid eax_in='0x80000020' ecx_in='0x00' eax='0x00000000' ebx='0x00000002' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000020' ecx_in='0x01' eax='0x0000000b' ebx='0x00000000' ecx='0x00000000' edx='0x0000000f'/> + <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <msr index='0x10a' edx='0x00000000' eax='0x00000069'/> +</cpudata> -- 2.26.2

2 1

[libvirt PATCH] tests: poison $HOME and $XDG_RUNTIME_DIR env variables
by Daniel P. Berrangé 06 May '20

06 May '20

To attempt to catch unit tests which accidentally create files in $HOME, or $XDG_RUNTIME_DIR, poison these env vars by pointing them to directories which don't exist. This should give easier to debug test failures. For example: $ VIR_TEST_DEBUG=1 ./qemuhotplugtest Could not initialize HostdevManager - operation failed: Failed to create state dir '/bad-test-used-env-xdg-runtime-dir/libvirt/hostdevmgr' Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/testutils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testutils.c b/tests/testutils.c index 5fd81b70a2..8533a02d73 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -767,6 +767,9 @@ int virTestMain(int argc, preloads[npreloads] = NULL; } + setenv("HOME", "/bad-test-used-env-home", 1); + setenv("XDG_RUNTIME_DIR", "/bad-test-used-env-xdg-runtime-dir", 1); + va_start(ap, func); while ((lib = va_arg(ap, const char *))) { if (!virFileIsExecutable(lib)) { -- 2.26.2

3 2

[libvirt PATCH] docs: documented protected branches and tags
by Daniel P. Berrangé 06 May '20

06 May '20

We need to prevent accidental deletion of release tags and maint branches. We need to ensure that shared CI runners are enabled on all repos. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/newreposetup.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/newreposetup.rst b/docs/newreposetup.rst index ce54aa09d3..cac4f84813 100644 --- a/docs/newreposetup.rst +++ b/docs/newreposetup.rst @@ -71,6 +71,26 @@ required under the **Settings** page: * *Require approval from code owners*: disabled + * *Branch*: ``v*-maint`` + + * *Allowed to merge*: Developers + Maintainers + + * *Allowed to push*: None (or Developers + Maintainers if MRs not used) + + * *Require approval from code owners*: disabled + + * **Protected tags** + + * *Tag*: ``v*`` + + * *Allowed to create*: Developers + Maintainers + +* **CI/CD** + + * **Runners** + + * *Shared runners*: Enable shared runners + GitHub configuration ==================== -- 2.26.2

2 2

[libvirt PATCH] tests: Mock virGetUserRuntimeDirectory() for qemuhotplug
by Andrea Bolognani 06 May '20

06 May '20

Not mocking this function results in files being created in the user's home directory when running the test and in the build failing altogether inside a constrained environment such as the one used by pbuilder: Could not initialize HostdevManager - operation failed: Failed to create state dir '/nonexistent/.cache/libvirt/hostdevmgr' Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemuhotplugmock.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/qemuhotplugmock.c b/tests/qemuhotplugmock.c index d2324913cf..27c81670a3 100644 --- a/tests/qemuhotplugmock.c +++ b/tests/qemuhotplugmock.c @@ -27,6 +27,7 @@ static int (*real_virGetDeviceID)(const char *path, int *maj, int *min); static bool (*real_virFileExists)(const char *path); +static char *(*real_virGetUserRuntimeDirectory)(void); static void init_syms(void) @@ -36,6 +37,7 @@ init_syms(void) VIR_MOCK_REAL_INIT(virGetDeviceID); VIR_MOCK_REAL_INIT(virFileExists); + VIR_MOCK_REAL_INIT(virGetUserRuntimeDirectory); } unsigned long long @@ -106,3 +108,10 @@ void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm G_GNUC_UNUSED) { } + +char * +virGetUserRuntimeDirectory(void) +{ + return g_build_filename(g_getenv("LIBVIRT_FAKE_ROOT_DIR"), + "user-runtime-directory", NULL); +} -- 2.25.4

3 6

[PATCH] qemuProcessStop: Reattach NVMe disks a domain is mirroring into
by Michal Privoznik 06 May '20

06 May '20

In v5.10.0-rc1~42 (which was later fixed in v6.0.0-rc1~487) I am removing XATTRs for a file that QEMU is mirroring a disk into but it is killed meanwhile. Well, if we call qemuDomainStorageSourceAccessRevoke() instead of qemuBlockRemoveImageMetadata() then not only the file will have perms fixed (instead of left accessible to qemu) but if the mirror destination is not a file but a NVMe disk, then the disk will be reattached back to the host. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1825785 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8ea470f75f..70c71e069c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7605,7 +7605,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainDiskDefPtr disk = def->disks[i]; if (disk->mirror) - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror); + qemuDomainStorageSourceAccessRevoke(driver, vm, disk->mirror); qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src); } -- 2.26.2

2 1

[libvirt PATCH 0/3] tests: Update capabilities for QEMU 5.0.0
by Andrea Bolognani 06 May '20

06 May '20

Now that QEMU 5.0.0 has been released, bring capabilities files for non-x86 architectures up to date. As usual, this series as posted to the mailing list is heavily trimmed: for the unabridged version, fetch https://gitlab.com/abologna/libvirt caps-5.0.0 Andrea Bolognani (3): tests: Update capabilities for QEMU 5.0.0 on aarch64 tests: Update capabilities for QEMU 5.0.0 on ppc64 tests: Add capabilities for QEMU 5.0.0 on riscv64 .../qemu_5.0.0-virt.aarch64.xml | 60 +- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 60 +- .../caps_5.0.0.aarch64.replies | 8937 ++--- .../caps_5.0.0.aarch64.xml | 384 +- .../caps_5.0.0.ppc64.replies | 2163 +- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 +- ...h64.replies => caps_5.0.0.riscv64.replies} | 27491 +++++++--------- .../caps_5.0.0.riscv64.xml | 201 + ...default-video-type-ppc64.ppc64-latest.args | 2 + ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args | 2 + ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 4 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 4 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 + ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 + ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 + .../ppc64-pseries-graphics.ppc64-latest.args | 2 + .../ppc64-pseries-headless.ppc64-latest.args | 2 + .../riscv64-virt-graphics.riscv64-latest.args | 8 +- .../riscv64-virt-headless.riscv64-latest.args | 8 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 + ...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml | 2 +- ...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml | 2 +- ...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml | 2 +- 24 files changed, 19067 insertions(+), 20294 deletions(-) copy tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies => caps_5.0.0.riscv64.replies} (78%) create mode 100644 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml -- 2.25.4

2 4

[libvirt-dbus PATCH] meson: Exclude some files from releases
by Andrea Bolognani 06 May '20

06 May '20

Both .mailmap and .travis.yml only make sense in the context of a git checkout, so we should not include them in releases. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- meson.build | 9 +++++++++ tools/nodist.sh | 5 +++++ 2 files changed, 14 insertions(+) create mode 100755 tools/nodist.sh diff --git a/meson.build b/meson.build index e765ed6..341abe9 100644 --- a/meson.build +++ b/meson.build @@ -263,6 +263,15 @@ if git foreach file : [ 'libvirt-dbus.spec', 'AUTHORS.rst' ] meson.add_dist_script('tools/dist.sh', meson.build_root(), file) endforeach + + nodist_files = [ + '.mailmap', + '.travis.yml', + ] + + foreach file : nodist_files + meson.add_dist_script('tools/nodist.sh', file) + endforeach endif diff --git a/tools/nodist.sh b/tools/nodist.sh new file mode 100755 index 0000000..f820147 --- /dev/null +++ b/tools/nodist.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +FILE=$1 + +rm -f $MESON_DIST_ROOT/$FILE -- 2.25.4

2 2

[libvirt PATCH] tests: Enable directory override for qemucapsprobe
by Andrea Bolognani 06 May '20

06 May '20

Currently, qemucapsprobe fails when libvirt is not already installed on the system: $ ./tests/qemucapsprobe /path/to/qemu-system-ppc64 >/dev/null I/O warning : failed to load external entity "/usr/share/libvirt/cpu_map/index.xml" 2020-05-06 09:49:59.136+0000: 269822: info : libvirt version: 6.4.0 2020-05-06 09:49:59.136+0000: 269822: info : hostname: [...] 2020-05-06 09:49:59.136+0000: 269822: warning : virQEMUCapsLogProbeFailure:5127 : Failed to probe capabilities for /path/to/qemu-system-ppc64: XML error: failed to parse xml document '/usr/share/libvirt/cpu_map/index.xml' It would be great if the tool could work entirely out of the build directory, and this patch achieves just that. Suggested-by: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/qemucapsprobe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index c7e8f3309d..ea88fd2e8a 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -55,6 +55,8 @@ main(int argc, char **argv) VIR_TEST_PRELOAD(mock); + virFileActivateDirOverrideForProg(argv[0]); + if (argc != 2) { fprintf(stderr, "%s QEMU_binary\n", argv[0]); return EXIT_FAILURE; -- 2.25.4

2 1

[libvirt PATCH] qemu: Don't use CPU from host capabilities as host-model on ARM
by Jiri Denemark 06 May '20

06 May '20

We never supported host-model CPUs on ARM and we don't want to support them even once patches for direct detection of host CPU are merged. And since using host CPU definition for host-model CPUs exist only for backward compatibility, we should not use it for any host-model support added in the future. Such enhancement should exclusively use the result of query-cpu-model-expansion. Until proper host-model support is implemented for ARM (if ever), we need to make sure the detected host CPU is not accidentally used for host-model CPUs. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47f88481c8..7b32511c3d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3569,6 +3569,8 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, } else if (ARCH_IS_X86(qemuCaps->arch)) { ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, modelInfo, cpu, migratable); + } else if (ARCH_IS_ARM(qemuCaps->arch)) { + ret = 2; } if (ret == 0) -- 2.26.2

2 1

[libvirt RFC PATCH] network: NetworkManager script to monitor for conflicts with new interfaces
by Laine Stump 06 May '20

06 May '20

There has been a problem for several years with libvirt's default network conflicting with the host network connection on new installs, particularly when the "host" is actually virtual machine that is, itself, connected to the libvirt default network on its respective host. If the two default networks use the same subnet, and if the nested host's libvirtd happens to start its network before the system networking connects to the toplevel host, then network connectivity to the guest is just silently non-working. We've tried several things over the years to eliminate this problem, including: 1) Checking for conflicting routes/interfaces during installation of the libvirt-daemon-config-network package (the one containing the default network config file) which tries different subnets until it finds one that doesn't conflict. This helps in some cases, but fails on 2 points: a) if the installation environment is different from the environment where the system is actually run (e.g. a "live CD" image of a distro, which is built in a container by the distro maintainers, then could be run in any number of places, and b) it modifies the installed files during the rpm installation post_install script, which is now discouraged because people building container images don't like dealing with that. 2) When starting a libvirt network, we now check for any route or interface that conflicts with the new network's IP's and routes. This doesn't fix the problem, but does notify the user of the problem *as long as libvirt starts its networks after the host has started its system networks*. Neither of these help in the situation where libvirt's networks are started first. The script in this patch uses a NetworkManager facility (dispatcher.d scripts, which are run whenever any interface is brought up or down) to check for any libvirt networks that conflict with the new NetworkManager interface, and if it finds a conflict it logs a message and destroys the libvirt network. So as with case (2) above, it doesn't solve the problem, but it does make it more obvious, and also makes sure the host networking isn't borked, so you can still ssh into the machine and fix it. There are a few caveats/misgivings with the script I've come up with, which cause me to post it as just an RFC: 1) It's written in python, and uses libxml2 When I first sat down to make this script (following a suggestion by danpb during an IRC discussion), I immediately put #!/bin/bash at the top of the file, because it's supposed to be a script. But then I remembered that we're trying to narrow down the usage of languages in libvirt, and anyway it would be nice to be able to properly parse the XML to get the IP addresses/netmasks/prefixes. So I instead wrote it in python. This makes for a less ugly program, but it does mean that the daemon-config-network package is now dependent on python3-libxml (and python3 of course), which pulls in a bunch of other packages. Everybody's dev systems already have these packages and their dependencies installed (since both are required to build) and many other users systems already have them (they are required by virt-install and virt-manager, among others), including the Fedora live CD, for example. But not *all* systems have them. There has been a lot of work to reduce package bloat caused by pulling in more and more packages, so I'm reluctant to contribute to that. On the other hand, someone who is looking to minimize their system footprint will also probably not be installing the libvirt default network, so maybe it's acceptable (I'm leaning towards "not", but want to know if anyone else has a different opinion) 2) As delivered, it checks for conflicts with *all* libvirt networks. While that was fun to write, and in theory is the right thing to do, in practice it may be / probably is overkill. As we discussed in IRC, the main time when this is a problem is just after the first boot of a new OS / libvirt installation, and the only libvirt network that's going to exist at that time is the default network. So while having a loop that scans all libvirt networks is more complete, in almost all cases it is just wasting time. (I did provide a bool at the top of the script that can be modified to tell it to only check the default network, but of course the script is installed in /usr/lib, and it's not proper to modify files in /usr/lib, so that isn't a real-world solution, but more a way to allow people (i.e. "me") right now to test out the different behaviors. 3) This only works if NetworkManager is enabled. I brought this up when danpb first mentioned the idea, and he rightly pointed out that every report of this problem we've had has been from the first boot of a new install on a system that used Network Manager - anybody using any other method of networking config on their host has had to manually intervene to get it setup, but NM tries to do everything auto-magically. So while there may still be a very occasional rare occurence of a silent networking failure even with this script installed, this should eliminate 99% of the cases. So, the questions I have are: 1) Do we want to allow adding the dependency on python3-libxml to the libvirt-daemon-config-network package in order to avoid adding a bash script. Or should I just redo it in bash 2) Do we want something that checks all active networks as this does, or just the default network (and if the latter, should we make it easily modifiable to check all networks, or just strip it down as much as possible) 3) I could eliminate the libxml2 dependency by just grepping the xml for "<address .*ip=". Is reduced correctness (which is probably 0% different in practice) worth the reduced package dependencies? As a single question: on a sliding scale of "this script" -----> "simple bash script" where do we want to land? Signed-off-by: Laine Stump <laine(a)redhat.com> --- libvirt.spec.in | 2 + src/network/Makefile.inc.am | 8 +- src/network/nm-dispatcher-check-nets.py | 182 ++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 1 deletion(-) create mode 100755 src/network/nm-dispatcher-check-nets.py diff --git a/libvirt.spec.in b/libvirt.spec.in index 6abf97df85..e40068b2be 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -496,6 +496,7 @@ Requires: libvirt-libs = %{version}-%{release} Requires: dnsmasq >= 2.41 Requires: radvd Requires: iptables +Requires: python3-libxml2 %description daemon-driver-network The network driver plugin for the libvirtd daemon, providing @@ -1630,6 +1631,7 @@ exit 0 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so +%{_prefix}/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets %if %{with_firewalld_zone} %{_prefix}/lib/firewalld/zones/libvirt.xml diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 196a30e16c..d58e09f88b 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -170,6 +170,9 @@ install-data-network: ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ rm -f default.xml && \ $(LN_S) ../default.xml default.xml ) + $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/NetworkManager/dispatcher.d" + $(INSTALL_DATA) $(srcdir)/network/nm-dispatcher-check-nets.py \ + $(DESTDIR)$(prefix)/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets if WITH_FIREWALLD_ZONE $(MKDIR_P) "$(DESTDIR)$(prefix)/lib/firewalld/zones" $(INSTALL_DATA) $(srcdir)/network/libvirt.zone \ @@ -189,7 +192,10 @@ endif WITH_FIREWALLD_ZONE endif WITH_NETWORK -EXTRA_DIST += network/default.xml network/libvirt.zone +EXTRA_DIST += \ + network/default.xml \ + network/nm-dispatcher-check-nets.py \ + network/libvirt.zone .PHONY: \ install-data-network \ diff --git a/src/network/nm-dispatcher-check-nets.py b/src/network/nm-dispatcher-check-nets.py new file mode 100755 index 0000000000..9225a08ea1 --- /dev/null +++ b/src/network/nm-dispatcher-check-nets.py @@ -0,0 +1,182 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2012-2019 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library. If not, see +# <http://www.gnu.org/licenses/>. + +import libvirt +import sys +import os +import libxml2 +from ipaddress import ip_network + +# This script should be installed in +# /usr/lib/NetworkManager/dispatcher.d/50-libvirt-check-nets. It will be +# called by NetworkManager every time a network interface is taken up +# or down. When a new network comes up, it checks the libvirt virtual +# networks to see if their IP address(es) (including any static +# routes) are in conflict with the IP address(es) (or static routes) +# of the newly added interface. If so, the libvirt network is +# disabled. It is assumed that the user will notice that their guests +# no longer have network connectvity (and/or the message logged by +# this script), see that the network has been disabled, and then +# realize the conflict when they try to restart it. +# +# set checkDefaultOnly=False to check *all* active libvirt networks +# for conflicts with the new interface. Set to True to check only the +# libvirt default network (since most networks other than the default +# network are added post-install at a time when all of the hosts other +# networks are already active, it may be overkill to check all of the +# libvirt networks for conflict here (and instead just add more +# needless overheard to bringing up a new host interface). +# +checkDefaultOnly = False + +# NB: since this file is installed in /usr/lib, it really shouldn't be +# modified by the user, but instead should be copied to +# /etc/NetworkManager/dispatcher.d, where it will override the copy in +# /usr/lib. Even that isn't a proper solution though - if we're going +# to actually have this config knob, perhaps we should check for it in +# the environment, and if someone wants to modify it they can put a +# short script in /etc that exports and environment variable and then +# calls this script? Just thinking out loud here... + +def checkconflict(conn, netname, hostnets, hostif): + + # ignore if the network has been brought down or removed since we + # got the list + try: + net = conn.networkLookupByName(netname) + except libvirt.libvirtError: + return + + if not net.isActive(): + return + + xml = net.XMLDesc() + doc = libxml2.parseDoc(xml) + ctx = doc.xpathNewContext() + + # see if NetworkManager is informing us that this libvirt network + # itself is coming online + bridge = ctx.xpathEval("/network/bridge/@name"); + if bridge and bridge[0].content == hostif: + return + + # check *all* the addresses of this network + addrs = ctx.xpathEval("/network/*[@address]") + for ip in addrs: + ctx.setContextNode(ip) + address = ctx.xpathEval("@address") + prefix = ctx.xpathEval("@prefix") + netmask = ctx.xpathEval("@netmask") + + if not (address and len(address[0].content)): + continue + + addrstr = address[0].content + if not (prefix and len(prefix[0].content)): + # check for a netmask + if not (netmask and len(netmask[0].content)): + # this element has address, but no prefix or netmask + # probably it is <mac address ...> so we can ignore it + continue + # convert netmask to prefix + prefixstr = str(ip_network("0.0.0.0/%s" % netmask[0].content).prefixlen) + else: + prefixstr = prefix[0].content + + virtnetaddress = ip_network("%s/%s" % (addrstr, prefixstr), strict = False) + # print("network %s address %s" % (netname, str(virtnetaddress))) + for hostnet in hostnets: + if virtnetaddress == hostnet: + # There is a conflict with this libvirt network and the specified + # net, so we need to disable the libvirt network + print("Conflict with host net %s when starting interface %s - bringing down libvirt network '%s'" + % (str(hostnet), hostif, netname)) + try: + net.destroy() + except libvirt.libvirtError: + print("Failed to destroy network %s" % netname) + return + return + + +def addHostNets(hostnets, countenv, addrenv): + + count = os.getenv(countenv) + if not count or count == 0: + return + + for num in range(int(count)): + addrstr = os.getenv("%s_%d" % (addrenv, num)) + if not addrstr or addrstr == "": + continue + + net = ip_network(addrstr.split()[0], strict=False) + if net: + hostnets.append(net) + return + + +############################################################ + +if sys.argv[2] != "up": + sys.exit(0) + +hostif = sys.argv[1] + +try: + conn = libvirt.open(None) +except libvirt.libvirtError: + print('Failed to open connection to the hypervisor') + sys.exit(0) + +if checkDefaultOnly: + nets = [] + net = conn.networkLookupByName("default") + if not (net and net.isActive()): + sys.exit(0) + nets.append(net) +else: + nets = conn.listAllNetworks(libvirt.VIR_CONNECT_LIST_NETWORKS_ACTIVE) + if not nets: + sys.exit(0) + +# We have at least one active network. Build a list of all network +# routes added by the new interface, and compare that list to the list +# of all networks used by each active libvirt network. If any are an +# exact match, then we have a conflict and need to shut down the +# libvirt network to avoid killing host networking. + +# When NetworkManager calls scripts in /etc/NetworkManager/dispatcher.d +# it will have all IP addresses and routes associated with the interface +# that is going up or down in the following environment variables: +# +# IP4_NUM_ADDRESSES - number of IPv4 addresses +# IP4_ADDRESS_N - one variable for each address, starting at _0 +# IP4_NUM_ROUTES - number of IPv5 routes +# IP4_ROUTE_N - one for each route, starting at _0 +# (replace "IP4" with "IP6" and repeat) +# +hostnets = [] +addHostNets(hostnets, "IP4_NUM_ADDRESSES", "IP4_ADDRESS"); +addHostNets(hostnets, "IP4_NUM_ROUTES", "IP4_ROUTE"); +addHostNets(hostnets, "IP6_NUM_ADDRESSES", "IP6_ADDRESS"); +addHostNets(hostnets, "IP6_NUM_ROUTES", "IP6_ROUTE"); + +for net in nets: + + checkconflict(conn, net.name(), hostnets, hostif) -- 2.25.4

3 3

[libvirt PATCH] gitlab: move some jobs onto CentOS 8
by Daniel P. Berrangé 05 May '20

05 May '20

So that we don't have to chase frequent Fedora releases, move the non-build related jobs onto the long life CentOS 8 distro. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d3025f031a..149334ed6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,7 +172,7 @@ website: - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Website' name: 'website' @@ -191,7 +191,7 @@ codestyle: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE syntax-check - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest # This artifact published by this job is downloaded to push to Weblate @@ -211,7 +211,7 @@ potfile: - $MAKE -C po libvirt.pot - cd .. - mv build/po/libvirt.pot libvirt.pot - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-centos-8:latest artifacts: expose_as: 'Potfile' name: 'potfile' -- 2.26.2

2 1

[libvirt-ci PATCH] guests: add libvirt-rust project packages
by Daniel P. Berrangé 05 May '20

05 May '20

On FreeBSD there is no separate "cargo" package, as the command is part of the amin "rust" package. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 8 ++++++++ guests/vars/projects/libvirt-rust.yml | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 guests/vars/projects/libvirt-rust.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..b78ce95 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -109,6 +109,10 @@ mappings: default: ca-certificates FreeBSD: ca_root_nss + cargo: + default: cargo + pkg: + ccache: default: ccache @@ -935,6 +939,10 @@ mappings: rpmbuild: rpm: rpm-build + rust: + default: rust + deb: rustc + sanlock: deb: libsanlock-dev rpm: sanlock-devel diff --git a/guests/vars/projects/libvirt-rust.yml b/guests/vars/projects/libvirt-rust.yml new file mode 100644 index 0000000..978d5ef --- /dev/null +++ b/guests/vars/projects/libvirt-rust.yml @@ -0,0 +1,4 @@ +--- +packages: + - cargo + - rust -- 2.26.2

2 2

[libvirt-ci PATCH v3] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..d109d87 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,18 @@ mappings: OpenSUSE: CentOS7: + php: + deb: php-dev + rpm: php-devel + pkg: php74 + + php-imagick: + deb: php-imagick + rpm: php-pecl-imagick + pkg: php74-pecl-imagick + OpenSUSE: php-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 1

[libvirt-ci PATCH v2] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 12 ++++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..3290201 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,18 @@ mappings: OpenSUSE: CentOS7: + php: + deb: php-dev + rpm: php-devel + pkg: php74 + + php-imagick: + default: php-imagick + FreeBSD: php74-pecl-imagick + Fedora: php-pecl-imagick + CentOS: php-pecl-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 9

Re: Backup of vm disk images
by Stefan Hajnoczi 05 May '20

05 May '20

On Wed, Apr 22, 2020 at 07:51:09AM +0200, Anders Östling wrote: > I am fighting to understand the difference between backing up a VM by > using a regular copy vs using the virsh blockcopy command. > What I want to do is to suspend the vm, copy the XML and .QCOW2 files > and then resume the vm again. What are your thoughts? What are the > drawbacks compared to other methods? Hi Anders, The kvm(a)vger.kernel.org mailing list is mostly for the discussion and development of the KVM kernel module so you may not get replies. I have CCed libvir-list and developers who have been involved in libvirt backup features. A naive cp(1) command will be very slow because the entire disk image is copied to a new file. The fastest solution with cp(1) is the --reflink flag which basically takes a snapshot of the file and shares the disk blocks (only available when the host file system supports it and not available across mounts). Libvirt's backup commands are more powerful. They can do things like copy out a point-in-time snapshot of the disk while the guest is running. They also support incremental backup so you don't need to store a full copy of the disk image each time you take a backup. I hope others will join the discussion and give examples of some of the available features. Stefan

4 3

[libvirt-ci PATCH] guests: add libvirt-publican and libvirt-appdev-guide-python projects
by Daniel P. Berrangé 05 May '20

05 May '20

The former provides a publican brand, while the latter provides the developer guide for the Python API. We want to use these to publish the docs in GitLab CI. Since the publican toolchain isn't available on FreeBSD, the projects aren't added to the VM host/project mappings. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt-appdev-guide-python.yml | 3 +++ guests/vars/projects/libvirt-publican.yml | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 guests/vars/projects/libvirt-appdev-guide-python.yml create mode 100644 guests/vars/projects/libvirt-publican.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..c5951d6 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -845,6 +845,10 @@ mappings: OpenSUSE: libpulse-devel cross-policy-deb: foreign + publican: + default: publican + pkg: + python3-docutils: default: python3-docutils FreeBSD: py37-docutils diff --git a/guests/vars/projects/libvirt-appdev-guide-python.yml b/guests/vars/projects/libvirt-appdev-guide-python.yml new file mode 100644 index 0000000..85f54bf --- /dev/null +++ b/guests/vars/projects/libvirt-appdev-guide-python.yml @@ -0,0 +1,3 @@ +--- +packages: + - publican diff --git a/guests/vars/projects/libvirt-publican.yml b/guests/vars/projects/libvirt-publican.yml new file mode 100644 index 0000000..85f54bf --- /dev/null +++ b/guests/vars/projects/libvirt-publican.yml @@ -0,0 +1,3 @@ +--- +packages: + - publican -- 2.26.2

1 0

[PATCH] virt-host-validate-bhyve.c: Reintroduce @ret to virHostValidateBhyve()
by Michal Privoznik 05 May '20

05 May '20

This partially reverts fe65e9c8b50c9029cba0e8c386162d293cd443d2. In the referenced commit I removed @ret from virHostValidateBhyve() thinking it wasn't used when in fact it is - it's usage is hidden under MODULE_STATUS_WARN(). Reintroduce the variable back. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virt-host-validate-bhyve.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virt-host-validate-bhyve.c b/tools/virt-host-validate-bhyve.c index 3e8cc59a38..2f0ec1e36c 100644 --- a/tools/virt-host-validate-bhyve.c +++ b/tools/virt-host-validate-bhyve.c @@ -47,6 +47,7 @@ int virHostValidateBhyve(void) { + int ret = 0; int fileid = 0; struct kld_file_stat stat; bool vmm_loaded = false, if_tap_loaded = false; @@ -72,5 +73,5 @@ int virHostValidateBhyve(void) MODULE_STATUS_WARN(if_bridge, "bridged networking will not work"); MODULE_STATUS_WARN(nmdm, "nmdm console will not work"); - return 0; + return ret; } -- 2.26.2

2 1

[PATCH 0/4] Random almost trivial improvements
by Michal Privoznik 05 May '20

05 May '20

These all stem out from me playing with coccinelle. Michal Prívozník (4): virnetserver: Check for virNetServerClientInitKeepAlive() retval rpc: Make some functions void lib: Drop needless ret variables src: Fix boolean assignment src/conf/nwfilter_conf.c | 6 +++--- src/conf/virstorageobj.c | 2 +- src/locking/lock_daemon.c | 3 +-- src/logging/log_daemon.c | 3 +-- src/lxc/lxc_driver.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/qemu/qemu_agent.c | 10 +++++----- src/qemu/qemu_monitor.c | 4 ++-- src/remote/remote_daemon.c | 2 +- src/remote/remote_daemon_config.c | 8 ++++---- src/remote/remote_driver.c | 2 +- src/rpc/virnetlibsshsession.c | 4 +--- src/rpc/virnetlibsshsession.h | 4 ++-- src/rpc/virnetserver.c | 7 ++++--- src/rpc/virnetserverclient.c | 2 +- src/rpc/virnetsocket.c | 6 ++---- src/rpc/virnetsshsession.c | 4 +--- src/rpc/virnetsshsession.h | 4 ++-- src/storage/storage_backend_mpath.c | 3 +-- src/util/virnetlink.c | 2 +- src/util/virtime.c | 4 ++-- src/util/viruri.c | 2 +- src/vmx/vmx.c | 4 ++-- tools/virt-host-validate-bhyve.c | 3 +-- 24 files changed, 42 insertions(+), 51 deletions(-) -- 2.26.2

2 6

[libvirt-ci PATCH] guests: add libvirt-php project packages
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 11 +++++++++++ guests/vars/projects/libvirt-php.yml | 6 ++++++ 2 files changed, 17 insertions(+) create mode 100644 guests/vars/projects/libvirt-php.yml diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 4808b12..4fec6f4 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -831,6 +831,17 @@ mappings: OpenSUSE: CentOS7: + php: + default: php + FreeBSD: php74 + + php-imagick: + default: php-imagick + FreeBSD: php74-pecl-imagick + Fedora: php-pecl-imagick + CentOS: php-pecl-imagick + CentOS8: + pkg-config: default: pkgconf rpm: pkgconfig diff --git a/guests/vars/projects/libvirt-php.yml b/guests/vars/projects/libvirt-php.yml new file mode 100644 index 0000000..c911dc6 --- /dev/null +++ b/guests/vars/projects/libvirt-php.yml @@ -0,0 +1,6 @@ +--- +packages: + - php + - php-imagick + - xmllint + - xsltproc -- 2.26.2

2 2

[libvirt-python PATCH] setup: post-release version bump to 6.4.0
by Daniel P. Berrangé 05 May '20

05 May '20

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 71a2a7f..cb24f30 100755 --- a/setup.py +++ b/setup.py @@ -339,7 +339,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '6.3.0', + version = '6.4.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.26.2

1 0

[libvirt PATCH] remote: fix driver name check for libxl driver
by Daniel P. Berrangé 05 May '20

05 May '20

The virConnectGetType() returns "xenlight" for libxl, not "LIBXL". This prevents users opening a connection to the libxl driver when using the modular daemons. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 5d1c6971c0..a8ac795d71 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, VIR_DEBUG("Primary driver type is '%s'", type); if (STREQ(type, "QEMU") || - STREQ(type, "LIBXL") || + STREQ(type, "xenlight") || STREQ(type, "LXC") || STREQ(type, "VBOX") || STREQ(type, "bhyve") || -- 2.26.2

4 6

[libvirt-python PATCH v2] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Daniel P. Berrangé 05 May '20

05 May '20

With the introduction of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index dced716..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-python PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..3472318 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +============================== +Contributing to libvirt-python +============================== + +The libvirt Python API binding accepts code contributions via merge requests +on the GitLab project: + +https://gitlab.com/libvirt/libvirt-python/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + +https://gitlab.com/libvirt/libvirt-python/pipelines + +CI pipeline results for merge requests will be visible via the contributors' +own private repository fork: + +https://gitlab.com/yourusername/libvirt-python/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + +https://developercertificate.org/ + +To indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submitter's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 1

[PATCH] Drop needless variable
by Michal Privoznik 05 May '20

05 May '20

Instead of the following pattern: type ret; ... ret = func(); return ret; we can use: return func() directly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 8 +------- src/conf/domain_conf.c | 8 +++----- src/conf/network_conf.c | 5 +---- src/conf/virnetworkportdef.c | 5 +---- src/qemu/qemu_capabilities.c | 5 +---- src/qemu/qemu_command.c | 8 ++------ src/qemu/qemu_conf.c | 9 ++------- src/qemu/qemu_domain.c | 12 +++--------- src/qemu/qemu_driver.c | 18 ++++++------------ src/qemu/qemu_tpm.c | 11 ++--------- src/security/security_apparmor.c | 5 +---- src/security/security_util.c | 9 +++------ src/storage/storage_driver.c | 7 ++----- src/util/vircgroup.c | 5 +---- src/util/virmdev.c | 10 ++-------- src/util/virresctrl.c | 6 +----- src/util/virsocketaddr.c | 5 +---- src/util/virutil.c | 8 +++----- tests/qemuxml2argvtest.c | 6 +----- 19 files changed, 37 insertions(+), 113 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5652bc9a33..8623e79daf 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1392,13 +1392,7 @@ virDomainPCIAddressSetAllMulti(virDomainDefPtr def) static char* virDomainCCWAddressAsString(virDomainDeviceCCWAddressPtr addr) { - char *addrstr = NULL; - - addrstr = g_strdup_printf("%x.%x.%04x", - addr->cssid, - addr->ssid, - addr->devno); - return addrstr; + return g_strdup_printf("%x.%x.%04x", addr->cssid, addr->ssid, addr->devno); } static int diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8a87586936..83748354b0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -31316,54 +31316,52 @@ char * virDomainDefGetShortName(const virDomainDef *def) { wchar_t wshortname[VIR_DOMAIN_SHORT_NAME_MAX + 1] = {0}; size_t len = 0; - char *ret = NULL; g_autofree char *shortname = NULL; /* No need to do the whole conversion thing when there are no multibyte * characters. The same applies for illegal sequences as they can occur * with incompatible locales. */ len = mbstowcs(NULL, def->name, 0); if ((len == (size_t) -1 && errno == EILSEQ) || len == strlen(def->name)) { - ret = g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, def->name); - return ret; + return g_strdup_printf("%d-%.*s", def->id, VIR_DOMAIN_SHORT_NAME_MAX, + def->name); } if (len == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } if (mbstowcs(wshortname, def->name, VIR_DOMAIN_SHORT_NAME_MAX) == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert domain name to " "wide character string")); return NULL; } len = wcstombs(NULL, wshortname, 0); if (len == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } if (VIR_ALLOC_N(shortname, len + 1) < 0) return NULL; if (wcstombs(shortname, wshortname, len) == (size_t) -1) { virReportSystemError(errno, "%s", _("Cannot convert wide character string " "back to multi-byte domain name")); return NULL; } - ret = g_strdup_printf("%d-%s", def->id, shortname); - return ret; + return g_strdup_printf("%d-%s", def->id, shortname); } #undef VIR_DOMAIN_SHORT_NAME_MAX diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index a7c177f8db..dc64ce6959 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2892,10 +2892,7 @@ char * virNetworkConfigFile(const char *dir, const char *name) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a4cffea8b6..2013e11dff 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -432,10 +432,7 @@ static char * virNetworkPortDefConfigFile(const char *dir, const char *name) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.xml", dir, name); - return ret; + return g_strdup_printf("%s/%s.xml", dir, name); } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 47f88481c8..c7e58f92ae 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4467,79 +4467,76 @@ char * virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; - char *ret = NULL; size_t i; virBufferAddLit(&buf, "<qemuCaps>\n"); virBufferAdjustIndent(&buf, 2); virBufferEscapeString(&buf, "<emulator>%s</emulator>\n", qemuCaps->binary); virBufferAsprintf(&buf, "<qemuctime>%llu</qemuctime>\n", (long long)qemuCaps->ctime); virBufferAsprintf(&buf, "<selfctime>%llu</selfctime>\n", (long long)qemuCaps->libvirtCtime); virBufferAsprintf(&buf, "<selfvers>%lu</selfvers>\n", (unsigned long)qemuCaps->libvirtVersion); for (i = 0; i < QEMU_CAPS_LAST; i++) { if (virQEMUCapsGet(qemuCaps, i)) { virBufferAsprintf(&buf, "<flag name='%s'/>\n", virQEMUCapsTypeToString(i)); } } virBufferAsprintf(&buf, "<version>%d</version>\n", qemuCaps->version); virBufferAsprintf(&buf, "<kvmVersion>%d</kvmVersion>\n", qemuCaps->kvmVersion); virBufferAsprintf(&buf, "<microcodeVersion>%u</microcodeVersion>\n", qemuCaps->microcodeVersion); if (qemuCaps->package) virBufferAsprintf(&buf, "<package>%s</package>\n", qemuCaps->package); if (qemuCaps->kernelVersion) virBufferAsprintf(&buf, "<kernelVersion>%s</kernelVersion>\n", qemuCaps->kernelVersion); virBufferAsprintf(&buf, "<arch>%s</arch>\n", virArchToString(qemuCaps->arch)); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_KVM); virQEMUCapsFormatAccel(qemuCaps, &buf, VIR_DOMAIN_VIRT_QEMU); for (i = 0; i < qemuCaps->ngicCapabilities; i++) { virGICCapabilityPtr cap; bool kernel; bool emulated; cap = &qemuCaps->gicCapabilities[i]; kernel = (cap->implementation & VIR_GIC_IMPLEMENTATION_KERNEL); emulated = (cap->implementation & VIR_GIC_IMPLEMENTATION_EMULATED); virBufferAsprintf(&buf, "<gic version='%d' kernel='%s' emulated='%s'/>\n", cap->version, kernel ? "yes" : "no", emulated ? "yes" : "no"); } if (qemuCaps->sevCapabilities) virQEMUCapsFormatSEVInfo(qemuCaps, &buf); if (qemuCaps->kvmSupportsNesting) virBufferAddLit(&buf, "<kvmSupportsNesting/>\n"); virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</qemuCaps>\n"); - ret = virBufferContentAndReset(&buf); - - return ret; + return virBufferContentAndReset(&buf); } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6acfc0b19d..269bdbaf56 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -251,44 +251,40 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd, static char * qemuVirCommandGetFDSet(virCommandPtr cmd, int fd) { - char *result = NULL; int idx = virCommandPassFDGetFDIndex(cmd, fd); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), fd); return NULL; } - result = g_strdup_printf("set=%d,fd=%d", idx, fd); - return result; + return g_strdup_printf("set=%d,fd=%d", idx, fd); } /** * qemuVirCommandGetDevSet: * @cmd: the command to modify * @fd: fd to reassign to the child * * Get the parameters for the QEMU path= parameter where a file * descriptor is accessed via a file descriptor set, for example * /dev/fdset/10. The file descriptor must previously have been * 'transferred' in a virCommandPassFD() call. */ static char * qemuVirCommandGetDevSet(virCommandPtr cmd, int fd) { - char *result = NULL; int idx = virCommandPassFDGetFDIndex(cmd, fd); if (idx < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("file descriptor %d has not been transferred"), fd); return NULL; } - result = g_strdup_printf("/dev/fdset/%d", idx); - return result; + return g_strdup_printf("/dev/fdset/%d", idx); } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c59824006c..2d5e527b47 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1429,29 +1429,26 @@ char * qemuGetSharedDeviceKey(const char *device_path) { int maj, min; - char *key = NULL; int rc; if ((rc = virGetDeviceID(device_path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get minor number of device '%s'"), device_path); return NULL; } - key = g_strdup_printf("%d:%d", maj, min); - - return key; + return g_strdup_printf("%d:%d", maj, min); } /* * Make necessary checks for the need to check and for the current setting * of the 'unpriv_sgio' value for the device_path passed. * * Returns: * 0 - Success * -1 - Some failure which would already have been messaged * -2 - Mismatch with the "shared" sgio setting - needs to be messaged * by caller since it has context of which type of disk resource is * being used and in the future the hostdev information. */ @@ -1704,19 +1701,17 @@ static char * qemuGetHostdevPath(virDomainHostdevDefPtr hostdev) { virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host; g_autofree char *dev_name = NULL; - char *dev_path = NULL; if (!(dev_name = virSCSIDeviceGetDevName(NULL, scsihostsrc->adapter, scsihostsrc->bus, scsihostsrc->target, scsihostsrc->unit))) return NULL; - dev_path = g_strdup_printf("/dev/%s", dev_name); - return dev_path; + return g_strdup_printf("/dev/%s", dev_name); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d63ec2313b..9c629c31a3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6835,17 +6835,14 @@ virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, virDomainDefPtr src, unsigned int flags) { - virDomainDefPtr ret = NULL; g_autofree char *xml = NULL; if (!(xml = qemuDomainDefFormatXML(driver, qemuCaps, src, flags))) return NULL; - ret = qemuDomainDefFromXML(driver, qemuCaps, xml); - - return ret; + return qemuDomainDefFromXML(driver, qemuCaps, xml); } @@ -13364,17 +13361,14 @@ qemuProcessEventFree(struct qemuProcessEvent *event) char * qemuDomainGetManagedPRSocketPath(qemuDomainObjPrivatePtr priv) { - char *ret = NULL; - - ret = g_strdup_printf("%s/%s.sock", priv->libDir, qemuDomainGetManagedPRAlias()); - - return ret; + return g_strdup_printf("%s/%s.sock", priv->libDir, + qemuDomainGetManagedPRAlias()); } /** * qemuDomainStorageIdNew: * @priv: qemu VM private data object. * * Generate a new unique id for a storage object. Useful for node name generation. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d5aeeac66d..1c7c87128d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7439,31 +7439,25 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, static int qemuConnectListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectListDefinedDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListGetInactiveNames(driver->domains, names, nnames, - virConnectListDefinedDomainsCheckACL, - conn); - - return ret; + return virDomainObjListGetInactiveNames(driver->domains, names, nnames, + virConnectListDefinedDomainsCheckACL, + conn); } static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) { virQEMUDriverPtr driver = conn->privateData; - int ret = -1; if (virConnectNumOfDefinedDomainsEnsureACL(conn) < 0) return -1; - ret = virDomainObjListNumOfDomains(driver->domains, false, - virConnectNumOfDefinedDomainsCheckACL, - conn); - - return ret; + return virDomainObjListNumOfDomains(driver->domains, false, + virConnectNumOfDefinedDomainsCheckACL, + conn); } diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 58dfdf689a..fe567f440c 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -171,19 +171,15 @@ static char * qemuTPMCreateEmulatorSocket(const char *swtpmStateDir, const char *shortName) { - char *path = NULL; - - path = g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); - - return path; + return g_strdup_printf("%s/%s-swtpm.sock", swtpmStateDir, shortName); } /* * qemuTPMEmulatorInitPaths: * * @tpm: TPM definition for an emulator type * @swtpmStorageDir: the general swtpm storage dir which is used as a base * directory for creating VM specific directories * @uuid: the UUID of the VM */ @@ -213,25 +209,22 @@ static char * qemuTPMEmulatorCreatePidFilename(const char *swtpmStateDir, const char *shortName) { - char *pidfile = NULL; g_autofree char *devicename = NULL; devicename = g_strdup_printf("%s-swtpm", shortName); - pidfile = virPidFileBuildPath(swtpmStateDir, devicename); - - return pidfile; + return virPidFileBuildPath(swtpmStateDir, devicename); } /* * qemuTPMEmulatorGetPid * * @swtpmStateDir: the directory where swtpm writes the pidfile into * @shortName: short name of the domain * @pid: pointer to pid * * Return -1 upon error, or zero on successful reading of the pidfile. * If the PID was not still alive, zero will be returned, and @pid will be * set to -1; */ diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 3bc200ffb3..7c8fd39584 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -213,15 +213,12 @@ static char * get_profile_name(virDomainDefPtr def) { char uuidstr[VIR_UUID_STRING_BUFLEN]; - char *name = NULL; virUUIDFormat(def->uuid, uuidstr); - name = g_strdup_printf("%s%s", AA_PREFIX, uuidstr); - - return name; + return g_strdup_printf("%s%s", AA_PREFIX, uuidstr); } /* returns -1 on error or profile for libvirtd is unconfined, 0 if complain * mode and 1 if enforcing. This is required because at present you cannot * aa_change_profile() from a process that is unconfined. */ diff --git a/src/security/security_util.c b/src/security/security_util.c index 4f661fd75e..7fa5163fe4 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -92,9 +92,8 @@ virSecurityGetRefCountAttrName(const char *name G_GNUC_UNUSED) static char * virSecurityGetTimestampAttrName(const char *name) { - char *ret = NULL; - ret = g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s", name); - return ret; + return g_strdup_printf(XATTR_NAMESPACE ".libvirt.security.timestamp_%s", + name); } #else /* !XATTR_NAMESPACE */ static char * @@ -112,49 +111,47 @@ static char * virSecurityGetTimestamp(void) { unsigned long long boottime = 0; - char *ret = NULL; if (virHostGetBootTime(&boottime) < 0) { virReportSystemError(errno, "%s", _("Unable to get host boot time")); return NULL; } - ret = g_strdup_printf("%llu", boottime); - return ret; + return g_strdup_printf("%llu", boottime); } /** * virSecurityValidateTimestamp: * @name: security driver name * @path: file name * * Check if remembered label on @path for security driver @name * is valid, i.e. the label has been set since the last boot. If * the label was set in previous runs, all XATTRs related to * @name are removed so that clean slate is restored. * * This is done having extra attribute timestamp_$SECDRIVER which * contains the host boot time. Its value is then compared to * actual host boot time. If these two values don't match then * XATTRs are considered as stale and thus invalid. * * In ideal world, where there network file systems have XATTRs * using plain host boot time is not enough as it may lead to a * situation where a freshly started host sees XATTRs, sees the * timestamp put there by some longer running host and considers * the XATTRs invalid. Well, there is not an easy way out. We * would need to somehow check if the longer running host is * still there and uses the @path (how?). * Fortunately, there is only one network file system which * supports XATTRs currently (GlusterFS via FUSE) and it is used * so rarely that it's almost a corner case. * The worst thing that happens there is that we remove XATTRs * and thus return @path to the default label for $SECDRIVER. * * Returns: 0 if remembered label is valid, * 1 if remembered label was not valid, * -2 if underlying file system doesn't support XATTRs, * -1 otherwise. */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2db763caa5..7e82c09be5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2837,13 +2837,10 @@ char * virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStorageVolDefPtr voldef) { virStoragePoolDefPtr def = virStoragePoolObjGetDef(obj); - char *tmp = NULL; - - tmp = g_strdup_printf("%s/%s.%s.secret.XXXXXX", - driver->stateDir, def->name, voldef->name); - return tmp; + return g_strdup_printf("%s/%s.%s.secret.XXXXXX", driver->stateDir, + def->name, voldef->name); } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 70d85200cb..bb535df4f2 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -423,28 +423,25 @@ virCgroupDetect(virCgroupPtr group, char * virCgroupGetBlockDevString(const char *path) { - char *ret = NULL; struct stat sb; if (stat(path, &sb) < 0) { virReportSystemError(errno, _("Path '%s' is not accessible"), path); return NULL; } if (!S_ISBLK(sb.st_mode)) { virReportSystemError(EINVAL, _("Path '%s' must be a block device"), path); return NULL; } /* Automatically append space after the string since all callers * use it anyway */ - ret = g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); - - return ret; + return g_strdup_printf("%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)); } diff --git a/src/util/virmdev.c b/src/util/virmdev.c index c2499c0a20..51a88a91d7 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -206,31 +206,28 @@ char * virMediatedDeviceGetIOMMUGroupDev(const char *uuidstr) { g_autofree char *result_path = NULL; g_autofree char *result_file = NULL; g_autofree char *iommu_path = NULL; g_autofree char *dev_path = virMediatedDeviceGetSysfsPath(uuidstr); - char *vfio_path = NULL; if (!dev_path) return NULL; iommu_path = g_strdup_printf("%s/iommu_group", dev_path); if (!virFileExists(iommu_path)) { virReportSystemError(errno, _("failed to access '%s'"), iommu_path); return NULL; } if (virFileResolveLink(iommu_path, &result_path) < 0) { virReportSystemError(errno, _("failed to resolve '%s'"), iommu_path); return NULL; } result_file = g_path_get_basename(result_path); - vfio_path = g_strdup_printf("/dev/vfio/%s", result_file); - - return vfio_path; + return g_strdup_printf("/dev/vfio/%s", result_file); } @@ -422,10 +419,7 @@ virMediatedDeviceIsUsed(virMediatedDevicePtr dev, char * virMediatedDeviceGetSysfsPath(const char *uuidstr) { - char *ret = NULL; - - ret = g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); - return ret; + return g_strdup_printf(MDEV_SYSFS_DEVICES "%s", uuidstr); } diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index c537d606cc..e17f6bd1bd 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2307,19 +2307,15 @@ static char * virResctrlDeterminePath(const char *parentpath, const char *prefix, const char *id) { - char *path = NULL; - if (!id) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Resctrl ID must be set before determining resctrl " "parentpath='%s' prefix='%s'"), parentpath, prefix); return NULL; } - path = g_strdup_printf("%s/%s-%s", parentpath, prefix, id); - - return path; + return g_strdup_printf("%s/%s-%s", parentpath, prefix, id); } diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4c9f124e88..a858a69204 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -578,35 +578,32 @@ char * virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUSED) { #ifndef WIN32 - char *path = NULL; if (addr == NULL) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("No socket address provided")); return NULL; } if (addr->data.sa.sa_family != AF_UNIX) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; } - path = g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_path)); - - return path; + return g_strndup(addr->data.un.sun_path, sizeof(addr->data.un.sun_path)); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("UNIX sockets not supported on this platform")); return NULL; #endif } /** * virSocketAddrIsNetmask: * @netmask: the netmask address * * Check that @netmask is a proper network mask * * Returns 0 in case of success and -1 in case of error */ diff --git a/src/util/virutil.c b/src/util/virutil.c index 5b52e4e6d4..fb46501142 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1419,21 +1419,19 @@ char * virGetUnprivSGIOSysfsPath(const char *path, const char *sysfs_dir) { int maj, min; - char *sysfs_path = NULL; int rc; if ((rc = virGetDeviceID(path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get device ID '%s'"), path); return NULL; } - sysfs_path = g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", - sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, - maj, min); - return sysfs_path; + return g_strdup_printf("%s/%d:%d/queue/unpriv_sgio", + sysfs_dir ? sysfs_dir : SYSFS_DEV_BLOCK_PATH, maj, + min); } int diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4a303c0185..04febd1b0c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -185,11 +185,7 @@ fakeStorageVolGetInfo(virStorageVolPtr vol, static char * fakeStorageVolGetPath(virStorageVolPtr vol) { - char *ret = NULL; - - ret = g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); - - return ret; + return g_strdup_printf("/some/%s/device/%s", vol->key, vol->name); } -- 2.26.2

3 3

libvirt-devaddr: a new library for device address assignment
by Daniel P. Berrangé 05 May '20

05 May '20

We've been doing alot of refactoring of code in recent times, and also have plans for significant infrastructure changes. We still need to spend time delivering interesting features to users / applications. This mail is to introduce an idea for a solution to an specific area applications have had long term pain with libvirt's current "mechanism, not policy" approach - device addressing. This is a way for us to show brand new ideas & approaches for what the libvirt project can deliver in terms of management APIs. To set expectations straight: I have written no code for this yet, merely identified the gap & conceptual solution. The device addressing problem ============================= One of the key jobs libvirt does when processing a new domain XML configuration is to assign addresses to all devices that are present. This involves adding various device controllers (PCI bridges, PCI root ports, IDE/SCSI buses, USB controllers, etc) if they are not already present, and then assigning PCI, USB, IDE, SCSI, etc, addresses to each device so they are associated with controllers. When libvirt spawns a QEMU guest, it will pass full address information to QEMU. Libvirt, as a general rule, aims to avoid defining and implementing policy around expansion of guest configuration / defaults, however, it is inescapable in the case of device addressing due to the need to guarantee a stable hardware ABI to make live migration and save/restore to disk work. The policy that libvirt has implemented for device addressing is, as much as possible, the same as the addressing scheme QEMU would apply itself. While libvirt succeeds in its goal of providing a stable hardware API, the addressing scheme used is not well suited to all deployment scenarios of QEMU. This is an inevitable result of having a specific assignment policy implemented in libvirt which has to trade off mutually incompatible use cases/goals. When the libvirt addressing policy is not been sufficient, management applications are forced to take on address assignment themselves, which is a massive non-trivial job with many subtle problems to consider. Places where libvirt's addressing is insufficient for PCI include * Setting up multiple guest NUMA nodes and associating devices to specific nodes * Pre-emptive creation of extra PCIe root ports, to allow for later device hotplug on PCIe topologies * Determining whether to place a device on a PCI or PCIe bridge * Controlling whether a device is placed into a hotpluggable slot * Controlling whether a PCIe root port supports hotplug or not * Determining whether to places all devices on distinct slots or buses, vs grouping them all into functions on the same slot * Ability to expand the device addressing without being on the hypervisor host Libvirt wishes to avoid implementing many different address assignment policies. It also wishes to keep the domain XML as a representation of the virtual hardware, not add a bunch of properties to it which merely serve as tunable input parameters for device addressing algorithms. There is thus a dilemma here. Management applications increasingly need fine grained control over device addressing, while libvirt doesn't want to expose fine grained policy controls via the XML. The new libvirt-devaddr API =========================== The way out of this is to define a brand new virt management API which tackles this specific problem in a way that addresses all the problems mgmt apps have with device addressing and explicitly provides a variety of policy impls with tunable behaviour. By "new API", I actually mean an entirely new library, completely distinct from libvirt.so, or anything else we've delivered so far. The closest we've come to delivering something at this kind of conceptual level, would be the abortive attempt we made with "libvirt-builder" to deliver a policy-driven API instead of mechanism based. This proposal is still quite different from that attempt. At a high level * The new API is "libvirt-devaddr" - short for "libvirt device addressing" * As input it will take 1. The guest CPU architecture and machine type 2. A list of global tunables specifying desired behaviour of the address assignment policy 3. A minimal list of devices needed in the virtual machine, with optional addresses and optional per-device tunables to override the global tunables * As output it will emit 1. fully expanded list of devices needed in the virtual machine, with addressing information sufficient to ensure stable hardware ABI Initially the API would implement something that behaves the same way as libvirt's current address assignment API. The intended usage would be * Mgmt application makes a minimal list of devices they want in their guest * List of devices is fed into libvirt-devaddr API * Mgmt application gets back a full list of devices & addresses * Mgmt application writes a libvirt XML doc using this full list & addresses * Mgmt application creates the guest in libvirt IOW, this new "libvirt-devaddr" API is intended to be used prior to creating the XML that is used by libvirt. The API could also be used prior to needing to hotplug a new device to an existing guest. This API is intended to be a deliverable of the libvirt project, but it would be completely independent of the current libvirt API. Most especially note that it would NOT use the domain XML in any way. This gives applications maximum flexibility in how they consume this functionality, not trying to force a way to build domain XML. It would have greater freedom in its API design, making different choices from libvirt.so on topics such as programming language (C vs Go vs Python etc), API stability timeframe (forever stable vs sometimes changing API), data formats (structs, vs YAML/JSON vs XML etc), and of course the conceptual approach (policy vs mechanism) The expectation is that this new API would be most likely to be consumed by KubeVirt, OpenStack, Kata, as the list of problems shown earlier is directly based on issues seen working with KubeVirt & OpenStack in particular. It is not limited to these applications and is broadly useful as conceptual thing. It would be a goal that this API should also be used by libvirt itself to replace its current internal device addressing impl. Essentially the new API should be seen as a way to expose/extract the current libvirt internal algorithm, making it available to applications in a flexible manner. I don't anticipate actually copying the current addressing code in libvirt as-is, but it would certainly serve as reference for the kind of logic we need to implement, so you might consider it a "port" or "rewrite" in some very rough sense. I think this new API concept is a good way for the project make a start in using Go for libvirt. The functionality covered has a clearly defined scope limit, making it practical to deliver a real impl in a reasonably short time frame. Extracting this will provide a real world benefit to our application consumers, solving many long standing problems they have with libvirt, and thus justify the effort in doing this work in libvirt in a non-C language. The main question mark would be about how we might make this functionality available to Python apps if we chose Go. It is possible to expose a C API from Go, and we would need this to consume it from libvirt. There is then the need to manually write a Python API binding which is tedious work. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

7 14

[PATCH 0/3] Xen: Improve the naming mess
by Jim Fehlig 05 May '20

05 May '20

Let's hope it's an improvement :-). See individual patches for details. Jim Fehlig (3): libxl: Use the name 'Xen' in driver tables libxl: Clarify that 'xenlight' should only be used internally docs: Xen improvements docs/aclpolkit.html.in | 4 ++-- docs/formatdomain.html.in | 6 +++--- src/libxl/libxl_conf.h | 8 +++++++- src/libxl/libxl_domain.c | 4 ++-- src/libxl/libxl_driver.c | 20 ++++++++++---------- 5 files changed, 24 insertions(+), 18 deletions(-) -- 2.26.0

2 4

[libvirt PATCH v2] remote: fix driver name check for libxl driver
by Daniel P. Berrangé 04 May '20

04 May '20

The virConnectGetType() returns "Xen" for libxl, not "LIBXL". This prevents users opening a connection to the libxl driver when using the modular daemons. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon_dispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index 5d1c6971c0..6f67d2fb30 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, VIR_DEBUG("Primary driver type is '%s'", type); if (STREQ(type, "QEMU") || - STREQ(type, "LIBXL") || + STREQ(type, "Xen") || STREQ(type, "LXC") || STREQ(type, "VBOX") || STREQ(type, "bhyve") || -- 2.26.2

2 1

[libvirt-python PATCH] gitlab: add CONTRIBUTING.rst file to indicate use of merge requests
by Daniel P. Berrangé 04 May '20

04 May '20

With the introduce of automated CI pipelines, we are now ready to switch to using merge requests for the project. With this switch we longer wish to have patches sent to the mailing list, and thus the git-publish config is removed. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 4 ---- CONTRIBUTING.rst | 28 ++++++++++++++++++++++++++++ This CONTRIBUTING.rst is intentionally fairly generic, as I intend to reuse it for most other projects too (libvirt.git being the exception which has far more details). 2 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 .gitpublish create mode 100644 CONTRIBUTING.rst diff --git a/.gitpublish b/.gitpublish deleted file mode 100644 index dced716..0000000 --- a/.gitpublish +++ /dev/null @@ -1,4 +0,0 @@ -[gitpublishprofile "default"] -base = master -to = libvir-list(a)redhat.com -prefix = libvirt-python PATCH diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst new file mode 100644 index 0000000..11e3c41 --- /dev/null +++ b/CONTRIBUTING.rst @@ -0,0 +1,28 @@ +============================== +Contributing to libvirt-python +============================== + +The libvirt Python API binding accepts code contributions via merge requests +on the GitLab project: + + https://gitlab.com/libvirt/libvirt-python/-/merge_requests + +It is required that automated CI pipelines succeed before a merge request +will be accepted. The global pipeline status for the ``master`` branch is +visible at: + + https://gitlab.com/libvirt/libvirt-python/pipelines + +CI pipline results for merge requests will be visible via the contributors' +own private repository fork: + + https://gitlab.com/::YOUR-USER-NAME::/libvirt-python/pipelines + +Contributions submitted to the project must be in compliance with the +Developer Certificate of Origin Version 1.1. This is documented at: + + https://developercertificate.org/ + +In indicate compliance, each commit in a series must have a "Signed-off-by" +tag with the submittor's name and email address. This can be added by passing +the ``-s`` flag to ``git commit`` when creating the patches. -- 2.26.2

2 2

[libvirt PATCH 0/2] CONTRIBUTING: Clean up and improve
by Andrea Bolognani 04 May '20

04 May '20

Andrea Bolognani (2): CONTRIBUTING: Indent command by three spaces CONTRIBUTING: Include note about build system tools CONTRIBUTING.rst | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) -- 2.25.4

3 12

[libvirt PATCH] gitlab: update list of distros used to use latest versions
by Daniel P. Berrangé 04 May '20

04 May '20

Replace Fedora 30 with Fedora 32 Replace Ubuntu 16.04 with Ubuntu 20.04 Switch generic jobs from Fedora 31 to Fedora 32 Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitlab-ci.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99e7b510c7..d4df2a02cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,14 +85,14 @@ x64-centos-8: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-centos-8:latest -x64-fedora-30: - <<: *native_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30:latest - x64-fedora-31: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest +x64-fedora-32: + <<: *native_build_default_job_definition + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest + x64-fedora-rawhide: <<: *native_build_default_job_definition image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide:latest @@ -101,14 +101,14 @@ x64-opensuse-151: <<: *native_build_default_job_definition image: quay.io/libvirt/buildenv-libvirt-opensuse-151:latest -x64-ubuntu-1604: - <<: *native_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-ubuntu-1604:latest - x64-ubuntu-1804: <<: *native_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-ubuntu-1804:latest +x64-ubuntu-2004: + <<: *native_build_default_job_definition + image: quay.io/libvirt/buildenv-libvirt-ubuntu-2004:latest + # Cross compiled build jobs @@ -148,13 +148,13 @@ mipsel-debian-sid: <<: *cross_build_extra_job_definition image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-mipsel:latest -mingw32-fedora-30: +mingw32-fedora-rawhide: <<: *cross_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30-cross-mingw32:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide-cross-mingw32:latest -mingw64-fedora-30: +mingw64-fedora-rawhide: <<: *cross_build_default_job_definition - image: quay.io/libvirt/buildenv-libvirt-fedora-30-cross-mingw64:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-rawhide-cross-mingw64:latest # This artifact published by this job is downloaded by libvirt.org to @@ -172,7 +172,7 @@ website: - $MAKE -C docs install - cd .. - mv vroot/share/doc/libvirt/html/ website - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest artifacts: expose_as: 'Website' name: 'website' @@ -191,7 +191,7 @@ codestyle: - cd build - ../autogen.sh || (cat config.log && exit 1) - $MAKE syntax-check - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest # This artifact published by this job is downloaded to push to Weblate @@ -211,7 +211,7 @@ potfile: - $MAKE -C po libvirt.pot - cd .. - mv build/po/libvirt.pot libvirt.pot - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest artifacts: expose_as: 'Potfile' name: 'potfile' @@ -226,7 +226,7 @@ potfile: # to test developer's personal branches. dco: stage: prebuild - image: quay.io/libvirt/buildenv-libvirt-fedora-31:latest + image: quay.io/libvirt/buildenv-libvirt-fedora-32:latest before_script: - *script_variables script: -- 2.26.2

2 1