- Devel - libvirt List Archives

[libvirt] [PATCH v3 0/2] Forbid new-line char in name of networks
by Sławek Kapłoński 19 Oct '16

19 Oct '16

v2: http://www.redhat.com/archives/libvir-list/2016-October/msg00451.html Differences in v3: * function to check string moved from src/util/virxml to src/util/virstring * validation if name of network contains \n char moved from parsing XML to functions responsible for create/define new networks Sławek Kapłoński (2): util: Add function to check if string contains some chars Forbid new-line char in name of new networks src/conf/network_conf.c | 2 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 6 ++++++ src/util/virstring.c | 9 +++++++++ src/util/virstring.h | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) -- 2.10.0

2 8

[libvirt] How libvirt address qemu command line args
by zhunxun＠gmail.com 19 Oct '16

19 Oct '16

Now I want to add some args about TPM to domain's XML,so I can start a domain by virt-manager or other virsh command,and then ,I would like to use sVIrt security context to label vTPM and correspondingVM,But I do not know how to get these XML args in libvirt. the key problem is that how can i get and recognize these args!!! related XML content : <qemu:commandline> <qemu:arg value='-enable-kvm'/> <qemu:arg value='-drive'/> <qemu:arg value='file=/root/nvram_2.0-jin.qcow2,if=none,id=nvram0-0-0,format=qcow2'/> <qemu:arg value='-device'/> <qemu:arg value='tpm-tis,tpmdev=tpm-tpm0,id=tpm0'/> <qemu:arg value='-tpmdev'/> <qemu:arg value='libtpms,id=tpm-tpm0,nvram=nvram0-0-0,startup=clear'/> <qemu:arg value='-bios'/> <qemu:arg value='/root/xenSeabios/out/bios.bin'/> </qemu:commandline> zhunxun(a)gmail.com

3 2

[libvirt] [PATCH v2 0/3] fix hot(un)plug of chardev devices with TLS encryption
by Pavel Hrdina 19 Oct '16

19 Oct '16

Pavel Hrdina (3): qemu_alias: introduce qemuAliasChardevFromDevAlias helper qemu_command: create prefixed alias to separate variable qemu: always generate the same alias for tls-creds-x509 object src/qemu/qemu_alias.c | 16 +++++++++ src/qemu/qemu_alias.h | 3 ++ src/qemu/qemu_command.c | 41 ++++++++++++---------- src/qemu/qemu_hotplug.c | 23 +++++++----- ...xml2argv-serial-tcp-tlsx509-chardev-verify.args | 4 +-- .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 4 +-- 6 files changed, 60 insertions(+), 31 deletions(-) -- 2.10.1

2 5

[libvirt] Qemu: create empty cdrom
by Gromak Yuriy 19 Oct '16

19 Oct '16

Hello. Qemu is latest from master branch. Tryingto start a domain, which is connected toa blankcdrom: <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='sdb' bus='scsi'/> <readonly/> <address type='drive' controller='0' target='1' bus='0' unit='0'/> </disk> But I get an error: qemu-system-x86_64: -drive if=none,id=drive-scsi0-0-1-0,readonly=on,format=raw: Can't use 'raw' as a block driver for the protocol level.

3 2

[libvirt] qemu-guest-agent windows
by Umar Draz 18 Oct '16

18 Oct '16

Hello All, I have install qemu guest agent on windows 10, but unable to get the ip address using this command virsh qemu-agent-command myvm '{ "execute": "guest-network-get-interfaces" }' I am getting the following error on above command. ibvirt: QEMU Driver error : internal error: unable to execute QEMU agent command 'guest-network-get-interfaces': this feature or command is not currently supported but the same command successfully working on linux vms. Would you please help if there any other way to get the interfaces ip of windows vm Br. Umar

4 15

[libvirt] [PATCH] vsh: Using vshError rather than virReportError
by Kothapally Madhu Pavan 18 Oct '16

18 Oct '16

Correcting the error reporting method by using vshError instead of virReportError Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 050e7fb..c9fabf2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10475,9 +10475,9 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "postcopy-after-precopy")) { if (!vshCommandOptBool(cmd, "postcopy")) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("--postcopy-after-precopy can only be used with " - "--postcopy")); + vshError(ctl, "%s", + _("argument unsupported: --postcopy-after-precopy can only " + "be used with --postcopy")); goto cleanup; } iterEvent = virConnectDomainEventRegisterAny(

3 2

[libvirt] [PATCH 0/2] fix hot(un)plug of chardev devices with TLS encryption
by Pavel Hrdina 18 Oct '16

18 Oct '16

Pavel Hrdina (2): qemu_command: create prefixed alias to separate variable qemu: always generate the same alias for tls-creds-x509 object src/qemu/qemu_command.c | 39 ++++++++++++---------- src/qemu/qemu_hotplug.c | 9 +++-- ...xml2argv-serial-tcp-tlsx509-chardev-verify.args | 4 +-- .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 4 +-- 4 files changed, 33 insertions(+), 23 deletions(-) -- 2.10.1

2 7

[libvirt] [PATCH v9 0/5] Add native TLS encrypted chardev TCP support
by John Ferlan 18 Oct '16

18 Oct '16

v8: http://www.redhat.com/archives/libvir-list/2016-October/msg00306.html Differences to v8 1. Alter patch 1 such that it's not choosing to add the tls object based on both a config and domain xml setting, rather that the decision point is to avoid adding the config setting if the domain is set to tls='no' 2. Alter patch 2 to remove the booleans - this impacts patch 4 and 5 insomuch as they need to key off whether the chardevTLSx509secretUUID is set or not. John Ferlan (5): domain: Add optional 'tls' attribute for TCP chardev conf: Introduce {default|chardev}_tls_x509_secret_uuid qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/formatdomain.html.in | 21 +++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 51 ++++++-- src/conf/domain_conf.h | 5 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 24 ++++ src/qemu/qemu_command.c | 35 ++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 14 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 143 ++++++++++++++++++++- src/qemu/qemu_domain.h | 30 ++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 64 ++++++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 6 +- src/qemu/test_libvirtd_qemu.aug.in | 2 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- tests/qemuhotplugtest.c | 2 +- ...uxml2argv-serial-tcp-tlsx509-chardev-notls.args | 30 +++++ ...muxml2argv-serial-tcp-tlsx509-chardev-notls.xml | 50 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 2 +- ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 50 +++++++ tests/qemuxml2argvtest.c | 21 +++ ...xml2xmlout-serial-tcp-tlsx509-chardev-notls.xml | 1 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 33 files changed, 584 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-notls.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-notls.xml -- 2.7.4

3 20

[libvirt] [PATCH] qemu_hotplug: fix crash in hot(un)plugging chardev devices
by Pavel Hrdina 18 Oct '16

18 Oct '16

We need to make sure that the chardev is serial and TCP. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_hotplug.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 14af4e1..1003d50 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1729,7 +1729,9 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuDomainChrPreInsert(vmdef, chr) < 0) goto cleanup; - if (cfg->chardevTLS) { + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + dev->type == VIR_DOMAIN_CHR_TYPE_TCP && + cfg->chardevTLS) { if (qemuBuildTLSx509BackendProps(cfg->chardevTLSx509certdir, dev->data.tcp.listen, cfg->chardevTLSx509verify, @@ -4398,7 +4400,9 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver, sa_assert(tmpChr->info.alias); - if (cfg->chardevTLS && + if (tmpChr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + tmpChr->source.type == VIR_DOMAIN_CHR_TYPE_TCP && + cfg->chardevTLS && !(objAlias = qemuAliasTLSObjFromChardevAlias(tmpChr->info.alias))) goto cleanup; -- 2.10.1

3 3

[libvirt] [PATCH 0/3] Misc adjustments from recent code review
by John Ferlan 18 Oct '16

18 Oct '16

The following were all part of the review of the TCP chardev TLS series which were outside the realm of the specific changes for the series... http://www.redhat.com/archives/libvir-list/2016-October/msg00742.html 1. Removal of cfg from qemuProcessPrepareDomain should be separate patch 2. Setting chardevTLSx509verify should have been it's own patch... 3. !conn in qemuDomainSecretChardevPrepare not necessary - so that's true for the SecretDiskPrepare and SecretHostdevPrepare too John Ferlan (3): qemu: Remove unnecessary cfg fetch/unref qemu: Add 'verify-peer=yes' test for chardev TCP TLS qemu: Remove unnecessary NULL arg check src/qemu/qemu_domain.c | 5 +-- src/qemu/qemu_process.c | 2 -- ...xml2argv-serial-tcp-tlsx509-chardev-verify.args | 33 +++++++++++++++++ ...uxml2argv-serial-tcp-tlsx509-chardev-verify.xml | 41 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 5 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-verify.xml -- 2.7.4

3 5

[libvirt] [PULL 20/21] target-i386: Return runnability information on query-cpu-definitions
by Eduardo Habkost 17 Oct '16

17 Oct '16

Fill the "unavailable-features" field on the x86 implementation of query-cpu-definitions. Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Reviewed-by: Igor Mammedov <imammedo(a)redhat.com> Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- target-i386/cpu.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 19b8cc4..754e575 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1945,6 +1945,27 @@ static inline void feat2prop(char *s) } } +/* Return the feature property name for a feature flag bit */ +static const char *x86_cpu_feature_name(FeatureWord w, int bitnr) +{ + /* XSAVE components are automatically enabled by other features, + * so return the original feature name instead + */ + if (w == FEAT_XSAVE_COMP_LO || w == FEAT_XSAVE_COMP_HI) { + int comp = (w == FEAT_XSAVE_COMP_HI) ? bitnr + 32 : bitnr; + + if (comp < ARRAY_SIZE(x86_ext_save_areas) && + x86_ext_save_areas[comp].bits) { + w = x86_ext_save_areas[comp].feature; + bitnr = ctz32(x86_ext_save_areas[comp].bits); + } + } + + assert(bitnr < 32); + assert(w < FEATURE_WORDS); + return feature_word_info[w].feat_names[bitnr]; +} + /* Compatibily hack to maintain legacy +-feat semantic, * where +-feat overwrites any feature set by * feat=on|feat even if the later is parsed after +-feat @@ -2030,6 +2051,59 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, } } +static void x86_cpu_load_features(X86CPU *cpu, Error **errp); +static int x86_cpu_filter_features(X86CPU *cpu); + +/* Check for missing features that may prevent the CPU class from + * running using the current machine and accelerator. + */ +static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, + strList **missing_feats) +{ + X86CPU *xc; + FeatureWord w; + Error *err = NULL; + strList **next = missing_feats; + + if (xcc->kvm_required && !kvm_enabled()) { + strList *new = g_new0(strList, 1); + new->value = g_strdup("kvm");; + *missing_feats = new; + return; + } + + xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc)))); + + x86_cpu_load_features(xc, &err); + if (err) { + /* Errors at x86_cpu_load_features should never happen, + * but in case it does, just report the model as not + * runnable at all using the "type" property. + */ + strList *new = g_new0(strList, 1); + new->value = g_strdup("type"); + *next = new; + next = &new->next; + } + + x86_cpu_filter_features(xc); + + for (w = 0; w < FEATURE_WORDS; w++) { + uint32_t filtered = xc->filtered_features[w]; + int i; + for (i = 0; i < 32; i++) { + if (filtered & (1UL << i)) { + strList *new = g_new0(strList, 1); + new->value = g_strdup(x86_cpu_feature_name(w, i)); + *next = new; + next = &new->next; + } + } + } + + object_unref(OBJECT(xc)); +} + /* Print all cpuid feature names in featureset */ static void listflags(FILE *f, fprintf_function print, const char **featureset) @@ -2122,6 +2196,8 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) info = g_malloc0(sizeof(*info)); info->name = x86_cpu_class_get_model_name(cc); + x86_cpu_class_check_missing_features(cc, &info->unavailable_features); + info->has_unavailable_features = true; entry = g_malloc0(sizeof(*entry)); entry->value = info; -- 2.7.4

1 0

[libvirt] [PULL 09/21] qmp: Add runnability information to query-cpu-definitions
by Eduardo Habkost 17 Oct '16

17 Oct '16

Add a new optional field to query-cpu-definitions schema: "unavailable-features". It will contain a list of QOM properties that prevent the CPU model from running in the current host. Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Reviewed-by: Eric Blake <eblake(a)redhat.com> Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- qapi-schema.json | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/qapi-schema.json b/qapi-schema.json index ded1179..5a8ec38 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3101,10 +3101,31 @@ # QEMU version, machine type, machine options and accelerator options. # A static model is always migration-safe. (since 2.8) # +# @unavailable-features: #optional List of properties that prevent +# the CPU model from running in the current +# host. (since 2.8) +# +# @unavailable-features is a list of QOM property names that +# represent CPU model attributes that prevent the CPU from running. +# If the QOM property is read-only, that means there's no known +# way to make the CPU model run in the current host. Implementations +# that choose not to provide specific information return the +# property name "type". +# If the property is read-write, it means that it MAY be possible +# to run the CPU model in the current host if that property is +# changed. Management software can use it as hints to suggest or +# choose an alternative for the user, or just to generate meaningful +# error messages explaining why the CPU model can't be used. +# If @unavailable-features is an empty list, the CPU model is +# runnable using the current host and machine-type. +# If @unavailable-features is not present, runnability +# information for the CPU is not available. +# # Since: 1.2.0 ## { 'struct': 'CpuDefinitionInfo', - 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool' } } + 'data': { 'name': 'str', '*migration-safe': 'bool', 'static': 'bool', + '*unavailable-features': [ 'str' ] } } ## # @query-cpu-definitions: -- 2.7.4

1 0

[libvirt] [PATCH v8 0/5] Add native TLS encrypted chardev TCP support
by John Ferlan 15 Oct '16

15 Oct '16

