June 2017 - Devel - Libvirt List Archives

[libvirt] [PATCH] qemu: Change coalesce settings on hotplug when they are different

by Martin Kletzander

Part of the condition was reverted so no value update was propagated through. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414627 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial src/qemu/qemu_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5247c065711d..a486fb4fe334 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3283,8 +3283,8 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, if (!!olddev->coalesce != !!newdev->coalesce || (olddev->coalesce && newdev->coalesce && - !memcmp(olddev->coalesce, newdev->coalesce, - sizeof(*olddev->coalesce)))) + memcmp(olddev->coalesce, newdev->coalesce, + sizeof(*olddev->coalesce)))) needCoalesceChange = true; /* FINALLY - actually perform the required actions */ -- 2.13.1

7 years, 9 months

1
0
0 / 0

[libvirt] [PATCH] Fix documentation errors about the path of conf files

by Lily Zhu

The conf files, for example, libvirtd.conf, virtlockd.conf and virtlogd.conf, should be located under the directory "/etc/libvirt", rather than "/etc". Signed-off-by: Lily Zhu <lizhu(a)redhat.com> --- daemon/libvirtd.pod | 2 +- src/locking/virtlockd.pod | 2 +- src/logging/virtlogd.pod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.pod b/daemon/libvirtd.pod index 3b819a2..1bca509 100644 --- a/daemon/libvirtd.pod +++ b/daemon/libvirtd.pod @@ -81,7 +81,7 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration. =over -=item F<SYSCONFDIR/libvirtd.conf> +=item F<SYSCONFDIR/libvirt/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/locking/virtlockd.pod b/src/locking/virtlockd.pod index a3bb268..2e155f8 100644 --- a/src/locking/virtlockd.pod +++ b/src/locking/virtlockd.pod @@ -67,7 +67,7 @@ upgrades of the virtlockd service. =over -=item F<SYSCONFDIR/virtlockd.conf> +=item F<SYSCONFDIR/libvirt/virtlockd.conf> The default configuration file used by virtlockd, unless overridden on the command line using the B<-f>|B<--config> option. diff --git a/src/logging/virtlogd.pod b/src/logging/virtlogd.pod index 7e55c9e..5fc20db 100644 --- a/src/logging/virtlogd.pod +++ b/src/logging/virtlogd.pod @@ -67,7 +67,7 @@ upgrades of the virtlogd service. =over -=item F<SYSCONFDIR/virtlogd.conf> +=item F<SYSCONFDIR/libvirt/virtlogd.conf> The default configuration file used by virtlogd, unless overridden on the command line using the B<-f>|B<--config> option. -- 1.8.3.1

7 years, 9 months

2
1
0 / 0

[libvirt] [PATCH] qemu: capabilities: Move comments separating groups of capabilities

by Peter Krempa

