February 2017 - Devel - libvirt List Archives

Re: [libvirt] [PATCHv5 0/4] UPDATE Add support for memory backing with file source
by Safka, JaroslavX 09 Feb '17

09 Feb '17

I updated a little the description diff --git a/docs/news.xml b/docs/news.xml index f408293..5f37592 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -23,6 +23,16 @@ built-in replication and disaster recovery. </description> </change> + <change> + <summary> + qemu: Add support for memory backing with file source + </summary> + <description> + Add support in numa topology for file source inside memory backing (hugepages are not needed) + Three new elements <source>,<access> and <allocation> were added to <memoryBacking> element. + Also new configuration parameter "memory_backing_dir" was added. + </description> + </change> </section> <section title="Improvements"> <change> > -----Original Message----- > From: Michal Privoznik [mailto:mprivozn@redhat.com] > Sent: Thursday, February 09, 2017 9:58 AM > To: Safka, JaroslavX <jaroslavx.safka(a)intel.com>; libvir-list(a)redhat.com > Cc: Mooney, Sean K <sean.k.mooney(a)intel.com>; Ptacek, MichalX > <michalx.ptacek(a)intel.com> > Subject: Re: [libvirt] [PATCHv5 0/4] Add support for memory backing with file > source > > On 02/02/2017 02:27 PM, Jaroslav Safka wrote: > > Hi, > > we would like to introduce 3 new elements source,access and allocation in > memoryBacking element. > > For now it was made for numa topology. > > > > <memoryBacking> > > <source type="file|anonymous"/> > > <access mode="shared|private"/> > > <allocation mode="immediate|ondemand"/> </memoryBacking> > > > > If allocation is immediate then -mem-prealloc should be added to the qemu > commanline. > > If source is file then > > -object memory-backend-file,id=mem,size=1024M,mem-path=*lib dir path* > > -numa node,memdev=mem Will be added to the qemu commandline > > > > If access is shared then the "share=on" parameter will be added to the > memory-backend-file e.g. > > -object > > memory-backend-file,id=mem,size=1024M,mem-path=/var/lib/libvirt/qemu,s > > hare=on > > > > The access mode can be overriden by specifying token memAccess in numa > cell. > > The mem-path can be defined by new config parameter > memory_backing_dir. > > > > PS: the sometime failing test qemuhotplug was failing also before this > > patch :) > > > > Jaroslav Safka (4): > > qemu,conf: Rename virNumaMemAccess to virDomainMemoryAccess > > qemu_conf: Add param memory_backing_dir > > conf: Add new xml elements for file memorybacking support > > qemu: Add args generation for file memory backing > > > > docs/formatdomain.html.in | 9 ++ > > docs/schemas/domaincommon.rng | 30 +++++ > > src/conf/domain_conf.c | 133 ++++++++++++++++----- > > src/conf/domain_conf.h | 22 ++++ > > src/conf/numa_conf.c | 15 +-- > > src/conf/numa_conf.h | 14 +-- > > src/qemu/libvirtd_qemu.aug | 3 + > > src/qemu/qemu.conf | 4 + > > src/qemu/qemu_command.c | 55 ++++++--- > > src/qemu/qemu_conf.c | 9 ++ > > src/qemu/qemu_conf.h | 2 + > > src/qemu/qemu_process.c | 2 +- > > src/qemu/test_libvirtd_qemu.aug.in | 1 + > > .../qemuxml2argv-fd-memory-no-numa-topology.args | 21 ++++ > > .../qemuxml2argv-fd-memory-no-numa-topology.xml | 27 +++++ > > .../qemuxml2argv-fd-memory-numa-topology.args | 24 ++++ > > .../qemuxml2argv-fd-memory-numa-topology.xml | 30 +++++ > > .../qemuxml2argv-fd-memory-numa-topology2.args | 27 +++++ > > .../qemuxml2argv-fd-memory-numa-topology2.xml | 31 +++++ > > .../qemuxml2argv-fd-memory-numa-topology3.args | 30 +++++ > > .../qemuxml2argv-fd-memory-numa-topology3.xml | 32 +++++ > > .../qemuxml2argv-memorybacking-set.xml | 24 ++++ > > .../qemuxml2argv-memorybacking-unset.xml | 24 ++++ > > tests/qemuxml2argvtest.c | 13 ++ > > .../qemuxml2xmlout-memorybacking-set.xml | 32 +++++ > > .../qemuxml2xmlout-memorybacking-unset.xml | 32 +++++ > > tests/qemuxml2xmltest.c | 3 + > > 27 files changed, 584 insertions(+), 65 deletions(-) create mode > > 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-no-numa-topology.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology2.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.args > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-fd-memory-numa-topology3.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-memorybacking-set.xml > > create mode 100644 > > tests/qemuxml2argvdata/qemuxml2argv-memorybacking-unset.xml > > create mode 100644 > > tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-set.xml > > create mode 100644 > > tests/qemuxml2xmloutdata/qemuxml2xmlout-memorybacking-unset.xml > > > > Looking good. ACK to all of them. However, please send a patch (as a reply to > this cover letter) that updates docs/news.xml. Only after that it is possible to > push these. > > Michal -------------------------------------------------------------- Intel Research and Development Ireland Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