v7: http://www.redhat.com/archives/libvir-list/2016-September/msg00729.html Differences in v8 1. Update to use 2.4.0 instead of 2.3.0 2. Alter text in qemu.conf as requested in review of v7 3. After update to top of branch found one more virDomainChrDefNew in a recent commit that needed a NULL parameter John Ferlan (5): domain: Add optional 'tls' attribute for TCP chardev conf: Introduce {default|chardev}_tls_x509_secret_uuid qemu: Introduce qemuDomainChardevPrivatePtr qemu: Add a secret object to/for a chardev tcp with secret qemu: Add the ability to hotplug a secret object for TCP chardev TLS docs/formatdomain.html.in | 21 +++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 51 ++++++-- src/conf/domain_conf.h | 5 +- src/libxl/libxl_domain.c | 2 +- src/lxc/lxc_native.c | 2 +- src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 24 ++++ src/qemu/qemu_command.c | 35 ++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 22 ++++ src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 143 ++++++++++++++++++++- src/qemu/qemu_domain.h | 30 ++++- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 64 ++++++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 6 +- src/qemu/test_libvirtd_qemu.aug.in | 2 + src/vz/vz_sdk.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- tests/qemuhotplugtest.c | 2 +- ...emuxml2argv-serial-tcp-tlsx509-chardev-tls.args | 30 +++++ ...qemuxml2argv-serial-tcp-tlsx509-chardev-tls.xml | 50 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 2 +- ...xml2argv-serial-tcp-tlsx509-secret-chardev.args | 38 ++++++ ...uxml2argv-serial-tcp-tlsx509-secret-chardev.xml | 50 +++++++ tests/qemuxml2argvtest.c | 22 ++++ ...muxml2xmlout-serial-tcp-tlsx509-chardev-tls.xml | 1 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 2 +- tests/qemuxml2xmltest.c | 1 + 33 files changed, 594 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-tls.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev-tls.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev-tls.xml -- 2.7.4

2 17

[libvirt] [PATCH] conf: Explain some code in more detail
by Andrea Bolognani 14 Oct '16

14 Oct '16

The code is entirely correct, but it still managed to trip me up when I first ran into it because I did not realize right away that VIR_PCI_CONNECT_TYPES_ENDPOINT was not a single flag, but rather a mask including both VIR_PCI_CONNECT_TYPE_PCI_DEVICE and VIR_PCI_CONNECT_TYPE_PCIE_DEVICE. In order to save the next distracted traveler in PCI Address Land some time, document this fact with a comment. Add a test case for the behavior as well. --- src/conf/domain_addr.c | 4 +- .../qemuxml2argv-q35-pci-force-address.args | 25 +++++++++++ .../qemuxml2argv-q35-pci-force-address.xml | 32 +++++++++++++++ tests/qemuxml2argvtest.c | 7 ++++ .../qemuxml2xmlout-q35-pci-force-address.xml | 48 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 7 ++++ 6 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 0406b50..bbeb611 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -100,7 +100,9 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddressPtr addr, if (fromConfig) { /* If the requested connection was manually specified in * config, allow a PCI device to connect to a PCIe slot, or - * vice versa. + * vice versa. In order to do so, we add *both* the PCI_DEVICE + * and the PCIE_DEVICE flags to the bus if it already has either + * of them, using the ENDPOINT mask. */ if (busFlags & VIR_PCI_CONNECT_TYPES_ENDPOINT) busFlags |= VIR_PCI_CONNECT_TYPES_ENDPOINT; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args b/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args new file mode 100644 index 0000000..9ca342b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.args @@ -0,0 +1,25 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/libexec/qemu-kvm \ +-name q35-test \ +-S \ +-M q35 \ +-m 2048 \ +-smp 2,sockets=2,cores=1,threads=1 \ +-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-q35-test/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \ +-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \ +-device e1000e,vlan=0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \ +-net user,vlan=0,name=hostnet0 \ +-device intel-hda,id=sound0,bus=pci.3,addr=0x0 \ +-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml new file mode 100644 index 0000000..34ec7c7 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-q35-pci-force-address.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'/> + <controller type='pci' index='2' model='pci-bridge'/> + <controller type='pci' index='3' model='pcie-root-port'/> + <sound model='ich6'> + <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> + </sound> + <interface type='user'> + <model type='e1000e'/> + <mac address='52:54:00:aa:bf:ef'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> + </interface> + <controller type='usb' model='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b996182..fc18317 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1749,6 +1749,13 @@ mymain(void) QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI); + /* Make sure the user can always override libvirt's default device + * placement policy by providing an explicit PCI address */ + DO_TEST("q35-pci-force-address", + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_HDA_DUPLEX); DO_TEST_PARSE_ERROR("q35-wrong-root", QEMU_CAPS_DEVICE_PCI_BRIDGE, diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml new file mode 100644 index 0000000..c0332d4 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-pci-force-address.xml @@ -0,0 +1,48 @@ +<domain type='qemu'> + <name>q35-test</name> + <uuid>11dbdcdd-4c3b-482b-8903-9bdb8c0a2774</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='x86_64' machine='q35'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/qemu-kvm</emulator> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='dmi-to-pci-bridge'> + <model name='i82801b11-bridge'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1e' function='0x0'/> + </controller> + <controller type='pci' index='2' model='pci-bridge'> + <model name='pci-bridge'/> + <target chassisNr='2'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </controller> + <controller type='pci' index='3' model='pcie-root-port'> + <model name='ioh3420'/> + <target chassis='3' port='0x10'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <controller type='usb' index='0' model='none'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/> + </controller> + <interface type='user'> + <mac address='52:54:00:aa:bf:ef'/> + <model type='e1000e'/> + <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <sound model='ich6'> + <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> + </sound> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 62bff8c..95c0bf2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -727,6 +727,13 @@ mymain(void) QEMU_CAPS_DEVICE_XIO3130_DOWNSTREAM, QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_NEC_USB_XHCI); + /* Make sure the user can always override libvirt's default device + * placement policy by providing an explicit PCI address */ + DO_TEST("q35-pci-force-address", + QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, + QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_HDA_DUPLEX); DO_TEST("hostdev-scsi-lsi", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI, -- 2.7.4

2 1

[libvirt] [PATCH v6 0/3] Add runnability info to query-cpu-definitions
by Eduardo Habkost 14 Oct '16

14 Oct '16

This series extends query-cpu-definitions to include an extra field: "unavailable-features". The new field can be used to find out reasons that prevent the CPU model from running in the current host. This will return information based on the current machine and accelerator only. In the future we may extend these mechanisms to allow querying other machines and other accelerators without restarting QEMU, but it will require some reorganization of QEMU's main code. To be able to implement this more cleanly, the series rework some of the feature/property name code. This series can be seen in the git branch at: https://github.com/ehabkost/qemu-hacks.git work/query-cpu-definitions-runnable-info The series is based on my x86-next branch: https://github.com/ehabkost/qemu.git x86-next Changes v5 -> v6: * Rebased to x86-next, that already has 8 of the previous patches from v5 applied * Removed x86_cpu_filter_features() from x86_cpu_load_features(), because some of the commands in the CPU model query API need info about CPU models before filtering * Recovered v3 of "target-i386: Move warning code outside x86_cpu_filter_features()" because now we can keep the simpler logic that checked the return value of x86_cpu_filter_features() Diff v5 -> v6: diff --git a/target-i386/cpu.c b/target-i386/cpu.c index d53e711..63330ce 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2052,6 +2052,7 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, } static void x86_cpu_load_features(X86CPU *cpu, Error **errp); +static int x86_cpu_filter_features(X86CPU *cpu); /* Check for missing features that may prevent the CPU class from * running using the current machine and accelerator. @@ -2085,6 +2086,8 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, next = &new->next; } + x86_cpu_filter_features(xc); + for (w = 0; w < FEATURE_WORDS; w++) { uint32_t filtered = xc->filtered_features[w]; int i; @@ -2234,11 +2237,14 @@ static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w, /* * Filters CPU feature words based on host availability of each feature. + * + * Returns: 0 if all flags are supported by the host, non-zero otherwise. */ -static void x86_cpu_filter_features(X86CPU *cpu) +static int x86_cpu_filter_features(X86CPU *cpu) { CPUX86State *env = &cpu->env; FeatureWord w; + int rv = 0; for (w = 0; w < FEATURE_WORDS; w++) { uint32_t host_feat = @@ -2246,22 +2252,21 @@ static void x86_cpu_filter_features(X86CPU *cpu) uint32_t requested_features = env->features[w]; env->features[w] &= host_feat; cpu->filtered_features[w] = requested_features & ~env->features[w]; + if (cpu->filtered_features[w]) { + rv = 1; + } } + + return rv; } -/* Report list of filtered features to stderr. - * Returns true if some features were found to be filtered, false otherwise - */ -static bool x86_cpu_report_filtered_features(X86CPU *cpu) +static void x86_cpu_report_filtered_features(X86CPU *cpu) { FeatureWord w; - uint32_t filtered = 0; for (w = 0; w < FEATURE_WORDS; w++) { - filtered |= cpu->filtered_features[w]; report_unavailable_features(w, cpu->filtered_features[w]); } - return filtered; } static void x86_cpu_apply_props(X86CPU *cpu, PropValue *props) @@ -3136,8 +3141,6 @@ static void x86_cpu_load_features(X86CPU *cpu, Error **errp) env->cpuid_xlevel2 = env->cpuid_min_xlevel2; } - x86_cpu_filter_features(cpu); - out: if (local_err != NULL) { error_propagate(errp, local_err); @@ -3176,8 +3179,12 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) goto out; } - if (cpu->check_cpuid || cpu->enforce_cpuid) { - if (x86_cpu_report_filtered_features(cpu) && cpu->enforce_cpuid) { + x86_cpu_filter_features(cpu); + + if (x86_cpu_filter_features(cpu) && + (cpu->check_cpuid || cpu->enforce_cpuid)) { + x86_cpu_report_filtered_features(cpu); + if (cpu->enforce_cpuid) { error_setg(&local_err, kvm_enabled() ? "Host doesn't support requested features" : Changes v4 -> v5: * New patch: "target-i386: Register aliases for feature names with underscores" * On patch: "tests: Add test case for x86 feature parsing compatibility": * Fix typo on commit message Reported-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> * Add comment noting that the "[+-]feature" compatibility mode will be removed soon * On patch: "target-i386: Make plus_features/minus_features QOM-based": * Removed feat2prop() call on , as we now have property aliases for the old names containing underscores * On patch: "target-i386: Remove underscores from feat_names arrays": * Remove the feat2prop() call from the alias registration loop, too * Commit message update to enumerate all code that uses feat_names * On patch: "target-i386: x86_cpu_load_features() function": * Fix typo on x86_cpu_load_features() comment Reported-by: Paolo Bonzini <pbonzini(a)redhat.com> Diff v4 ->v5: diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 4dd3aee..620889f 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2002,12 +2002,10 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, /* Compatibility syntax: */ if (featurestr[0] == '+') { - feat2prop(featurestr + 1); plus_features = g_list_append(plus_features, g_strdup(featurestr + 1)); continue; } else if (featurestr[0] == '-') { - feat2prop(featurestr + 1); minus_features = g_list_append(minus_features, g_strdup(featurestr + 1)); continue; @@ -3066,8 +3064,7 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) env->features[FEAT_XSAVE_COMP_HI] = mask >> 32; } -/* Load CPUID data based on configureured features - */ +/* Load CPUID data based on configured features */ static void x86_cpu_load_features(X86CPU *cpu, Error **errp) { CPUX86State *env = &cpu->env; @@ -3443,7 +3440,10 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu, return; } - /* Property names should use "-" instead of "_" */ + /* Property names should use "-" instead of "_". + * Old names containing underscores are registered as aliases + * using object_property_add_alias() + */ assert(!strchr(name, '_')); /* aliases don't use "|" delimiters anymore, they are registered * manually using object_property_add_alias() */ @@ -3496,7 +3496,6 @@ static void x86_cpu_initfn(Object *obj) } } - /* Alias for feature properties: */ object_property_add_alias(obj, "sse3", obj, "pni", &error_abort); object_property_add_alias(obj, "pclmuldq", obj, "pclmulqdq", &error_abort); object_property_add_alias(obj, "sse4-1", obj, "sse4.1", &error_abort); @@ -3505,6 +3504,28 @@ static void x86_cpu_initfn(Object *obj) object_property_add_alias(obj, "ffxsr", obj, "fxsr-opt", &error_abort); object_property_add_alias(obj, "i64", obj, "lm", &error_abort); + object_property_add_alias(obj, "ds_cpl", obj, "ds-cpl", &error_abort); + object_property_add_alias(obj, "tsc_adjust", obj, "tsc-adjust", &error_abort); + object_property_add_alias(obj, "fxsr_opt", obj, "fxsr-opt", &error_abort); + object_property_add_alias(obj, "lahf_lm", obj, "lahf-lm", &error_abort); + object_property_add_alias(obj, "cmp_legacy", obj, "cmp-legacy", &error_abort); + object_property_add_alias(obj, "nodeid_msr", obj, "nodeid-msr", &error_abort); + object_property_add_alias(obj, "perfctr_core", obj, "perfctr-core", &error_abort); + object_property_add_alias(obj, "perfctr_nb", obj, "perfctr-nb", &error_abort); + object_property_add_alias(obj, "kvm_nopiodelay", obj, "kvm-nopiodelay", &error_abort); + object_property_add_alias(obj, "kvm_mmu", obj, "kvm-mmu", &error_abort); + object_property_add_alias(obj, "kvm_asyncpf", obj, "kvm-asyncpf", &error_abort); + object_property_add_alias(obj, "kvm_steal_time", obj, "kvm-steal-time", &error_abort); + object_property_add_alias(obj, "kvm_pv_eoi", obj, "kvm-pv-eoi", &error_abort); + object_property_add_alias(obj, "kvm_pv_unhalt", obj, "kvm-pv-unhalt", &error_abort); + object_property_add_alias(obj, "svm_lock", obj, "svm-lock", &error_abort); + object_property_add_alias(obj, "nrip_save", obj, "nrip-save", &error_abort); + object_property_add_alias(obj, "tsc_scale", obj, "tsc-scale", &error_abort); + object_property_add_alias(obj, "vmcb_clean", obj, "vmcb-clean", &error_abort); + object_property_add_alias(obj, "pause_filter", obj, "pause-filter", &error_abort); + object_property_add_alias(obj, "sse4_1", obj, "sse4.1", &error_abort); + object_property_add_alias(obj, "sse4_2", obj, "sse4.2", &error_abort); + x86_cpu_load_def(cpu, xcc->cpu_def, &error_abort); } diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c index 7cff2b5..260dd27 100644 --- a/tests/test-x86-cpuid-compat.c +++ b/tests/test-x86-cpuid-compat.c @@ -81,9 +81,14 @@ static void test_plus_minus(void) char *path; /* Rules: - * "-foo" overrides "+foo" - * "[+-]foo" overrides "foo=..." - * "foo_bar" should be translated to "foo-bar" + * 1)"-foo" overrides "+foo" + * 2) "[+-]foo" overrides "foo=..." + * 3) Old feature names with underscores (e.g. "sse4_2") + * should keep working + * + * Note: rules 1 and 2 are planned to be removed soon, but we + * need to keep compatibility for a while until we start + * warning users about it. */ qtest_start("-cpu pentium,-fpu,+fpu,-mce,mce=on,+cx8,cx8=off,+sse4_1,sse4_2=on"); path = get_cpu0_qom_path(); Changes v3 -> v4: * Removed patch "Define CPUID filtering functions before x86_cpu_list" * New patch: "tests: Add test case for x86 feature parsing compatibility" * New patch: "target-i386: Disable VME by default with TCG" * Disable VME by default on TCG to avoid returning bogus results for all CPU models in TCG mode * New patch: "target-i386: Make plus_features/minus_features QOM-based" * New patch: "target-i386: Remove underscores from property names" * New patch: "target-i386: Register properties for feature aliases manually" * New patch: "target-i386: xsave: Add FP and SSE bits to x86_ext_save_areas" * New patch: "target-i386: x86_cpu_load_features() function" * On patch: "target-i386: Return runnability information on query-cpu-definitions" * Added code to handle unsupported XSAVE components cleanly * Use x86_cpu_load_features() function Changes v2 -> v3: * Small documentation reword * Suggested-by: Markus Armbruster <armbru(a)redhat.com> * Create a x86_cpu_feature_name() function, to isolate the code that returns the property name Changes v1 -> v2: * Fixed documentation to say "(since 2.7)" * Removed @runnable field, improved documentation Example command output: { "return": [ { "unavailable-features": [], "static": false, "name": "host" }, { "unavailable-features": [], "static": false, "name": "qemu64" }, { "unavailable-features": [], "static": false, "name": "qemu32" }, { "unavailable-features": ["npt", "sse4a", "3dnow", "3dnowext", "fxsr-opt", "mmxext"], "static": false, "name": "phenom" }, { "unavailable-features": [], "static": false, "name": "pentium3" }, { "unavailable-features": [], "static": false, "name": "pentium2" }, { "unavailable-features": [], "static": false, "name": "pentium" }, { "unavailable-features": [], "static": false, "name": "n270" }, { "unavailable-features": [], "static": false, "name": "kvm64" }, { "unavailable-features": [], "static": false, "name": "kvm32" }, { "unavailable-features": [], "static": false, "name": "coreduo" }, { "unavailable-features": [], "static": false, "name": "core2duo" }, { "unavailable-features": ["3dnow", "3dnowext", "mmxext"], "static": false, "name": "athlon" }, { "unavailable-features": [], "static": false, "name": "Westmere" }, { "unavailable-features": ["xgetbv1", "xsavec", "3dnowprefetch", "smap", "adx", "rdseed", "mpx", "rtm", "hle"], "static": false, "name": "Skylake-Client" }, { "unavailable-features": [], "static": false, "name": "SandyBridge" }, { "unavailable-features": [], "static": false, "name": "Penryn" }, { "unavailable-features": ["tbm", "fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G5" }, { "unavailable-features": ["fma4", "xop", "3dnowprefetch", "misalignsse", "sse4a"], "static": false, "name": "Opteron_G4" }, { "unavailable-features": ["misalignsse", "sse4a"], "static": false, "name": "Opteron_G3" }, { "unavailable-features": [], "static": false, "name": "Opteron_G2" }, { "unavailable-features": [], "static": false, "name": "Opteron_G1" }, { "unavailable-features": [], "static": false, "name": "Nehalem" }, { "unavailable-features": [], "static": false, "name": "IvyBridge" }, { "unavailable-features": ["rtm", "hle"], "static": false, "name": "Haswell" }, { "unavailable-features": [], "static": false, "name": "Haswell-noTSX" }, { "unavailable-features": [], "static": false, "name": "Conroe" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed", "rtm", "hle"], "static": false, "name": "Broadwell" }, { "unavailable-features": ["3dnowprefetch", "smap", "adx", "rdseed"], "static": false, "name": "Broadwell-noTSX" }, { "unavailable-features": [], "static": false, "name": "486" } ]} Cc: David Hildenbrand <dahi(a)linux.vnet.ibm.com> Cc: Michael Mueller <mimu(a)linux.vnet.ibm.com> Cc: Christian Borntraeger <borntraeger(a)de.ibm.com> Cc: Cornelia Huck <cornelia.huck(a)de.ibm.com> Cc: Jiri Denemark <jdenemar(a)redhat.com> Cc: libvir-list(a)redhat.com Eduardo Habkost (3): target-i386: Move warning code outside x86_cpu_filter_features() target-i386: x86_cpu_load_features() function target-i386: Return runnability information on query-cpu-definitions target-i386/cpu.c | 169 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 137 insertions(+), 32 deletions(-) -- 2.7.4