Similarly to how we specify the groups of 5 capabilities in the header file move the labels to separate line also for the VIR_ENUM_IMPL part. This simplifies rebase conflict resolution in the capability file since only lines have to be shuffled around, but they don't need to be edited. --- src/qemu/qemu_capabilities.c | 159 ++++++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a9171893e..61c9a1066 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -61,319 +61,372 @@ VIR_LOG_INIT("qemu.qemu_capabilities"); * daemon restarts */ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, - "kqemu", /* 0 */ + /* 0 */ + "kqemu", "vnc-colon", "no-reboot", "drive", "drive-boot", - "name", /* 5 */ + /* 5 */ + "name", "uuid", "domid", "vnet-hdr", "migrate-kvm-stdio", - "migrate-qemu-tcp", /* 10 */ + /* 10 */ + "migrate-qemu-tcp", "migrate-qemu-exec", "drive-cache-v2", "kvm", "drive-format", - "vga", /* 15 */ + /* 15 */ + "vga", "0.10", "pci-device", "mem-path", "drive-serial", - "xen-domid", /* 20 */ + /* 20 */ + "xen-domid", "migrate-qemu-unix", "chardev", "enable-kvm", "monitor-json", - "balloon", /* 25 */ + /* 25 */ + "balloon", "device", "sdl", "smp-topology", "netdev", - "rtc", /* 30 */ + /* 30 */ + "rtc", "vhost-net", "rtc-td-hack", "no-hpet", "no-kvm-pit", - "tdf", /* 35 */ + /* 35 */ + "tdf", "pci-configfd", "nodefconfig", "boot-menu", "enable-kqemu", - "fsdev", /* 40 */ + /* 40 */ + "fsdev", "nesting", "name-process", "drive-readonly", "smbios-type", - "vga-qxl", /* 45 */ + /* 45 */ + "vga-qxl", "spice", "vga-none", "migrate-qemu-fd", "boot-index", - "hda-duplex", /* 50 */ + /* 50 */ + "hda-duplex", "drive-aio", "pci-multibus", "pci-bootindex", "ccid-emulated", - "ccid-passthru", /* 55 */ + /* 55 */ + "ccid-passthru", "chardev-spicevmc", "device-spicevmc", "virtio-tx-alg", "device-qxl-vga", - "pci-multifunction", /* 60 */ + /* 60 */ + "pci-multifunction", "virtio-blk-pci.ioeventfd", "sga", "virtio-blk-pci.event_idx", "virtio-net-pci.event_idx", - "cache-directsync", /* 65 */ + /* 65 */ + "cache-directsync", "piix3-usb-uhci", "piix4-usb-uhci", "usb-ehci", "ich9-usb-ehci1", - "vt82c686b-usb-uhci", /* 70 */ + /* 70 */ + "vt82c686b-usb-uhci", "pci-ohci", "usb-redir", "usb-hub", "no-shutdown", - "cache-unsafe", /* 75 */ + /* 75 */ + "cache-unsafe", "rombar", "ich9-ahci", "no-acpi", "fsdev-readonly", - "virtio-blk-pci.scsi", /* 80 */ + /* 80 */ + "virtio-blk-pci.scsi", "blk-sg-io", "drive-copy-on-read", "cpu-host", "fsdev-writeout", - "drive-iotune", /* 85 */ + /* 85 */ + "drive-iotune", "system_wakeup", "scsi-disk.channel", "scsi-block", "transaction", - "block-job-sync", /* 90 */ + /* 90 */ + "block-job-sync", "block-job-async", "scsi-cd", "ide-cd", "no-user-config", - "hda-micro", /* 95 */ + /* 95 */ + "hda-micro", "dump-guest-memory", "nec-usb-xhci", "virtio-s390", "balloon-event", - "bridge", /* 100 */ + /* 100 */ + "bridge", "lsi", "virtio-scsi-pci", "blockio", "disable-s3", - "disable-s4", /* 105 */ + /* 105 */ + "disable-s4", "usb-redir.filter", "ide-drive.wwn", "scsi-disk.wwn", "seccomp-sandbox", - "reboot-timeout", /* 110 */ + /* 110 */ + "reboot-timeout", "dump-guest-core", "seamless-migration", "block-commit", "vnc", - "drive-mirror", /* 115 */ + /* 115 */ + "drive-mirror", "usb-redir.bootindex", "usb-host.bootindex", "blockdev-snapshot-sync", "qxl", - "VGA", /* 120 */ + /* 120 */ + "VGA", "cirrus-vga", "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", /* 125 */ + /* 125 */ + "usb-serial", "usb-net", "add-fd", "nbd-server", "virtio-rng", - "rng-random", /* 130 */ + /* 130 */ + "rng-random", "rng-egd", "virtio-ccw", "dtb", "megasas", - "ipv6-migration", /* 135 */ + /* 135 */ + "ipv6-migration", "machine-opt", "machine-usb-opt", "tpm-passthrough", "tpm-tis", - "nvram", /* 140 */ + /* 140 */ + "nvram", "pci-bridge", "vfio-pci", "vfio-pci.bootindex", "scsi-generic", - "scsi-generic.bootindex", /* 145 */ + /* 145 */ + "scsi-generic.bootindex", "mem-merge", "vnc-websocket", "drive-discard", "mlock", - "vnc-share-policy", /* 150 */ + /* 150 */ + "vnc-share-policy", "device-del-event", "dmi-to-pci-bridge", "i440fx-pci-hole64-size", "q35-pci-hole64-size", - "usb-storage", /* 155 */ + /* 155 */ + "usb-storage", "usb-storage.removable", "virtio-mmio", "ich9-intel-hda", "kvm-pit-lost-tick-policy", - "boot-strict", /* 160 */ + /* 160 */ + "boot-strict", "pvpanic", "enable-fips", "spice-file-xfer-disable", "spiceport", - "usb-kbd", /* 165 */ + /* 165 */ + "usb-kbd", "host-pci-multidomain", "msg-timestamp", "active-commit", "change-backing-file", - "memory-backend-ram", /* 170 */ + /* 170 */ + "memory-backend-ram", "numa", "memory-backend-file", "usb-audio", "rtc-reset-reinjection", - "splash-timeout", /* 175 */ + /* 175 */ + "splash-timeout", "iothread", "migrate-rdma", "ivshmem", "drive-iotune-max", - "VGA.vgamem_mb", /* 180 */ + /* 180 */ + "VGA.vgamem_mb", "vmware-svga.vgamem_mb", "qxl.vgamem_mb", "qxl-vga.vgamem_mb", "pc-dimm", - "machine-vmport-opt", /* 185 */ + /* 185 */ + "machine-vmport-opt", "aes-key-wrap", "dea-key-wrap", "pci-serial", "aarch64-off", - "vhost-user-multiqueue", /* 190 */ + /* 190 */ + "vhost-user-multiqueue", "migration-event", "gpex-pcihost", "ioh3420", "x3130-upstream", - "xio3130-downstream", /* 195 */ + /* 195 */ + "xio3130-downstream", "rtl8139", "e1000", "virtio-net", "gic-version", - "incoming-defer", /* 200 */ + /* 200 */ + "incoming-defer", "virtio-gpu", "virtio-gpu.virgl", "virtio-keyboard", "virtio-mouse", - "virtio-tablet", /* 205 */ + /* 205 */ + "virtio-tablet", "virtio-input-host", "chardev-file-append", "ich9-disable-s3", "ich9-disable-s4", - "vserport-change-event", /* 210 */ + /* 210 */ + "vserport-change-event", "virtio-balloon-pci.deflate-on-oom", "mptsas1068", "spice-gl", "qxl.vram64_size_mb", - "qxl-vga.vram64_size_mb", /* 215 */ + /* 215 */ + "qxl-vga.vram64_size_mb", "chardev-logfile", "debug-threads", "secret", "pxb", - "pxb-pcie", /* 220 */ + /* 220 */ + "pxb-pcie", "device-tray-moved-event", "nec-usb-xhci-ports", "virtio-scsi-pci.iothread", "name-guest", - "qxl.max_outputs", /* 225 */ + /* 225 */ + "qxl.max_outputs", "qxl-vga.max_outputs", "spice-unix", "drive-detect-zeroes", "tls-creds-x509", - "display", /* 230 */ + /* 230 */ + "display", "intel-iommu", "smm", "virtio-pci-disable-legacy", "query-hotpluggable-cpus", - "virtio-net.rx_queue_size", /* 235 */ + /* 235 */ + "virtio-net.rx_queue_size", "machine-iommu", "virtio-vga", "drive-iotune-max-length", "ivshmem-plain", - "ivshmem-doorbell", /* 240 */ + /* 240 */ + "ivshmem-doorbell", "query-qmp-schema", "gluster.debug_level", "vhost-scsi", "drive-iotune-group", - "query-cpu-model-expansion", /* 245 */ + /* 245 */ + "query-cpu-model-expansion", "virtio-net.host_mtu", "spice-rendernode", "nvdimm", "pcie-root-port", - "query-cpu-definitions", /* 250 */ + /* 250 */ + "query-cpu-definitions", "block-write-threshold", "query-named-block-nodes", "cpu-cache", "qemu-xhci", - "kernel-irqchip", /* 255 */ + /* 255 */ + "kernel-irqchip", "kernel-irqchip.split", "intel-iommu.intremap", "intel-iommu.caching-mode", "intel-iommu.eim", - "intel-iommu.device-iotlb", /* 260 */ + /* 260 */ + "intel-iommu.device-iotlb", "virtio.iommu_platform", "virtio.ats", "loadparm", -- 2.12.2

