- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: escape literal IPv6 address in NBD migration
by Ján Tomko 31 May '13

31 May '13

A literal IPv6 must be escaped, otherwise migration fails with: unable to execute QEMU command 'drive-mirror': address resolution failed for f0::0d:5901: Servname not supported for ai_socktype since QEMU treats everything after the first ':' as the port. --- src/qemu/qemu_migration.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ffc86a4..7aa0476 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1193,6 +1193,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, size_t i, lastGood = 0; char *diskAlias = NULL; char *nbd_dest = NULL; + char *hoststr = NULL; unsigned int mirror_flags = VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; virErrorPtr err = NULL; @@ -1212,6 +1213,16 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, port = mig->nbd->port; mig->nbd->port = 0; + /* escape literal IPv6 address */ + if (strchr(host, ':')) { + if (virAsprintf(&hoststr, "[%s]", host) < 0) { + virReportOOMError(); + goto error; + } + } else if (VIR_STRDUP(hoststr, host) < 0) { + goto error; + } + if (*migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) mirror_flags |= VIR_DOMAIN_BLOCK_REBASE_SHALLOW; @@ -1228,7 +1239,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, if ((virAsprintf(&diskAlias, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) || (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=%s", - host, port, diskAlias) < 0)) { + hoststr, port, diskAlias) < 0)) { virReportOOMError(); goto error; } @@ -1297,6 +1308,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); VIR_FREE(nbd_dest); + VIR_FREE(hoststr); return ret; error: -- 1.8.1.5

2 2

[libvirt] [PATCH] Check for existence of interface prior to setting terminate flag
by John Ferlan 31 May '13

31 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=903480 During domain destruction it's possible that the learnIPAddressThread has already removed the interface prior to the teardown filter path being run. The teardown code would only be telling the thread to terminate. --- src/nwfilter/nwfilter_learnipaddr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 2b49333..c56d119 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -251,6 +251,14 @@ virNWFilterTerminateLearnReq(const char *ifname) { int ifindex; virNWFilterIPAddrLearnReqPtr req; + /* It's possible that it's already be removed as a result of + * virNWFilterDeregisterLearnReq during learnIPAddressThread() exit + */ + if (virNetDevExists(ifname) != 1) { + virResetLastError(); + return 0; + } + if (virNetDevGetIndex(ifname, &ifindex) < 0) { virResetLastError(); return rc; -- 1.8.1.4

2 2

[libvirt] Information needed about "virsh # cpu-stats test_vm"
by Anusha Rayani 31 May '13

31 May '13

Hi, We are implementing feature called CPU separation in the platform. So, guest VMs will have dedicated cores allocated using cgroups (cgroups hierachy related VMs managed by libvirt). virsh cpu-stats command is not working in our platform : virsh # cpu-stats test_vm error: Failed to virDomainGetCPUStats() error: Requested operation is not valid: cgroup CPUACCT controller is not mounted It should show info like this. $ virsh cpu-stats test_vm CPU0: cpu_time 0.025812184 seconds vcpu_time 0.025812184 seconds CPU1: cpu_time 4.893484927 seconds vcpu_time 4.893484927 seconds Total: cpu_time 4.924620941 seconds user_time 1.060000000 seconds system_time 3.050000000 seconds We are suspecting some issue in virsh when it is trying to find to where that cgroups is mounted in a system (default in ubuntu is /sys/fs/cgroup/cpuset/libvirt/, but in our platform uses /dev/cgroup_xxx). Find /proc/cgroups and /proc/mounts log below: ================================== # cat /proc/cgroups #subsys_name hierarchy num_cgroups enabled cpuset 0 1 1 ns 0 1 1 cpu 1 3 1 cpuacct 0 1 1 memory 2 1 1 freezer 0 1 1 net_cls 0 1 1 blkio 0 1 1 # cat /proc/mounts cpu /dev/cgroup_cpu cgroup rw,relatime,cpu 0 0 memory /dev/cgroup_mem cgroup rw,relatime,memory 0 0 Can you please help us in this regard to enable this command in our platform, Thanks in advance !!! Regards, Anusha

2 4

[libvirt] [PATCH] Resolve memory leak found by valgrind
by John Ferlan 31 May '13

31 May '13

Commit '6afdfc8e' adjusted the exit and error paths to go through the error and cleanup labels, but neglected to remove the return ret prior to cleanup. Also noted the 'type' xml string fetch was never checked for NULL which could lead to some interesting results. --- src/conf/storage_conf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f0ea41d..94eb69a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -834,6 +834,12 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) } type = virXPathString("string(./@type)", ctxt); + if (type == NULL) { + virReportError(VIR_ERR_XML_ERROR, + _("storage pool missing type attribute")); + goto error; + } + if ((ret->type = virStoragePoolTypeFromString(type)) < 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown storage pool type %s"), type); @@ -956,8 +962,6 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) goto error; } - return ret; - cleanup: VIR_FREE(uuid); VIR_FREE(type); -- 1.8.1.4

2 3

[libvirt] [PATCH] qemu: snapshot: Don't kill access to disk if snapshot creation fails
by Peter Krempa 31 May '13

31 May '13

If snapshot creation failed for example due to invalid use of the "REUSE_EXTERNAL" flag, libvirt killed access to the original image file instead of the new image file. On machines with selinux this kills the whole VM as the selinux context is enforced immediately. * qemu_driver.c:qemuDomainSnapshotUndoSingleDiskActive(): - Kill access to the new image file instead of the old one. Partially resolves: https://bugzilla.redhat.com/show_bug.cgi?id=906639 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e638e7c..5ca0fd4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11309,7 +11309,7 @@ qemuDomainSnapshotUndoSingleDiskActive(virQEMUDriverPtr driver, (persistDisk && VIR_STRDUP(persistSource, source) < 0)) goto cleanup; - qemuDomainPrepareDiskChainElement(driver, vm, disk, origdisk->src, + qemuDomainPrepareDiskChainElement(driver, vm, disk, disk->src, VIR_DISK_CHAIN_NO_ACCESS); if (need_unlink && stat(disk->src, &st) == 0 && S_ISREG(st.st_mode) && unlink(disk->src) < 0) -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Fix damaged whitespace
by Peter Krempa 31 May '13

31 May '13

After deleting "WithDriver" from the async job function the code was unaligned. --- Notes: Pushed as trivial. src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d0dee14..e638e7c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11460,8 +11460,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ bool pmsuspended = false; - if (qemuDomainObjBeginAsyncJob(driver, vm, - QEMU_ASYNC_JOB_SNAPSHOT) < 0) + if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* If quiesce was requested, then issue a freeze command, and a -- 1.8.2.1

1 0

[libvirt] [PATCH] Properly indent function's opening bracket
by Martin Kletzander 31 May '13

31 May '13

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as 'trivial' src/storage/storage_backend_fs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 1379f17..1a85afc 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1089,7 +1089,8 @@ static int virStorageBackendFileSystemVolBuild(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol, - unsigned int flags) { + unsigned int flags) +{ virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1); return _virStorageBackendFileSystemVolBuild(conn, pool, vol, NULL, flags); -- 1.8.2.1

1 0

[libvirt] [PATCH v2] conf: Generate address for scsi host device automatically
by Osier Yang 31 May '13

31 May '13

With unknown good reasons, the attribute "bus" of scsi device address is always set to 0, same for attribute "target". (See virDomainDiskDefAssignAddress). Though we might need to change the algorithm to honor "bus" and "target" too, that's a different issue. The address generator for scsi host device in this patch just follows the unknown good reasons, only considering the "controller" and "unit". It walks through all scsi controllers and their units, to see if the address $controller:0:0:$unit can be used, if found one, it sits on it, otherwise, it creates a new controller (actually the controller is implicitly created by someone else), and sits on $new_controller:0:0:0 instead. --- v1 - v2: * A new helper virDomainSCSIDriveAddressIsUsed * Move virDomainDefMaybeAddHostdevSCSIcontroller * More comments * Add testing. * problems fixed with the testing: 1) s/nscsi_controllers + 1/nscsi_controllers/, 2) Add the controller implicitly after a scsi hostdev def parsing, as it can use a new scsi controller index (nscsi_controllers), which should be added implicitly. --- src/conf/domain_conf.c | 209 ++++++++++++++++++--- .../qemuxml2argv-hostdev-scsi-autogen-address.xml | 95 ++++++++++ ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 106 +++++++++++ tests/qemuxml2xmltest.c | 2 + 4 files changed, 382 insertions(+), 30 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ad5550c..86d743b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3782,6 +3782,148 @@ cleanup: return ret; } +/* Check if a drive type address $controller:0:0:$unit is already + * taken by a disk or not. + */ +static bool +virDomainDriveAddressIsUsedByDisk(virDomainDefPtr def, + enum virDomainDiskBus type, + unsigned int controller, + unsigned int unit) +{ + virDomainDiskDefPtr disk; + int i; + + for (i = 0; i < def->ndisks; i++) { + disk = def->disks[i]; + + if (disk->bus != type || + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) + continue; + + if (disk->info.addr.drive.controller == controller && + disk->info.addr.drive.unit == unit && + disk->info.addr.drive.bus == 0 && + disk->info.addr.drive.target == 0) + return true; + } + + return false; +} + +/* Check if a drive type address $controller:0:0:$unit is already + * taken by a host device or not. + */ +static bool +virDomainDriveAddressIsUsedByHostdev(virDomainDefPtr def, + enum virDomainHostdevSubsysType type, + unsigned int controller, + unsigned int unit) +{ + virDomainHostdevDefPtr hostdev; + int i; + + for (i = 0; i < def->nhostdevs; i++) { + hostdev = def->hostdevs[i]; + + if (hostdev->source.subsys.type != type) + continue; + + if (hostdev->info->addr.drive.controller == controller && + hostdev->info->addr.drive.unit == unit && + hostdev->info->addr.drive.bus == 0 && + hostdev->info->addr.drive.target == 0) + return true; + } + + return false; +} + +static bool +virDomainSCSIDriveAddressIsUsed(virDomainDefPtr def, + unsigned int controller, + unsigned int unit) +{ + /* In current implementation, the maximum unit number of a controller + * is either 16 or 7 (narrow SCSI bus), and if the maximum unit number + * is 16, the controller itself is on unit 7 */ + if (unit == 7) + return true; + + if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI, + controller, unit) || + virDomainDriveAddressIsUsedByHostdev(def, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI, + controller, unit)) + return true; + + return false; +} + +/* Find out the next usable "unit" of a specific controller */ +static int +virDomainControllerSCSINextUnit(virDomainDefPtr def, + unsigned int max_unit, + unsigned int controller) +{ + int i; + + for (i = 0; i < max_unit; i++) { + if (!virDomainSCSIDriveAddressIsUsed(def, controller, i)) + return i; + } + + return -1; +} + +#define SCSI_WIDE_BUS_MAX_CONT_UNIT 16 +#define SCSI_NARROW_BUS_MAX_CONT_UNIT 7 + +static int +virDomainHostdevAssignAddress(virDomainXMLOptionPtr xmlopt, + virDomainDefPtr def, + virDomainHostdevDefPtr hostdev) +{ + int next_unit; + unsigned nscsi_controllers = 0; + bool found = false; + int i; + + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) + return -1; + + for (i = 0; i < def->ncontrollers; i++) { + if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + continue; + + nscsi_controllers++; + next_unit = virDomainControllerSCSINextUnit(def, + xmlopt->config.hasWideScsiBus ? + SCSI_WIDE_BUS_MAX_CONT_UNIT : + SCSI_NARROW_BUS_MAX_CONT_UNIT, + def->controllers[i]->idx); + if (next_unit >= 0) { + found = true; + break; + } + } + + hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE; + + if (found) { + hostdev->info->addr.drive.controller = def->controllers[i]->idx; + hostdev->info->addr.drive.bus = 0; + hostdev->info->addr.drive.target = 0; + hostdev->info->addr.drive.unit = next_unit; + } else { + hostdev->info->addr.drive.controller = nscsi_controllers; + hostdev->info->addr.drive.bus = 0; + hostdev->info->addr.drive.target = 0; + hostdev->info->addr.drive.unit = 0; + } + + return 0; +} + static int virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -8802,7 +8944,9 @@ error: } static virDomainHostdevDefPtr -virDomainHostdevDefParseXML(const xmlNodePtr node, +virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, + virDomainDefPtr vmdef, + const xmlNodePtr node, xmlXPathContextPtr ctxt, virHashTablePtr bootHash, unsigned int flags) @@ -8862,7 +9006,9 @@ virDomainHostdevDefParseXML(const xmlNodePtr node, } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: - if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + if (def->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + virDomainHostdevAssignAddress(xmlopt, vmdef, def) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("SCSI host devices must have address specified")); goto error; @@ -9271,8 +9417,8 @@ virDomainDeviceDefParse(const char *xmlStr, goto error; } else if (xmlStrEqual(node->name, BAD_CAST "hostdev")) { dev->type = VIR_DOMAIN_DEVICE_HOSTDEV; - if (!(dev->data.hostdev = virDomainHostdevDefParseXML(node, ctxt, NULL, - flags))) + if (!(dev->data.hostdev = virDomainHostdevDefParseXML(xmlopt, def, node, + ctxt, NULL, flags))) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "controller")) { dev->type = VIR_DOMAIN_DEVICE_CONTROLLER; @@ -10255,6 +10401,30 @@ error: return NULL; } +static int +virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) +{ + /* Look for any hostdev scsi dev */ + int i; + int maxController = -1; + virDomainHostdevDefPtr hostdev; + + for (i = 0; i < def->nhostdevs; i++) { + hostdev = def->hostdevs[i]; + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && + (int)hostdev->info->addr.drive.controller > maxController) { + maxController = hostdev->info->addr.drive.controller; + } + } + + for (i = 0; i <= maxController; i++) { + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, -1) < 0) + return -1; + } + + return 0; +} static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, @@ -11618,7 +11788,8 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { virDomainHostdevDefPtr hostdev; - hostdev = virDomainHostdevDefParseXML(nodes[i], ctxt, bootHash, flags); + hostdev = virDomainHostdevDefParseXML(xmlopt, def, nodes[i], + ctxt, bootHash, flags); if (!hostdev) goto error; @@ -11631,6 +11802,9 @@ virDomainDefParseXML(xmlDocPtr xml, } def->hostdevs[def->nhostdevs++] = hostdev; + + if (virDomainDefMaybeAddHostdevSCSIcontroller(def) < 0) + goto error; } VIR_FREE(nodes); @@ -13232,31 +13406,6 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def) return 0; } -static int -virDomainDefMaybeAddHostdevSCSIcontroller(virDomainDefPtr def) -{ - /* Look for any hostdev scsi dev */ - int i; - int maxController = -1; - virDomainHostdevDefPtr hostdev; - - for (i = 0; i < def->nhostdevs; i++) { - hostdev = def->hostdevs[i]; - if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI && - (int)hostdev->info->addr.drive.controller > maxController) { - maxController = hostdev->info->addr.drive.controller; - } - } - - for (i = 0; i <= maxController; i++) { - if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SCSI, i, -1) < 0) - return -1; - } - - return 0; -} - /* * Based on the declared <address/> info for any devices, * add necessary drive controllers which are not already present diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml new file mode 100644 index 0000000..21f112b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-autogen-address.xml @@ -0,0 +1,95 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host1'/> + <address bus='0' target='0' unit='1'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host2'/> + <address bus='0' target='0' unit='2'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host3'/> + <address bus='0' target='0' unit='3'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host4'/> + <address bus='0' target='0' unit='4'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host5'/> + <address bus='0' target='0' unit='5'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host6'/> + <address bus='0' target='0' unit='6'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host7'/> + <address bus='0' target='0' unit='7'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host8'/> + <address bus='0' target='0' unit='8'/> + </source> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host9'/> + <address bus='0' target='0' unit='9'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host10'/> + <address bus='0' target='0' unit='10'/> + </source> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml new file mode 100644 index 0000000..e416654 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-autogen-address.xml @@ -0,0 +1,106 @@ +<domain type='qemu'> + <name>QEMUGuest2</name> + <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</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/QEMUGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='scsi' index='1'/> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host0'/> + <address bus='0' target='0' unit='0'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host1'/> + <address bus='0' target='0' unit='1'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host2'/> + <address bus='0' target='0' unit='2'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host3'/> + <address bus='0' target='0' unit='3'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='3'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host4'/> + <address bus='0' target='0' unit='4'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='4'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host5'/> + <address bus='0' target='0' unit='5'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host6'/> + <address bus='0' target='0' unit='6'/> + </source> + <address type='drive' controller='0' bus='0' target='0' unit='6'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host7'/> + <address bus='0' target='0' unit='7'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='0'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host8'/> + <address bus='0' target='0' unit='8'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='1'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host9'/> + <address bus='0' target='0' unit='9'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='5'/> + </hostdev> + <hostdev mode='subsystem' type='scsi' managed='yes'> + <source> + <adapter name='scsi_host10'/> + <address bus='0' target='0' unit='10'/> + </source> + <address type='drive' controller='1' bus='0' target='0' unit='2'/> + </hostdev> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 64a271c..06e4206 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -298,6 +298,8 @@ mymain(void) DO_TEST("hostdev-scsi-shareable"); DO_TEST("hostdev-scsi-sgio"); + DO_TEST_DIFFERENT("hostdev-scsi-autogen-address"); + virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.4

2 3

[libvirt] DTD or Schema for VM definition file
by Jorge Fábregas 30 May '13

30 May '13

Hi there, Is there any DTD or Schema for the VM's XML file? I found an interesting doc called "Domain XML Format", on the libvirt website, which explains all the elements but didn't find any reference to a Schema or DTD. Thanks, Jorge

3 3

[libvirt] [PATCH] build: use correct rpc.h for lockd
by Eric Blake 30 May '13

30 May '13

On cygwin, the build failed with: In file included from ./rpc/virnetmessage.h:24:0, from ./rpc/virnetclient.h:29, from locking/lock_driver_lockd.c:31: ./rpc/virnetprotocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory * src/Makefile.am (lockd_la_CFLAGS): Add XDR_CFLAGS. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under build-breaker rule. src/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 430a356..7c404b3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1727,7 +1727,9 @@ lockd_la_SOURCES = \ $(LOCK_DRIVER_LOCKD_SOURCES) \ $(LOCK_PROTOCOL_GENERATED) \ $(NULL) -lockd_la_CFLAGS = -I$(top_srcdir)/src/conf $(AM_CFLAGS) +lockd_la_CFLAGS = -I$(top_srcdir)/src/conf \ + $(XDR_CFLAGS) \ + $(AM_CFLAGS) lockd_la_LDFLAGS = -module -avoid-version lockd_la_LIBADD = ../gnulib/lib/libgnu.la libvirt-net-rpc.la libvirt-net-rpc-client.la augeas_DATA += locking/libvirt_lockd.aug -- 1.8.1.4

1 1

[libvirt] [PATCH] build: work around cygwin header bug
by Eric Blake 30 May '13

30 May '13

A bug in Cygwin [1] and poor error messages from gcc [2] lead to this confusing compilation error: qemu/qemu_monitor.c:418:9: error: passing argument 2 of 'sendmsg' from incmpatible pointer type /usr/include/sys/socket.h:42:11: note: expected 'const struct msghdr *' but argument is of type 'struct msghdr *' [1] http://cygwin.com/ml/cygwin/2013-05/msg00451.html [2] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57475 * src/qemu/qemu_monitor.c (includes): Include <sys/socket.h> before <sys/un.h>. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/qemu/qemu_monitor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 4e35f79..ad326c5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -24,6 +24,7 @@ #include <config.h> #include <poll.h> +#include <sys/socket.h> #include <sys/un.h> #include <unistd.h> #include <fcntl.h> -- 1.8.1.4

1 0

[libvirt] Entering freeze for libvirt-1.0.6
by Daniel Veillard 30 May '13

30 May '13

As planned, I just tagged the rc1 release in git and pushed tarball and rpms to the FTP repository: ftp://libvirt.org/ So focuse should be given to bug fixes this week, and if everything goes well I will make the release on Monday 3, a week from now. I gave a bit of testing to the rc1 rpms, seems to work okay for KVM on Fedora but further testing would be a good idea, on other distro/platforms and also other hypervisor, especially with VirtualBox as the driver was mdified to now rely on the daemon for support of that hypervisor. thanks in advance, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 6

[libvirt] VFIO device groups and libvirt
by Laine Stump 30 May '13

30 May '13

VFIO device assignment has a concept of device "groups"; each group is a set of devices that must all be assigned to the same guest (alternately, unassigned devices can be attached to the vfio stub driver). This is to prevent cross-guest (or guest-host) contamination of devices that share DMA mapping or some such thing and thus can't be completely isolated from each other. The vfio support currently in libvirt works with no problems if no other devices are in the same "group" as a device being assigned to a guest. If there are other devices in the group, it fails with a message noting that the other devices in the group must also be attached to the vfio stub driver (so that the host can't use them). I am now adding code to libvirt that, when receiving a request to attach a device in a group to the vfio stub, will notice the other devices in the group and attach them to the stub as well; it will then allow attaching all of these devices to the guest, but not to any other guest. This will be nice for those who *want* this behavior, but I think that very often a person trying to assign a device that's in a group doesn't even realize that it's in a group, and if they knew it was in a group, they *wouldn't* want to lose all those devices just to assign one (once a single device in a group is assigned to the guest, none of the other devices in the group are usable by the host). An example of this was encountered by Cole the other day. He had a non-SRIOV network card plugged into his system that he wanted to assign with VFIO, but it turned out that due to the hardware layout of his motherboard, this plugin network card was placed in a group with 2 devices that were part of the motherboard chipset. When this occurs, a user might want to take one of three different courses: 1) attach all those onboard devices to the vfio stub driver too (making them inaccessible to the host, but allowing the assignment of the target device via VFIO) 2) use legacy KVM device assignment instead (which is less secure, but will allow assigning one of the devices while the rest remain available to the host) 3) try plugging the card they want to assign into a different slot (which may remove the device from this group and place it in another, possibly empty, group) It's difficult to say which the user will want, so I don't want the new "attach all devices in the group to the stub" code to be automatic. Instead, I think it should only take effect if some option is specified in the device's <driver> element. For example: <hostdev managed='yes'> <driver name='vfio' group='allow'/> ... </hostdev> Without that xml option, the same error message logged now will continue to be logged. With that xml option, all the devices in the group will be attached to the vfio stub driver. Likewise, in virNodeDeviceDetachFlags(), a VIR_NODE_DEVICE_DETACH_GROUP flag will have the following effect: Single device in group - no effect Multiple devices, no flag - detach will fail Multiple devices, flag set - all devices in the same group as specified device will be detached by one call. Does this sound reasonable?