1 0

[libvirt] [PATCH 0/2] libxl: a few domain maximum memory fixes
by Jim Fehlig 08 Feb '17

08 Feb '17

Patch 1 fixes reporting of domain maximum memory for running domains. When creating a virDomainDef object to represent dom0, max memory was not set correctly, which is fixed by patch2. Jim Fehlig (2): libxl: fix reporting of maximum memory libxl: fix dom0 maximum memory setting src/libxl/libxl_conf.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 3 ++ src/libxl/libxl_driver.c | 7 ++--- 3 files changed, 81 insertions(+), 4 deletions(-) -- 2.9.2

2 6

[libvirt] [PATCH 0/2] libxl: some small fixes
by Jim Fehlig 08 Feb '17

08 Feb '17

I noticed a few small bugs while fixing the domain maximum memory bugs :-). See patches for details. Jim Fehlig (2): libxl: honor autoballoon setting in libxl.conf libxl: use init and dispose functions with libxl_physinfo src/libxl/libxl_capabilities.c | 16 +++++++++++----- src/libxl/libxl_conf.c | 7 ++++++- src/libxl/libxl_driver.c | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) -- 2.9.2

2 7

[libvirt] [PATCH] xenconfig: fix xml conversion convert with no graphics
by Joao Martins 08 Feb '17

08 Feb '17