2 18

[libvirt] [PATCH rfc v2 0/8] fspool: backend directory
by Olga Krishtal 14 Oct '16

14 Oct '16

Hi everyone, we would like to propose the first implementation of fspool with directory backend. Filesystem pools is a facility to manage filesystems resources similar to how storage pools manages volume resources. Furthermore new API follows storage API closely where it makes sense. Uploading/downloading operations are not defined yet as it is not obvious how to make it properly. I guess we can use some kind of tar to make a stream from a filesystem. Please share you thoughts on this particular issue. The patchset provides 'dir' backend which simply expose directories in some directory in host filesystem. The virsh commands are provided too. So it is ready to play with, just replace 'pool' in xml descriptions and virsh commands to 'fspool' and 'volume' to 'item'. Examle and usage: Define: virsh -c qemu:///system fspool-define-as fs_pool_name dir --target /path/on/host Build virsh -c qemu:///system fspool-build fs_pool_name Start virsh -c qemu:///system fspool-start fs_pool_name Look inside virsh -c qemu:///system fspool-list (--all) fspool_name Fspool called POOL, on the host fs uses /fs_driver to hold items. virsh -c qemu:///system fspool-dumpxml POOL <fspool type='dir'> <name>POOL</name> <uuid>c57c9d7c-b1d5-4c45-ba9c-67f03d4da160</uuid> <capacity unit='bytes'>733722615808</capacity> <allocation unit='bytes'>1331486720</allocation> <available unit='bytes'>534810800128</available> <source> </source> <target> <path>/fs_driver</path> <permissions> <mode>0755</mode> <owner>0</owner> <group>0</group> </permissions> </target> </fspool> virsh -c qemu:///system fspool-info POOL Name: POOL UUID: c57c9d7c-b1d5-4c45-ba9c-67f03d4da160 State: running Persistent: yes Autostart: no autostart Capacity: 683.33 GiB Allocation: 1.24 GiB Available: 498.08 GiB virsh -c qemu+unix:///system item-list POOL Name Path ------------------------------------------------------------------------------ item1 /fs_driver/item1 item10 /fs_driver/item10 item11 /fs_driver/item11 item12 /fs_driver/item12 item15 /fs_driver/item15 Fspool of directory type is some directory on host fs that holds items (subdirs). Example of usage for items: virsh -c vz+unix:///system item-create-as POOL item1 1g - create item virsh -c qemu+unix:///system item-dumpxml item1 POOL <fsitem> <name>item1</name> <key>/fs_driver/item1</key> <source> </source> <capacity unit='bytes'>0</capacity> <allocation unit='bytes'>0</allocation> <target> <format type='dir'/> </target> </fsitem> virsh -c qemu+unix:///system item-info item1 POOL Name: item1 Type: dir Capacity: 683.33 GiB Allocation: 634.87 MiB Autostart: no autostart Capacity: 683.33 GiB Allocation: 1.24 GiB Available: 498.08 GiB virsh -c qemu+unix:///system item-list POOL Name Path ------------------------------------------------------------------------------ item1 /fs_driver/item1 item10 /fs_driver/item10 item11 /fs_driver/item11 item12 /fs_driver/item12 item15 /fs_driver/item15 v2: - renamed Fs to FS - in configure.ac script macro m4 is used - updates docs - created simple tests - updated virsh.pod - added information abot fspool in fotmatfs.html Olga Krishtal (8): fspool: introduce filesystem pools API fspool: usual driver based implementation of filesystem pools API fspools: configuration and internal representation fspools: acl support for filesystem pools remote: filesystem pools driver implementation fspool: default implementation of filesystem pools virsh: filesystem pools commands fspools: docs and tests for fspool directory backend configure.ac | 38 + daemon/Makefile.am | 4 + daemon/libvirtd.c | 10 + daemon/remote.c | 35 + docs/formatfs.html.in | 208 ++ docs/fspool.html.in | 41 + docs/schemas/fsitem.rng | 66 + docs/schemas/fspool.rng | 82 + docs/sitemap.html.in | 4 + include/libvirt/libvirt-fs.h | 260 +++ include/libvirt/libvirt.h | 1 + include/libvirt/virterror.h | 8 + m4/virt-driver-fspool.m4 | 52 + po/POTFILES.in | 6 + src/Makefile.am | 46 + src/access/viraccessdriver.h | 12 + src/access/viraccessdrivernop.c | 19 + src/access/viraccessdriverpolkit.c | 47 + src/access/viraccessdriverstack.c | 49 + src/access/viraccessmanager.c | 31 + src/access/viraccessmanager.h | 11 + src/access/viraccessperm.c | 15 +- src/access/viraccessperm.h | 124 ++ src/check-driverimpls.pl | 2 + src/conf/fs_conf.c | 1637 ++++++++++++++++ src/conf/fs_conf.h | 323 +++ src/datatypes.c | 154 ++ src/datatypes.h | 94 + src/driver-fs.h | 192 ++ src/driver.h | 3 + src/fs/fs_backend.h | 107 + src/fs/fs_backend_dir.c | 355 ++++ src/fs/fs_backend_dir.h | 8 + src/fs/fs_driver.c | 2058 ++++++++++++++++++++ src/fs/fs_driver.h | 10 + src/libvirt-fs.c | 1556 +++++++++++++++ src/libvirt.c | 28 + src/libvirt_private.syms | 53 + src/libvirt_public.syms | 42 + src/remote/remote_driver.c | 66 + src/remote/remote_protocol.x | 466 ++++- src/remote_protocol-structs | 165 ++ src/rpc/gendispatch.pl | 23 +- src/util/virerror.c | 37 + tests/Makefile.am | 12 + tests/fsitemxml2xmlin/item.xml | 13 + tests/fsitemxml2xmlout/item.xml | 13 + tests/fsitemxml2xmltest.c | 105 + .../dir-missing-target-path-invalid.xml | 12 + tests/fspoolxml2xmlin/fspool-dir.xml | 16 + tests/fspoolxml2xmlout/fspool-dir.xml | 16 + tests/fspoolxml2xmltest.c | 81 + tools/Makefile.am | 2 + tools/virsh-fsitem.c | 1292 ++++++++++++ tools/virsh-fsitem.h | 39 + tools/virsh-fspool.c | 1586 +++++++++++++++ tools/virsh-fspool.h | 38 + tools/virsh.c | 4 + tools/virsh.h | 9 + tools/virsh.pod | 252 ++- 60 files changed, 12028 insertions(+), 10 deletions(-) create mode 100644 docs/formatfs.html.in create mode 100644 docs/fspool.html.in create mode 100644 docs/schemas/fsitem.rng create mode 100644 docs/schemas/fspool.rng create mode 100644 include/libvirt/libvirt-fs.h create mode 100644 m4/virt-driver-fspool.m4 create mode 100644 src/conf/fs_conf.c create mode 100644 src/conf/fs_conf.h create mode 100644 src/driver-fs.h create mode 100644 src/fs/fs_backend.h create mode 100644 src/fs/fs_backend_dir.c create mode 100644 src/fs/fs_backend_dir.h create mode 100644 src/fs/fs_driver.c create mode 100644 src/fs/fs_driver.h create mode 100644 src/libvirt-fs.c create mode 100644 tests/fsitemxml2xmlin/item.xml create mode 100644 tests/fsitemxml2xmlout/item.xml create mode 100644 tests/fsitemxml2xmltest.c create mode 100644 tests/fspoolschemadata/dir-missing-target-path-invalid.xml create mode 100644 tests/fspoolxml2xmlin/fspool-dir.xml create mode 100644 tests/fspoolxml2xmlout/fspool-dir.xml create mode 100644 tests/fspoolxml2xmltest.c create mode 100644 tools/virsh-fsitem.c create mode 100644 tools/virsh-fsitem.h create mode 100644 tools/virsh-fspool.c create mode 100644 tools/virsh-fspool.h -- 1.8.3.1

4 21

[libvirt] [PATCH 0/8] IVSHMEM -- third time's the charm
by Martin Kletzander 14 Oct '16

14 Oct '16

In this version we bring back the model, but disable migration for now. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1347049 Martin Kletzander (8): conf: Fix virDomainShmemDefFind qemu: Disable migration with ivshmem conf, qemu: Add support for shmem model conf, qemu: Add newer shmem models qemu: Add capabilities for ivshmem-{plain,doorbell} qemu: Save various defaults for shmem qemu: Support newer ivshmem device variants qemu: Add support for hot/cold-(un)plug of shmem devices docs/schemas/domaincommon.rng | 11 + src/conf/domain_conf.c | 50 +++-- src/conf/domain_conf.h | 10 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 100 ++++++++- src/qemu/qemu_command.h | 10 + src/qemu/qemu_domain.c | 49 +++- src/qemu/qemu_driver.c | 39 +++- src/qemu/qemu_hotplug.c | 247 ++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 6 + .../caps_2.6.0-gicv2.aarch64.xml | 2 + .../caps_2.6.0-gicv3.aarch64.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 21 ++ .../qemuhotplug-ivshmem-doorbell-detach.xml | 7 + .../qemuhotplug-ivshmem-doorbell.xml | 4 + .../qemuhotplug-ivshmem-plain-detach.xml | 6 + .../qemuhotplug-ivshmem-plain.xml | 3 + ...muhotplug-base-live+ivshmem-doorbell-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-doorbell.xml | 65 ++++++ .../qemuhotplug-base-live+ivshmem-plain-detach.xml | 1 + .../qemuhotplug-base-live+ivshmem-plain.xml | 58 +++++ .../qemuxml2argv-shmem-plain-doorbell.args | 43 ++++ ...m.xml => qemuxml2argv-shmem-plain-doorbell.xml} | 11 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 9 + 33 files changed, 760 insertions(+), 22 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-doorbell.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-ivshmem-plain.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml create mode 120000 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain-detach.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args copy tests/qemuxml2argvdata/{qemuxml2argv-shmem.xml => qemuxml2argv-shmem-plain-doorbell.xml} (82%) -- 2.10.0