2 3

[libvirt] [PATCH 00/12] A bunch of extensions to libxl driver
by Marek Marczykowski 30 May '13

30 May '13

This are some additional features to libxl driver. Some of them require change in domain config structures/syntax. Details described with each patch. The last two patches are bugfix for deadlock during daemon startup. Marek Marczykowski (12): libxl: allow script for any network interface, not only bridge libxl: PCI passthrough support libxl: nodeDevice* support for PCI devices libxl: populate xenstore memory entries at startup conf: add 'script' attribute to disk specification libxl: use disk 'script' attribute conf: support backend domain name in disk and network devices libxl: support backend domain setting for disk and net devices libxl: fill HVM SDL and VNC settings based on <graphics/> entries RFC: libxl: special 'stubdom-dm' emulator to use qemu in stub domain conf: virDomainObjListRemoveLocked function libxl: fix deadlock in libxlReconnectDomain docs/schemas/domaincommon.rng | 14 ++ src/conf/domain_conf.c | 54 ++++++++ src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 297 +++++++++++++++++++++++++++++++++--------- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_driver.c | 253 +++++++++++++++++++++++++++++++---- 7 files changed, 545 insertions(+), 85 deletions(-) -- 1.8.1.4

7 44

[libvirt] [PATCH] build: port qemu to cygwin
by Eric Blake 30 May '13

