- Devel - libvirt List Archives

[libvirt] [PATCH] apibuild: Disallow 'returns' return decription
by Michal Privoznik 13 May '14

13 May '14

Our documentation generator is a bit messy, to say the least. For instance, the description to return values of a function is searched within C comment. Currently, all lines that start with 'returns' or 'Returns' are viewed as return value description. However, there are some valid uses where the 'returns' word is in the middle of a sentence describing function behavior nor the return value. For instance: virDomainDetachDeviceFlags, virConnectNetworkEventRegisterAny and virDomainGetDiskErrors. This leads to HTML documentation to be not correctly generated. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 71494d5..5250c5a 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -926,7 +926,7 @@ class CParser: if i < len(l) and l[i] == ' ': i = i + 1 l = l[i:] - if len(l) >= 6 and l[0:7] == "returns" or l[0:7] == "Returns": + if len(l) >= 6 and l[0:7] == "Returns": try: l = string.split(l, ' ', 1)[1] except: -- 1.9.0

3 2

[libvirt] [PATCH] virsh: domain: Fix output of the VNC display number for domdisplay
by Peter Krempa 13 May '14

13 May '14

Commit 9976c4b9a665f10ab0d2071954efb7f432d194eb broke the output for VNC displays as the port number is converted to VNC display number by subtracting 5900. This yields port 0 for the first display and thus the output would be skipped. Before: $ virsh domdisplay VM vnc://localhost After: $ tools/virsh domdisplay VM vnc://localhost:0 --- tools/virsh-domain.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 54d8867..d8183ee 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9392,12 +9392,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) passwd = virXPathString(xpath, ctxt); VIR_FREE(xpath); - if (STREQ(scheme[iter], "vnc")) { - /* VNC protocol handlers take their port number as - * 'port' - 5900 */ - port -= 5900; - } - /* Build up the full URI, starting with the scheme */ virBufferAsprintf(&buf, "%s://", scheme[iter]); @@ -9416,8 +9410,15 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "%s", listen_addr); /* Add the port */ - if (port) + if (port) { + if (STREQ(scheme[iter], "vnc")) { + /* VNC protocol handlers take their port number as + * 'port' - 5900 */ + port -= 5900; + } + virBufferAsprintf(&buf, ":%d", port); + } /* TLS Port */ if (tls_port) { -- 1.9.2

2 2

[libvirt] [PATCH v7 0/6] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 13 May '14

13 May '14

Hello, This is patchset v7 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes since v6: * return VIR_ERR_ARGUMENT_UNSUPPORTED when 'mountpoints' parameter is given even though the driver doesn't support it, rather than ignore it. * include some missing argument in debug line in libvirt.c * change option format of virsh domfsfreeze/domfsthaw from '--mountpoints <a comma separated list of mountpoints>' to '--mountpoint <mountpoint> --mountpoint <mountpoint> ...' (v6: http://www.redhat.com/archives/libvir-list/2014-April/msg01124.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs take mountpoints parameters, which is a list of mountpoint paths of filesystems to be frozen/thawed. If the option is not provided, every mounted filesystem is frozen/thawed. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (6): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: track quiesced status in qemuDomainSnapshotFSFreeze qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API qemu: Support mountpoints option of guest-fsfreeze-freeze include/libvirt/libvirt.h.in | 10 +++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 14 ++++ src/libvirt.c | 93 ++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 47 +++++++++++- src/qemu/qemu_agent.h | 3 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 166 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 38 +++++++++- src/remote_protocol-structs | 18 +++++ src/rpc/gendispatch.pl | 2 + tests/qemuagenttest.c | 8 +- tools/virsh-domain.c | 126 ++++++++++++++++++++++++++++++++ tools/virsh.pod | 23 ++++++ 18 files changed, 546 insertions(+), 25 deletions(-)

3 18

[libvirt] [PATCH] maint: fix typos related to 'frozen'
by Eric Blake 13 May '14

13 May '14

"Freezed" is not an English word. * src/lxc/lxc_driver.c (lxcFreezeContainer): Fix typo. * src/qemu/qemu_driver.c (qemuDomainSnapshotFSFreeze): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index dba2182..1086289 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3231,7 +3231,7 @@ static int lxcFreezeContainer(virDomainObjPtr vm) /* * Returning EBUSY explicitly indicates that the group is - * being freezed but incomplete and other errors are true + * being frozen but incomplete, and other errors are true * errors. */ if (r < 0 && r != -EBUSY) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4ff8a2d..e587183 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12091,7 +12091,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver, { qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg; - int freezed; + int frozen; if (priv->quiesced) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -12113,9 +12113,9 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver, virObjectUnref(cfg); qemuDomainObjEnterAgent(vm); - freezed = qemuAgentFSFreeze(priv->agent); + frozen = qemuAgentFSFreeze(priv->agent); qemuDomainObjExitAgent(vm); - return freezed < 0 ? -2 : freezed; + return frozen < 0 ? -2 : frozen; } /* Return -1 on error, otherwise number of thawed filesystems. */ -- 1.9.0

1 0

Re: [libvirt] [PATCH 1/2] libxl: support syntax <interface type="hostdev">
by Jim Fehlig 12 May '14

12 May '14