7 years, 9 months

2
1
0 / 0

[libvirt] [PATCH v2] util: fix locale problem with virStrToDouble().

by Julio Faracco

This commit fixes a locale problem with locales that use comma as a mantissa separator. Example: 12.34 en_US = 12,34 pt_BR. Since strtod() is a non-safe function, virStrToDouble() will have problems to parse double numbers from kernel settings and other double numbers from static files (XMLs, JSONs, etc). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457634 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1457481 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virstring.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virstring.c b/src/util/virstring.c index 089b539..6dd5138 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -28,6 +28,7 @@ #include "base64.h" #include "c-ctype.h" #include "virstring.h" +#include "virthread.h" #include "viralloc.h" #include "virbuffer.h" #include "virerror.h" @@ -516,6 +517,22 @@ virStrToLong_ullp(char const *s, char **end_ptr, int base, return 0; } +#if HAVE_NEWLOCALE + +static locale_t virLocale; + +static int +virLocaleOnceInit(void) +{ + virLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0); + if (!virLocale) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virLocale); +#endif + int virStrToDouble(char const *s, char **end_ptr, @@ -526,7 +543,17 @@ virStrToDouble(char const *s, int err; errno = 0; +#if HAVE_NEWLOCALE + locale_t old_loc; + if (virLocaleInitialize() < 0) + return -1; + + old_loc = uselocale(virLocale); +#endif val = strtod(s, &p); /* exempt from syntax-check */ +#if HAVE_NEWLOCALE + uselocale(old_loc); +#endif err = (errno || (!end_ptr && *p) || p == s); if (end_ptr) *end_ptr = p; -- 2.7.4

