- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix JSON migrate_set_downtime command
by Jiri Denemark 20 Aug '10

20 Aug '10

--- src/qemu/qemu_monitor_json.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index e8609aa..8a586bc 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1481,17 +1481,12 @@ int qemuMonitorJSONSetMigrationDowntime(qemuMonitorPtr mon, unsigned long long downtime) { int ret; - char *downtimestr; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; - if (virAsprintf(&downtimestr, "%llums", downtime) < 0) { - virReportOOMError(); - return -1; - } + cmd = qemuMonitorJSONMakeCommand("migrate_set_downtime", - "s:value", downtimestr, + "d:value", downtime / 1000.0, NULL); - VIR_FREE(downtimestr); if (!cmd) return -1; -- 1.7.2

3 5

[libvirt] how to Create virtual machine
by Saravanan S 20 Aug '10

20 Aug '10

Hi, I am working on a virtualization project that involves setting up virtual appliances to implement the same, which tool is required to 1) create virtual appliances 2) deploy virtual appliances 3) manage virtual appliances/virtual machines Could you please guide me with some pointers or resources to get started with the creation of virtual machines? I am little confused with libvirt with Xen and qemu. how does xen or qemu related with libvirt ? Thank you. Saravanan Sundaramoorthy Red Hat Certified Engineer http://www.google.com/profiles/dearsaravanan#about +91 99404 32545

1 0

[libvirt] [PATCH 0/2] qemu: Update next usable PCI slot on domain reconnect
by Jiri Denemark 20 Aug '10

20 Aug '10

When libvirtd restarted and reconnected to existing domains, we didn't update nextslot so that hotplug starts with a slot next to the last used one. Jiri Denemark (2): qemu: Use structured PCI address as hash payload qemu: Update next usable PCI slot on domain reconnect src/qemu/qemu_conf.c | 118 +++++++++++++++++++++++++++++++++++++----------- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 2 + 3 files changed, 94 insertions(+), 27 deletions(-) -- 1.7.2

3 14

[libvirt] [PATCH 00/10] start tackling *printf issues
by Eric Blake 20 Aug '10

20 Aug '10

Based on the long thread about whether %zu and %llu are safe to use, here's a series of patches to start tackling the problems. I've got more work to do, but had enough ready that it was worth posting this much for review, and can push in pieces as individual patches are ACK'd. Eric Blake (10): uml: fix logic bug in checking reply length nwfilter: use consistent OOM reporting build: delete dead comment maint: whitespace cleanups storage: avoid s[n]printf squash to dead comment xenapi: avoid sprintf vbox: add location used in rpmfusion release vbox: factor a large function vbox: avoid sprintf configure.ac | 1 + src/nwfilter/nwfilter_driver.c | 6 +- src/qemu/qemu_driver.c | 1 - src/storage/storage_backend.c | 16 ++- src/storage/storage_backend_disk.c | 124 +++++++++----- src/uml/uml_driver.c | 8 +- src/vbox/vbox_tmpl.c | 327 +++++++++++++++++++----------------- src/xen/sexpr.c | 8 - src/xenapi/xenapi_utils.c | 15 +- src/xenapi/xenapi_utils.h | 4 - 10 files changed, 277 insertions(+), 233 deletions(-) -- 1.7.2.1

3 30

[libvirt] [PATCH] Add support for Vendor and Model in Storage Pool XML
by Patrick Dignan 20 Aug '10

20 Aug '10