3 28

[libvirt] [PATCH 0/2] RFC: New libssh transport
by Pino Toscano 14 Oct '16

14 Oct '16

Hi, this series introduces a new libssh transport in libvirt, based on the libssh C library. This library supports what libssh2 does, and more: - easier API for known_hosts handling (there's a ticket upstream to request extensions for it, but what is implemented now works well) - potential GSSAPI authentication (not enabled yet because of a libssh bug [1] - easier API for ssh-agent support TODO: - implement the keyboard-interactive authentication method - more testing than my own The implementation for the new transport is based on the libssh2 one, hence it shares origin and style. [1] https://red.libssh.org/issues/242 Thanks, Pino Toscano (2): virNetSocket: allow to not close FD libssh_transport: add new libssh-based transport config-post.h | 2 + configure.ac | 3 + include/libvirt/virterror.h | 2 + m4/virt-libssh.m4 | 26 + src/Makefile.am | 21 +- src/libvirt_libssh.syms | 22 + src/remote/remote_driver.c | 41 ++ src/rpc/virnetclient.c | 123 ++++ src/rpc/virnetclient.h | 13 + src/rpc/virnetlibsshsession.c | 1267 +++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetlibsshsession.h | 80 +++ src/rpc/virnetsocket.c | 184 +++++- src/rpc/virnetsocket.h | 13 + src/util/virerror.c | 9 +- 14 files changed, 1802 insertions(+), 4 deletions(-) create mode 100644 m4/virt-libssh.m4 create mode 100644 src/libvirt_libssh.syms create mode 100644 src/rpc/virnetlibsshsession.c create mode 100644 src/rpc/virnetlibsshsession.h -- 2.7.4

1 2

[libvirt] [PATCH 0/2] support qemu drive cache.* parameters
by Nikolay Shirokovskiy 14 Oct '16

14 Oct '16

Nikolay Shirokovskiy (2): conf: add disk cache tuning parameters after qemu qemu: support <cachetune> in domain disk xml .gnulib | 2 +- docs/schemas/domaincommon.rng | 22 ++++++ src/conf/domain_conf.c | 90 ++++++++++++++++++++++ src/conf/domain_conf.h | 7 ++ src/qemu/qemu_capabilities.c | 12 ++- src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 30 ++++++++ tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 + .../caps_2.6.0-gicv2.aarch64.xml | 3 + .../caps_2.6.0-gicv3.aarch64.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 3 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 + 17 files changed, 194 insertions(+), 2 deletions(-) -- 1.8.3.1

3 8

[libvirt] [PATCH] util: Fix build on s390
by Jiri Denemark 14 Oct '16

14 Oct '16

GCC on s390 complains util/virconf.c: In function 'virConfGetValueSizeT': util/virconf.c:1220:9: error: format '%zu' expects argument of type 'size_t', but argument 9 has type 'unsigned int' [-Werror=format=] Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index 3e49f41..1372389 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -1219,7 +1219,7 @@ int virConfGetValueSizeT(virConfPtr conf, if (((unsigned long long)cval->l) > SIZE_MAX) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s: value for '%s' parameter must be in range 0:%zu"), - conf->filename, setting, SIZE_MAX); + conf->filename, setting, (size_t) SIZE_MAX); return -1; } #endif -- 2.10.1

5 9

Re: [libvirt] [PATCH] util: Alter return value of virReadFCHost and fix mem leak
by Erik Skultety 14 Oct '16

14 Oct '16

On Wed, Oct 12, 2016 at 09:20:29AM -0400, John Ferlan wrote: > > > On 10/12/2016 06:40 AM, Erik Skultety wrote: > > On Tue, Oct 11, 2016 at 05:25:49PM -0400, John Ferlan wrote: > >> https://bugzilla.redhat.com/show_bug.cgi?id=1357416 > >> > >> Rather than return a 0 or -1 and the *result string, return just the result > >> string to the caller. Alter all the callers to handle the different return. > >> > >> As a side effect or result of this, it's much clearer that we cannot just > >> assign the returned string into the scsi_host wwnn, wwpn, and fabric_wwn > >> fields - rather we should fetch a temporary string, then as long as our > >> fetch was good, VIR_FREE what may have been there, and STEAL what we just got. > >> This fixes a memory leak in the virNodeDeviceCreateXML code path through > >> find_new_device and nodeDeviceLookupSCSIHostByWWN which will continually > >> call nodeDeviceSysfsGetSCSIHostCaps until the expected wwnn/wwpn is found > >> in the device object capabilities. > >> > >> Signed-off-by: John Ferlan <jferlan(a)redhat.com> > >> --- > >> > >> I suppose I could have made two patches out of this, but it felt like > >> overkill once I realized what the issue was. OK a third one line patch > >> could have been added to change the virGetFCHostNameByWWN comment as well, > >> but that'd really be overkill. > >> > >> src/node_device/node_device_linux_sysfs.c | 55 ++++++++++++------------------- > >> src/util/virutil.c | 34 ++++++++----------- > >> src/util/virutil.h | 9 +++-- > >> tests/fchosttest.c | 30 ++++++----------- > >> 4 files changed, 49 insertions(+), 79 deletions(-) > >> > >> diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c > >> index 549d32c..be99c41 100644 > >> --- a/src/node_device/node_device_linux_sysfs.c > >> +++ b/src/node_device/node_device_linux_sysfs.c > >> @@ -44,8 +44,7 @@ VIR_LOG_INIT("node_device.node_device_linux_sysfs"); > >> int > >> nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) > >> { > >> - char *max_vports = NULL; > >> - char *vports = NULL; > >> + char *tmp = NULL; > >> int ret = -1; > >> > >> if (virReadSCSIUniqueId(NULL, d->scsi_host.host, > >> @@ -59,64 +58,53 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) > >> if (virIsCapableFCHost(NULL, d->scsi_host.host)) { > >> d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST; > >> > >> - if (virReadFCHost(NULL, > >> - d->scsi_host.host, > >> - "port_name", > >> - &d->scsi_host.wwpn) < 0) { > >> + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "port_name"))) { > >> VIR_WARN("Failed to read WWPN for host%d", d->scsi_host.host); > >> goto cleanup; > >> } > >> + VIR_FREE(d->scsi_host.wwpn); > >> + VIR_STEAL_PTR(d->scsi_host.wwpn, tmp); > >> > >> - if (virReadFCHost(NULL, > >> - d->scsi_host.host, > >> - "node_name", > >> - &d->scsi_host.wwnn) < 0) { > >> + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "node_name"))) { > >> VIR_WARN("Failed to read WWNN for host%d", d->scsi_host.host); > >> goto cleanup; > >> } > >> + VIR_FREE(d->scsi_host.wwnn); > >> + VIR_STEAL_PTR(d->scsi_host.wwnn, tmp); > >> > >> - if (virReadFCHost(NULL, > >> - d->scsi_host.host, > >> - "fabric_name", > >> - &d->scsi_host.fabric_wwn) < 0) { > >> + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "fabric_name"))) { > >> VIR_WARN("Failed to read fabric WWN for host%d", > >> d->scsi_host.host); > >> goto cleanup; > >> } > >> + VIR_FREE(d->scsi_host.fabric_wwn); > >> + VIR_STEAL_PTR(d->scsi_host.fabric_wwn, tmp); > >> } > >> > > > > So if I understand correctly, the problem is basically that we did not call > > VIR_FREE on the data that had previously been filled to the virNodeDevCapData > > structure during replacing it with new data. So, we could just keep the > > signature of virReadFCHost as is and just add the VIR_FREE and VIR_STEAL_PTR > > to the function, thus there won't be any need to use VIR_FREE+STEAL repeatedly > > in here. > > > > True - we're overwriting the &d->scsi_host.{wwnn|wwpn|fabric_wwn} fields > and that's the primary issue (e.g. mem leak). > > While I understand your point, I'm not sure adding a VIR_FREE(*result) > to virReadFCHost just prior to the "if VIR_STRDUP(*result, p) < 0)" is a > proper solution since virReadFCHost does not "own" that memory. It > doesn't state that if *result has something in it, the code will perform > a VIR_FREE (although that's a nice convenience in this case). Sure it's > simple enough to add that comment, but then I believe that the I don't see a major problem here... > VIR_FREE() would have to be done at the top of the function; otherwise, > how does the caller distinguish which error occurred when -1 gets > returned and whether it should VIR_FREE itself? > Well, I have to admin that this^^ is a fair argument because there are 3 different spots where the function can fail, not that the caller could not check result for NULL but the fact that a function touched caller's argument and then failed would be just weird. So, yeah, good point. > Also, what if the caller didn't want the *result wiped out? What if it > was using it to compare what it found "this" time vs. what was present > in the data/file a previous time? That caller would then need to be > adjusted to pass a temporary variable anyway. Exactly, if a caller wanted to just compare 2 values - old and new one - they would use a temporary variable, that would IMHO be expected correct behaviour. Anyway, it's irrelevant now that I agree with your point above. > > I think for me most compelling reason to alter virReadFCHost is that it > follows the mindset of not returning two values from a function when one > is perfectly reasonable. > > John > > BTW: The OCD would still kick in and want to change the comment below to > match the function name... Yeah, since the patch is going to be relatively beefy, this change will blend in fairly easily, so go ahead, ACK. Erik NOTE: I've recently switched to mutt and it's still quite new, so I forgot to hit 'g' for group reply, therefore most of this conversation 'officially' never happened, so CC'ng libvir-list at least for the last bit, I suppose the whole 'thread' is going to look odd, sigh.... > > >> -/* virGetHostNameByWWN: > >> +/* virGetFCHostNameByWWN: > > > > Normally, I'd say sure, you're absolutely right about not creating a separate > > patch for this kind of change, but once you make the adjustment I mentioned > > above none of the below changes will be necessary and thus this rename change > > would look sort of unrelated imho. > > > > ACK with the adjustment. > > > > Erik > > > >> * > >> * Iterate over the sysfs tree to get FC host name (e.g. host5) > >> * by the provided "wwnn,wwpn" pair. > >> @@ -2298,7 +2293,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix) > >> if (!virIsCapableVport(prefix, host)) > >> continue; > >> > >> - if (virReadFCHost(prefix, host, "port_state", &state) < 0) { > >> + if (!(state = virReadFCHost(prefix, host, "port_state"))) { > >> VIR_DEBUG("Failed to read port_state for host%d", host); > >> continue; > >> } > >> @@ -2310,12 +2305,12 @@ virFindFCHostCapableVport(const char *sysfs_prefix) > >> } > >> VIR_FREE(state); > >> > >> - if (virReadFCHost(prefix, host, "max_npiv_vports", &max_vports) < 0) { > >> + if (!(max_vports = virReadFCHost(prefix, host, "max_npiv_vports"))) { > >> VIR_DEBUG("Failed to read max_npiv_vports for host%d", host); > >> continue; > >> } > >> > >> - if (virReadFCHost(prefix, host, "npiv_vports_inuse", &vports) < 0) { > >> + if (!(vports = virReadFCHost(prefix, host, "npiv_vports_inuse"))) { > >> VIR_DEBUG("Failed to read npiv_vports_inuse for host%d", host); > >> VIR_FREE(max_vports); > >> continue; > >> @@ -2379,14 +2374,13 @@ virGetSCSIHostNameByParentaddr(unsigned int domain ATTRIBUTE_UNUSED, > >> return NULL; > >> } > >> > >> -int > >> +char * > >> virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, > >> int host ATTRIBUTE_UNUSED, > >> - const char *entry ATTRIBUTE_UNUSED, > >> - char **result ATTRIBUTE_UNUSED) > >> + const char *entry ATTRIBUTE_UNUSED) > >> { > >> virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); > >> - return -1; > >> + return NULL; > >> } > >> > >> bool > >> diff --git a/src/util/virutil.h b/src/util/virutil.h > >> index 703ec53..8c0d83c 100644 > >> --- a/src/util/virutil.h > >> +++ b/src/util/virutil.h > >> @@ -182,11 +182,10 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, > >> unsigned int slot, > >> unsigned int function, > >> unsigned int unique_id); > >> -int virReadFCHost(const char *sysfs_prefix, > >> - int host, > >> - const char *entry, > >> - char **result) > >> - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); > >> +char *virReadFCHost(const char *sysfs_prefix, > >> + int host, > >> + const char *entry) > >> + ATTRIBUTE_NONNULL(3); > >> > >> bool virIsCapableFCHost(const char *sysfs_prefix, int host); > >> bool virIsCapableVport(const char *sysfs_prefix, int host); > >> diff --git a/tests/fchosttest.c b/tests/fchosttest.c > >> index e9b89a7..a08a2e8 100644 > >> --- a/tests/fchosttest.c > >> +++ b/tests/fchosttest.c > >> @@ -68,35 +68,25 @@ test3(const void *data ATTRIBUTE_UNUSED) > >> char *vports = NULL; > >> int ret = -1; > >> > >> - if (virReadFCHost(TEST_FC_HOST_PREFIX, > >> - TEST_FC_HOST_NUM, > >> - "node_name", > >> - &wwnn) < 0) > >> + if (!(wwnn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, > >> + "node_name"))) > >> return -1; > >> > >> - if (virReadFCHost(TEST_FC_HOST_PREFIX, > >> - TEST_FC_HOST_NUM, > >> - "port_name", > >> - &wwpn) < 0) > >> + if (!(wwpn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, > >> + "port_name"))) > >> goto cleanup; > >> > >> - if (virReadFCHost(TEST_FC_HOST_PREFIX, > >> - TEST_FC_HOST_NUM, > >> - "fabric_name", > >> - &fabric_wwn) < 0) > >> + if (!(fabric_wwn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, > >> + "fabric_name"))) > >> goto cleanup; > >> > >> - if (virReadFCHost(TEST_FC_HOST_PREFIX, > >> - TEST_FC_HOST_NUM, > >> - "max_npiv_vports", > >> - &max_vports) < 0) > >> + if (!(max_vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, > >> + "max_npiv_vports"))) > >> goto cleanup; > >> > >> > >> - if (virReadFCHost(TEST_FC_HOST_PREFIX, > >> - TEST_FC_HOST_NUM, > >> - "npiv_vports_inuse", > >> - &vports) < 0) > >> + if (!(vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, > >> + "npiv_vports_inuse"))) > >> goto cleanup; > >> > >> if (STRNEQ(expect_wwnn, wwnn) || > >> -- > >> 2.7.4 > >> > >> -- > >> libvir-list mailing list > >> libvir-list(a)redhat.com > >> https://www.redhat.com/mailman/listinfo/libvir-list

2 2

[libvirt] [PATCH v2 00/14] Couple of vhost-user fixes and cleanups
by Michal Privoznik 14 Oct '16

14 Oct '16

v2 of: https://www.redhat.com/archives/libvir-list/2016-August/msg00806.html The first patches are mostly code movement and cleanups. diff to v1: - Hopefully all John's review suggestions are worked in now Michal Privoznik (14): virDomainNetDefParseXML: Realign virDomainNetGetActualType: Return type is virDomainNetType qemuBuildInterfaceCommandLine: Move hostdev handling a bit further qemuBuildInterfaceCommandLine: Move vhostuser handling a bit further qemuBuildInterfaceCommandLine: Move from if-else forest to switch qemuDomainAttachNetDevice: Move hostdev handling a bit further qemuDomainAttachNetDevice: Explicitly list allowed types for hotplug qemuBuildHostNetStr: Explicitly enumerate net types qemuBuildChrChardevStr: Introduce @nowait argument qemuBuildVhostuserCommandLine: Reuse qemuBuildChrChardevStr qemuBuildInterfaceCommandLine: Pass proper args qemuBuildVhostuserCommandLine: Unify -netdev creation qemuBuildHostNetStr: Support VIR_DOMAIN_NET_TYPE_VHOSTUSER qemu_hotplug: Support interface type of vhost-user hotplug src/bhyve/bhyve_command.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/conf/domain_conf.c | 16 +- src/conf/domain_conf.h | 2 +- src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 9 +- src/qemu/qemu_command.c | 182 +++++++++++++-------- src/qemu/qemu_hotplug.c | 130 +++++++++++---- src/qemu/qemu_process.c | 13 +- .../qemuxml2argv-net-hostdev-fail.xml | 39 +++++ .../qemuxml2argv-net-vhostuser-fail.xml | 36 ++++ .../qemuxml2argv-net-vhostuser-multiq.args | 6 +- .../qemuxml2argv-net-vhostuser.args | 4 +- tests/qemuxml2argvtest.c | 7 + 15 files changed, 334 insertions(+), 118 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-fail.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-fail.xml -- 2.8.4

2 31

[libvirt] [PATCH 0/4] vbox: address thread-safety issues.
by Dawid Zamirski 14 Oct '16

14 Oct '16

This patch series solves (at least in my testing) vbox driver thread-safety issues that were also outlined on libvirt-users ML [1] and I was affected with. Those patches try to follow the suggestions made Matthias' [2] in that thread as close as possible. Here's where my patch differs from that suggesions: * vboxGlobalData - still needs to keep reference to ISession and IVirutalBox session because it's apparently not possible to have multiple instances created/destroyed safely with pfnComInitialize and pfnComUninitalize calls on per-connection basis. * as such vboxPrivate (the new struct introduced here) also has references to ISession and IVirutalBox (which are just referenes to the ones from the global) mainly to immitate ISession instance per-connection. Apparently newer VBOX SDKs introduced pfnClinetInitialize that can allegedly create multiple ISessions and we might want to take advantage of that in the future hopefully without making additional changes allover the driver code that this patch did. The gist of the change is in patch 3 and it also contains more in-depth explanation on how the issue is being resolved. Also, please note that patch 4 should be squashed into 3 as it was kept separate only for code-review purposes and 3rd patch won't compile without 4 applied on top. [1] https://www.redhat.com/archives/libvirt-users/2012-April/msg00122.html [2] https://www.redhat.com/archives/libvirt-users/2012-April/msg00125.htmlgq Dawid Zamirski (4): vbox: add vboxPrivate struct. vbox: replace vboxGlobalData with vboxPrivate. vbox: change API (un)initialization logic. vbox: update rest of the code to for prior changes. src/vbox/vbox_common.c | 275 ++++++++++++--------------- src/vbox/vbox_common.h | 32 ++-- src/vbox/vbox_network.c | 51 +++-- src/vbox/vbox_storage.c | 20 +- src/vbox/vbox_tmpl.c | 433 +++++++++++++++++++++--------------------- src/vbox/vbox_uniformed_api.h | 128 +++++++------ 6 files changed, 460 insertions(+), 479 deletions(-) -- 2.7.4

3 19

[libvirt] [PATCH] virLogDefineOutputs: Fix build without syslog.h
by Michal Privoznik 14 Oct '16

14 Oct '16

Not every system out there has syslog, that's why we check for it in our configure script. However, in 640b58abdf while fixing another issue, some variables and functions are called that are defined only when syslog.h is present. But these function calls/variables were not guarded by #ifdef-s. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. src/util/virlog.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 52b0eea..8f831fc 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1362,9 +1362,10 @@ virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs, int virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) { - int ret = -1; +#if HAVE_SYSLOG_H int id; char *tmp = NULL; +#endif /* HAVE_SYSLOG_H */ if (virLogInitialize() < 0) return -1; @@ -1372,6 +1373,7 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) virLogLock(); virLogResetOutputs(); +#if HAVE_SYSLOG_H /* syslog needs to be special-cased, since it keeps the fd in private */ if ((id = virLogFindOutput(outputs, noutputs, VIR_LOG_TO_SYSLOG, current_ident)) != -1) { @@ -1379,20 +1381,21 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) * holding the lock so it's safe to call openlog and change the message * tag */ - if (VIR_STRDUP_QUIET(tmp, outputs[id]->name) < 0) - goto cleanup; + if (VIR_STRDUP_QUIET(tmp, outputs[id]->name) < 0) { + virLogUnlock(); + return -1; + } VIR_FREE(current_ident); current_ident = tmp; openlog(current_ident, 0, 0); } +#endif /* HAVE_SYSLOG_H */ virLogOutputs = outputs; virLogNbOutputs = noutputs; - ret = 0; - cleanup: virLogUnlock(); - return ret; + return 0; } -- 2.8.4

2 2

[libvirt] [PATCH 0/4] qemu: escape smbios strings passed on commandline
by Peter Krempa 14 Oct '16

14 Oct '16

See patch 3 for the core change. Peter Krempa (4): qemu: command: Fix up coding style of smbios commandine formatters qemu: command: Don't bother reporting errors in smbios formatters qemu: command: escape smbios entry strings schema: smbios: allow any strings docs/schemas/domaincommon.rng | 4 +- src/qemu/qemu_command.c | 129 ++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 57 deletions(-) -- 2.10.0

2 10

[libvirt] [PATCH 0/4] Couple of test driver fixes and improvements
by Michal Privoznik 13 Oct '16

13 Oct '16

BLURB Michal Privoznik (4): testOpenDefault: Rename loop variable testNodeGetCellsFreeMemory: Fix off by one error test driver: Store memory per NUMA node test_driver: Implement virNodeAllocPages src/test/test_driver.c | 198 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 164 insertions(+), 34 deletions(-) -- 2.8.4

2 12

[libvirt] libvirt API / balloon last-update
by Marko Myllynen 13 Oct '16

13 Oct '16

Hi, I see that recently the last-update field has been added to the balloon statistics, this is how it looks like from Python: [(<libvirt.virDomain object at 0x7fb45b7faa50>, {'balloon.rss': 960048L, 'balloon.swap_in': 0L, 'balloon.usable': 1676424L, 'balloon.unused': 1376188L, 'balloon.major_fault': 816L, 'balloon.swap_out': 0L, 'balloon.current': 2097152L, 'balloon.maximum': 2097152L, 'balloon.available': 2048364L, 'balloon.minor_fault': 460160L, 'balloon.last-update': 1476213030L})] As you can see, there's an inconsistency as all the other members use underscore (_), not dash (-). This actually matters with the PCP plugin since PCP metric names can contain _ but not -. Now that last-update is part of the API in 2.3 I guess it's too late to change this but it would nice if in the future the member names could be kept consistent and underscore used for new members, as it has been so far. Thanks, -- Marko Myllynen

2 1

[libvirt] Cpu Modeling
by Jason J. Herne 13 Oct '16

13 Oct '16

Hi Jiri & Eduardo, You might remember a discussion with David Hildenbrand of IBM on the Qemu mailing list regarding a new Qemu<->Libvirt interface for cpu modeling. I am picking up this work from David and I wanted to confirm that we are still on the same page as to the direction of that interface. For your reference: https://www.redhat.com/archives/libvir-list/2016-June/thread.html#01413 https://lists.gnu.org/archive/html/qemu-devel/2016-09/threads.html#00489 The first link is to the discussion you were directly involved in. The second link is to the final patch set posted to qemu-devel. The cover letter gives a good overview of the interface added to Qemu and the proposed use-case for Libvirt to use this new cpu modeling support. I'll paste in the most relevant section for your convenience: --------------------------------Libvirt usecase---------------------------- Testing for runability: - Simply try to start QEMU with KVM, compat machine, CPU model - Could be done using query-cpu-model-comparison in the future. Identifying host model, e.g. "virsh capabilities" - query-cpu-model-expansion on "host" with "-M none --enable-kvm" <cpu mode='host-model'>: - simply copy the identified host model <cpu mode='host-passthrough'>: - "-cpu host" "virsh cpu-baseline": - query-cpu-model-baseline on two models with "-M none" "virsh cpu-compare": - query-cpu-model-comparison on two models with "-M none" There might be some cenarios where libvirt wants to convert another CPU model to a static variant, this can be done using query-cpu-model-expansion --------------------------------------------------------------------------- Now that I've hopefully refreshed your memory :) I just want to make sure that you are still on-board with this plan. I realize that this new approach does things differently than Libvirt does today for other platforms. Especially x86_64. The big differences are as follows: 1. We will invoke qemu to gather the host cpu data used for virsh capabilities. Today this data seems to be collected directly from the host hardware for most (all?) architectures. 2. virsh cpu-models {arch} will also use a Qemu invocation to gather cpu model data. 3. Most architectures seem to use a "map" (xml file containing cpu model data that ships with Libvirt) to satisfy #1 and #2 above. Our new method does not use this map as it gets all of the data directly from Qemu. 4. virsh cpu-baseline and cpu-compare will now invoke qemu directly as well. Note: I'm not sure exactly how much all of this will apply just to s390 with other architectures moving over to the new interface if/when they want to. Or if we will want to change all architectures to this new interface at the same time. Any guidance? Thanks for your time and consideration. -- -- Jason J. Herne (jjherne(a)linux.vnet.ibm.com)

4 13

[libvirt] [libvirt-perl][PATCH] Add VIR_DOMAIN_VCPU_HOTPLUGGABLE constant
by Michal Privoznik 13 Oct '16

13 Oct '16

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 2 +- Virt.xs | 1 + lib/Sys/Virt/Domain.pm | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 4985100..5831939 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,7 @@ Revision history for perl module Sys::Virt 2.4.0 2016-00-00 - - XXX + - Add VIR_DOMAIN_VCPU_HOTPLUGGABLE constant 2.3.0 2016-10-06 diff --git a/Virt.xs b/Virt.xs index b4ca049..c1d923c 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8309,6 +8309,7 @@ BOOT: REGISTER_CONSTANT(VIR_DOMAIN_VCPU_CONFIG, VCPU_CONFIG); REGISTER_CONSTANT(VIR_DOMAIN_VCPU_MAXIMUM, VCPU_MAXIMUM); REGISTER_CONSTANT(VIR_DOMAIN_VCPU_GUEST, VCPU_GUEST); + REGISTER_CONSTANT(VIR_DOMAIN_VCPU_HOTPLUGGABLE, VCPU_HOTPLUGGABLE); REGISTER_CONSTANT(VIR_DOMAIN_SHUTDOWN_DEFAULT, SHUTDOWN_DEFAULT); diff --git a/lib/Sys/Virt/Domain.pm b/lib/Sys/Virt/Domain.pm index e37b078..f45fc9e 100644 --- a/lib/Sys/Virt/Domain.pm +++ b/lib/Sys/Virt/Domain.pm @@ -2768,6 +2768,10 @@ Flag to request adjustment of the maximum vCPU value Flag to request the guest VCPU mask +=item Sys::Virt::Domain::VCPU_HOTPLUGGABLE + +Flag to make vcpus added hot(un)pluggable + =back =head2 STATE CHANGE EVENTS -- 2.8.4

2 1

[libvirt] [PATCH V3 0/4] qemu: report actual vcpu state in virVcpuInfo
by Viktor Mihajlovski 13 Oct '16

13 Oct '16

Currently, the virVcpuInfo returned by virDomainGetVcpus() will always report a state of VIR_VCPU_RUNNING for each defined domain vcpu even if the vcpu is currently in the halted state. As the monitor interface is in fact reporting the accurate state, it is rather easy to transport this information with the existing API. This is done by - adding a new state of VIR_VCPU_HALTED - extending the monitor to pass back the halted state for the vcpus - adding a new field to the private domain vcpu object reflecting the halted state for the vcpu - modifying the driver code to report the vcpu state based on the halted indicator - extending virsh vcpuinfo to also display the halted state The vcpu state is however not recorded in the internal XML format, since the state can change asynchronously (without notification). V2 is a rebase on top of Peter Krempa's CPU hotplug modernization. V3 tries to address the review comments by John and Peter. I noticed Peter has posted (we had a tendency for mid-air collisions lately) https://www.redhat.com/archives/libvir-list/2016-October/msg00498.html I've applied the patches on top of mine and have seen no issues so far. Viktor Mihajlovski (4): domain: Add new VCPU state "halted" qemu: Add monitor support for CPU halted state qemu: Add domain support for VCPU halted state qemu: Ensure reported VCPU state is current in driver API include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_domain.c | 66 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 5 +++ src/qemu/qemu_driver.c | 15 +++++++-- src/qemu/qemu_monitor.c | 6 +++- src/qemu/qemu_monitor.h | 3 ++ src/qemu/qemu_monitor_json.c | 3 ++ src/qemu/qemu_monitor_text.c | 8 ++++- tests/qemumonitorjsontest.c | 8 ++--- tools/virsh-domain.c | 3 +- tools/virsh.pod | 57 ++++++++++++++++++++++++++++++++++ 11 files changed, 166 insertions(+), 9 deletions(-) -- 1.9.1

3 8

[libvirt] [PATCH] virlog: Enclose part of virLogDefineOutputs in HAVE_SYSLOG_H block
by Erik Skultety 13 Oct '16

13 Oct '16

Commit 640b58ab broke the mingw build because it referenced 'current_ident' as well as 'openlog' symbols both of which are declared conditionally within HAVE_SYSLOG_H directive. This patch fixes the broken build. Additional changes like moving all variable declarations in virLogDefineOutputs into the conditional block were necessary to avoid 'unused variable' errors from mingw. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- I could've pushed it under build breaker rule but I'd rather be safe than sorry that I missed anything else. Erik src/util/virlog.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 14ee701..f52d9d8 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1362,16 +1362,15 @@ virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs, int virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) { - int ret = -1; - int id; + if (virLogInitialize() < 0) + return -1; + + virLogLock(); + virLogResetOutputs(); + +#if HAVE_SYSLOG_H + int id = -1; char *tmp = NULL; - - if (virLogInitialize() < 0) - return -1; - - virLogLock(); - virLogResetOutputs(); - /* syslog needs to be special-cased, since it keeps the fd in private */ if ((id = virLogFindOutput(outputs, noutputs, VIR_LOG_TO_SYSLOG, current_ident)) != -1) { @@ -1379,20 +1378,21 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs) * holding the lock so it's safe to call openlog and change the message * tag */ - if (VIR_STRDUP_QUIET(tmp, outputs[id]->name) < 0) - goto cleanup; + if (VIR_STRDUP_QUIET(tmp, outputs[id]->name) < 0) { + virLogUnlock(); + return -1; + } VIR_FREE(current_ident); current_ident = tmp; openlog(current_ident, 0, 0); } +#endif virLogOutputs = outputs; virLogNbOutputs = noutputs; - ret = 0; - cleanup: virLogUnlock(); - return ret; + return 0; } -- 2.5.5

2 1

[libvirt] [PATCH 0/2] Minor panic device fixes
by Martin Kletzander 13 Oct '16

13 Oct '16

Completely new BLURB, just for €99.99, call now! Martin Kletzander (2): schema: Allow alias for panic device conf: Honour flags in virDomainPanicDefParseXML docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) -- 2.10.1