If no graphics element is in XML xenFormatXLSpice will access graphics without checking it has one in the first place, leading to a segmentation fault. Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/xenconfig/xen_xl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 2c9174e..74f68b3 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -1168,7 +1168,7 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def) virDomainGraphicsListenDefPtr glisten; virDomainGraphicsDefPtr graphics; - if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { + if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && def->graphics) { graphics = def->graphics[0]; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { -- 2.1.4

2 1

[libvirt] [PATCH] qemu_security: Introduce ImageLabel APIs
by Michal Privoznik 08 Feb '17

08 Feb '17

Just like we need wrappers over other virSecurityManager APIs, we need one for virSecurityManagerSetImageLabel and virSecurityManagerRestoreImageLabel. Otherwise we might end up relabelling device in wrong namespace. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 7 +++--- src/qemu/qemu_security.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_security.h | 8 +++++++ 3 files changed, 67 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3f765605..7c696963e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -31,6 +31,7 @@ #include "qemu_parse_command.h" #include "qemu_capabilities.h" #include "qemu_migration.h" +#include "qemu_security.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -5094,8 +5095,7 @@ qemuDomainDiskChainElementRevoke(virQEMUDriverPtr driver, VIR_WARN("Failed to teardown cgroup for disk path %s", NULLSTR(elem->path)); - if (virSecurityManagerRestoreImageLabel(driver->securityManager, - vm->def, elem) < 0) + if (qemuSecurityRestoreImageLabel(driver, vm, elem) < 0) VIR_WARN("Unable to restore security label on %s", NULLSTR(elem->path)); if (qemuDomainNamespaceTeardownDisk(driver, vm, elem) < 0) @@ -5135,8 +5135,7 @@ qemuDomainDiskChainElementPrepare(virQEMUDriverPtr driver, if (qemuSetupImageCgroup(vm, elem) < 0) goto cleanup; - if (virSecurityManagerSetImageLabel(driver->securityManager, vm->def, - elem) < 0) + if (qemuSecuritySetImageLabel(driver, vm, elem) < 0) goto cleanup; ret = 0; diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index ceac5bf56..f2931976b 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -133,6 +133,62 @@ qemuSecurityRestoreDiskLabel(virQEMUDriverPtr driver, } +int +qemuSecuritySetImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + int ret = -1; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerSetImageLabel(driver->securityManager, + vm->def, + src) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret = 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} + + +int +qemuSecurityRestoreImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src) +{ + int ret = -1; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionStart(driver->securityManager) < 0) + goto cleanup; + + if (virSecurityManagerRestoreImageLabel(driver->securityManager, + vm->def, + src) < 0) + goto cleanup; + + if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) && + virSecurityManagerTransactionCommit(driver->securityManager, + vm->pid) < 0) + goto cleanup; + + ret = 0; + cleanup: + virSecurityManagerTransactionAbort(driver->securityManager); + return ret; +} + + int qemuSecuritySetHostdevLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index cc373b3e1..54638908d 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -45,6 +45,14 @@ int qemuSecurityRestoreDiskLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk); +int qemuSecuritySetImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); + +int qemuSecurityRestoreImageLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStorageSourcePtr src); + int qemuSecuritySetHostdevLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainHostdevDefPtr hostdev); -- 2.11.0

2 1

[libvirt] [resend v2 0/7] Support cache tune in libvirt
by Eli Qiao 08 Feb '17

08 Feb '17

This series patches are for supportting CAT featues, which also called cache tune in libvirt. First to expose cache information which could be tuned in capabilites XML. Then add new domain xml element support to add cacahe bank which will apply on this libvirt domain. This series patches add a util file `resctrl.c/h`, an interface to talk with linux kernel's sys fs. There are still some TODOs such as expose new public interface to get free cache information. Some discussion about this feature support can be found from: https://www.redhat.com/archives/libvir-list/2017-January/msg00644.html Eli Qiao (7): Resctrl: Add some utils functions Resctrl: expose cache information to capabilities Resctrl: Add new xml element to support cache tune Resctrl: Add private interface to set cachebanks Qemu: Set cache banks Resctrl: enable l3code/l3data Resctrl: Make sure l3data/l3code are pairs docs/schemas/domaincommon.rng | 41 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/capabilities.c | 56 +++ src/conf/capabilities.h | 23 + src/conf/domain_conf.c | 154 +++++++ src/conf/domain_conf.h | 18 + src/libvirt_private.syms | 10 + src/qemu/qemu_capabilities.c | 68 +++ src/qemu/qemu_driver.c | 4 + src/qemu/qemu_process.c | 11 + src/util/virerror.c | 1 + src/util/virresctrl.c | 1019 +++++++++++++++++++++++++++++++++++++++++ src/util/virresctrl.h | 135 ++++++ 14 files changed, 1542 insertions(+) create mode 100644 src/util/virresctrl.c create mode 100644 src/util/virresctrl.h -- 1.9.1

5 25

[libvirt] [PATCH] conf: fix use-after-free when sending event message
by Wang King 08 Feb '17

08 Feb '17

If there is a process with a client which registers event callbacks, and it calls libvirt's API which uses the same virConnectPtr in that callback function. When this process exit abnormally lead to client disconnect, there is a possibility that the main thread is refer to virServerClient just after the virServerClient been freed by job thread of libvirtd. Following is the backtrace: #0 0x00007fda223d66d8 in virClassIsDerivedFrom (klass=0xdeadbeef,parent=0x7fda24c81b40) #1 0x00007fda223d6a1e in virObjectIsClass (anyobj=anyobj@entry=0x7fd9e575b400,klass=) #2 0x00007fda223d6a44 in virObjectLock (anyobj=anyobj@entry=0x7fd9e575b400) #3 0x00007fda22507f71 in virNetServerClientSendMessage (client=client@entry=0x7fd9e575b400, msg=msg@entry=0x7fd9ec30de90) #4 0x00007fda230d714d in remoteDispatchObjectEventSend (client=0x7fd9e575b400, program=0x7fda24c844e0, procnr=procnr@entry=348, proc=0x7fda2310e5e0 , data=data@entry=0x7ffc3857fdb0) #5 0x00007fda230dd71b in remoteRelayDomainEventTunable (conn=, dom=0x7fda27cd7660, params=0x7fda27f3aae0, nparams=1, opaque=0x7fd9e6c99e00) #6 0x00007fda224484cb in virDomainEventDispatchDefaultFunc (conn=0x7fda27cd0120, event=0x7fda2736ea00, cb=0x7fda230dd610 , cbopaque=0x7fd9e6c99e00) #7 0x00007fda22446871 in virObjectEventStateDispatchCallbacks (callbacks=, callbacks=, event=0x7fda2736ea00, state=0x7fda24ca3960) #8 virObjectEventStateQueueDispatch (callbacks=0x7fda24c65800, queue=0x7ffc3857fe90, state=0x7fda24ca3960) #9 virObjectEventStateFlush (state=0x7fda24ca3960) #10 virObjectEventTimer (timer=, opaque=0x7fda24ca3960) #11 0x00007fda223ae8b9 in virEventPollDispatchTimeouts () #12 virEventPollRunOnce () #13 0x00007fda223ad1d2 in virEventRunDefaultImpl () #14 0x00007fda225046cd in virNetDaemonRun (dmn=dmn@entry=0x7fda24c775c0) #15 0x00007fda230d6351 in main (argc=, argv=) (gdb) p *(virNetServerClientPtr)0x7fd9e575b400 $2 = {parent = {parent = {u = {dummy_align1 = 140573849338048, dummy_align2 = 0x7fd9e65ac0c0, s = {magic = 3864707264, refs = 32729}}, klass = 0x7fda00000078}, lock = {lock = {__data = {__lock = 0, __count = 0, __owner = 0, __nusers = 0, __kind = 0, __spins = 0, __list = {__prev = 0x0, __next = 0x0}}, __size = '\000' , __align = 0}}}, wantClose = false, delayedClose = false, sock = 0x0, auth = 0, readonly = false, tlsCtxt = 0x0, tls = 0x0, sasl = 0x0, sockTimer = 0, identity = 0x0, nrequests = 0, nrequests_max = 0, rx = 0x0, tx = 0x0, filters = 0x0, nextFilterID = 0, dispatchFunc = 0x0, dispatchOpaque = 0x0, privateData = 0x0, privateDataFreeFunc = 0x0, privateDataPreExecRestart = 0x0, privateDataCloseFunc = 0x0, keepalive = 0x0} --- src/rpc/virnetserverclient.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 81da82c..562516f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1021,6 +1021,12 @@ void virNetServerClientClose(virNetServerClientPtr client) client->sock = NULL; } + if (client->privateData && + client->privateDataFreeFunc) { + client->privateDataFreeFunc(client->privateData); + client->privateData = NULL; + } + virObjectUnlock(client); } -- 2.8.3

2 1

[libvirt] [PATCH] Remove additional newline from virsh-domain-monitor.c
by Nitesh Konkar 08 Feb '17

08 Feb '17

Currently "virsh domstats domainName" result ends with two blanklines. This shall remove the additional blank line. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain-monitor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 77aa272..c558819 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2047,7 +2047,6 @@ virshDomainStatsPrintRecord(vshControl *ctl ATTRIBUTE_UNUSED, VIR_FREE(param); } - vshPrint(ctl, "\n"); return true; } -- 1.9.3

2 1

[libvirt] [Block Replication] Question about supporting COLO in libvirt
by Hailiang Zhang 08 Feb '17

08 Feb '17

Hi, I'm trying to implement supporting COLO in libvirt, But i found an annoying problem that libvirt does not support the command line option argument syntax we used for block replication in QEMU. That is libvirt does not support the bellow syntax for block: -drive driver=qcow2,file.filename=test:a.qcow2 -drive file=test.qcow2,\ backing.file.filename=/dev/fdset/1 It seems to be a new syntax that libvirt does not support thought it has been exist in QEMU for a time. I found some introductions from http://www.linux-kvm.org/images/3/34/Kvm-forum-2013-block-dev-configuration… The command line we use for COLO is just like the above syntax, For example, for the shared disk in COLO, it is: -drive if=none,driver=qcow2,file.filename=/mnt/ramfs/hidden_disk.img,id=hidden_disk0,\ backing.driver=raw,backing.file.filename=1.raw \ -drive if=virtio,id=active-disk0,driver=replication,mode=secondary,\ file.driver=qcow2,top-id=active-disk0,\ file.file.filename=/mnt/ramfs/active_disk.img,\ file.backing=hidden_disk0,shared-disk=on For the none-shared disk in COLO, it is quite same with the shared-disk: -drive if=none,driver=raw,file.filename=1.raw,id=colo1 \ -drive if=xxx,id=topxxx,driver=replication,mode=secondary,top-id=topxxx\ file.file.filename=active_disk.qcow2,\ file.driver=qcow2,\ file.backing.file.filename=hidden_disk.qcow2,\ file.backing.driver=qcow2,\ file.backing.backing=colo1 So there seems to be two ways to solve this problem. One is to support this new option argument syntax in libvirt, but I'm not sure if it is difficult or not to implement it, and i don't know where to start either. Another way is to convert these command line options in QEMU totally, I mean hidden the descriptions of 'active_disk' and 'hidden_disk' disks. Create/add them dynamicly by qmp commands while users want to make VM goes into COLO state. That's just like to support live image clone in QEMU. Any ideas ? Thanks, Hailiang

2 2

[libvirt] [PATCH] libxl: fix disk detach when <driver> not specified
by Jim Fehlig 07 Feb '17

07 Feb '17

When a user does not explicitly set a <driver> in the disk config, libvirt defers selection of a default to libxl. This approach works fine when starting a domain with such configuration or attaching a disk to a running domain. But when detaching such a disk, libxl will fail with "unrecognized disk backend type: 0". libxl makes no attempt to recalculate a default backend (driver) on detach and simply fails when uninitialized. This patch updates the libvirt disk config with the backend selected by libxl when starting a domain or attaching a disk to a running domain. Another benefit of this approach is that the live XML is also updated with the backend driver selected by libxl. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 33 +++++++++++++++++++++++++++++++++ src/libxl/libxl_conf.h | 4 ++++ src/libxl/libxl_domain.c | 25 +++++++++++++++++++++++++ src/libxl/libxl_driver.c | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b5186f2..6ef7570 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -851,6 +851,7 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) * xl-disk-configuration.txt in the xen documentation and let * libxl pick a suitable backend. */ + virDomainDiskSetFormat(l_disk, VIR_STORAGE_FILE_RAW); x_disk->format = LIBXL_DISK_FORMAT_RAW; x_disk->backend = LIBXL_DISK_BACKEND_UNKNOWN; } @@ -913,6 +914,38 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; } +/* + * Update libvirt disk config with libxl disk config. + * + * This function can be used to update the libvirt disk config with default + * values selected by libxl. Currently only the backend type is selected by + * libxl when not explicitly specified by the user. + */ +void +libxlUpdateDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) +{ + const char *driver = NULL; + + if (virDomainDiskGetDriver(l_disk)) + return; + + switch (x_disk->backend) { + case LIBXL_DISK_BACKEND_QDISK: + driver = "qemu"; + break; + case LIBXL_DISK_BACKEND_TAP: + driver = "tap"; + break; + case LIBXL_DISK_BACKEND_PHY: + driver = "phy"; + break; + case LIBXL_DISK_BACKEND_UNKNOWN: + break; + } + if (driver) + ignore_value(virDomainDiskSetDriver(l_disk, driver)); +} + int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 69d7885..732a1d2 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -175,6 +175,10 @@ int libxlDriverConfigLoadFile(libxlDriverConfigPtr cfg, int libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); + +void +libxlUpdateDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); + int libxlMakeNic(virDomainDefPtr def, virDomainNetDefPtr l_nic, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ed73cd2..0168777 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1067,6 +1067,30 @@ libxlDomainCreateIfaceNames(virDomainDefPtr def, libxl_domain_config *d_config) } } +static void +libxlDomainUpdateDiskParams(virDomainDefPtr def, libxl_ctx *ctx) +{ + libxl_device_disk *disks; + int num_disks = 0; + size_t i; + int idx; + + disks = libxl_device_disk_list(ctx, def->id, &num_disks); + if (!disks) + return; + + for (i = 0; i < num_disks; i++) { + if ((idx = virDomainDiskIndexByName(def, disks[i].vdev, false)) < 0) + continue; + + libxlUpdateDisk(def->disks[idx], &disks[i]); + } + + for (i = 0; i < num_disks; i++) + libxl_device_disk_dispose(&disks[i]); + VIR_FREE(disks); +} + #ifdef LIBXL_HAVE_DEVICE_CHANNEL static void libxlDomainCreateChannelPTY(virDomainDefPtr def, libxl_ctx *ctx) @@ -1310,6 +1334,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, goto destroy_dom; libxlDomainCreateIfaceNames(vm->def, &d_config); + libxlDomainUpdateDiskParams(vm->def, cfg->ctx); #ifdef LIBXL_HAVE_DEVICE_CHANNEL if (vm->def->nchannels > 0) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 3a69720..6dddf9f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3027,7 +3027,7 @@ libxlDomainAttachDeviceDiskLive(virDomainObjPtr vm, virDomainDeviceDefPtr dev) } goto cleanup; } - + libxlUpdateDisk(l_disk, &x_disk); virDomainDiskInsertPreAlloced(vm->def, l_disk); } else { -- 2.9.2

2 3