7 years, 9 months

2
2
0 / 0

[libvirt] [PATCH] util: storage: Make @backingFormat optional in virStorageFileGetMetadataInternal

by Peter Krempa

Some callers don't need to know the backing format. Make the argument optional by using a dummy int if NULL is passed. --- src/util/virstoragefile.c | 4 ++++ src/util/virstoragefile.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 8047d977f..042698872 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -966,9 +966,13 @@ virStorageFileGetMetadataInternal(virStorageSourcePtr meta, size_t len, int *backingFormat) { + int format; int ret = -1; size_t i; + if (!backingFormat) + backingFormat = &format; + VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d", meta->path, buf, len, meta->format); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index ce54a19ce..0bff8671f 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -293,7 +293,7 @@ int virStorageFileGetMetadataInternal(virStorageSourcePtr meta, char *buf, size_t len, int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path, int fd, -- 2.12.2

7 years, 9 months

3
2
0 / 0

[libvirt] [libvirt-python PATCH] Add details for shutdown event

by Martin Kletzander

In commit a8eba5036cb4b0e2ec827e9e6e019ce70e451377, libvirt added support for two more details. Follow that in python bindings as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1463188 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- examples/event-test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/event-test.py b/examples/event-test.py index 3bca9e27c9be..4eb71425cff4 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -477,7 +477,7 @@ def domDetailToString(event, detail): ( "Paused", "Migrated", "IOError", "Watchdog", "Restored", "Snapshot", "API error" ), ( "Unpaused", "Migrated", "Snapshot" ), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), - ( "Finished", ), + ( "Finished", "On guest request", "On host request"), ( "Memory", "Disk" ), ( "Panicked", ), ) -- 2.13.1

7 years, 9 months

2
1
0 / 0

[libvirt] [PATCH 0/5] Fix regression when relative block commit does not work after snapshots

by Peter Krempa

See patch 5/5. Peter Krempa (5): qemu: block commit: Determine relative path of images before initializing qemu: block commit: Don't overwrite error when rolling back disk labels util: storage: Export virStorageIsRelative storage: Add helper to retrieve the backing store string of a storage volume qemu: snapshot: Load data necessary for relative block commit to work src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 51 +++++++++++++++++++++++++++++++------------- src/storage/storage_driver.c | 44 ++++++++++++++++++++++++++++++++++++++ src/storage/storage_driver.h | 3 +++ src/util/virstoragefile.c | 2 +- src/util/virstoragefile.h | 1 + 6 files changed, 86 insertions(+), 16 deletions(-) -- 2.12.2

7 years, 9 months

2
10
0 / 0

[libvirt] [PATCH] check the return value of qemuBuildVirtioOptionsStr

by Ján Tomko

Only qemuBuildFSDevStr missed the return check. --- src/qemu/qemu_command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 900239f05..57893cfda 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2527,7 +2527,8 @@ qemuBuildFSDevStr(const virDomainDef *def, QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); - qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps); + if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) + goto error; if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0) goto error; -- 2.13.0

7 years, 9 months

3
2
0 / 0

[libvirt] [PATCH 0/3] Small patches

by Marc Hartmayer

7 years, 9 months

2
7
0 / 0

[libvirt] [PATCH v2 0/8] Add new JSON pseudo-protocol support for qemu 2.9 changes

by Peter Krempa

Patches 1-3 of old series were pushed already. Patch 1 of this series is new and adapts to change in 'SocketAddress' in qemu. Patches 2 and 3 needed to be modified because of patch 1. Patch 4 fixes the 'lun' field and splits the portal into host and port. There are a few changes in the rest of the patches, mostly changes from 'tcp' to 'inet' in the test suite. Peter Krempa (8): util: storage: Add support for type 'inet' in virStorageSourceParseBackingJSONSocketAddress util: storage: Split out parsing of TCP network host from JSON pseudoprotocol util: storage: Report errors when source host data is missing util: storage: Add JSON parser for new options in iSCSI protocol util: storage: adapt to changes in JSON format for NBD util: storage: adapt to changes in JSON format for ceph/rbd util: storage: adapt to changes in JSON format for ssh util: storage: adapt to changes in JSON format for sheepdog src/util/virstoragefile.c | 270 ++++++++++++++++++++++++++++++++++++---------- tests/virstoragetest.c | 73 ++++++++++++- 2 files changed, 283 insertions(+), 60 deletions(-) -- 2.12.2

7 years, 9 months

2
17
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Devel June 2017