2 3

[libvirt] [PATCH] src: Threat pid as signed
by Michal Privoznik 13 Oct '16

13 Oct '16

This initially started as a fix of some debug printing in virCgroupDetect. However it turned out that other places suffer from the similar problem. While dealing with pids, esp. in cases where we cannot use pid_t for ABI stability reasons, we often chose an unsigned integer type. This makes no sense as pid_t is signed. Also, new syntax-check rule is introduced so we won't repeat this mistake. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically, this is v2 of [1], but like 99% of the patch is different, so I'm sending this as a completely new patch. 1: https://www.redhat.com/archives/libvir-list/2016-October/msg00254.html cfg.mk | 8 ++++++++ src/locking/lock_driver_sanlock.c | 4 ++-- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 8 ++++---- src/lxc/lxc_driver.c | 4 ++-- src/lxc/lxc_monitor.c | 3 +-- src/lxc/lxc_process.c | 8 ++++---- src/qemu/qemu_process.c | 12 ++++++------ src/util/vircgroup.c | 24 ++++++++++++------------ src/util/viridentity.c | 2 +- src/util/virpolkit.c | 1 + src/util/virprocess.c | 14 ++++++-------- src/util/virsystemd.c | 9 +++++---- src/util/virutil.c | 4 ++-- 14 files changed, 56 insertions(+), 49 deletions(-) diff --git a/cfg.mk b/cfg.mk index 9f5949c..b33b1e2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -581,6 +581,11 @@ sc_prohibit_int_assign_bool: halt='use bool type for boolean values' \ $(_sc_search_regexp) +sc_prohibit_unsigned_pid: + @prohibit='\<unsigned\> [^,=]+pid' \ + halt='use signed type for pid values' \ + $(_sc_search_regexp) + # Many of the function names below came from this filter: # git grep -B2 '\<_('|grep -E '\.c- *[[:alpha:]_][[:alnum:]_]* ?\(.*[,;]$' \ # |sed 's/.*\.c- *//'|perl -pe 's/ ?\(.*//'|sort -u \ @@ -1214,6 +1219,9 @@ exclude_file_name_regexp--sc_prohibit_include_public_headers_brackets = \ exclude_file_name_regexp--sc_prohibit_int_ijk = \ ^(src/remote_protocol-structs|src/remote/remote_protocol\.x|cfg\.mk|include/libvirt/libvirt.+|src/admin_protocol-structs|src/admin/admin_protocol\.x)$$ +exclude_file_name_regexp--sc_prohibit_unsigned_pid = \ + ^(include/libvirt/libvirt-qemu.h|src/(driver-hypervisor.h|libvirt-qemu.c|locking/lock_protocol.x|lxc/lxc_monitor_protocol.x|qemu/qemu_driver.c|remote/qemu_protocol.x|util/virpolkit.c|util/virsystemd.c)|tests/virpolkittest.c|tools/virsh-domain.c)$$ + exclude_file_name_regexp--sc_prohibit_getenv = \ ^tests/.*\.[ch]$$ diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 332c2de..280219f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -87,7 +87,7 @@ struct _virLockManagerSanlockPrivate { char *vm_name; unsigned char vm_uuid[VIR_UUID_BUFLEN]; unsigned int vm_id; - unsigned int vm_pid; + int vm_pid; unsigned int flags; bool hasRWDisks; int res_count; @@ -494,7 +494,7 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, if (VIR_STRDUP(priv->vm_name, param->value.str) < 0) goto error; } else if (STREQ(param->key, "pid")) { - priv->vm_pid = param->value.ui; + priv->vm_pid = param->value.iv; } else if (STREQ(param->key, "id")) { priv->vm_id = param->value.ui; } else if (STREQ(param->key, "uri")) { diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8c581df..508bc3e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1022,7 +1022,7 @@ static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn, int status; ret = waitpid(-1, &status, WNOHANG); - VIR_DEBUG("Got sig child %d vs %lld", ret, (unsigned long long)ctrl->initpid); + VIR_DEBUG("Got sig child %d vs %lld", ret, (long long) ctrl->initpid); if (ret == ctrl->initpid) { virNetDaemonQuit(dmn); virMutexLock(&lock); @@ -2328,7 +2328,7 @@ virLXCControllerEventSendInit(virLXCControllerPtr ctrl, { virLXCMonitorInitEventMsg msg; - VIR_DEBUG("Init pid %llu", (unsigned long long)initpid); + VIR_DEBUG("Init pid %lld", (long long) initpid); memset(&msg, 0, sizeof(msg)); msg.initpid = initpid; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 9027c25..3a7404f 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -328,8 +328,8 @@ virLXCDomainObjPrivateXMLFormat(virBufferPtr buf, { virLXCDomainObjPrivatePtr priv = vm->privateData; - virBufferAsprintf(buf, "<init pid='%llu'/>\n", - (unsigned long long)priv->initpid); + virBufferAsprintf(buf, "<init pid='%lld'/>\n", + (long long) priv->initpid); return 0; } @@ -340,9 +340,9 @@ virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virDomainDefParserConfigPtr config ATTRIBUTE_UNUSED) { virLXCDomainObjPrivatePtr priv = vm->privateData; - unsigned long long thepid; + long long thepid; - if (virXPathULongLong("string(./init[1]/@pid)", ctxt, &thepid) < 0) { + if (virXPathLongLong("string(./init[1]/@pid)", ctxt, &thepid) < 0) { VIR_WARN("Failed to load init pid from state %s", virGetLastErrorMessage()); priv->initpid = 0; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a9e664c..a880f7c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3438,7 +3438,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, errno != ESRCH) { virReportSystemError(errno, _("Unable to send SIGTERM to init pid %llu"), - (unsigned long long)priv->initpid); + (long long) priv->initpid); goto endjob; } } @@ -3521,7 +3521,7 @@ lxcDomainReboot(virDomainPtr dom, errno != ESRCH) { virReportSystemError(errno, _("Unable to send SIGTERM to init pid %llu"), - (unsigned long long)priv->initpid); + (long long) priv->initpid); goto endjob; } } diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 57f4098..d828d52 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -105,8 +105,7 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virLXCMonitorPtr mon = opaque; virLXCMonitorInitEventMsg *msg = evdata; - VIR_DEBUG("Event init %llu", - (unsigned long long)msg->initpid); + VIR_DEBUG("Event init %lld", (long long) msg->initpid); if (mon->cb.initNotify) mon->cb.initNotify(mon, (pid_t)msg->initpid, mon->vm); } diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index bce6a2f..07da3d3 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -740,8 +740,8 @@ virLXCProcessGetNsInode(pid_t pid, struct stat sb; int ret = -1; - if (virAsprintf(&path, "/proc/%llu/ns/%s", - (unsigned long long)pid, nsname) < 0) + if (virAsprintf(&path, "/proc/%lld/ns/%s", + (long long) pid, nsname) < 0) goto cleanup; if (stat(path, &sb) < 0) { @@ -776,8 +776,8 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED priv->initpid = initpid; if (virLXCProcessGetNsInode(initpid, "pid", &inode) < 0) { - VIR_WARN("Cannot obtain pid NS inode for %llu: %s", - (unsigned long long)initpid, + VIR_WARN("Cannot obtain pid NS inode for %lld: %s", + (long long) initpid, virGetLastErrorMessage()); virResetLastError(); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a4bc082..cfa7725 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5396,8 +5396,8 @@ qemuProcessLaunch(virConnectPtr conn, _("Domain %s didn't show up"), vm->def->name); rv = -1; } - VIR_DEBUG("QEMU vm=%p name=%s running with pid=%llu", - vm, vm->def->name, (unsigned long long)vm->pid); + VIR_DEBUG("QEMU vm=%p name=%s running with pid=%lld", + vm, vm->def->name, (long long) vm->pid); } else { VIR_DEBUG("QEMU vm=%p name=%s failed to spawn", vm, vm->def->name); @@ -5788,9 +5788,9 @@ qemuProcessKill(virDomainObjPtr vm, unsigned int flags) { int ret; - VIR_DEBUG("vm=%p name=%s pid=%llu flags=%x", + VIR_DEBUG("vm=%p name=%s pid=%lld flags=%x", vm, vm->def->name, - (unsigned long long)vm->pid, flags); + (long long) vm->pid, flags); if (!(flags & VIR_QEMU_PROCESS_KILL_NOCHECK)) { if (!virDomainObjIsActive(vm)) { @@ -5868,10 +5868,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, char *timestamp; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); - VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%llu, " + VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, " "reason=%s, asyncJob=%s, flags=%x", vm, vm->def->name, vm->def->id, - (unsigned long long)vm->pid, + (long long) vm->pid, virDomainShutoffReasonTypeToString(reason), qemuDomainAsyncJobTypeToString(asyncJob), flags); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 8b52816..24917e7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -548,13 +548,13 @@ virCgroupDetectPlacement(virCgroupPtr group, char *procfile; VIR_DEBUG("Detecting placement for pid %lld path %s", - (unsigned long long)pid, path); + (long long) pid, path); if (pid == -1) { if (VIR_STRDUP(procfile, "/proc/self/cgroup") < 0) goto cleanup; } else { - if (virAsprintf(&procfile, "/proc/%llu/cgroup", - (unsigned long long)pid) < 0) + if (virAsprintf(&procfile, "/proc/%lld/cgroup", + (long long) pid) < 0) goto cleanup; } @@ -732,11 +732,12 @@ virCgroupDetect(virCgroupPtr group, return -1; } - VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %llu", i, + VIR_DEBUG("Detected mount/mapping %zu:%s at %s in %s for pid %lld", + i, virCgroupControllerTypeToString(i), group->controllers[i].mountPoint, group->controllers[i].placement, - (unsigned long long)pid); + (long long) pid); } return 0; @@ -1235,8 +1236,7 @@ virCgroupAddTaskController(virCgroupPtr group, pid_t pid, int controller) return -1; } - return virCgroupSetValueU64(group, controller, "tasks", - (unsigned long long)pid); + return virCgroupSetValueI64(group, controller, "tasks", pid); } @@ -3506,8 +3506,8 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids) goto cleanup; } else { while (!feof(fp)) { - unsigned long pid_value; - if (fscanf(fp, "%lu", &pid_value) != 1) { + long pid_value; + if (fscanf(fp, "%ld", &pid_value) != 1) { if (feof(fp)) break; virReportSystemError(errno, @@ -3518,12 +3518,12 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids) if (virHashLookup(pids, (void*)pid_value)) continue; - VIR_DEBUG("pid=%lu", pid_value); + VIR_DEBUG("pid=%ld", pid_value); /* Cgroups is a Linux concept, so this cast is safe. */ if (kill((pid_t)pid_value, signum) < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to kill process %lu"), + _("Failed to kill process %ld"), pid_value); goto cleanup; } @@ -3553,7 +3553,7 @@ virCgroupKillInternal(virCgroupPtr group, int signum, virHashTablePtr pids) static uint32_t virCgroupPidCode(const void *name, uint32_t seed) { - unsigned long pid_value = (unsigned long)(intptr_t)name; + long pid_value = (long)(intptr_t)name; return virHashCodeGen(&pid_value, sizeof(pid_value), seed); } diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 9b8ba4a..52a0a30 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -505,7 +505,7 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident, { char *val; int ret; - if (virAsprintf(&val, "%llu", (unsigned long long)pid) < 0) + if (virAsprintf(&val, "%lld", (long long) pid) < 0) return -1; ret = virIdentitySetAttr(ident, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index e7e46b8..d8c35f1 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -82,6 +82,7 @@ int virPolkitCheckAuth(const char *actionid, VIR_INFO("Checking PID %lld running as %d", (long long) pid, uid); + /* Yes, PolicyKit really takes pid ad uint. */ if (virDBusCallMethod(sysbus, &reply, NULL, diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 8b9f9c5..718c4a2 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -608,8 +608,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) *npids = 0; *pids = NULL; - if (virAsprintf(&taskPath, "/proc/%llu/task", - (unsigned long long)pid) < 0) + if (virAsprintf(&taskPath, "/proc/%llu/task", (long long) pid) < 0) goto cleanup; if (virDirOpen(&dir, taskPath) < 0) @@ -657,7 +656,7 @@ int virProcessGetNamespaces(pid_t pid, int fd; if (virAsprintf(&nsfile, "/proc/%llu/ns/%s", - (unsigned long long)pid, + (long long) pid, ns[i]) < 0) goto cleanup; @@ -968,8 +967,7 @@ int virProcessGetStartTime(pid_t pid, int len; char **tokens = NULL; - if (virAsprintf(&filename, "/proc/%llu/stat", - (unsigned long long)pid) < 0) + if (virAsprintf(&filename, "/proc/%llu/stat", (long long) pid) < 0) return -1; if ((len = virFileReadAll(filename, 1024, &buf)) < 0) @@ -1051,8 +1049,8 @@ int virProcessGetStartTime(pid_t pid, { static int warned; if (virAtomicIntInc(&warned) == 1) { - VIR_WARN("Process start time of pid %llu not available on this platform", - (unsigned long long)pid); + VIR_WARN("Process start time of pid %lld not available on this platform", + (long long) pid); } *timestamp = 0; return 0; @@ -1069,7 +1067,7 @@ static int virProcessNamespaceHelper(int errfd, int fd = -1; int ret = -1; - if (virAsprintf(&path, "/proc/%llu/ns/mnt", (unsigned long long)pid) < 0) + if (virAsprintf(&path, "/proc/%lld/ns/mnt", (long long) pid) < 0) goto cleanup; if ((fd = open(path, O_RDONLY)) < 0) { diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 604dcdd..bc3496a 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -210,8 +210,8 @@ virSystemdGetMachineNameByPID(pid_t pid) if (virDBusMessageRead(reply, "o", &object) < 0) goto cleanup; - VIR_DEBUG("Domain with pid %llu has object path '%s'", - (unsigned long long)pid, object); + VIR_DEBUG("Domain with pid %lld has object path '%s'", + (long long) pid, object); if (virDBusCallMethod(conn, &reply, NULL, "org.freedesktop.machine1", @@ -226,8 +226,8 @@ virSystemdGetMachineNameByPID(pid_t pid) if (virDBusMessageRead(reply, "v", "s", &name) < 0) goto cleanup; - VIR_DEBUG("Domain with pid %llu has machine name '%s'", - (unsigned long long)pid, name); + VIR_DEBUG("Domain with pid %lld has machine name '%s'", + (long long) pid, name); cleanup: VIR_FREE(object); @@ -348,6 +348,7 @@ int virSystemdCreateMachine(const char *name, virError error; memset(&error, 0, sizeof(error)); + /* Yup, CreateMachine* APIs expect unsigned PID */ if (virDBusCallMethod(conn, NULL, &error, diff --git a/src/util/virutil.c b/src/util/virutil.c index b57a195..2d46b7e 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2582,8 +2582,8 @@ virGetListenFDs(void) } if ((pid_t)procid != getpid()) { - VIR_DEBUG("LISTEN_PID %s is not for us %llu", - pidstr, (unsigned long long)getpid()); + VIR_DEBUG("LISTEN_PID %s is not for us %lld", + pidstr, (long long) getpid()); return 0; } -- 2.8.4

