- Devel - libvirt List Archives

[libvirt] [PATCH] vz: fix cleanup of nets of bridged type
by Dmitry Guryanov 10 Jul '15

10 Jul '15

We create a virtual network of special type, which has the same name as bridge name to create bridged network adapter in vz. So when we delete such an adapter we have to remove corresponding virtual network. So let's rename prlsdkDelNet to prlsdkCleanupBridgedNet and don't check for return value. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/vz/vz_sdk.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index a312990..d1bc312 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -2986,20 +2986,15 @@ static int prlsdkAddNet(PRL_HANDLE sdkdom, return ret; } -static int -prlsdkDelNet(vzConnPtr privconn, virDomainNetDefPtr net) +static void +prlsdkCleanupBridgedNet(vzConnPtr privconn, virDomainNetDefPtr net) { - int ret = -1; PRL_RESULT pret; PRL_HANDLE vnet = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE; - if (net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("unplugging network device of type %s is not supported"), - virDomainNetTypeToString(net->type)); - return ret; - } + if (net->type != VIR_DOMAIN_NET_TYPE_BRIDGE) + return; pret = PrlVirtNet_Create(&vnet); prlsdkCheckRetGoto(pret, cleanup); @@ -3011,11 +3006,8 @@ prlsdkDelNet(vzConnPtr privconn, virDomainNetDefPtr net) if (PRL_FAILED(pret = waitJob(job))) goto cleanup; - ret = 0; - cleanup: PrlHandle_Free(vnet); - return ret; } int prlsdkAttachNet(virDomainObjPtr dom, @@ -3107,8 +3099,7 @@ int prlsdkDetachNet(virDomainObjPtr dom, if (sdknet == PRL_INVALID_HANDLE) goto cleanup; - if (prlsdkDelNet(privconn, net) < 0) - goto cleanup; + prlsdkCleanupBridgedNet(privconn, net); pret = PrlVmDev_Remove(sdknet); prlsdkCheckRetGoto(pret, cleanup); @@ -3530,7 +3521,7 @@ prlsdkDoApplyConfig(virConnectPtr conn, if (olddef) { for (i = 0; i < olddef->nnets; i++) - prlsdkDelNet(conn->privateData, olddef->nets[i]); + prlsdkCleanupBridgedNet(conn->privateData, olddef->nets[i]); } for (i = 0; i < def->nnets; i++) { @@ -3575,7 +3566,7 @@ prlsdkDoApplyConfig(virConnectPtr conn, VIR_FREE(mask); for (i = 0; i < def->nnets; i++) - prlsdkDelNet(conn->privateData, def->nets[i]); + prlsdkCleanupBridgedNet(conn->privateData, def->nets[i]); return -1; } @@ -3722,7 +3713,7 @@ prlsdkUnregisterDomain(vzConnPtr privconn, virDomainObjPtr dom) size_t i; for (i = 0; i < dom->def->nnets; i++) - prlsdkDelNet(privconn, dom->def->nets[i]); + prlsdkCleanupBridgedNet(privconn, dom->def->nets[i]); job = PrlVm_Unreg(privdom->sdkdom); if (PRL_FAILED(waitJob(job))) -- 2.4.3

2 2

[libvirt] [PATCH] libxl: set dom0 state to running
by Jim Fehlig 10 Jul '15

10 Jul '15

Commit 45697fe5 added dom0 to driver->domains, but missed setting its state to 'running' > virsh list Id Name State ---------------------------------------------------- 0 Domain-0 shut off Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e72b12d..5f69b49 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -549,6 +549,7 @@ libxlAddDom0(libxlDriverPrivatePtr driver) def = NULL; + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, VIR_DOMAIN_RUNNING_BOOTED); vm->def->vcpus = d_info.vcpu_online; vm->def->maxvcpus = d_info.vcpu_max_id + 1; vm->def->mem.cur_balloon = d_info.current_memkb; -- 2.1.4

2 1

[libvirt] [PATCH] Fix qemu-nbd cleanup crashes
by Cédric Bosdonnat 10 Jul '15

10 Jul '15

The virLXCControllerAppendNBDPids function didn't properly initialize pids and npids. In case of failure it was crashing when freeing those. The nbd device pid file doesn't appear immediately after starting qemu-nbd: adding a small loop to wait for it. --- src/lxc/lxc_controller.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 828b8a8..78d3eee 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -533,16 +533,31 @@ static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, const char *dev) { char *pidpath = NULL; - pid_t *pids; - size_t npids; + pid_t *pids = NULL; + size_t npids = 0; size_t i; int ret = -1; + size_t loops = 0; pid_t pid; if (!STRPREFIX(dev, "/dev/") || virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5) < 0) goto cleanup; + /* Wait for the pid file to appear */ + while (!virFileExists(pidpath)) { + /* wait for 100ms before checking again, but don't do it for ever */ + if (errno == ENOENT && loop < 10) { + usleep(100 * 1000); + loop++; + } else { + virReportSystemError(errno, + _("Cannot check NBD device %s pid"), + dev + 5); + goto cleanup; + } + } + if (virPidFileReadPath(pidpath, &pid) < 0) goto cleanup; -- 2.1.4

1 0

[libvirt] [PATCH 0/4] Improve migration errors
by Jiri Denemark 10 Jul '15

10 Jul '15

When QEMU exits on destination during migration, the source reports either success (if the failure happened at the very end) or unhelpful "unexpectedly failed" error message, only the destination host knows more about the error, but usually there's no way to get the error back to the source because the domain is already gone at the time virDomainMigrateFinish* is called. This series changes libvirt to remember incoming migration errors so that they can be sent back to a source host. https://bugzilla.redhat.com/show_bug.cgi?id=1090093 Jiri Denemark (4): Introduce virHashLockable qemu: Remember incoming migration errors qemu: Don't report false error from MigrateFinish qemu: Use error from Finish instead of "unexpectedly failed" include/libvirt/virterror.h | 1 + src/libvirt-domain.c | 21 ++++++++++- src/libvirt_private.syms | 3 ++ src/qemu/qemu_conf.h | 3 ++ src/qemu/qemu_driver.c | 31 +++++++++++---- src/qemu/qemu_migration.c | 91 +++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_migration.h | 7 ++++ src/qemu/qemu_monitor.c | 19 ++++++++++ src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_process.c | 4 ++ src/util/virerror.c | 3 ++ src/util/virhash.c | 81 ++++++++++++++++++++++++++++++++++++++++ src/util/virhash.h | 10 +++++ 13 files changed, 263 insertions(+), 13 deletions(-) -- 2.4.5

2 10

[libvirt] [libvirt-snmp][PATCH] LIBVIRT-MIB: Comply with formatting rules
by Michal Privoznik 10 Jul '15

10 Jul '15

So, I've came along this web site [1] which tries to validate a MIB file. So I fed it with LIBVIRT-MIB and found some errors. This commit fixes them so that the test passes again. This should be no functional change, rather than some formatting change. 1: http://www.simpleweb.org/ietf/mibs/validate/ Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/LIBVIRT-MIB.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/LIBVIRT-MIB.txt b/src/LIBVIRT-MIB.txt index d83db49..a8195ff 100644 --- a/src/LIBVIRT-MIB.txt +++ b/src/LIBVIRT-MIB.txt @@ -6,12 +6,10 @@ LIBVIRT-MIB DEFINITIONS ::= BEGIN IMPORTS MODULE-IDENTITY, OBJECT-TYPE, enterprises, Unsigned32, Gauge32, - Counter64 - FROM SNMPv2-SMI - OBJECT-GROUP, MODULE-COMPLIANCE - FROM SNMPv2-CONF - TEXTUAL-CONVENTION, RowStatus - FROM SNMPv2-TC + Counter64 FROM SNMPv2-SMI + OBJECT-GROUP, MODULE-COMPLIANCE FROM SNMPv2-CONF + TEXTUAL-CONVENTION, RowStatus FROM SNMPv2-TC + NOTIFICATION-TYPE FROM SNMPv2-SMI ; @@ -78,7 +76,7 @@ LibvirtGuestEntry ::= SEQUENCE { libvirtGuestUUID OBJECT-TYPE SYNTAX UUID - MAX-ACCESS not-accessible + MAX-ACCESS accessible-for-notify STATUS current DESCRIPTION "The UUID of the virtual guest." @@ -202,11 +200,11 @@ libvirtGuestGroup OBJECT-GROUP ::= { libvirtGroups 1 } libvirtGuestNotif NOTIFICATION-TYPE - STATUS current OBJECTS { libvirtGuestName, libvirtGuestUUID, libvirtGuestState, libvirtGuestRowStatus } + STATUS current DESCRIPTION "Guest lifecycle notification." ::= { libvirtNotifications 1 } -- 2.3.6

1 0

[libvirt] [PATCH 0/2] Fix timerActive logic in virNetDaemon
by Martin Kletzander 10 Jul '15

10 Jul '15

Nowadays the daemon can quit even if there's a client connected, so let's fix that. If ACK'd, I'll backport this to v1.2.17-maint as well as v1.2.17 is the only affected release. Martin Kletzander (2): rpc: Add virNetDaemonHasClients rpc: Rework timerActive logic in daemon src/libvirt_remote.syms | 1 + src/rpc/virnetdaemon.c | 37 ++++++++++++++++++++++--------------- src/rpc/virnetdaemon.h | 2 ++ 3 files changed, 25 insertions(+), 15 deletions(-) -- 2.4.5

2 3

[libvirt] [PATCH] Document that virNodeGetInfo can return mhz == 0.
by Richard W.M. Jones 10 Jul '15

10 Jul '15

On the s/390x architecture, libvirt may already return 0 in the node_info->mhz field (see src/nodeinfo.c:linuxNodeInfoCPUPopulate). We may also want to return this on aarch64 in future, because calculating the proper value requires SMBIOS, which is not available on non-server-class systems (specifically on systems which don't adhere to the SBSA standard). Therefore this change documents the existing behaviour and provides a valid path for aarch64. Signed-off-by: Richard W.M. Jones <rjones(a)redhat.com> Bug-URL: https://bugzilla.redhat.com/1206353 --- include/libvirt/libvirt-host.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 953366b..070550b 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -354,7 +354,8 @@ struct _virNodeInfo { char model[32]; /* string indicating the CPU model */ unsigned long memory; /* memory size in kilobytes */ unsigned int cpus; /* the number of active CPUs */ - unsigned int mhz; /* expected CPU frequency */ + unsigned int mhz; /* expected CPU frequency, 0 if not known or + on unusual architectures */ unsigned int nodes; /* the number of NUMA cell, 1 for unusual NUMA topologies or uniform memory access; check capabilities XML for the actual NUMA topology */ -- 2.3.1

3 3

[libvirt] [PATCH] qemu: Reject updating unsupported disk information
by Martin Kletzander 10 Jul '15

10 Jul '15

If one calls update-device with information that is not updatable, libvirt reports success even though no data were updated. The example used in the bug linked below uses updating device with <boot order='2'/> which, in my opinion, is a valid thing to request from user's perspective. Mainly since we properly error out if user wants to update such data on a network device for example. And since there are many things that might happen (update-device on disk basically knows just how to change removable media), check for what's changing and moreover, since the function might be usable in other dirvers (updating only disk path is a valid possibility) let's abstract it for any two disks. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1007228 --- src/conf/domain_conf.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 3 ++ 4 files changed, 117 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0219c3c4814d..a6950087d987 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5687,6 +5687,117 @@ virDomainDiskFindByBusAndDst(virDomainDefPtr def, return NULL; } + +/* + * Makes sure the @disk differs from @orig_disk only by the source + * path and nothing else. Fields that are being checked and the + * information whether they are nullable (can be NULL) or is taken + * from the virDomainDiskDefFormat() code. + */ +bool +virDomainDiskDiffersSourceOnly(virDomainDiskDefPtr disk, + virDomainDiskDefPtr orig_disk) +{ +#define CHECK_EQ(field, field_name, nullable) \ + do { \ + if (nullable && !disk->field) \ + break; \ + if (disk->field != orig_disk->field) { \ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, \ + _("cannot modify field '%s' of the disk"), \ + field_name); \ + return false; \ + } \ + } while (0) + + CHECK_EQ(device, "device", false); + CHECK_EQ(cachemode, "cache", true); + CHECK_EQ(error_policy, "error_policy", true); + CHECK_EQ(rerror_policy, "rerror_policy", true); + CHECK_EQ(iomode, "io", true); + CHECK_EQ(ioeventfd, "ioeventfd", true); + CHECK_EQ(event_idx, "event_idx", true); + CHECK_EQ(copy_on_read, "copy_on_read", true); + CHECK_EQ(discard, "discard", true); + CHECK_EQ(iothread, "iothread", true); + + if (disk->geometry.cylinders && + disk->geometry.heads && + disk->geometry.sectors) { + CHECK_EQ(geometry.cylinders, "geometry cylinders", false); + CHECK_EQ(geometry.heads, "geometry heads", false); + CHECK_EQ(geometry.sectors, "geometry sectors", false); + CHECK_EQ(geometry.trans, "BIOS-translation-modus", true); + } + + CHECK_EQ(blockio.logical_block_size, + "blockio logical_block_size", false); + CHECK_EQ(blockio.physical_block_size, + "blockio physical_block_size", false); + + if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) + CHECK_EQ(removable, "removable", true); + + CHECK_EQ(blkdeviotune.total_bytes_sec, + "blkdeviotune.total_bytes_sec", + true); + CHECK_EQ(blkdeviotune.read_bytes_sec, + "blkdeviotune.read_bytes_sec", + true); + CHECK_EQ(blkdeviotune.write_bytes_sec, + "blkdeviotune.write_bytes_sec", + true); + CHECK_EQ(blkdeviotune.total_iops_sec, + "blkdeviotune.total_iops_sec", + true); + CHECK_EQ(blkdeviotune.read_iops_sec, + "blkdeviotune.read_iops_sec", + true); + CHECK_EQ(blkdeviotune.write_iops_sec, + "blkdeviotune.write_iops_sec", + true); + CHECK_EQ(blkdeviotune.total_bytes_sec_max, + "blkdeviotune.total_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.read_bytes_sec_max, + "blkdeviotune.read_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.write_bytes_sec_max, + "blkdeviotune.write_bytes_sec_max", + true); + CHECK_EQ(blkdeviotune.total_iops_sec_max, + "blkdeviotune.total_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.read_iops_sec_max, + "blkdeviotune.read_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.write_iops_sec_max, + "blkdeviotune.write_iops_sec_max", + true); + CHECK_EQ(blkdeviotune.size_iops_sec, + "blkdeviotune.size_iops_sec", + true); + + CHECK_EQ(transient, "transient", true); + CHECK_EQ(serial, "serial", true); + CHECK_EQ(wwn, "wwn", true); + CHECK_EQ(vendor, "vendor", true); + CHECK_EQ(product, "product", true); + + CHECK_EQ(info.bootIndex, "boot order", true); + + if (disk->info.alias && STRNEQ(disk->info.alias, orig_disk->info.alias)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("cannot modify field '%s' of the disk"), + "alias name"); + return false; + } + +#undef CHECK_EQ + + return true; +} + int virDomainDiskDefAssignAddress(virDomainXMLOptionPtr xmlopt, virDomainDiskDefPtr def) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 12d945ea7f24..b84640c2de56 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2475,6 +2475,8 @@ int virDomainDeviceFindControllerModel(virDomainDefPtr def, virDomainDiskDefPtr virDomainDiskFindByBusAndDst(virDomainDefPtr def, int bus, char *dst); +bool virDomainDiskDiffersSourceOnly(virDomainDiskDefPtr disk, + virDomainDiskDefPtr orig_disk); void virDomainControllerDefFree(virDomainControllerDefPtr def); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1566d11e4156..5534dc7ed704 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -249,6 +249,7 @@ virDomainDiskDefFree; virDomainDiskDefNew; virDomainDiskDefSourceParse; virDomainDiskDeviceTypeToString; +virDomainDiskDiffersSourceOnly; virDomainDiskDiscardTypeToString; virDomainDiskErrorPolicyTypeFromString; virDomainDiskErrorPolicyTypeToString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ba804429a28a..4f1724e92e4a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7916,6 +7916,9 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn, goto end; } + if (!virDomainDiskDiffersSourceOnly(disk, orig_disk)) + goto end; + /* Add the new disk src into shared disk hash table */ if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) goto end; -- 2.4.5

3 3

[libvirt] [PATCH] qemu: Check duplicate WWNs also for hotplugged disks
by Peter Krempa 10 Jul '15

10 Jul '15

In commit 714b38cb232bcbbd7487af4c058fa6d0999b3326 I tried to avoid having two disks with the same WWN in a VM. I forgot to check the hotplug paths though which make it possible bypass that check. Reinforce the fix by checking the wwn when attaching the disk. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1208009 --- src/conf/domain_conf.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1f7862b..5a9a88d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -22135,6 +22135,34 @@ virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, return 0; } + +/** + * virDomainDefGetDiskByWWN: + * @def: domain definition + * @wwn: wwn of a disk to find + * + * Returns a disk definition pointer corresponding to the given WWN identifier + * or NULL either if @wwn was NULL or if disk with given WWN is not present in + * the domain definition. + */ +static virDomainDiskDefPtr +virDomainDefGetDiskByWWN(virDomainDefPtr def, + const char *wwn) +{ + size_t i; + + if (!wwn) + return NULL; + + for (i = 0; i < def->ndisks; i++) { + if (STREQ_NULLABLE(def->disks[i]->wwn, wwn)) + return def->disks[i]; + } + + return NULL; +} + + int virDomainDefCompatibleDevice(virDomainDefPtr def, virDomainDeviceDefPtr dev, @@ -22178,6 +22206,15 @@ virDomainDefCompatibleDevice(virDomainDefPtr def, } } + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (!!virDomainDefGetDiskByWWN(def, dev->data.disk->wwn)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Domain already has a disk with wwn '%s'"), + dev->data.disk->wwn); + return -1; + } + } + return 0; } -- 2.4.5

2 2

[libvirt] [PATCH] cpu: Add support for MPX and AVX512 Intel features
by Jiri Denemark 10 Jul '15

10 Jul '15

Corresponding QEMU commits: MPX 79e9ebebbf2a00c46fcedb6dc7dd5e12bbd30216 AVX512 9aecd6f8aef653cea58932f06a2740299dbe5fd3 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_map.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index b9e95cf..b924bd3 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -317,6 +317,12 @@ <feature name='rtm'> <cpuid function='0x00000007' ebx='0x00000800'/> </feature> + <feature name='mpx'> + <cpuid function='0x00000007' ebx='0x00004000'/> + </feature> + <feature name='avx512f'>  + <cpuid function='0x00000007' ebx='0x00010000'/> + </feature> <feature name='rdseed'> <cpuid function='0x00000007' ebx='0x00040000'/> </feature> @@ -326,6 +332,15 @@ <feature name='smap'> <cpuid function='0x00000007' ebx='0x00100000'/> </feature> + <feature name='avx512pf'>  + <cpuid function='0x00000007' ebx='0x04000000'/> + </feature> + <feature name='avx512er'>  + <cpuid function='0x00000007' ebx='0x08000000'/> + </feature> + <feature name='avx512cd'>  + <cpuid function='0x00000007' ebx='0x10000000'/> + </feature>  <feature name='invtsc' migratable='no'> -- 2.4.5

2 1

[libvirt] [PATCH v3] qemu: Use heads parameter for QXL driver
by Frediano Ziglio 10 Jul '15

10 Jul '15

Allows to specify maximum number of head to QXL driver. The patch to support the "max_outputs" in Qemu is still not merged but I got agreement on the name of the argument. Actually can be a compatiblity problem as heads in the XML configuration was set by default to '1'. Signed-off-by: Frediano Ziglio <fziglio(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 +++++ 3 files changed, 8 insertions(+) Changes from v2: - removed capability tests (Martin Kletzander) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 27686c3..68060cd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -287,6 +287,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "aarch64-off", "vhost-user-multiqueue", /* 190 */ + "qxl-vga.max_outputs", ); @@ -1649,6 +1650,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, + { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS }, }; struct virQEMUCapsObjectTypeProps { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 30aa504..02f9e81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -230,6 +230,7 @@ typedef enum { QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ + QEMU_CAPS_QXL_VGA_MAX_OUTPUTS = 191, /* qxl-vga.max_outputs */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 25a7bc6..59666e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5661,6 +5661,11 @@ qemuBuildDeviceVideoStr(virDomainDefPtr def, /* QEMU accepts mebibytes for vgamem_mb. */ virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024); } + + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS) && + video->heads > 0) { + virBufferAsprintf(&buf, ",max_outputs=%u", video->heads); + } } else if (video->vram && ((video->type == VIR_DOMAIN_VIDEO_TYPE_VGA && virQEMUCapsGet(qemuCaps, QEMU_CAPS_VGA_VGAMEM)) || -- 2.1.0

2 2

[libvirt] [PATCH] qemu: don't use initialized ret in qemuRemoveSharedDevice
by Guido Günther 09 Jul '15

09 Jul '15

This fixes CC qemu/libvirt_driver_qemu_impl_la-qemu_conf.lo qemu/qemu_conf.c: In function 'qemuRemoveSharedDevice': qemu/qemu_conf.c:1384:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized] --- This is only catched by Debian Wheezy's gcc 4.7.2, Jessies gcc 4.9.2 doesn't trap on it. src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2ab5494..38d4a86 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1381,7 +1381,7 @@ qemuRemoveSharedHostdev(virQEMUDriverPtr driver, { char *dev_path = NULL; char *key = NULL; - int ret; + int ret = -1; if (!qemuIsSharedHostdev(hostdev)) return 0; -- 2.1.4

3 3

[libvirt] [PATCH] qemu: Log all arguments of qemuProcessStart
by Jiri Denemark 09 Jul '15

09 Jul '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ba84182..ee522b9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4302,9 +4302,10 @@ int qemuProcessStart(virConnectPtr conn, size_t nnicindexes = 0; int *nicindexes = NULL; - VIR_DEBUG("vm=%p name=%s id=%d pid=%llu", - vm, vm->def->name, vm->def->id, - (unsigned long long)vm->pid); + VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s stdin_fd=%d " + "stdin_path=%s snapshot=%p vmop=%d flags=0x%x", + vm, vm->def->name, vm->def->id, asyncJob, NULLSTR(migrateFrom), + stdin_fd, NULLSTR(stdin_path), snapshot, vmop, flags); /* Okay, these are just internal flags, * but doesn't hurt to check */ -- 2.4.5

2 2

[libvirt] [PATCH] qemu: Drop LFs at the end of error from QEMU log
by Jiri Denemark 09 Jul '15

09 Jul '15

Libvirt's error messages do not end with a LF. However, when reading the error from QEMU log, we would read the LF from the log and keep it in the message. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 93fcc7f..896d9fd 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -407,6 +407,9 @@ qemuMonitorGetErrorFromLog(qemuMonitorPtr mon) if ((len = qemuProcessReadLog(mon->logfd, logbuf, 4096 - 1, 0, true)) <= 0) goto error; + while (len > 0 && logbuf[len - 1] == '\n') + logbuf[--len] = '\0'; + cleanup: errno = orig_errno; VIR_FORCE_CLOSE(mon->logfd); -- 2.4.5

2 2

[libvirt] [PATCH v4 0/5] Add support for migration event
by Jiri Denemark 09 Jul '15

09 Jul '15

The final version of migration event patches which got accepted upstream had to be slightly modified -- the event is only emitted when "events" migration capability is turned on (default is off). Thus a new patch had to be added to libvirt. I'm resending all migration event patches for context even though they haven't changed at all since they were ACKed. Jiri Denemark (5): qemu_monitor: Wire up MIGRATION event qemu: Enable migration events on QMP monitor qemuDomainGetJobStatsInternal: Support migration events qemu: Update migration state according to MIGRATION event qemu: Wait for migration events on domain condition src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 27 ++++++++++++--- src/qemu/qemu_migration.c | 59 +++++++++++++++++++++++++++----- src/qemu/qemu_monitor.c | 16 ++++++++- src/qemu/qemu_monitor.h | 9 +++++ src/qemu/qemu_monitor_json.c | 23 +++++++++++++ src/qemu/qemu_process.c | 80 +++++++++++++++++++++++++++++++++++++------- 9 files changed, 195 insertions(+), 25 deletions(-) -- 2.4.5

2 9

[libvirt] [java] [PATCH 0/6] Fix JNA wrapping, fix memory leaks and wrap security model / label function
by Claudio Bley 09 Jul '15

09 Jul '15

Hi. First and foremost, this series fixes a few mistakes in the wrapping code found by inspecting the org.libvirt.jna.Libvirt interface and the corresponding C types of the XML API file. The last two patches add two missing functions introduced in libvirt 0.6.1. At the end of the day, this means libvirt-java has gained full coverage of the libvirt functions up to and including version 0.8.5. Yay! Claudio Bley (6): JNA: fix wrong return type void vs. int JNA: add CString class and fix memory leaks JNA: simplify freeing memory for C strings Use the CString class for Arrays of CStrings too Implement Domain.getSecurityLabel and add SecurityLabel class Implement Connect.getSecurityModel and add SecurityModel class src/main/java/org/libvirt/Connect.java | 74 +++++++++-------- src/main/java/org/libvirt/Device.java | 9 +- src/main/java/org/libvirt/Domain.java | 57 ++++++------- src/main/java/org/libvirt/DomainSnapshot.java | 8 +- src/main/java/org/libvirt/Interface.java | 7 +- src/main/java/org/libvirt/Library.java | 44 +++------- src/main/java/org/libvirt/Network.java | 14 +--- src/main/java/org/libvirt/NetworkFilter.java | 2 +- src/main/java/org/libvirt/Secret.java | 2 +- src/main/java/org/libvirt/SecurityLabel.java | 49 +++++++++++ src/main/java/org/libvirt/SecurityModel.java | 37 +++++++++ src/main/java/org/libvirt/StoragePool.java | 9 +- src/main/java/org/libvirt/StorageVol.java | 16 +--- src/main/java/org/libvirt/jna/CString.java | 85 +++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 114 +++++++++++++++++--------- 15 files changed, 343 insertions(+), 184 deletions(-) create mode 100644 src/main/java/org/libvirt/SecurityLabel.java create mode 100644 src/main/java/org/libvirt/SecurityModel.java create mode 100644 src/main/java/org/libvirt/jna/CString.java -- 2.2.2

2 9

[libvirt] [PATCHv4 0/2] Fix cloning of sparse raw volumes
by Ján Tomko 09 Jul '15

09 Jul '15

v3: https://www.redhat.com/archives/libvir-list/2015-June/msg01422.html v4: * introduces a new no-op patch changing the calculation of remaining allocation * allows partial allocation of new volumes on systems without fallocate Ján Tomko (1): Rewrite allocation tracking when cloning volumes Prerna Saxena (1): Fix cloning of raw, sparse volumes src/storage/storage_backend.c | 29 ++++++++++++++++++----------- src/storage/storage_driver.c | 5 ----- 2 files changed, 18 insertions(+), 16 deletions(-) -- 2.3.6

2 3

[libvirt] [PATCH v2 0/4] fix ejecting removable media and some cleanup
by Pavel Hrdina 09 Jul '15

09 Jul '15

Pavel Hrdina (4): virCondWaitUntil: add another return value virDomainObjSignal: drop this function monitor: detect that eject fails because the tray is locked qemu_hotplug: try harder to eject media src/conf/domain_conf.c | 27 ++++++++-------- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - src/qemu/qemu_hotplug.c | 73 +++++++++++++++++++++----------------------- src/qemu/qemu_monitor_json.c | 14 +++++++++ src/qemu/qemu_monitor_text.c | 10 ++++++ src/qemu/qemu_process.c | 6 ++-- 7 files changed, 77 insertions(+), 55 deletions(-) -- 2.4.4

3 9

[libvirt] [PATCH 0/7] Simplify qemuMigrationFinish
by Jiri Denemark 09 Jul '15

09 Jul '15

While hacking qemuMigrationFinish I found it pretty hard to follow and revealed few bugs (patches 3 to 5) in the code. Jiri Denemark (7): qemu: Split qemuMigrationFinish qemu: Simplify qemuMigrationFinish qemu: Don't fail migration on save status failure qemu: Kill domain when migration finish fails qemu: Don't report false errors in migration protocol v2 qemuDomainEventQueue: Check if event is non-NULL qemu: Queue events in migration Finish phase ASAP src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_driver.c | 87 +++++++------------- src/qemu/qemu_hotplug.c | 26 +++--- src/qemu/qemu_migration.c | 199 ++++++++++++++++++++++------------------------ src/qemu/qemu_process.c | 72 ++++++----------- 7 files changed, 167 insertions(+), 232 deletions(-) -- 2.4.5

2 14

[libvirt] [PATCH] storage: Revert volume obj list updating after volume creation (4749d82a)
by Erik Skultety 09 Jul '15

09 Jul '15

This patch reverts commit 4749d82a which tried to tweak the logic in volume creation. We did realloc and update our object list before we executed volume building within a specific storage backend. If that failed, we had to update (again) our object list to the original state as it was before the build and delete the volume from the pool (even though it didn't exist - this truly depends on the backend). I misunderstood the base idea to be able to poll the status of the volume creation using vol-info. After commit 4749d82a this wasn't possible anymore, although no BZ has been reported yet. Commit 4749d82a also claimed to fix https://bugzilla.redhat.com/show_bug.cgi?id=1223177, but commit c8be606b of the same series as 4749d82ad (which was more of a refactor than a fix) fixes the same issue so the revert should be pretty straightforward. Further more, BZ https://bugzilla.redhat.com/show_bug.cgi?id=1241454 can be fixed with this revert. --- src/storage/storage_driver.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d3cdbc5..b67a5d8 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1803,6 +1803,9 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; } + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count+1) < 0) + goto cleanup; if (!backend->createVol) { virReportError(VIR_ERR_NO_SUPPORT, @@ -1817,6 +1820,14 @@ storageVolCreateXML(virStoragePoolPtr obj, if (backend->createVol(obj->conn, pool, voldef) < 0) goto cleanup; + pool->volumes.objs[pool->volumes.count++] = voldef; + volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, + voldef->key, NULL, NULL); + if (!volobj) { + pool->volumes.count--; + goto cleanup; + } + if (VIR_ALLOC(buildvoldef) < 0) { voldef = NULL; goto cleanup; @@ -1845,18 +1856,15 @@ storageVolCreateXML(virStoragePoolPtr obj, voldef->building = false; pool->asyncjobs--; - if (buildret < 0) + if (buildret < 0) { + VIR_FREE(buildvoldef); + storageVolDeleteInternal(volobj, backend, pool, voldef, + 0, false); + voldef = NULL; goto cleanup; - } - - if (VIR_REALLOC_N(pool->volumes.objs, - pool->volumes.count+1) < 0) - goto cleanup; + } - pool->volumes.objs[pool->volumes.count++] = voldef; - if (!(volobj = virGetStorageVol(obj->conn, pool->def->name, voldef->name, - voldef->key, NULL, NULL))) - goto cleanup; + } if (backend->refreshVol && backend->refreshVol(obj->conn, pool, voldef) < 0) -- 1.9.3

2 2

[libvirt] shall libvirtd validate guest's name ?
by zhang bo 09 Jul '15

09 Jul '15

linux-ZyvZnF:~ # virsh list --all Id Name State ---------------------------------------------------- - redhat7;reboot shut off - oscar-vm-5 shut off As shown above, 1 we use command "virsh define a.xml" to define a guest with a name containing ';', that's 'redhat7;reboot' 2 then we start the guest: "virsh start redhat7;reboot" 3 shell consider the command as a) run "virsh start redhat7", failed b) run "reboot", to reboot the host And *the host get rebooted*. shall libvirtd do the guest-name-validation work? Or other suggustions? -- Oscar oscar.zhangbo(a)huawei.com

3 2

[libvirt] [PATCH v4 0/3] Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 09 Jul '15

09 Jul '15

Virt machine in qemu since v2.3.0 has PCI generic host controller, and can use PCI devices. This provides performance improvement as well as vhost-net with irqfd support for virtio-net. However libvirt currently does not allow ARM virt machine to have PCI devices. This patchset adds the necessary support. Changes since v3: - Capability is based not on qemu version but on support of "gpex-pcihost" device by qemu - Added a workaround, allowing to pass "make check". The problem is that test suite does not build capabilities cache. Unfortunately this means that correct unit-test for the new functionality currently cannot be written. Test suite framework needs to be improved. Changes since v2: Complete rework, use different approach - Correctly model PCI Express bus on the machine. It is now possible to explicitly specify <address-type='pci'> with attributes. This allows to attach not only virtio, but any other PCI device to the model. - Default is not changed and still mmio, for backwards compatibility with existing installations. PCI bus has to be explicitly specified. - Check for the capability in correct place, in v2 it actually did not work Changes since v1: - Added capability based on qemu version number - Recognize also "virt-" prefix Pavel Fedin (3): Introduce QEMU_CAPS_OBJECT_GPEX Add PCI-Express root to ARM virt machine Build correct command line for PCI NICs on ARM src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_domain.c | 17 +++++++++++++---- 4 files changed, 18 insertions(+), 5 deletions(-) -- 1.9.5.msysgit.0

1 3

[libvirt] [PATCH] conf: Don't allow duplicated targets regardless of bus
by John Ferlan 09 Jul '15

09 Jul '15

https://bugzilla.redhat.com/show_bug.cgi?id=1142631 Commit id 'e0e290552' added a check to determine if the same bus had the same target value. It seems that's not quite good enough as the check should check the target name value regardless of bus type. Also added a DO_TEST_DIFFERENT to exhibit the issue Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/domain_conf.c | 3 +- .../qemuxml2argv-disk-same-targets.xml | 35 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b10f6cd..7855bcb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12590,8 +12590,7 @@ virDomainDiskDefDstDuplicates(virDomainDefPtr def) for (i = 1; i < def->ndisks; i++) { for (j = 0; j < i; j++) { - if (def->disks[i]->bus == def->disks[j]->bus && - STREQ(def->disks[i]->dst, def->disks[j]->dst)) { + if (STREQ(def->disks[i]->dst, def->disks[j]->dst)) { virReportError(VIR_ERR_XML_ERROR, _("target '%s' duplicated for disk sources " "'%s' and '%s'"), diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml new file mode 100644 index 0000000..3276ce5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-same-targets.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>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/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/usbdisk.img'/> + <target dev='sda' bus='usb'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='sda' bus='ide'/> + </disk> + <disk type='file' device='disk'> + <source file='/tmp/scsidisk.img'/> + <target dev='sda' bus='scsi'/> + </disk> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index be82dd2..b066681 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -882,6 +882,9 @@ mymain(void) QEMU_CAPS_DEVICE); DO_TEST("disk-snapshot", QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_CACHE_V2, QEMU_CAPS_DRIVE_FORMAT); + DO_TEST_FAILURE("disk-same-targets", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_SCSI_LSI, + QEMU_CAPS_DEVICE_USB_STORAGE, QEMU_CAPS_NODEFCONFIG); DO_TEST("event_idx", QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, -- 2.1.0

2 3

[libvirt] [PATCH v3 0/4] Followup for unpriv_sgio changes
by John Ferlan 09 Jul '15

09 Jul '15

v2: http://www.redhat.com/archives/libvir-list/2015-July/msg00204.html I pushed the first 3 patches already since they were ACK'd This is patches 4-8 adjusted for code review comments Patch1 (former patch4) - change the function to use qemuCheckUnprivSGIO not qemuCheckUnprivSGIO. Also used a -1 or -2 return value for handling the mismatched sgio setting error which requires the caller to have a message including the device with the issue Former patch 5 abandoned Patch2 (former patch6) - completely removed qemuGetSharedHostdevKey and replaced with inline code. Although this looks odd now, a future patch will use the device name on the add side. Patch3 (former patch7) - restored the {} in the right place Patch4 (former patch8) - remove val initialization - already ACK'd, but easier for me to just keep in the current order. Former patches 9 & 10 - keeping separate for downstream John Ferlan (4): qemu: Refactor qemuCheckSharedDisk to create qemuCheckUnprivSGIO qemu: Inline qemuGetHostdevPath qemu: Refactor qemuSetUnprivSGIO return values qemu: Fix integer/boolean logic in qemuSetUnprivSGIO src/qemu/qemu_conf.c | 151 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 89 insertions(+), 62 deletions(-) -- 2.1.0

2 8

[libvirt] [PATCH 00/10] Implement shared memory device - Part 1
by Luyao Huang 09 Jul '15

09 Jul '15

This part contains some small fix and Implement the hot-plug/hot-unplug and cold-plug/cold-unplug for Inter-VM Shared Memory PCI device. Luyao Huang (10): qemu: auto assign pci address for shared memory device qemu: always build id when generate shared memory device CLI qemu: Refactor creation of shared memory device commandline conf: use virDomainChrSourceDef to save the path conf:audit: introduce audit function for shared memory device conf: Add helpers to insert/remove/find shmem devices in domain def qemu: Implement shared memory device cold (un)plug qemu: Implement share memory device hot-plug qemu: Implement shared memory device hot-unplug qemu: report error when shmem have a invalid address docs/auditlog.html.in | 16 +++ src/conf/domain_audit.c | 16 +++ src/conf/domain_audit.h | 6 + src/conf/domain_conf.c | 69 ++++++++++- src/conf/domain_conf.h | 9 +- src/libvirt_private.syms | 5 + src/qemu/qemu_command.c | 82 +++++++------ src/qemu/qemu_command.h | 7 ++ src/qemu/qemu_driver.c | 35 +++++- src/qemu/qemu_hotplug.c | 156 ++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 + tests/qemuxml2argvdata/qemuxml2argv-shmem.args | 16 +-- 12 files changed, 372 insertions(+), 51 deletions(-) -- 1.8.3.1

3 30