Hi all, I wrote a patch to add support for listing the Vendor and Model of a storage pool in the storage pool XML. This would allow vendor extensions of specific devices. The patch includes a test for the new attributes as well. I'd appreciate some feedback on it, and would like get it merged when it's ready. Patch added at the bottom of the message. Best, Patrick Dignan diff -Naurb libvirt-0.8.2.mod/docs/schemas/storagepool.rng libvirt-0.8.2.ml/docs/schemas/storagepool.rng --- libvirt-0.8.2.mod/docs/schemas/storagepool.rng 2010-06-16 17:27:22.000000000 -0500 +++ libvirt-0.8.2.ml/docs/schemas/storagepool.rng 2010-07-30 17:19:32.835531455 -0500 @@ -8,6 +8,10 @@ <define name='pool'> <element name='pool'> + <optional> + <ref name='poolvendor'/> + <ref name='poolmodel'/> + </optional> <choice> <ref name='pooldir'/> <ref name='poolfs'/> @@ -103,6 +107,18 @@ <ref name='target'/> </define> + <define name='poolvendor'> + <attribute name='vendor'> + <text/> + </attribute> + </define> + + <define name='poolmodel'> + <attribute name='model'> + <text/> + </attribute> + </define> + <define name='commonmetadata'> <element name='name'> <ref name='name'/> diff -Naurb libvirt-0.8.2.mod/include/libvirt/libvirt.h libvirt-0.8.2.ml/include/libvirt/libvirt.h --- libvirt-0.8.2.mod/include/libvirt/libvirt.h 2010-07-22 10:26:05.000000000 -0500 +++ libvirt-0.8.2.ml/include/libvirt/libvirt.h 2010-07-30 11:56:48.726415607 -0500 @@ -1141,6 +1141,8 @@ typedef struct _virStoragePoolInfo virStoragePoolInfo; struct _virStoragePoolInfo { + char *vendor; + char *model; int state; /* virStoragePoolState flags */ unsigned long long capacity; /* Logical size bytes */ unsigned long long allocation; /* Current allocation bytes */ diff -Naurb libvirt-0.8.2.mod/src/conf/storage_conf.c libvirt-0.8.2.ml/src/conf/storage_conf.c --- libvirt-0.8.2.mod/src/conf/storage_conf.c 2010-06-16 17:27:22.000000000 -0500 +++ libvirt-0.8.2.ml/src/conf/storage_conf.c 2010-08-02 11:52:48.618533010 -0500 @@ -298,6 +298,12 @@ VIR_FREE(def->name); + if (def->vendor != "generic") + VIR_FREE(def->vendor); + + if (def->model != "generic") + VIR_FREE(def->model); + virStoragePoolSourceFree(&def->source); VIR_FREE(def->target.path); @@ -601,6 +607,8 @@ virStoragePoolDefPtr ret; xmlNodePtr source_node; char *type = NULL; + char *vendor = NULL; + char *model = NULL; char *uuid = NULL; char *tmppath; @@ -616,6 +624,22 @@ goto cleanup; } + /* Get the vendor and model from the XML and set them in the struct */ + vendor = virXPathString("string(./@vendor)", ctxt); + model = virXPathString("string(./@model)", ctxt); + + if (vendor != NULL) { + ret->vendor = vendor; + } else { + ret->vendor = "generic"; + } + + if (model != NULL) { + ret->model = model; + } else { + ret->model = "generic"; + } + xmlFree(type); type = NULL; @@ -861,7 +885,13 @@ "%s", _("unexpected pool type")); goto cleanup; } + + if (def->vendor == NULL || def->model == NULL || STREQ(def->vendor,"generic") || STREQ(def->model,"generic")) { virBufferVSprintf(&buf, "<pool type='%s'>\n", type); + } else { + virBufferVSprintf(&buf, "<pool type='%s' vendor='%s' model='%s'>\n", type, def->vendor, def->model); + } + virBufferVSprintf(&buf," <name>%s</name>\n", def->name); virUUIDFormat(def->uuid, uuid); diff -Naurb libvirt-0.8.2.mod/src/conf/storage_conf.h libvirt-0.8.2.ml/src/conf/storage_conf.h --- libvirt-0.8.2.mod/src/conf/storage_conf.h 2010-06-16 17:27:22.000000000 -0500 +++ libvirt-0.8.2.ml/src/conf/storage_conf.h 2010-07-29 16:37:28.333458251 -0500 @@ -256,6 +256,8 @@ char *name; unsigned char uuid[VIR_UUID_BUFLEN]; int type; /* virStoragePoolType */ + char *vendor; + char *model; unsigned long long allocation; unsigned long long capacity; diff -Naurb libvirt-0.8.2.mod/tests/storagepoolxml2xmlin/pool-iscsi-vendor-model.xml libvirt-0.8.2.ml/tests/storagepoolxml2xmlin/pool-iscsi-vendor-model.xml --- libvirt-0.8.2.mod/tests/storagepoolxml2xmlin/pool-iscsi-vendor-model.xml 1969-12-31 18:00:00.000000000 -0600 +++ libvirt-0.8.2.ml/tests/storagepoolxml2xmlin/pool-iscsi-vendor-model.xml 2010-08-02 12:00:37.015538583 -0500 @@ -0,0 +1,17 @@ +<pool type='iscsi' vendor='test-vendor' model='test-model'> + <name>virtimages</name> + <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> + <source> + <host name="iscsi.example.com"/> + <device path="demo-target"/> + <auth type='chap' login='foobar' passwd='frobbar'/> + </source> + <target> + <path>/dev/disk/by-path</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff -Naurb libvirt-0.8.2.mod/tests/storagepoolxml2xmlout/pool-iscsi-vendor-model.xml libvirt-0.8.2.ml/tests/storagepoolxml2xmlout/pool-iscsi-vendor-model.xml --- libvirt-0.8.2.mod/tests/storagepoolxml2xmlout/pool-iscsi-vendor-model.xml 1969-12-31 18:00:00.000000000 -0600 +++ libvirt-0.8.2.ml/tests/storagepoolxml2xmlout/pool-iscsi-vendor-model.xml 2010-08-02 12:16:19.571537734 -0500 @@ -0,0 +1,20 @@ +<pool type='iscsi' vendor='test-vendor' model='test-model'> + <name>virtimages</name> + <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> + <capacity>0</capacity> + <allocation>0</allocation> + <available>0</available> + <source> + <host name='iscsi.example.com'/> + <device path='demo-target'/> + <auth type='chap' login='foobar' passwd='frobbar'/> + </source> + <target> + <path>/dev/disk/by-path</path> + <permissions> + <mode>0700</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> +</pool> diff -Naurb libvirt-0.8.2.mod/tests/storagepoolxml2xmltest.c libvirt-0.8.2.ml/tests/storagepoolxml2xmltest.c --- libvirt-0.8.2.mod/tests/storagepoolxml2xmltest.c 2010-06-16 17:27:22.000000000 -0500 +++ libvirt-0.8.2.ml/tests/storagepoolxml2xmltest.c 2010-08-02 12:32:47.838532225 -0500 @@ -96,6 +96,7 @@ DO_TEST("pool-scsi"); DO_TEST("pool-mpath"); DO_TEST("pool-iscsi-multiiqn"); + DO_TEST("pool-iscsi-vendor-model"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); }