2 1

[libvirt] [PATCH] virsh: vol-resize: be explicit that this is an offline operation.
by Ivan Baldo 13 Oct '16

13 Oct '16

No time to read manpages at home heheh (qemu-img check -r all repaired it very well though). --- tools/virsh-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index f302f95..46c36c2 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1050,7 +1050,7 @@ static const vshCmdInfo info_vol_resize[] = { .data = N_("resize a vol") }, {.name = "desc", - .data = N_("Resizes a storage volume.") + .data = N_("Resizes a storage volume offline (only safe if not in use).") }, {.name = NULL} }; -- 2.1.4

2 1

[libvirt] [PATCH 0/2] Fix virsh manpage commas and typos.
by Nitesh Konkar 12 Oct '16

12 Oct '16

Nitesh Konkar (2): virsh: Fix commas in manpage to enhance readability. virsh: Fix typos in manpage tools/virsh.pod | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.1.0

2 3

[libvirt] [PATCH 0/2] Forbid new-line char in name of networks
by Sławek Kapłoński 12 Oct '16

12 Oct '16

*** BLURB HERE *** Sławek Kapłoński (2): util: Add function to check if string contains some chars Forbid new-line char in name of networks src/conf/network_conf.c | 5 +---- src/util/virxml.c | 18 ++++++++++++++++++ src/util/virxml.h | 4 ++++ 3 files changed, 23 insertions(+), 4 deletions(-) -- 2.10.0