Chun Yan Liu wrote: > >>>> On 5/10/2014 at 06:18 AM, in message <536D541D.5040107(a)suse.com>, Jim Fehlig >>>> > <jfehlig(a)suse.com> wrote: > >> Chunyan Liu wrote: >> >>> Signed-off-by: Chunyan Liu <cyliu(a)suse.com> >>> >>> >> >> A while back when testing Chunyan's "common hostdev library" series, I >> mentioned that <interface type='hostdev'> was not working with the libxl >> driver. Chunyan later privately sent a "v1" of this patch for testing >> in my setup. In addition to testing, I provided some private comments. >> I see those have been incorporated in this patch and functionally it >> looks good, but I do have one additional question about the commit >> message... >> >> >>> --- >>> src/libxl/libxl_conf.c | 16 +++++++++++----- >>> 1 file changed, 11 insertions(+), 5 deletions(-) >>> >>> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c >>> index 298c8a1..b7fed7f 100644 >>> --- a/src/libxl/libxl_conf.c >>> +++ b/src/libxl/libxl_conf.c >>> @@ -921,25 +921,31 @@ static int >>> libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) >>> { >>> virDomainNetDefPtr *l_nics = def->nets; >>> - int nnics = def->nnets; >>> + size_t nnics = def->nnets; >>> libxl_device_nic *x_nics; >>> - size_t i; >>> + size_t i, nvnics = 0; >>> >>> if (VIR_ALLOC_N(x_nics, nnics) < 0) >>> return -1; >>> >>> for (i = 0; i < nnics; i++) { >>> - if (libxlMakeNic(def, l_nics[i], &x_nics[i])) >>> + if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) >>> + continue; >>> >>> >> >> After looking at this again, it seems we are really *fixing* <interface >> type='hostdev'>. The driver already supports creating the hostdev >> device, but without this patch a libxl_device_nic is created too. Is >> that a fair statement? If so, the commit message should be changed to >> reflect this. Thanks! >> > > A NET_TYPE_HOSTDEV device is really a hostdev device, the driver will create > a hostdev device for it, so no need to create a libxl_device_nic again. Before > this patch, it tried to call libxlMakeNic to create a libxl_device_nic for it but > failed since NET_TYPE_HOSTDEV is not supported there. > Yep, understood. > I'll add this to commit message. Is that OK? > I fixed up the commit message and pushed the patch. Thanks Chunyan! Regards, Jim

1 0

[libvirt] [PATCH 1/2] libxl: support syntax <interface type="hostdev">
by Chunyan Liu 12 May '14

12 May '14

Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_conf.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 298c8a1..b7fed7f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -921,25 +921,31 @@ static int libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) { virDomainNetDefPtr *l_nics = def->nets; - int nnics = def->nnets; + size_t nnics = def->nnets; libxl_device_nic *x_nics; - size_t i; + size_t i, nvnics = 0; if (VIR_ALLOC_N(x_nics, nnics) < 0) return -1; for (i = 0; i < nnics; i++) { - if (libxlMakeNic(def, l_nics[i], &x_nics[i])) + if (l_nics[i]->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) + continue; + + if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics])) goto error; /* * The devid (at least right now) will not get initialized by * libxl in the setup case but is required for starting the * device-model. */ - if (x_nics[i].devid < 0) - x_nics[i].devid = i; + if (x_nics[nvnics].devid < 0) + x_nics[nvnics].devid = nvnics; + + nvnics++; } + VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); d_config->nics = x_nics; d_config->num_nics = nnics; -- 1.8.4.5

4 6

[libvirt] [PATCH] Doc patch for apps.html
by James 12 May '14

12 May '14

Doc patch for apps.html as per: http://libvirt.org/apps.html#add Cheers, James Disclaimer: I've contributed patches to the project that this commit adds.

4 4

[libvirt] [PATCH v2] maint: use $(SED) instead of sed for syntax-check
by Roman Bogorodskiy 12 May '14

12 May '14

This is actually almost the same patch that I've sent back in January, decided to re-send as much time has passed. Also, now we're not blocked by the gnulib part. I've been using this patch on FreeBSD for quite some time now and had no problems with it. Also, I tested it on Linux and it doesn't seem to cause any regressions. Roman Bogorodskiy (1): maint: use $(SED) instead of sed for syntax-check cfg.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 1.9.0

2 2

Re: [libvirt] [Qemu-devel] [PATCH] cirrus_vga: adding sanity check for vram size
by Eric Blake 12 May '14

12 May '14

[adding libvirt] On 05/09/2014 05:54 AM, Gerd Hoffmann wrote: > Hi, > >> virt-manager/libvirt seems to default to 9 MByte of Vram for cirrus, >> so this would break a lot of setups. > > It wouldn't. libvirt sticks that into the xml, but it doesn't set any > qemu parameters. The libvirt parameter actually predates the qemu > property for setting the size. > Then we should probably re-evaluate what libvirt does with the parameters, which avoids breaking any guest that happens to be pre-existing with the odd 9MB sizing in the XML. >> Looking at datasheets on the web seems to say the chips actually went >> down to 1 MB or less. > > I have my doubts we emulate that correctly (register telling the guest > how much memory is actually there etc.). Also it is pretty much useless > these days, even the 4MB imply serious constrains when FullHD displays > are commonplace. Newer cirrus drivers such as the kernel's drm driver > are specifically written to qemu's cirrus cards, I have my doubs that > they are prepared to handle 1MB cirrus cards correctly. > > Bottom line: Allowing less than 4MB is asking for trouble for no good > reason ;) > > cheers, > Gerd > > > > > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] troubles creating an OVS network with xen, libxl and libvirt.
by Alvin Starr 12 May '14

12 May '14

One more quirk I can create a domain using the lx commands and a slightly modified .conf file. "virsh start kvmtest" returns a failure. I tracked the information passed to vif-openvswitch and it is being called with type_if=tap and it needs to be type_if=vif. Any help would be greatly appreciated once again. -- Alvin Starr || voice: (905)513-7688 Netvel Inc. || Cell: (416)806-0133 alvin(a)netvel.net ||

2 4

[libvirt] [PATCH] bhyve: implement connectGetSysinfo
by Roman Bogorodskiy 12 May '14

12 May '14