30 May '13

A cygwin build of the qemu driver fails with: qemu/qemu_process.c: In function 'qemuPrepareCpumap': qemu/qemu_process.c:1803:31: error: 'CPU_SETSIZE' undeclared (first use in this function) CPU_SETSIZE is a Linux extension in <sched.h>; a bit more portable is using sysconf if _SC_NPROCESSORS_CONF is defined (several platforms have it, including Cygwin). Ultimately, I would have preferred to use gnulib's 'nproc' module, but it is currently under an incompatible license. * src/qemu/qemu_conf.h (QEMUD_CPUMASK_LEN): Provide definition on cygwin. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'll wait for a review on this one, particularly since I'm still trying to solve another qemu failure on cygwin: qemu/qemu_monitor.c:418:9: error: passing argument 2 of 'sendmsg' from incmpatible pointer type /usr/include/sys/socket.h:42:11: note: expected 'const struct msghdr *' but argument is of type 'struct msghdr *' src/qemu/qemu_conf.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index df0791e..42566b4 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -45,7 +45,13 @@ # include "locking/lock_manager.h" # include "qemu_capabilities.h" -# define QEMUD_CPUMASK_LEN CPU_SETSIZE +# ifdef CPU_SETSIZE /* Linux */ +# define QEMUD_CPUMASK_LEN CPU_SETSIZE +# elif defined(_SC_NPROCESSORS_CONF) /* Cygwin */ +# define QEMUD_CPUMASK_LEN (sysconf(_SC_NPROCESSORS_CONF)) +# else +# error "Port me" +# endif typedef struct _virQEMUCloseCallbacks virQEMUCloseCallbacks; typedef virQEMUCloseCallbacks *virQEMUCloseCallbacksPtr; -- 1.8.1.4