3 6

[libvirt] [PATCH v2 00/17] cleanups and improvements for video device code
by Pavel Hrdina 12 Oct '16

12 Oct '16

Pavel Hrdina (17): qemu_process: move qemuProcessStartValidateGraphics to correct place qemu_command: remove xenner leftover from video device code tests: fix some QXL capability combinations that don't make sense qemu_capabilities: join capabilities for qxl and qxl-vga devices qemu_capabilities: mark QEMU_CAPS_VGA_QXL capability as deprecated qemu_capabilities: rename QEMU_CAPS_VIRTIO_GPU_VIRGL qemu_capabilities: detect properties for virtio-gpu-device qemu_domain: move video validation out of qemu_command qemu_process: move video validation out of qemu_command qemu_process: always check capabilities for video devices qemu_command: separate code for video device via -vga attribute qemu_command: pass only video device to qemuBuildVgaVideoCommand qemu_capabilities: check for existence of virtio-vga qemu_command: properly detect which model to use for video device qemu_command: cleanup qemuBuildVideoCommandLine qemu_command: introduce enum of secondary models for video device qemu_command: add support to use virtio as secondary video device docs/formatdomain.html.in | 3 +- src/qemu/qemu_capabilities.c | 23 +- src/qemu/qemu_capabilities.h | 15 +- src/qemu/qemu_command.c | 318 ++++++++------------- src/qemu/qemu_domain.c | 87 ++++++ src/qemu/qemu_domain.h | 3 + src/qemu/qemu_domain_address.c | 6 - src/qemu/qemu_process.c | 54 +++- .../qemu_2.6.0-gicv2-virt.aarch64.xml | 1 - .../qemu_2.6.0-gicv3-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 1 - .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 70 +---- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 76 +---- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 74 +---- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 74 +---- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 74 +---- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 74 +---- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 74 +---- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 4 - .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 107 ++----- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 6 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 117 +++----- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 6 +- .../caps_2.6.0-gicv2.aarch64.replies | 43 ++- .../caps_2.6.0-gicv2.aarch64.xml | 1 - .../caps_2.6.0-gicv3.aarch64.replies | 43 ++- .../caps_2.6.0-gicv3.aarch64.xml | 1 - .../caps_2.6.0.ppc64le.replies | 43 ++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 117 +++----- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 6 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 122 +++----- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 6 +- tests/qemuhelptest.c | 4 - .../qemuxml2argv-pcie-root-port.args | 5 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 5 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 5 +- .../qemuxml2argv-pcihole64-q35.args | 5 +- .../qemuxml2argv-q35-usb2-multi.args | 5 +- .../qemuxml2argv-q35-usb2-reorder.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 5 +- .../qemuxml2argv-video-virtio-gpu-device.args | 2 +- .../qemuxml2argv-video-virtio-gpu-sec.args | 22 ++ .../qemuxml2argv-video-virtio-gpu-sec.xml | 27 ++ .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- .../qemuxml2argv-video-virtio-gpu-virgl.args | 2 +- .../qemuxml2argv-video-virtio-vga.args | 24 ++ ...evice.xml => qemuxml2argv-video-virtio-vga.xml} | 11 +- tests/qemuxml2argvtest.c | 152 +++++----- .../qemuxml2xmlout-video-virtio-gpu-sec.xml | 35 +++ tests/qemuxml2xmltest.c | 19 +- 59 files changed, 802 insertions(+), 1215 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-sec.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-sec.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-virtio-vga.args rename tests/qemuxml2argvdata/{qemuxml2argv-video-qxl-sec-nodevice.xml => qemuxml2argv-video-virtio-vga.xml} (77%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-sec.xml -- 2.10.1

2 22

[libvirt] [PATCH 0/6] virsh: Fix 'vcpuinfo' on inactive VMs with new hotplug vcpus
by Peter Krempa 12 Oct '16

12 Oct '16

See patch 6/6. Peter Krempa (6): util: bitmap: Make bitmaps const in virBitmapNewData and virBitmapDataToString virsh: domain: Fix broken indentation in virshCPUCountCollect virsh: Fix xpath queries for retrieving vcpu count virsh: Extract cpumap formatting in cmdVcpuinfo virsh: Extract fallback handling in cmdVcpuinfo virsh: vcpuinfo: Report proper vcpu numbers and data for offline VMs src/util/virbitmap.c | 6 +- src/util/virbitmap.h | 4 +- tools/virsh-domain.c | 287 ++++++++++++++++++++++++++++++++++++++------------- 3 files changed, 219 insertions(+), 78 deletions(-) -- 2.10.0

2 7

[libvirt] [PATCH] allow snapshots of network sheepdog disks
by Vasiliy Tolstov 12 Oct '16

12 Oct '16

Sometimes ago in f7c1410b0ee5b878e81f2eddf86c609947a9b27c ability to snapshot sheepdog disk removed. But sheepdog have ability to store vm state inside special object type. Vasiliy Tolstov (1): sheepdog: allow snapshot src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.7.4

2 4

[libvirt] [PATCH 0/5] Various virObjectEventState fixes
by Martin Kletzander 12 Oct '16

12 Oct '16

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1363628 Martin Kletzander (5): Change virDomainEventState to virObjectLockable Reference state when using it as opaque De-duplicate code into virObjectEventStateCleanupTimer() Add virObjectEventStateRegisterID to symsfile Clean timer in virObjectEventStateFlush src/bhyve/bhyve_driver.c | 2 +- src/conf/object_event.c | 145 ++++++++++++++++++------------------- src/conf/object_event.h | 1 - src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 2 +- src/storage/storage_driver.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vz/vz_driver.c | 2 +- src/xen/xen_driver.c | 2 +- 16 files changed, 86 insertions(+), 88 deletions(-) -- 2.10.1

2 11

[libvirt] [PATCH v3] qemu-migration: Disallow migration of read only disk
by Corey S. McQuay 12 Oct '16

12 Oct '16

Currently Libvirt allows attempts to migrate read only disks. Qemu cannot handle this as read only disks cannot be written to on the destination system. The end result is a cryptic error message and a failed migration. This patch causes migration to fail earlier and provides a meaningful error message stating that migrating read only disks is not supported. Signed-off-by: Corey S. McQuay <csmcquay(a)linux.vnet.ibm.com> Reviewed-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e451ef6..c8fb7ec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1764,6 +1764,12 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, /* check whether disk should be migrated */ if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) continue; + + if (disk->src->readonly) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Cannot migrate read-only disk %s"), disk->dst); + goto cleanup; + } VIR_FREE(diskAlias); if (!(diskAlias = qemuAliasFromDisk(disk))) -- 2.7.4

4 4

[libvirt] [PATCH] util: Alter return value of virReadFCHost and fix mem leak
by John Ferlan 11 Oct '16

11 Oct '16