5 11

[libvirt] [PATCH] Support virDomainAttachDevice and virDomainDetachDevice for disks in UML
by soren＠linux2go.dk 19 Aug '10

19 Aug '10

From: Soren Hansen <soren(a)linux2go.dk> UML supports hot plugging and unplugging of various devices. This patch exposes this functionality for disks. Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/uml/uml_driver.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 221 insertions(+), 2 deletions(-) diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 04493ba..a09bc60 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1686,6 +1686,225 @@ cleanup: } +static inline void umlShrinkDisks(virDomainDefPtr def, size_t i) +{ + if (def->ndisks > 1) { + memmove(def->disks + i, + def->disks + i + 1, + sizeof(*def->disks) * + (def->ndisks - (i + 1))); + def->ndisks--; + if (VIR_REALLOC_N(def->disks, def->ndisks) < 0) { + /* ignore, harmless */ + } + } else { + VIR_FREE(def->disks); + def->ndisks = 0; + } +} + + +static int umlDomainAttachUmlDisk(struct uml_driver *driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk) +{ + int i, ret; + char *cmd = NULL; + char *reply; + + for (i = 0 ; i < vm->def->ndisks ; i++) { + if (STREQ(vm->def->disks[i]->dst, disk->dst)) { + umlReportError(VIR_ERR_OPERATION_FAILED, + _("target %s already exists"), disk->dst); + return -1; + } + } + + if (!disk->src) { + umlReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("disk source path is missing")); + goto error; + } + + if (virAsprintf(&cmd, "config %s=%s", disk->dst, disk->src) < 0) { + virReportOOMError(); + return -1; + } + + if (umlMonitorCommand(driver, vm, cmd, &reply) < 0) + return -1; + + if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0) { + virReportOOMError(); + goto error; + } + + if (ret < 0) + goto error; + + virDomainDiskInsertPreAlloced(vm->def, disk); + + VIR_FREE(cmd); + + return 0; + +error: + + VIR_FREE(cmd); + + return -1; +} + + +static int umlDomainAttachDevice(virDomainPtr dom, const char *xml) +{ + struct uml_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + virDomainDeviceDefPtr dev = NULL; + int ret = -1; + + umlDriverLock(driver); + + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + umlReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + umlReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot attach device on inactive domain")); + goto cleanup; + } + + dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, + VIR_DOMAIN_XML_INACTIVE); + + if (dev == NULL) + goto cleanup; + + if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML) { + ret = umlDomainAttachUmlDisk(driver, vm, dev->data.disk); + if (ret == 0) + dev->data.disk = NULL; + } else { + umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk bus '%s' cannot be hotplugged."), + virDomainDiskBusTypeToString(dev->data.disk->bus)); + } + } else { + umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("device type '%s' cannot be attached"), + virDomainDeviceTypeToString(dev->type)); + goto cleanup; + } + +cleanup: + + virDomainDeviceDefFree(dev); + if (vm) + virDomainObjUnlock(vm); + umlDriverUnlock(driver); + return ret; +} + + +static int umlDomainDetachUmlDisk(struct uml_driver *driver, + virDomainObjPtr vm, + virDomainDeviceDefPtr dev) +{ + int i, ret = -1; + virDomainDiskDefPtr detach = NULL; + char *cmd; + char *reply; + + for (i = 0 ; i < vm->def->ndisks ; i++) { + if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) { + break; + } + } + + if (i == vm->def->ndisks) { + umlReportError(VIR_ERR_OPERATION_FAILED, + _("disk %s not found"), dev->data.disk->dst); + return -1; + } + + detach = vm->def->disks[i]; + + if (virAsprintf(&cmd, "remove %s", detach->dst) < 0) { + virReportOOMError(); + return -1; + } + + if (umlMonitorCommand(driver, vm, cmd, &reply) < 0) + goto cleanup; + + umlShrinkDisks(vm->def, i); + + virDomainDiskDefFree(detach); + + ret = 0; + +cleanup: + VIR_FREE(cmd); + + return ret; +} + + +static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) { + struct uml_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + virDomainDeviceDefPtr dev = NULL; + int ret = -1; + + umlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + umlReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainObjIsActive(vm)) { + umlReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot detach device on inactive domain")); + goto cleanup; + } + + dev = virDomainDeviceDefParse(driver->caps, vm->def, xml, + VIR_DOMAIN_XML_INACTIVE); + if (dev == NULL) + goto cleanup; + + if (dev->type == VIR_DOMAIN_DEVICE_DISK && + dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_DISK) { + if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_UML) + ret = umlDomainDetachUmlDisk(driver, vm, dev); + else { + umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This type of disk cannot be hot unplugged")); + } + } else { + umlReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("This type of device cannot be hot unplugged")); + } + +cleanup: + virDomainDeviceDefFree(dev); + if (vm) + virDomainObjUnlock(vm); + umlDriverUnlock(driver); + return ret; +} + static int umlDomainGetAutostart(virDomainPtr dom, int *autostart) { @@ -1900,9 +2119,9 @@ static virDriver umlDriver = { umlDomainStartWithFlags, /* domainCreateWithFlags */ umlDomainDefine, /* domainDefineXML */ umlDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ + umlDomainAttachDevice, /* domainAttachDevice */ NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ + umlDomainDetachDevice, /* domainDetachDevice */ NULL, /* domainDetachDeviceFlags */ NULL, /* domainUpdateDeviceFlags */ umlDomainGetAutostart, /* domainGetAutostart */ -- 1.7.0.4

3 2

[libvirt] [PATCH] build: fix compiler warning
by Eric Blake 18 Aug '10

18 Aug '10

node_device/node_device_driver.c: In function 'nodeDeviceVportCreateDelete': node_device/node_device_driver.c:423: error: implicit declaration of function 'stat' [-Wimplicit-function-declaration] * src/node_device/node_device_driver.c (includes): Add <sys/stat.h>. --- Pushing as obvious under the build-breaker rule. src/node_device/node_device_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index a6ac80b..448cfd3 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1,6 +1,7 @@ /* * node_device.c: node device enumeration * + * Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2008 Virtual Iron Software, Inc. * Copyright (C) 2008 David F. Lively * @@ -27,6 +28,7 @@ #include <errno.h> #include <fcntl.h> #include <time.h> +#include <sys/stat.h> #include "virterror_internal.h" #include "datatypes.h" -- 1.7.2.1

1 0

[libvirt] virsh attach-disk using files and KVM
by Ryan Harper 18 Aug '10

18 Aug '10

Currently virsh attach-disk interface only accepts 'file' or 'tap' for driver type when attaching files as disks. One can succesfully attach a file as disk with: virsh attach-disk <vm> <file> <drive> --driver file --type disk which generates the following xml which is passed to libvirt: <disk type='file' device='disk'> <driver name='file' type='raw'/> <source file='/images/test02.img'/> <target dev='vdc' bus='virtio'/> <alias name='virtio-disk2'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> Now, if you shutdown the guest and restart, libvirt complains that the driver type 'file' isn't supported. This is from src/qemu/qemu_conf.c:4146 where if the driver name isn't 'qemu' it rejects the configuration. How best to resolve this? Update qemu_conf.c to accept 'file' type? update virsh to allow specifying 'qemu' as a driver type for files? -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh(a)us.ibm.com

2 2

[libvirt] [PATCH 0/5] Salvage old fixes
by Jiri Denemark 18 Aug '10

18 Aug '10

The following fixes did never make it to upstream libvirt Daniel Berrange (2): remote: Fix incorrect use of private data field xen: Fix device count on detach Daniel Veillard (1): xen: Fix scheduler setting problems Dave Allan (1): nodedev: Fix sysfs paths for vport operations Jiri Denemark (1): nodedev: Free the right pointers when getting WWNs fails src/conf/node_device_conf.c | 4 +- src/node_device/node_device_driver.c | 21 +++++++++++++++++++ src/node_device/node_device_driver.h | 2 +- src/node_device/node_device_linux_sysfs.c | 31 +++++++++++++++++++++++----- src/remote/remote_driver.c | 10 +++++++- src/xen/xen_driver.c | 3 +- src/xen/xen_hypervisor.c | 4 +- src/xen/xm_internal.c | 2 + 8 files changed, 63 insertions(+), 14 deletions(-) -- 1.7.2

3 11

[libvirt] [PATCH 0/3] Managed save updates
by Chris Lalancette 18 Aug '10

18 Aug '10

A couple of updates to the managed save code in qemu. Details are in the individual patches.

3 13