2 3

[libvirt] [PATCH] build: cast [ug]id_t when printing
by Eric Blake 30 May '13

30 May '13

This is a recurring problem for cygwin :) For example, see commit 23a4df88. qemu/qemu_driver.c: In function 'qemuStateInitialize': qemu/qemu_driver.c:691:13: error: format '%d' expects type 'int', but argument 8 has type 'uid_t' [-Wformat] * src/qemu/qemu_driver.c (qemuStateInitialize): Add casts. * daemon/remote.c (remoteDispatchAuthList): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. daemon/remote.c | 4 ++-- src/qemu/qemu_driver.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 0e253bf..47267c2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1,7 +1,7 @@ /* * remote.c: handlers for RPC method calls * - * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2007-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2354,7 +2354,7 @@ remoteDispatchAuthList(virNetServerPtr server ATTRIBUTE_UNUSED, } else if (callerUid == 0) { char *ident; if (virAsprintf(&ident, "pid:%lld,uid:%d", - (long long) callerPid, callerUid) < 0) { + (long long) callerPid, (int) callerUid) < 0) { virReportOOMError(); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4a76f14..d0dee14 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -690,25 +690,29 @@ qemuStateInitialize(bool privileged, if (chown(cfg->libDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to user %d:%d"), - cfg->libDir, cfg->user, cfg->group); + cfg->libDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->cacheDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->cacheDir, cfg->user, cfg->group); + cfg->cacheDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->saveDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->saveDir, cfg->user, cfg->group); + cfg->saveDir, (int) cfg->user, + (int) cfg->group); goto error; } if (chown(cfg->snapshotDir, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership of '%s' to %d:%d"), - cfg->snapshotDir, cfg->user, cfg->group); + cfg->snapshotDir, (int) cfg->user, + (int) cfg->group); goto error; } run_uid = cfg->user; @@ -752,8 +756,8 @@ qemuStateInitialize(bool privileged, if (chown(mempath, cfg->user, cfg->group) < 0) { virReportSystemError(errno, _("unable to set ownership on %s to %d:%d"), - mempath, cfg->user, - cfg->group); + mempath, (int) cfg->user, + (int) cfg->group); goto error; } } -- 1.8.1.4

1 0

[libvirt] [PATCH] build: port vbox to cygwin
by Eric Blake 30 May '13

30 May '13

I have no idea if a Cygwin app can be made to directly interact with VBoxXPCOMC.dll, but this at least lets compilation of vbox finish rather than requiring me to ./configure --without-vbox. * src/vbox/vbox_XPCOMCGlue.c (DYNLIB_NAME): Assume .dll under cygwin. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Although I'm tempted to push this under the build-breaker rule, and although I suspect no one else is trying to build libvirt on cygwin, I'll wait for a review on this one. An alternative, more conservative, patch might be to hack configure.ac to declare vbox and cygwin as incompatible. src/vbox/vbox_XPCOMCGlue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 9719014..9cc41b0 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -3,6 +3,7 @@ */ /* + * Copyright (C) 2013 Red Hat, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc. * * This file is part of a free software library; you can redistribute @@ -54,7 +55,7 @@ # define DYNLIB_NAME "VBoxXPCOMC.so" #elif defined(__APPLE__) # define DYNLIB_NAME "VBoxXPCOMC.dylib" -#elif defined(_MSC_VER) || defined(__OS2__) +#elif defined(_MSC_VER) || defined(__OS2__) || defined(__CYGWIN__) # define DYNLIB_NAME "VBoxXPCOMC.dll" #else # error "Port me" -- 1.8.1.4

2 2

[libvirt] [PATCH 1/3] qemu: migration: Improve p2p error if we can't open conn
by Cole Robinson 30 May '13

30 May '13

By actually showing the Open() error to the user --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 19b1236..9ac9be4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3472,7 +3472,8 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, qemuDomainObjExitRemote(vm); if (dconn == NULL) { virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to connect to remote libvirt URI %s"), dconnuri); + _("Failed to connect to remote libvirt URI %s: %s"), + dconnuri, virGetLastErrorMessage()); virObjectUnref(cfg); return -1; } -- 1.8.2.1

3 9

[libvirt] [PATCH] build: work around broken sasl header
by Eric Blake 29 May '13

29 May '13

Compilation on cygwin failed due to a bug in the sasl headers present on that platform (libsasl2-devel 2.1.26): In file included from rpc/virnetserverclient.c:27:0: /usr/include/sasl/sasl.h:230:38: error: expected declaration specifiers or '...' before 'size_t' * src/rpc/virnetserverclient.c (includes): Ensure size_t is defined before using sasl.h. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/rpc/virnetserverclient.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 0bd88ad..2fc4838 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1,7 +1,7 @@ /* * virnetserverclient.c: generic network RPC server client * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -23,6 +23,7 @@ #include <config.h> +#include "internal.h" #if WITH_SASL # include <sasl/sasl.h> #endif -- 1.8.1.4

1 0

[libvirt] [PATCH] build: fix build without libvirtd
by Eric Blake 29 May '13

29 May '13

Building when configured --with-libvirtd=no fails with: In file included from ../src/qemu/qemu_command.h:30:0, from testutilsqemu.h:4, from networkxml2xmltest.c:14: ../src/qemu/qemu_conf.h:175:5: error: expected specifier-qualifier-list before 'virStateInhibitCallback' * src/libvirt_internal.h (virStateInhibitCallback): Move outside of conditional. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under build-breaker rule src/libvirt_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 5c83ffa..29f2043 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -1,7 +1,7 @@ /* - * libvirt.h: publically exported APIs, not for public use + * libvirt_internal.h: internally exported APIs, not for public use * - * Copyright (C) 2006-2008, 2011 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,10 +27,10 @@ # include "internal.h" -# ifdef WITH_LIBVIRTD typedef void (*virStateInhibitCallback)(bool inhibit, void *opaque); +# ifdef WITH_LIBVIRTD int virStateInitialize(bool privileged, virStateInhibitCallback inhibit, void *opaque); -- 1.8.1.4

1 0

[libvirt] [PATCH] build: fix build with newer gnutls
by Eric Blake 29 May '13

29 May '13

Building with gnutls 3.2.0 (such as shipped with current cygwin) fails with: rpc/virnettlscontext.c: In function 'virNetTLSSessionGetKeySize': rpc/virnettlscontext.c:1358:5: error: implicit declaration of function 'gnutls_cipher_get_key_size' [-Wimplicit-function-declaration] Yeah, it's stupid that gnutls broke API by moving their declaration into a new header without including that header from the old one, but it's easy enough to work around, all without breaking on gnutls 1.4.1 (hello RHEL 5) that lacked the new header. * src/rpc/virnettlscontext.c (includes): Include additional header. * configure.ac (gnutls): Check for <gnutls/crypto.h>. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, once my testing completes across multiple systems with various gnutls versions (1.4.1 in RHEL5, 2.12.23 in Fedora 18, 3.2.0 in Cygwin). configure.ac | 1 + src/rpc/virnettlscontext.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 7041710..0b3d028 100644 --- a/configure.ac +++ b/configure.ac @@ -1087,6 +1087,7 @@ if test "x$with_gnutls" != "xno"; then if test "$GNUTLS_FOUND" = "no"; then fail=0 AC_CHECK_HEADER([gnutls/gnutls.h], [], [fail=1]) + AC_CHECK_HEADERS([gnutls/crypto.h]) AC_CHECK_LIB([gnutls], [gnutls_handshake],[], [fail=1], [-lgcrypt]) test $fail = 0 && GNUTLS_FOUND=yes diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index e29c439..f2ac551 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -25,6 +25,9 @@ #include <stdlib.h> #include <gnutls/gnutls.h> +#if HAVE_GNULTLS_CRYPTO_H +# include <gnutls/crypto.h> +#endif #include <gnutls/x509.h> #include "gnutls_1_0_compat.h" -- 1.8.1.4

1 2

Re: [libvirt] [PATCH] target-i386: Disable CPUID_EXT_MONITOR when KVM is enabled
by Eduardo Habkost 29 May '13

29 May '13

(CCing libvirt people) On Tue, May 28, 2013 at 06:48:52PM +0200, Andreas Färber wrote: > Am 28.05.2013 18:46, schrieb Paolo Bonzini: > > Il 28/05/2013 18:34, Bandan Das ha scritto: > >> Eduardo Habkost <ehabkost(a)redhat.com> writes: > >> > >>> On Mon, May 27, 2013 at 02:21:36PM +0200, Paolo Bonzini wrote: > >>>> Il 27/05/2013 14:09, Eduardo Habkost ha scritto: > >>>>> On Sat, May 25, 2013 at 08:25:49AM +0200, Paolo Bonzini wrote: > >>>>>> Il 25/05/2013 03:21, Bandan Das ha scritto: > >>>>>>> There is one user-visible effect: "-cpu ...,enforce" will stop failing > >>>>>>> because of missing KVM support for CPUID_EXT_MONITOR. But that's exactly > >>>>>>> the point: there's no point in having CPU model definitions that would > >>>>>>> never work as-is with neither TCG or KVM. This patch is changing the > >>>>>>> meaning of (e.g.) "-machine ...,accel=kvm -cpu Opteron_G3" to match what > >>>>>>> was already happening in practice. > >>>>>> > >>>>>> But then -cpu Opteron_G3 does not match a "real" Opteron G3. Is it > >>>>>> worth it? > >>>>> > >>>>> No models match a "real" CPU this way, because neither TCG or KVM > >>>>> support all features supported by a real CPU. I ask the opposite > >>>>> question: is it worth maintaining an "accurate" CPU model definition > >>>>> that would never work without feature-bit tweaking in the command-line? > >>>> > >>>> It would work with TCG. Changing TCG to KVM should not change hardware > >>>> if you use "-cpu ...,enforce", so it is right that it fails when > >>>> starting with KVM. > >>>> > >>> > >>> Changing between KVM and TCG _does_ change hardware, today (with or > >>> without check/enforce). All CPU models on TCG have features not > >>> supported by TCG automatically removed. See the "if (!kvm_enabled())" > >>> block at x86_cpu_realizefn(). > >> > >> Yes, this is exactly why I was inclined to remove the monitor flag. > >> We already have uses of kvm_enabled() to set (or remove) kvm specific stuff, > >> and this change is no different. > > > > Do any of these affect something that is part of x86_def_t? > > The vendor comes to mind. I believe we can still consider the "vendor" field a special one: if other components care about the TCG/KVM difference regarding the "vendor" field, they can simply set "vendor" explicitly on the command-line. > >> I can see Paolo's point though, having > >> a common definition probably makes sense too. > > Paolo is convincing me that keeping the rest of the features exactly the same on TCG and KVM modes (and making check/enforce work for TCG as well) would simplify the logic a lot. This will add a little extra work for libvirt, that will probably need to use "-cpu Opteron_G3,-monitor" once it implements enforce-mode (to make sure the results really match existing libvirt assumptions about the Opteron_G* models), but it is probably worth it. I will give it a try and send a proposal soon. > >>> (That's why I argue that we need separate classes/names for TCG and KVM > >>> modes. Otherwise our predefined models get less useful as they will > >>> require low-level feature-bit fiddling on the libvirt side to make them > >>> work as expected.) > >> > >> Agreed. From a user's perspective, I think the more a CPU model "just works", > >> whether it's KVM or TCG, the better. > > > > Yes, that's right. But I think extending the same expectation to "-cpu > > ...,enforce" is not necessary, and perhaps even wrong for "-cpu > > ...,check" since it's only a warning rather than a fatal error. > > > > Paolo > > > > > -- > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg -- Eduardo

1 0

[libvirt] [PATCH] qemu: match vcpu topology to maximum vcpu numbers.
by Guannan Ren 29 May '13

29 May '13

For qemu, if the -smp N or the value of maxcpus is given, it define the number of vcpu of guest whenever the vcpu topology is defined or not. But if the -smp N and maxcpus are missing, the topology can compute and define vcpus for guest automatically by math: vcpu number = sockets*cores*threads For libvirt, as <vcpu> is always mandatory, so we can ask topology to match maximum vcpu numbers. --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a9656af..ffdc6da 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11815,10 +11815,10 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; if (def->cpu->sockets && - def->maxvcpus > + def->maxvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) { virReportError(VIR_ERR_XML_DETAIL, "%s", - _("Maximum CPUs greater than topology limit")); + _("Topology limit does not match maximum CPUs")); goto error; } -- 1.8.1.4

2 7

[libvirt] [PATCH 00/12 v2] storage_conf: left cleanup/fixes/improvement patches
by Osier Yang 29 May '13

29 May '13

Part of v1 are pushed, the left patches are splitted Osier Yang (12): storage_conf: Fix the wrong error message storage_conf: Don't leak "uuid" in virStoragePoolDefParseAuthCephx storage_conf: Remove the useless casting storage_conf: Use xmlStrEqual instead of STREQ storage_conf: Put "%s" at the same line with error type storage_conf: Fix the error type storage_conf: Improve the memory deallocation of pool def parsing storage_conf: Improve the memory deallocation of virStorageVolDefParseXML storage_conf: Use NULLSTR instead storage_conf: Use VIR_STRDUP instead of strdup storage_conf: Improve error messages storage_conf: Use uid_t/gid_t instead of int to cast the value src/conf/storage_conf.c | 242 ++++++++++++++++++++++++------------------------ 1 file changed, 122 insertions(+), 120 deletions(-) -- 1.8.1.4

3 28

[libvirt] Put the audio work on Windows 2008 Server 64bits
by Carlos Rodrigues 29 May '13

29 May '13

Hello, I am trying to put the audio audio work on Windows 2008 Server with 64bits but without success. I have tested with sound model ac97 and hda, and i always get the same error: the devices appears on Windows Device Manager with following message - "Windows cannot load the device driver for this hardware. The driver may be corrupted or missing. (Code 39)". I have qemu-kvm 1.2 and libvirt 0.10.2. I also tried different drivers with different sound model combinations but no success. Any suggestion of drivers that can i use and how can i get audio device working? Best Regards, -- Carlos Rodrigues <cmar(a)eurotux.com> Engenheiro de Software Sénior Eurotux Informática, S.A. | www.eurotux.com (t) +351 253 680 300

2 2