--- src/bhyve/bhyve_driver.c | 31 +++++++++++++++++++++++++++++++ src/bhyve/bhyve_utils.h | 1 + 2 files changed, 32 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 0cafe4c..ec1ba69 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -237,6 +237,33 @@ bhyveConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) return virGetHostname(); } +static char * +bhyveConnectGetSysinfo(virConnectPtr conn, unsigned int flags) +{ + bhyveConnPtr privconn = conn->privateData; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virCheckFlags(0, NULL); + + if (virConnectGetSysinfoEnsureACL(conn) < 0) + return NULL; + + if (!privconn->hostsysinfo) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Host SMBIOS information is not available")); + return NULL; + } + + if (virSysinfoFormat(&buf, privconn->hostsysinfo) < 0) + return NULL; + if (virBufferError(&buf)) { + virReportOOMError(); + return NULL; + } + + return virBufferContentAndReset(&buf); +} + static int bhyveConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *version) { @@ -976,6 +1003,7 @@ bhyveStateCleanup(void) virObjectUnref(bhyve_driver->domains); virObjectUnref(bhyve_driver->caps); virObjectUnref(bhyve_driver->xmlopt); + virObjectUnref(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->closeCallbacks); virMutexDestroy(&bhyve_driver->lock); @@ -1015,6 +1043,8 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, if (!(bhyve_driver->domains = virDomainObjListNew())) goto cleanup; + bhyve_driver->hostsysinfo = virSysinfoRead(); + if (virFileMakePath(BHYVE_LOG_DIR) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), @@ -1173,6 +1203,7 @@ static virDriver bhyveDriver = { .connectClose = bhyveConnectClose, /* 1.2.2 */ .connectGetVersion = bhyveConnectGetVersion, /* 1.2.2 */ .connectGetHostname = bhyveConnectGetHostname, /* 1.2.2 */ + .connectGetSysinfo = bhyveConnectGetSysinfo, /* 1.2.4 */ .domainGetInfo = bhyveDomainGetInfo, /* 1.2.2 */ .domainGetState = bhyveDomainGetState, /* 1.2.2 */ .connectGetCapabilities = bhyveConnectGetCapabilities, /* 1.2.2 */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index 94f31b0..22f458d 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -39,6 +39,7 @@ struct _bhyveConn { virCapsPtr caps; virDomainXMLOptionPtr xmlopt; char *pidfile; + virSysinfoDefPtr hostsysinfo; virCloseCallbacksPtr closeCallbacks; }; -- 1.9.0

2 3

[libvirt] [libvirt-glib] domain-device-private: fix typo in header guard
by Christophe Fergeau 12 May '14

12 May '14

From: Timm Bäder <mail(a)baedert.org> --- I've reviewed and pushed this patch directly as it's trivial Christophe libvirt-gobject/libvirt-gobject-domain-device-private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain-device-private.h b/libvirt-gobject/libvirt-gobject-domain-device-private.h index f15fea6..73b3956 100644 --- a/libvirt-gobject/libvirt-gobject-domain-device-private.h +++ b/libvirt-gobject/libvirt-gobject-domain-device-private.h @@ -20,7 +20,7 @@ * Author: Marc-André Lureau <marcandre.lureau(a)redhat.com> */ #ifndef __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATE_H__ -#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ +#define __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATE_H__ G_BEGIN_DECLS @@ -30,4 +30,4 @@ virDomainPtr gvir_domain_device_get_domain_handle(GVirDomainDevice *self); G_END_DECLS -#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATEH__ */ +#endif /* __LIBVIRT_GOBJECT_DOMAIN_DEVICE_PRIVATE_H__ */ -- 1.9.0

1 0

[libvirt] [PATCH] qemu: Adjust size for qcow2/qed if not on sector boundary (rewrite)
by John Ferlan 12 May '14

12 May '14

A post commit id 'e3d66229' review (and followup): http://www.redhat.com/archives/libvir-list/2014-May/msg00268.html noted some issues with the code, so I have adjusted the code accordingly. The difference between this and the commit prior to the change (commit id 'f3be5f0c') will just be the check for qcow2/qed using a non 512 block aligned size will result in a round up of size. If the size is within the last 512 bytes to ULLONG_MAX, then just set it there rather than erroring out. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_driver.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4ff8a2d..8771cae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9413,7 +9413,6 @@ qemuDomainBlockResize(virDomainPtr dom, virDomainObjPtr vm; qemuDomainObjPrivatePtr priv; int ret = -1, idx; - unsigned long long size_up; char *device = NULL; virDomainDiskDefPtr disk = NULL; @@ -9434,12 +9433,6 @@ qemuDomainBlockResize(virDomainPtr dom, return -1; } size *= 1024; - size_up = size; - } else { - /* For 'qcow2' and 'qed', qemu resize blocks expects values - * on sector boundary, so round our value up to prepare - */ - size_up = VIR_ROUND_UP(size, 512); } if (!(vm = qemuDomObjFromDomain(dom))) @@ -9466,19 +9459,16 @@ qemuDomainBlockResize(virDomainPtr dom, } disk = vm->def->disks[idx]; - /* qcow2 and qed must be sized appropriately, so be sure our value - * is sized appropriately and will fit + /* qcow2 and qed must be sized on 512 byte blocks/sectors, + * so adjust size if necessary to round up (if possible). */ - if (size != size_up && - (disk->src.format == VIR_STORAGE_FILE_QCOW2 || - disk->src.format == VIR_STORAGE_FILE_QED)) { - if (size_up > ULLONG_MAX) { - virReportError(VIR_ERR_OVERFLOW, - _("size must be less than %llu KiB"), - ULLONG_MAX / 1024); - goto endjob; - } - size = size_up; + if ((disk->src.format == VIR_STORAGE_FILE_QCOW2 || + disk->src.format == VIR_STORAGE_FILE_QED) && + (size % 512)) { + if ((ULLONG_MAX - size) < 512) + size = ULLONG_MAX; + else + size = VIR_ROUND_UP(size, 512); } if (virAsprintf(&device, "%s%s", QEMU_DRIVE_HOST_PREFIX, -- 1.9.0

2 2

[libvirt] [PATCH libvirt-glib 1/2] gconfig: add spiceport chardev
by Marc-André Lureau 12 May '14

12 May '14

From: Marc-André Lureau <marcandre.lureau(a)gmail.com> --- libvirt-gconfig/Makefile.am | 2 + libvirt-gconfig/libvirt-gconfig-domain-channel.h | 1 + ...bvirt-gconfig-domain-chardev-source-spiceport.c | 101 +++++++++++++++++++++ ...bvirt-gconfig-domain-chardev-source-spiceport.h | 71 +++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 9 ++ 6 files changed, 185 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index d328ca7..83d521f 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -28,6 +28,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-chardev.h \ libvirt-gconfig-domain-chardev-source.h \ libvirt-gconfig-domain-chardev-source-pty.h \ + libvirt-gconfig-domain-chardev-source-spiceport.h \ libvirt-gconfig-domain-chardev-source-spicevmc.h \ libvirt-gconfig-domain-clock.h \ libvirt-gconfig-domain-console.h \ @@ -114,6 +115,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-chardev.c \ libvirt-gconfig-domain-chardev-source.c \ libvirt-gconfig-domain-chardev-source-pty.c \ + libvirt-gconfig-domain-chardev-source-spiceport.c \ libvirt-gconfig-domain-chardev-source-spicevmc.c \ libvirt-gconfig-domain-clock.c \ libvirt-gconfig-domain-console.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.h b/libvirt-gconfig/libvirt-gconfig-domain-channel.h index 889b09a..4f1130e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.h @@ -59,6 +59,7 @@ struct _GVirConfigDomainChannelClass typedef enum { GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_GUESTFWD, GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_VIRTIO, + GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_SPICEPORT, } GVirConfigDomainChannelTargetType; diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c new file mode 100644 index 0000000..570e7ea --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-chardev-source-spiceport.c: libvirt domain chardev spiceport configuration + * + * Copyright (C) 2014 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, GVirConfigDomainChardevSourceSpicePortPrivate)) + +struct _GVirConfigDomainChardevSourceSpicePortPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainChardevSourceSpicePort, gvir_config_domain_chardev_source_spiceport, GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE); + + +static void gvir_config_domain_chardev_source_spiceport_class_init(GVirConfigDomainChardevSourceSpicePortClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevSourceSpicePortPrivate)); +} + + +static void gvir_config_domain_chardev_source_spiceport_init(GVirConfigDomainChardevSourceSpicePort *source) +{ + g_debug("Init GVirConfigDomainChardevSourceSpicePort=%p", source); + + source->priv = GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_GET_PRIVATE(source); +} + + +GVirConfigDomainChardevSourceSpicePort *gvir_config_domain_chardev_source_spiceport_new(void) +{ + GVirConfigObject *object; + + /* the name of the root node is just a placeholder, it will be + * overwritten when the GVirConfigDomainChardevSourceSpicePort is attached to a + * GVirConfigDomainChardevSourceSpicePort + */ + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, "dummy", NULL); + gvir_config_object_set_attribute(object, "type", "spiceport", NULL); + return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(object); +} + + +GVirConfigDomainChardevSourceSpicePort *gvir_config_domain_chardev_source_spiceport_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + /* the name of the root node is just a placeholder, it will be + * overwritten when the GVirConfigDomainChardevSourceSpicePort is attached to a + * GVirConfigDomainChardevSourceSpicePort + */ + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, + "dummy", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "spiceport") != 0) { + g_object_unref(G_OBJECT(object)); + g_return_val_if_reached(NULL); + } + return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(object); +} + +void gvir_config_domain_chardev_source_spiceport_set_channel(GVirConfigDomainChardevSourceSpicePort *port, + const char *channel) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(port)); + + gvir_config_object_replace_child_with_attribute(GVIR_CONFIG_OBJECT(port), + "source", + "channel", + channel); + +} + +const gchar * gvir_config_domain_chardev_source_spiceport_get_channel(GVirConfigDomainChardevSourceSpicePort *port) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(port), NULL); + + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(port), + "source", "channel"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.h b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.h new file mode 100644 index 0000000..5ff7794 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.h @@ -0,0 +1,71 @@ +/* + * libvirt-gconfig-domain-chardev-source-spiceport.h: libvirt domain chardev spiceport configuration + * + * Copyright (C) 2014 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT (gvir_config_domain_chardev_source_spiceport_get_type ()) +#define GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, GVirConfigDomainChardevSourceSpicePort)) +#define GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, GVirConfigDomainChardevSourceSpicePortClass)) +#define GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE_SPICE_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT)) +#define GVIR_CONFIG_IS_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT)) +#define GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_PORT, GVirConfigDomainChardevSourceSpicePortClass)) + +typedef struct _GVirConfigDomainChardevSourceSpicePort GVirConfigDomainChardevSourceSpicePort; +typedef struct _GVirConfigDomainChardevSourceSpicePortPrivate GVirConfigDomainChardevSourceSpicePortPrivate; +typedef struct _GVirConfigDomainChardevSourceSpicePortClass GVirConfigDomainChardevSourceSpicePortClass; + +struct _GVirConfigDomainChardevSourceSpicePort +{ + GVirConfigDomainChardevSource parent; + + GVirConfigDomainChardevSourceSpicePortPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainChardevSourceSpicePortClass +{ + GVirConfigDomainChardevSourceClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_domain_chardev_source_spiceport_get_type(void); + +GVirConfigDomainChardevSourceSpicePort *gvir_config_domain_chardev_source_spiceport_new(void); +GVirConfigDomainChardevSourceSpicePort *gvir_config_domain_chardev_source_spiceport_new_from_xml(const gchar *xml, + GError **error); + +void gvir_config_domain_chardev_source_spiceport_set_channel(GVirConfigDomainChardevSourceSpicePort *port, + const char *channel); + +const gchar * gvir_config_domain_chardev_source_spiceport_get_channel(GVirConfigDomainChardevSourceSpicePort *port); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_PORT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 61b5a04..1582109 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -44,6 +44,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-chardev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-chardev-source.h> #include <libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spiceport.h> #include <libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.h> #include <libvirt-gconfig/libvirt-gconfig-domain-channel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index ead313b..fc68050 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -687,4 +687,13 @@ global: gvir_config_object_new_from_xml; } LIBVIRT_GCONFIG_0.1.7; +LIBVIRT_GCONFIG_0.1.9 { +global: + gvir_config_domain_chardev_source_spiceport_get_channel; + gvir_config_domain_chardev_source_spiceport_get_type; + gvir_config_domain_chardev_source_spiceport_new; + gvir_config_domain_chardev_source_spiceport_new_from_xml; + gvir_config_domain_chardev_source_spiceport_set_channel; +} LIBVIRT_GCONFIG_0.1.8; + # .... define new API here using predicted next version number .... -- 1.8.5.3

2 3

[libvirt] [PATCH] util: Fix return type mismatch for nl_recv
by Wangrui (K) 12 May '14

12 May '14

1. As shown in the definition of nl_recv, its return value is of INT type. int nl_recv(struct nl_handle *handle, struct sockaddr_nl *nla, unsigned char **buf, struct ucred **creds) However, in function virNetlinkCommand, it uses an unsigned int param, respbuflen, to receive its return value. Thus, the branch "*respbuflen < 0" is unreachable, negative return values are handled incorrectly. 2. It's said in nl_recv's description that "The caller is responsible for freeing the buffer allocated * in \c *buf if a positive value is returned." which means, we needn't to free it in case it fails. Additionally, nl_recv has a BUG in handling buf: in the error branch, it frees the buf, but didn't set it to NULL. Freeing it outside in the caller function will cause double free. Thus, we set but(resp) to NULL if nl_recv fails. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/virnetlink.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 0cf18f2..1a09567 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -192,6 +192,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, int n; struct nlmsghdr *nlmsg = nlmsg_hdr(nl_msg); virNetlinkHandle *nlhandle = NULL; + int length = 0; if (protocol >= MAX_LINKS) { virReportSystemError(EINVAL, @@ -257,12 +258,15 @@ int virNetlinkCommand(struct nl_msg *nl_msg, goto error; } - *respbuflen = nl_recv(nlhandle, &nladdr, - (unsigned char **)resp, NULL); + length = nl_recv(nlhandle, &nladdr, + (unsigned char **)resp, NULL); - if (*respbuflen <= 0) { + if (length <= 0) { virReportSystemError(errno, "%s", _("nl_recv failed")); + *resp = NULL; rc = -1; + } else { + *respbuflen = length; } error: if (rc == -1) { -- 1.7.12.4

2 1

[libvirt] [VHPC’14] LAST Call for Papers - Deadline in 4 weeks
by VHPC 14 12 May '14

12 May '14

================================================================= CALL FOR PAPERS 9th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '14) held in conjunction with Euro-Par 2014, August 25-29, Porto, Portugal (Springer LNCS) ================================================================= Date: August 26, 2014 Workshop URL: http://vhpc.org Paper Submission Deadline: June 9, 2014 (extended) Confirmed Keynote Speakers: Ron Brightwell, Sandia National Laboratory Hobbes: Using Virtualization to Enable Exascale Applications and Helge Meinhard, CERN CALL FOR PAPERS Virtualization technologies constitute a key enabling factor for flexible resource management in modern data centers, and particularly in cloud environments. Cloud providers need to dynamically manage complex infrastructures in a seamless fashion for varying workloads and hosted applications, independently of the customers deploying software or users submitting highly dynamic and heterogeneous workloads. Thanks to virtualization, we have the ability to manage vast computing and networking resources dynamically and close to the marginal cost of providing the services, which is unprecedented in the history of scientific and commercial computing. Various virtualization technologies contribute to the overall picture in different ways: machine virtualization, with its capability to enable consolidation of multiple under-utilized servers with heterogeneous software and operating systems (OSes), and its capability to live-migrate a fully operating virtual machine (VM) with a very short downtime, enables novel and dynamic ways to manage physical servers; OS-level virtualization, with its capability to isolate multiple user-space environments and to allow for their co-existence within the same OS kernel, promises to provide many of the advantages of machine virtualization with high levels of responsiveness and performance; I/O Virtualization allows physical NICs/HBAs to take traffic from multiple VMs; network virtualization, with its capability to create logical network overlays that are independent of the underlying physical topology and IP addressing, provides the fundamental ground on top of which evolved network services can be realized with an unprecedented level of dynamicity and flexibility; the increasingly adopted paradigm of Software-Defined Networking (SDN) promises to extend this flexibility to the control and data planes of network paths. These technologies have to be inter-mixed and integrated in an intelligent way, to support workloads that are increasingly demanding in terms of absolute performance, responsiveness and interactivity, and have to respect well-specified Service- Level Agreements (SLAs), as needed for industrial-grade provided services. Indeed, among emerging and increasingly interesting application domains for virtualization, we can find big-data application workloads in cloud infrastructures, interactive and real-time multimedia services in the cloud, including real-time big-data streaming platforms such as used in real-time analytics supporting nowadays a plethora of application domains. Distributed cloud infrastructures promise to offer unprecedented responsiveness levels for hosted applications, but that is only possible if the underlying virtualization technologies can overcome most of the latency impairments typical of current virtualized infrastructures (e.g., far worse tail-latency). What is more, in data communications Network Function Virtualization (NFV) is becoming a key technology enabling a shift from supplying hardware-based network functions, to providing them in a software-based and elastic way. In conjunction with (public and private) cloud technologies, NFV may be used for constructing the foundation for cost-effective network functions that can easily and seamlessly adapt to demand, still keeping their major carrier-grade characteristics in terms of QoS and reliability. The Workshop on Virtualization in High-Performance Cloud Computing (VHPC) aims to bring together researchers and industrial practitioners facing the challenges posed by virtualization in order to foster discussion, collaboration, mutual exchange of knowledge and experience, enabling research to ultimately provide novel solutions for virtualized computing systems of tomorrow. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections, and lightning talks, limited to 5 minutes. Presentations may be accompanied by interactive demonstrations. TOPICS Topics of interest include, but are not limited to: - Management, deployment and monitoring of virtualized environments - Language-process virtual machines - Performance monitoring for virtualized/cloud workloads - Virtual machine monitor platforms - Topology management and optimization for distributed virtualized applications - Paravirtualized I/O - Improving I/O and network virtualization including use of RDMA, Infiniband, PCIe - Improving performance in VM access to GPUs, GPU clusters, GP-GPUs - HPC storage virtualization - Virtualized systems for big-data and analytics workloads - Optimizations and enhancements to OS virtualization support - Improving OS-level virtualization and its integration within cloud management - Performance modelling for virtualized/cloud applications - Heterogeneous virtualized environments - Parallel virtualized - virtualization aware file systems - Network virtualization - Software defined networking - Network function virtualization - Hypervisor and network virtualization QoS and SLAs - Cloudbursting - Evolved European grid architectures including such based on network virtualization - Workload characterization for VM-based environments - Optimized communication libraries/protocols in the cloud - System and process/bytecode VM convergence - Cloud frameworks and APIs - Checkpointing/migration of VM-based large compute jobs - Job scheduling/control/policy with VMs - Instrumentation interfaces and languages - VMM performance (auto-)tuning on various load types - Cloud reliability, fault-tolerance, and security - Research, industrial and educational use cases - Virtualization in cloud, cluster and grid environments - Cross-layer VM optimizations - Cloud HPC use cases including optimizations - Services in cloud HPC - Hypervisor extensions and tools for cluster and grid computing - Cluster provisioning in the cloud - Performance and cost modelling - Languages for describing highly-distributed compute jobs - VM cloud and cluster distribution algorithms, load balancing - Instrumentation interfaces and languages - Energy-aware virtualization Important Dates Rolling Paper registration June 9, 2014 - Full paper submission (extended) July 4, 2014 - Acceptance notification October 3, 2014 - Camera-ready version due August 26, 2014 - Workshop Date TPC CHAIR Michael Alexander (chair), TU Wien, Austria Anastassios Nanos (co-chair), NTUA, Greece Tommaso Cucinotta (co-chair), Bell Labs, Dublin, Ireland PROGRAM COMMITTEE Costas Bekas, IBM Jakob Blomer, CERN Roberto Canonico, University of Napoli Federico II, Italy Piero Castoldi, Sant'Anna School of Advanced Studies Paolo Costa, MS Research Cambridge, England Jorge Ejarque Artigas, Barcelona Supercomputing Center, Spain William Gardner, University of Guelph, USA Balazs Gerofi, University of Tokyo, Japan Krishna Kant, Temple University, USA Romeo Kinzler, IBM Nectarios Koziris, National Technical University of Athens, Greece Giuseppe Lettieri, University of Pisa, Italy Jean-Marc Menaud, Ecole des Mines de Nantes, France Christine Morin, INRIA, France Dimitrios Nikolopoulos, Queen's University of Belfast, UK Herbert Poetzl, VServer, Austria Luigi Rizzo, University of Pisa, Italy Josh Simons, VMware, USA Borja Sotomayor, University of Chicago, USA Vangelis Tasoulas, Simula Research Lab, Norway Yoshio Turner, HP Labs, USA Kurt Tutschku, Blekinge Institute of Technology, Sweden Chao-Tung Yang, Tunghai University, Taiwan PAPER SUBMISSION-PUBLICATION Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in the Springer LNCS series - the format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: http://www.springer.de/comp/lncs/authors.html EasyChair Abstract Submission Link: https://www.easychair.org/conferences/?conf=europar2014ws GENERAL INFORMATION The workshop is one day in length and will be held in conjunction with Euro-Par 2014, 25-29 August, Porto, Portugal

1 0

[libvirt] [PATCH 2/2] util: do not set resp to NULL after VIR_FREE
by Wangrui (K) 12 May '14

12 May '14

Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/virnetlink.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 4f4dedc..40912f5 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -271,7 +271,6 @@ int virNetlinkCommand(struct nl_msg *nl_msg, cleanup: if (rc == -1) { VIR_FREE(*resp); - *resp = NULL; *respbuflen = 0; } -- 1.7.12.4

1 0

[libvirt] [PATCH 1/2] util: replace error with cleanup in virNetlinkCommand
by Wangrui (K) 12 May '14

12 May '14

In funtcion virNetlinkCommand, it uses the word "error" as the goto out keyword, but it's not an error-handling branch, so, use "cleanup" instead. Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/virnetlink.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 1a09567..4f4dedc 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -212,7 +212,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, _("cannot connect to netlink socket with protocol %d"), protocol); rc = -1; - goto error; + goto cleanup; } fd = nl_socket_get_fd(nlhandle); @@ -220,14 +220,14 @@ int virNetlinkCommand(struct nl_msg *nl_msg, virReportSystemError(errno, "%s", _("cannot get netlink socket fd")); rc = -1; - goto error; + goto cleanup ; } if (groups && nl_socket_add_membership(nlhandle, groups) < 0) { virReportSystemError(errno, "%s", _("cannot add netlink membership")); rc = -1; - goto error; + goto cleanup; } nlmsg_set_dst(nl_msg, &nladdr); @@ -239,7 +239,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, virReportSystemError(errno, "%s", _("cannot send to netlink socket")); rc = -1; - goto error; + goto cleanup; } memset(fds, 0, sizeof(fds)); @@ -255,7 +255,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, virReportSystemError(ETIMEDOUT, "%s", _("no valid netlink response was received")); rc = -1; - goto error; + goto cleanup; } length = nl_recv(nlhandle, &nladdr, @@ -268,7 +268,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, } else { *respbuflen = length; } - error: + cleanup: if (rc == -1) { VIR_FREE(*resp); *resp = NULL; -- 1.7.12.4

1 0

[libvirt] [PATCH 0/2] *** replace error with cleanup in virNetlinkCommand ***
by Wangrui (K) 12 May '14

12 May '14

Zhang Bo (2): util: replace error with cleanup in virNetlinkCommand util: do not set resp to NULL after VIR_FREE src/util/virnetlink.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 1.7.12.4

1 0

[libvirt] [RFC PATCH] Add support for invtsc timer
by Ján Tomko 12 May '14

12 May '14

Not yet merged in upstream QEMU: https://lists.gnu.org/archive/html/qemu-devel/2014-04/msg05024.html Add support for invariant TSC timer running at constant rate in all ACPI P-, C- and T-states. It can be enabled by specifying: <clock> <timer name='invtsc' present='yes'/> </clock> in the domain XML. Migration and saving the domain does not work with this timer. The support for this timer is indicated by bit 8 of EDX after calling CPUID with 0x80000007. It does not show up in /proc/cpuinfo [1] and since we're calling qemu without 'enforce', it doesn't error out if the host doesn't support this. Alternatively, we could expose it in libvirt as a cpu flag: <cpu mode='custom' match='exact'> <model fallback='forbid'>qemu64</model> <feature policy='require' name='invtsc'/> </cpu> or maybe add +invtsc to qemu args when the 'nonstop_tsc' flag is requested? [1]: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/x… --- docs/formatdomain.html.in | 9 ++++++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 6 +++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 6 +++++ src/qemu/qemu_migration.c | 14 ++++++++++++ .../qemuxml2argv-clock-timer-inv-tsc.args | 5 +++++ .../qemuxml2argv-clock-timer-inv-tsc.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4f19473..1d3fd93 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1368,13 +1368,18 @@ being modified, and can be one of "platform" (currently unsupported), "hpet" (libxl, xen, qemu), "kvmclock" (qemu), - "pit" (qemu), "rtc" (qemu), "tsc" (libxl) or "hypervclock" - (qemu - since 1.2.2). + "pit" (qemu), "rtc" (qemu), "tsc" (libxl), "hypervclock" + (qemu - since 1.2.2) or + "invtsc" (qemu - since 1.2.5). The <code>hypervclock</code> timer adds support for the reference time counter and the reference page for iTSC feature for guests running the Microsoft Windows operating system. + + The <code>invtsc</code> timer adds support for the invariant + TSC. It runs at a constant rate in all ACPI P- C- and T-states. + A guest with this timer enabled cannot be migrated or saved. </dd> <dt><code>track</code></dt> <dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4249ed5..5154826 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -918,6 +918,7 @@ <choice> <value>kvmclock</value> <value>hypervclock</value> + <value>invtsc</value> </choice> </attribute> </group> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c3bdad..893d904 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -706,7 +706,8 @@ VIR_ENUM_IMPL(virDomainTimerName, VIR_DOMAIN_TIMER_NAME_LAST, "hpet", "tsc", "kvmclock", - "hypervclock"); + "hypervclock", + "invtsc"); VIR_ENUM_IMPL(virDomainTimerTrack, VIR_DOMAIN_TIMER_TRACK_LAST, "boot", @@ -2931,7 +2932,8 @@ virDomainDefPostParseInternal(virDomainDefPtr def, virDomainTimerDefPtr timer = def->clock.timers[i]; if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK || - timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) { + timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK || + timer->name == VIR_DOMAIN_TIMER_NAME_INVTSC) { if (timer->tickpolicy != -1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("timer %s doesn't support setting of " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a92f0f3..53c02e6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1635,6 +1635,7 @@ enum virDomainTimerNameType { VIR_DOMAIN_TIMER_NAME_TSC, VIR_DOMAIN_TIMER_NAME_KVMCLOCK, VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK, + VIR_DOMAIN_TIMER_NAME_INVTSC, VIR_DOMAIN_TIMER_NAME_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6c1e17d..2994427 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6736,6 +6736,11 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver, have_cpu ? "" : default_model, timer->present ? '+' : '-'); have_cpu = true; + } else if (timer->name == VIR_DOMAIN_TIMER_NAME_INVTSC) { + virBufferAsprintf(&buf, "%s,%cinvtsc", + have_cpu ? "" : default_model, + timer->present ? '+' : '-'); + have_cpu = true; } else if (timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK && timer->present) { virBufferAsprintf(&buf, "%s,hv_time", @@ -8063,6 +8068,7 @@ qemuBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: + case VIR_DOMAIN_TIMER_NAME_INVTSC: /* Timers above are handled when building -cpu. */ case VIR_DOMAIN_TIMER_NAME_LAST: break; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a9f7fea..c1ffc0f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1513,6 +1513,20 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, return false; } + for (i = 0; i < def->clock.ntimers; i++) { + virDomainTimerDefPtr timer = def->clock.timers[i]; + + if (timer->present != 1) + continue; + + if (timer->name == VIR_DOMAIN_TIMER_NAME_INVTSC) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain has '%s' timer"), + virDomainTimerNameTypeToString(timer->name)); + return false; + } + } + return true; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.args b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.args new file mode 100644 index 0000000..ae74ae8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/kvm -S -M pc \ +-cpu qemu32,+invtsc -m 214 -smp 6 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ +none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.xml new file mode 100644 index 0000000..b4a82e8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-timer-inv-tsc.xml @@ -0,0 +1,26 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <pae/> + </features> + <clock offset='utc'> + <timer name='invtsc' present='yes'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/kvm</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 14482fd..3c5024e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -641,6 +641,7 @@ mymain(void) DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_CPU_HOST); DO_TEST("kvmclock", QEMU_CAPS_KVM); DO_TEST("clock-timer-hyperv-rtc", QEMU_CAPS_KVM); + DO_TEST("clock-timer-inv-tsc", QEMU_CAPS_KVM); DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM); DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3ea03e6..a659cd0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -185,6 +185,7 @@ mymain(void) DO_TEST("clock-catchup"); DO_TEST("kvmclock"); DO_TEST("clock-timer-hyperv-rtc"); + DO_TEST("clock-timer-inv-tsc"); DO_TEST("cpu-eoi-disabled"); DO_TEST("cpu-eoi-enabled"); -- 1.8.3.2

5 7

[libvirt] [PATCH] maint: prohibit empty first lines
by Martin Kletzander 12 May '14

12 May '14

I just found this in one of my branches and I remembered I wanted to send this right after a discussion with Eric, but I forgot, somehow: https://www.redhat.com/archives/libvir-list/2014-March/msg01001.html Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- cfg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cfg.mk b/cfg.mk index 3f4bba0..b2d12f9 100644 --- a/cfg.mk +++ b/cfg.mk @@ -929,6 +929,13 @@ sc_prohibit_mixed_case_abbreviations: halt='Use PCI, USB, SCSI, not Pci, Usb, Scsi' \ $(_sc_search_regexp) +sc_prohibit_empty_first_line: + @awk 'BEGIN { fail=0; } \ + FNR == 1 { if ($$0 == "") { print FILENAME:1:; fail=1; } } \ + END { if (fail == 1) { \ + print "$(ME): Prohibited empty first line" > "/dev/stderr"; \ + } exit fail; }' $$($(VC_LIST_EXCEPT) | grep '\.[ch]$$'); + # We don't use this feature of maint.mk. prev_version_file = /dev/null -- 1.9.2

1 0

[libvirt] [PATCH] qemu: Implement a stub cpuArchDriver.compare() handler for arm and aarch64
by Oleg Strikov 12 May '14

12 May '14

Libvirt calls cpuArchDriver.compare() while doing guest migration. We don't have any logic to distinguish between different arm and aarch64 models that's why this patch allows migration to any host. Signed-off-by: Oleg Strikov <oleg.strikov(a)canonical.com> --- src/cpu/cpu_aarch64.c | 9 ++++++++- src/cpu/cpu_arm.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/cpu/cpu_aarch64.c b/src/cpu/cpu_aarch64.c index 3c3e749..7255d9f 100644 --- a/src/cpu/cpu_aarch64.c +++ b/src/cpu/cpu_aarch64.c @@ -108,11 +108,18 @@ AArch64Baseline(virCPUDefPtr *cpus, return cpu; } +static virCPUCompareResult +AArch64Compare(virCPUDefPtr host ATTRIBUTE_UNUSED, + virCPUDefPtr cpu ATTRIBUTE_UNUSED) +{ + return VIR_CPU_COMPARE_IDENTICAL; +} + struct cpuArchDriver cpuDriverAARCH64 = { .name = "aarch64", .arch = archs, .narch = ARRAY_CARDINALITY(archs), - .compare = NULL, + .compare = AArch64Compare, .decode = AArch64Decode, .encode = NULL, .free = AArch64DataFree, diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index ec80b35..53bf4f4 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -109,11 +109,18 @@ ArmBaseline(virCPUDefPtr *cpus, return cpu; } +static virCPUCompareResult +ArmCompare(virCPUDefPtr host ATTRIBUTE_UNUSED, + virCPUDefPtr cpu ATTRIBUTE_UNUSED) +{ + return VIR_CPU_COMPARE_IDENTICAL; +} + struct cpuArchDriver cpuDriverArm = { .name = "arm", .arch = archs, .narch = ARRAY_CARDINALITY(archs), - .compare = NULL, + .compare = ArmCompare, .decode = ArmDecode, .encode = NULL, .free = ArmDataFree, -- 1.7.9.5

2 1

[libvirt] [PATCH 0/4] esx, vmware: conditionally allow newer virtualHW versions
by Martin Kletzander 11 May '14

11 May '14

With this one should be able to connect with e.g. 'esx://localhost?allow_unsafe=1' to newer ESX hypervisor than supported. Docs are in [1/4] and [2/4] with esx and vmware changes, respectively. Reason for the parameter is explained in [3/4]. Tests are in [4/4]. Martin Kletzander (4): esx: parse new URI param 'allow_unsafe' vmware: parse new URI param 'allow_unsafe' vmx: allow version safety bypass with allowUnsafe tests: vmx support for allowUnsafe docs/drvesx.html.in | 14 ++++++++++++++ docs/drvvmware.html.in | 35 +++++++++++++++++++++++++++++++++++ src/esx/esx_driver.c | 6 ++++-- src/esx/esx_util.c | 13 ++++++++++++- src/esx/esx_util.h | 2 ++ src/vmware/vmware_conf.c | 4 ++-- src/vmware/vmware_conf.h | 2 ++ src/vmware/vmware_driver.c | 20 ++++++++++++++++++-- src/vmx/vmx.c | 24 ++++++++++++++++++------ src/vmx/vmx.h | 4 +++- tests/vmx2xmldata/vmx2xml-unsafe.vmx | 2 ++ tests/vmx2xmldata/vmx2xml-unsafe.xml | 18 ++++++++++++++++++ tests/vmx2xmltest.c | 36 +++++++++++++++++++++++++++++++----- 13 files changed, 161 insertions(+), 19 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-unsafe.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-unsafe.xml -- 1.9.2

3 8

[libvirt] [PATCH] ESX: add virStorageVolGetInfo in iSCSI backend.
by Dawid Zamirski 10 May '14

10 May '14

Since the ESX storage implements VMFS and iSCSI storage backends and chooses relevant backend dynamically at runtime, there was a segfault when issuing vol-info on iSCSI volume due to unimplemented virStorageGetInfo function. This patch implements that function that was missing in iSCSI backend and returns expected result without a segfault. --- src/esx/esx_storage_backend_iscsi.c | 47 +++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 4619629..3d31908 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -621,6 +621,52 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +static int +esxStorageVolGetInfo(virStorageVolPtr volume, + virStorageVolInfoPtr info) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + esxVI_ScsiLun *scsiLunList = NULL; + esxVI_ScsiLun *scsiLun; + esxVI_HostScsiDisk *hostScsiDisk = NULL; + + if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { + goto cleanup; + } + + for (scsiLun = scsiLunList; scsiLun; + scsiLun = scsiLun->_next) { + hostScsiDisk = esxVI_HostScsiDisk_DynamicCast(scsiLun); + + if (hostScsiDisk && + STREQ(hostScsiDisk->deviceName, volume->name)) { + break; + } + } + + if (!hostScsiDisk) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Could not find volume with name: %s"), + volume->name); + goto cleanup; + } + + info->type = VIR_STORAGE_VOL_BLOCK; + info->capacity = hostScsiDisk->capacity->block->value * + hostScsiDisk->capacity->blockSize->value; + info->allocation = info->capacity; + + result = 0; + + cleanup: + esxVI_ScsiLun_Free(&scsiLunList); + + return result; +} + + + static char * esxStorageVolGetXMLDesc(virStorageVolPtr volume, unsigned int flags) @@ -752,6 +798,7 @@ virStorageDriver esxStorageBackendISCSI = { .storageVolLookupByKey = esxStorageVolLookupByKey, /* 1.0.1 */ .storageVolCreateXML = esxStorageVolCreateXML, /* 1.0.1 */ .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 1.0.1 */ + .storageVolGetInfo = esxStorageVolGetInfo, /* 1.2.4 */ .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 1.0.1 */ .storageVolDelete = esxStorageVolDelete, /* 1.0.1 */ .storageVolWipe = esxStorageVolWipe, /* 1.0.1 */ -- 1.9.0

2 1

[libvirt] technicality
by ENGLISH, Sean Matthew 10 May '14

10 May '14

Hi, Is it accurate to say that: *To virtualize the hardware memory, VMware ESX forces the real hardware MMU point to the shadow page table.* I guess it's true, isn't it? Sincerely, Matthew

1 0