https://bugzilla.redhat.com/show_bug.cgi?id=1357416 Rather than return a 0 or -1 and the *result string, return just the result string to the caller. Alter all the callers to handle the different return. As a side effect or result of this, it's much clearer that we cannot just assign the returned string into the scsi_host wwnn, wwpn, and fabric_wwn fields - rather we should fetch a temporary string, then as long as our fetch was good, VIR_FREE what may have been there, and STEAL what we just got. This fixes a memory leak in the virNodeDeviceCreateXML code path through find_new_device and nodeDeviceLookupSCSIHostByWWN which will continually call nodeDeviceSysfsGetSCSIHostCaps until the expected wwnn/wwpn is found in the device object capabilities. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I suppose I could have made two patches out of this, but it felt like overkill once I realized what the issue was. OK a third one line patch could have been added to change the virGetFCHostNameByWWN comment as well, but that'd really be overkill. src/node_device/node_device_linux_sysfs.c | 55 ++++++++++++------------------- src/util/virutil.c | 34 ++++++++----------- src/util/virutil.h | 9 +++-- tests/fchosttest.c | 30 ++++++----------- 4 files changed, 49 insertions(+), 79 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 549d32c..be99c41 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -44,8 +44,7 @@ VIR_LOG_INIT("node_device.node_device_linux_sysfs"); int nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) { - char *max_vports = NULL; - char *vports = NULL; + char *tmp = NULL; int ret = -1; if (virReadSCSIUniqueId(NULL, d->scsi_host.host, @@ -59,64 +58,53 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) if (virIsCapableFCHost(NULL, d->scsi_host.host)) { d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST; - if (virReadFCHost(NULL, - d->scsi_host.host, - "port_name", - &d->scsi_host.wwpn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "port_name"))) { VIR_WARN("Failed to read WWPN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.wwpn); + VIR_STEAL_PTR(d->scsi_host.wwpn, tmp); - if (virReadFCHost(NULL, - d->scsi_host.host, - "node_name", - &d->scsi_host.wwnn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "node_name"))) { VIR_WARN("Failed to read WWNN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.wwnn); + VIR_STEAL_PTR(d->scsi_host.wwnn, tmp); - if (virReadFCHost(NULL, - d->scsi_host.host, - "fabric_name", - &d->scsi_host.fabric_wwn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "fabric_name"))) { VIR_WARN("Failed to read fabric WWN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.fabric_wwn); + VIR_STEAL_PTR(d->scsi_host.fabric_wwn, tmp); } if (virIsCapableVport(NULL, d->scsi_host.host)) { d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS; - if (virReadFCHost(NULL, - d->scsi_host.host, - "max_npiv_vports", - &max_vports) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, + "max_npiv_vports"))) { VIR_WARN("Failed to read max_npiv_vports for host%d", d->scsi_host.host); goto cleanup; } - if (virReadFCHost(NULL, - d->scsi_host.host, - "npiv_vports_inuse", - &vports) < 0) { - VIR_WARN("Failed to read npiv_vports_inuse for host%d", - d->scsi_host.host); + if (virStrToLong_i(tmp, NULL, 10, &d->scsi_host.max_vports) < 0) { + VIR_WARN("Failed to parse value of max_npiv_vports '%s'", tmp); goto cleanup; } - if (virStrToLong_i(max_vports, NULL, 10, - &d->scsi_host.max_vports) < 0) { - VIR_WARN("Failed to parse value of max_npiv_vports '%s'", - max_vports); + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, + "npiv_vports_inuse"))) { + VIR_WARN("Failed to read npiv_vports_inuse for host%d", + d->scsi_host.host); goto cleanup; } - if (virStrToLong_i(vports, NULL, 10, - &d->scsi_host.vports) < 0) { - VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", - vports); + if (virStrToLong_i(tmp, NULL, 10, &d->scsi_host.vports) < 0) { + VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", tmp); goto cleanup; } } @@ -132,8 +120,7 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) VIR_FREE(d->scsi_host.wwpn); VIR_FREE(d->scsi_host.fabric_wwn); } - VIR_FREE(max_vports); - VIR_FREE(vports); + VIR_FREE(tmp); return ret; } diff --git a/src/util/virutil.c b/src/util/virutil.c index b57a195..2459d2d 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2008,24 +2008,21 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, * @sysfs_prefix: "fc_host" sysfs path, defaults to SYSFS_FC_HOST_PATH * @host: Host number, E.g. 5 of "fc_host/host5" * @entry: Name of the sysfs entry to read - * @result: Return the entry value as string * * Read the value of sysfs "fc_host" entry. * - * Returns 0 on success, and @result is filled with the entry value. - * as string, Otherwise returns -1. Caller must free @result after - * use. + * Returns result as a stringon success, caller must free @result after + * Otherwise returns NULL. */ -int +char * virReadFCHost(const char *sysfs_prefix, int host, - const char *entry, - char **result) + const char *entry) { char *sysfs_path = NULL; char *p = NULL; - int ret = -1; char *buf = NULL; + char *result = NULL; if (virAsprintf(&sysfs_path, "%s/host%d/%s", sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, @@ -2043,14 +2040,12 @@ virReadFCHost(const char *sysfs_prefix, else p = buf; - if (VIR_STRDUP(*result, p) < 0) - goto cleanup; + ignore_value(VIR_STRDUP(result, p)); - ret = 0; cleanup: VIR_FREE(sysfs_path); VIR_FREE(buf); - return ret; + return result; } bool @@ -2171,7 +2166,7 @@ virManageVport(const int parent_host, return ret; } -/* virGetHostNameByWWN: +/* virGetFCHostNameByWWN: * * Iterate over the sysfs tree to get FC host name (e.g. host5) * by the provided "wwnn,wwpn" pair. @@ -2298,7 +2293,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix) if (!virIsCapableVport(prefix, host)) continue; - if (virReadFCHost(prefix, host, "port_state", &state) < 0) { + if (!(state = virReadFCHost(prefix, host, "port_state"))) { VIR_DEBUG("Failed to read port_state for host%d", host); continue; } @@ -2310,12 +2305,12 @@ virFindFCHostCapableVport(const char *sysfs_prefix) } VIR_FREE(state); - if (virReadFCHost(prefix, host, "max_npiv_vports", &max_vports) < 0) { + if (!(max_vports = virReadFCHost(prefix, host, "max_npiv_vports"))) { VIR_DEBUG("Failed to read max_npiv_vports for host%d", host); continue; } - if (virReadFCHost(prefix, host, "npiv_vports_inuse", &vports) < 0) { + if (!(vports = virReadFCHost(prefix, host, "npiv_vports_inuse"))) { VIR_DEBUG("Failed to read npiv_vports_inuse for host%d", host); VIR_FREE(max_vports); continue; @@ -2379,14 +2374,13 @@ virGetSCSIHostNameByParentaddr(unsigned int domain ATTRIBUTE_UNUSED, return NULL; } -int +char * virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, int host ATTRIBUTE_UNUSED, - const char *entry ATTRIBUTE_UNUSED, - char **result ATTRIBUTE_UNUSED) + const char *entry ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); - return -1; + return NULL; } bool diff --git a/src/util/virutil.h b/src/util/virutil.h index 703ec53..8c0d83c 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -182,11 +182,10 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, unsigned int slot, unsigned int function, unsigned int unique_id); -int virReadFCHost(const char *sysfs_prefix, - int host, - const char *entry, - char **result) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); +char *virReadFCHost(const char *sysfs_prefix, + int host, + const char *entry) + ATTRIBUTE_NONNULL(3); bool virIsCapableFCHost(const char *sysfs_prefix, int host); bool virIsCapableVport(const char *sysfs_prefix, int host); diff --git a/tests/fchosttest.c b/tests/fchosttest.c index e9b89a7..a08a2e8 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -68,35 +68,25 @@ test3(const void *data ATTRIBUTE_UNUSED) char *vports = NULL; int ret = -1; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "node_name", - &wwnn) < 0) + if (!(wwnn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "node_name"))) return -1; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "port_name", - &wwpn) < 0) + if (!(wwpn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "port_name"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "fabric_name", - &fabric_wwn) < 0) + if (!(fabric_wwn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "fabric_name"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "max_npiv_vports", - &max_vports) < 0) + if (!(max_vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "max_npiv_vports"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "npiv_vports_inuse", - &vports) < 0) + if (!(vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "npiv_vports_inuse"))) goto cleanup; if (STRNEQ(expect_wwnn, wwnn) || -- 2.7.4

1 0

[libvirt] [Fwd: Re: [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate.]
by Dawid Zamirski 11 Oct '16

11 Oct '16

Sorry, forgot to CC the ML in my last reply. -------- Forwarded Message -------- From: Dawid Zamirski <dzamirski(a)datto.com> To: Martin Kletzander <mkletzan(a)redhat.com> Subject: Re: [libvirt] [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate. Date: Tue, 11 Oct 2016 10:43:23 -0400 On Tue, 2016-10-11 at 15:47 +0200, Martin Kletzander wrote: > > > and this (and others) you *just* cast it to different struct. That's > not good. I'm guessing this is still just a differently separated > commit. Yes, this was to just make simple changes all over the code base but keep the commit in "compilable" state for bisecting reasons. Same goes for the first patch in the series.

1 0

[libvirt] [PATCH] libvirt-guests: Weaken dependency on libvirtd
by Andrea Bolognani 11 Oct '16

11 Oct '16

The Requires relationship is very strong, in that it prevents a unit from running unless all the units it Requires are running as well. This turns out to be a problem because we want to be able to restart libvirtd at any time without having libvirt-guests suspend or shutdown running guests. Turn the Requires relationship into a Wants relationship: this way starting libvirt-guests will cause systemd to (attempt to) start libvirtd as well, but stopping or restarting libvirtd will not alter libvirt-guests' running state. --- tools/libvirt-guests.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index b4f54f2..02e6747 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,6 +1,6 @@ [Unit] Description=Suspend/Resume Running libvirt Guests -Requires=libvirtd.service +Wants=libvirtd.service After=network.target After=time-sync.target After=libvirtd.service -- 2.7.4

3 4

[libvirt] [PATCH 0/4] systemd-related fixes and improvements
by Andrea Bolognani 11 Oct '16

11 Oct '16

Make libvirt on systemd nicer for the user, by getting rid of some confusing behavior, and overall more solid. More details in each specific patch. Andrea Bolognani (4): virtlogd.socket: Tie lifecycle to libvirtd.service libvirt-guests.service: Improve description libvirt-guests.service: Split After= relationship libvirt-guests.service: Add Requires=libvirtd.service daemon/libvirtd.service.in | 1 + src/logging/virtlogd.service.in | 2 ++ src/logging/virtlogd.socket.in | 2 ++ tools/libvirt-guests.service.in | 7 +++++-- 4 files changed, 10 insertions(+), 2 deletions(-) -- 2.7.4

3 14

[libvirt] [OSSTEST PATCH 0/2] libvirt: Fix save/restore capability check on ARM
by Ian Jackson 11 Oct '16

11 Oct '16

Currently, osstest, the Xen Project's automated test framework, erroneously thinks that save/restore is supported with libvirt on ARM. In fact, save/restore is not supported by Xen on ARM at all. The result is that osstest then actually attempts the save/restore, and abandons the test job as a failure. This is not desirable. In these two patches I try to fix the feature detection to get this right. I'd appreciate advice about whether I have done the right thing. My code is based partly on empirical observation of the output of `virsh capabilities' on x86 and ARM. (See below.) Thanks, Ian. >From baroque0, x86. As left by 101253.test-amd64-amd64-libvirt-pair; osstest "branch" osstest <capabilities> <host> <cpu> <arch>x86_64</arch> <features> <pae/> </features> <model>Haswell-noTSX</model> <topology sockets='1' cores='4' threads='2'/> <feature name='vme'/> <feature name='ds'/> <feature name='acpi'/> <feature name='ht'/> <feature name='tm'/> <feature name='pbe'/> <feature name='dtes64'/> <feature name='monitor'/> <feature name='ds_cpl'/> <feature name='vmx'/> <feature name='smx'/> <feature name='est'/> <feature name='tm2'/> <feature name='xtpr'/> <feature name='pdcm'/> <feature name='f16c'/> <feature name='rdrand'/> <feature name='tsc_adjust'/> <feature name='xsaveopt'/> <feature name='pdpe1gb'/> <feature name='abm'/> <feature name='invtsc'/> </cpu> <power_management/> <migration_features> <live/> </migration_features> <netprefix>vif</netprefix> <topology> <cells num='1'> <cell id='0'> <memory unit='KiB'>9699328</memory> <cpus num='8'> <cpu id='0' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='2' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='3' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='4' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='5' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='6' socket_id='0' core_id='3' siblings='6-7'/> <cpu id='7' socket_id='0' core_id='3' siblings='6-7'/> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>xen</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> </guest> <guest> <os_type>xen</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> <features> <pae/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> <domain type='xen'/> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> <hap default='on' toggle='yes'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> <hap default='on' toggle='yes'/> </features> </guest> </capabilities> >From arndale-lakeside, ARM. As left by 101251 | test-armhf-armhf-libvirt; osstest "branch" qemu-mainline <capabilities> <host> <cpu> <arch>armv7l</arch> </cpu> <power_management/> <netprefix>vif</netprefix> <topology> <cells num='1'> <cell id='0'> <memory unit='KiB'>2097152</memory> <cpus num='2'> <cpu id='0' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='0' core_id='0' siblings='0-1'/> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>xen</os_type> <arch name='armv7l'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> </guest> </capabilities>

4 14

[libvirt] Recommendations for Libvirt LTS release
by Guido Günther 11 Oct '16

11 Oct '16

Hi, Debian is about to enter it's freeze for the Stretch release in November and we will support the libvirt version that is in Stretch for at least 5 years. The upstream version of libvirt at this point will likely be 2.4.0. Are any other distros about to pick a version around that time so we can possibly join forces? Are there any recommendations to rather pick another version due to planned features/fixes/refactorings that haven't made it to the list yet? As with previous versions I will feed back patches to the -maint branch and hope to cut point releases as were currently doing with 0.9.12 but if other distros (apart from Debians downstreams) would use the same version this would be a plus. Cheers, -- Guido

3 2

[libvirt] [PATCH] audit: add descriptions about audit log
by Chen Hanxiao 11 Oct '16

11 Oct '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch add some descriptions on what libvirt audit will record in introduction section. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- docs/auditlog.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 45464af..d1d0f6e 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -14,7 +14,9 @@ subsystem. This provides administrators / auditors with a canonical historical record of changes to virtual machines' / containers' lifecycle states and their configuration. On hosts which are running the Linux audit daemon, - the logs will usually end up in <code>/var/log/audit/audit.log</code> + the logs will usually end up in <code>/var/log/audit/audit.log</code>. + If QEMU try to use some resources on the host, libvirt will record them + in audit log. </p> <h2><a name="config">Configuration</a></h2> -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Sanitize vcpu topology checking
by Peter Krempa 11 Oct '16

11 Oct '16

See patch 1. Peter Krempa (2): conf: Sanitize cpu topology numbers qemu: Reuse virDomainDeGetVcpusTopology to calculate total vcpu count src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 18 ++++++++---------- src/qemu/qemu_driver.c | 14 ++++++-------- 5 files changed, 56 insertions(+), 18 deletions(-) -- 2.10.0

2 3

[libvirt] libvirt-guest.sh bug fixes
by Stefan Bader 11 Oct '16

11 Oct '16

Two small changes, before I forget about submitting them... First one affects all environments the same. The list of UIDs which is generated has each element on a separate line. And using quotes in the echo preserves those newlines. However the processing assumes one line per URI and all UIDs separated by spaces. So without dropping the quotes only one guest will get shutdown/suspended. The second change is for Xen environments only. Domain-0 appears in the list of guests and it is a persistent one. So on shutdown, the script tries to stop Domain-0 (which is not working) and then waits the whole timeout for it to stop. -Stefan

4 11