- Devel - libvirt List Archives

[libvirt] Document
by Penas Cédric 07 Dec '11

07 Dec '11

Hi, As part of a research project for the HES-SO (/http://www.hes-so.ch/), I produced a document on the operation of libvirt and implementation of a libvirt cloning function to ESXi. Currently this document is available in French (/http://www.tdeig.ch/kvm/Libvirt.pdf/). If anyone is interestedin, I can translate it into English. Your remarks and comments are welcome. Best regards, Penas Cédric -- _Cédric Penas Assistant HES Laboratoire de Transmission de Données *hepia* Rue de la Prairie 4 CH-1202 Genève cedric.penas(a)hesge.ch <mailto:cedric.penas@hesge.ch> www.hesge.ch/hepia <http://www.hesge.ch/hepia> Tél. +41 (0)22 546 25 47

1 0

[libvirt] KVM Call Agenda for 12/6 (Tuesday) @ 10am US/Eastern
by Anthony Liguori 07 Dec '11

07 Dec '11

Hi, I'd like to propose that we discuss guest agent convergence in our next KVM call. I've CC'd folks from oVirt and libvirt to join the discussion. I think we should probably attempt to have some structure to the discussion. I would suggest: 1. A short introduction to each of the guest agents, what guests they support, and what verbs they support. 2. A short description of key requirements from each party (oVirt, libvirt, QEMU) for a guest agent 3. An open discussion about possible ways to collaborate/converge. Regards, Anthony Liguori

6 7

[libvirt] [PATCH v2 0/2] Guest NUMA topology support
by Bharata B Rao 06 Dec '11

06 Dec '11

Hi, This is v2 of the patchset that adds support for specifying NUMA topology for guests. <cpu> ... <topology sockets='2' cores='4' threads='2'/> <numa> <cell cpus='0-7' mems='512000'/> <cell cpus='8-15' mems='512000'/> </numa> ... </cpu> This change allows libvirt to generate -numa options for QEMU/KVM. This patchset passes all tests except daemon-conf test. Changes for v2 -------------- - Renamed mems to memory in NUMA cell specification. - Make both cpus= and memory= mandatory in a NUMA cell. - Reuse cpuset and memoryKB definitions for cpus and memory. - Fix a bug in reading memory=. - Correct error handling for usages of virXMLPropString. - Support virsh dumpxml. - Fix XML in domaincommon.rng so that <numa> works correctly for both <cpu> ... <cpu> as well as <cpu match="..."> ... <cpu> - Don't use virBufferTruncate. - Modifiy qemuxml2argv test cases for s/mems/memory change. - Use virBufferLit wherever possible. - Now qemuBuildNumaCPUArgStr can't fail, hence doesn't need return val. - Pass memory in MB to qemu. v1 - https://www.redhat.com/archives/libvir-list/2011-November/msg00247.html v0 - https://www.redhat.com/archives/libvir-list/2011-October/msg00025.html RFC - http://permalink.gmane.org/gmane.comp.emulators.libvirt/44626 Regards, Bharata.

4 8

[libvirt] [PATCH] security: don't try to restore label on NFS if label failed
by Eric Blake 06 Dec '11

06 Dec '11

I noticed that the logs contained messages like this: 2011-12-05 23:32:40.382+0000: 26569: warning : SELinuxRestoreSecurityFileLabel:533 : cannot lookup default selinux label for /nfs/libvirt/images/dom.img for all my domain images living on NFS. But if we would just remember that on domain creation that we were unable to set a SELinux label (due to NFSv3 lacking labels, or NFSv4 not being configured to expose attributes), then we could avoid wasting the time trying to clear the label on domain shutdown. This in turn is one less point of NFS failure, especially since there have been documented cases of virDomainDestroy hanging during an attempted operation on a failed NFS connection. I tested that this works over libvirtd restart for <disk> images; it cannot work for other labeled file types unless we also enhance those in-memory representations to track whether a label is in force. * src/conf/domain_conf.h (_virDomainDiskDef): Add member. * src/conf/domain_conf.c (virDomainDiskDefParseXML): Parse it. (virDomainDiskDefFormat): Output it. * src/security/security_selinux.c (SELinuxSetFilecon): Move guts... (SELinuxSetFileconHelper): ...to new function. (SELinuxSetFileconOptional): New function. (SELinuxSetSecurityFileLabel): Remember if labeling failed. (SELinuxRestoreSecurityImageLabelInt): Skip relabeling on NFS. --- This is an attempt to address the primary symptom (but NOT the root cause) of https://bugzilla.redhat.com/746666, since that is a documented case of a hang during the label restoration that would be skipped had we remembered that no label was applied at domain start. A full solution to that problem will involve much more invasive lock refactoring, and probably the creation of one thread per VM rather than the current approach of reusing RPC threads for VM operations, where the per-VM thread is used for any operation that might hang on NFS. https://www.redhat.com/archives/libvir-list/2011-November/msg00267.html src/conf/domain_conf.c | 5 +++++ src/conf/domain_conf.h | 1 + src/security/security_selinux.c | 39 ++++++++++++++++++++++++++++----------- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 75e51a0..38d24e0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2774,6 +2774,9 @@ virDomainDiskDefParseXML(virCapsPtr caps, } else if (xmlStrEqual(cur->name, BAD_CAST "transient")) { def->transient = 1; } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && + xmlStrEqual(cur->name, BAD_CAST "nolabel")) { + def->noSecurityLabel = 1; + } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && xmlStrEqual(cur->name, BAD_CAST "state")) { /* Legacy back-compat. Don't add any more attributes here */ devaddr = virXMLPropString(cur, "devaddr"); @@ -9856,6 +9859,8 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <shareable/>\n"); if (def->transient) virBufferAddLit(buf, " <transient/>\n"); + if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && def->noSecurityLabel) + virBufferAddLit(buf, " <nolabel/>\n"); virBufferEscapeString(buf, " <serial>%s</serial>\n", def->serial); if (def->encryption) { virBufferAdjustIndent(buf, 6); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d6ed898..97786f7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -359,6 +359,7 @@ struct _virDomainDiskDef { unsigned int readonly : 1; unsigned int shared : 1; unsigned int transient : 1; + unsigned int noSecurityLabel : 1; virDomainDeviceInfo info; virStorageEncryptionPtr encryption; }; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 78c0d45..864b35e 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -394,8 +394,11 @@ SELinuxGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, return 0; } +/* Attempt to change the label of PATH to TCON. If OPTIONAL is true, + * return 1 if labelling was not possible. Otherwise, require a label + * change, and return 0 for success, -1 for failure. */ static int -SELinuxSetFilecon(const char *path, char *tcon) +SELinuxSetFileconHelper(const char *path, char *tcon, bool optional) { security_context_t econ; @@ -408,7 +411,7 @@ SELinuxSetFilecon(const char *path, char *tcon) if (STREQ(tcon, econ)) { freecon(econ); /* It's alright, there's nothing to change anyway. */ - return 0; + return optional ? 1 : 0; } freecon(econ); } @@ -440,12 +443,26 @@ SELinuxSetFilecon(const char *path, char *tcon) VIR_INFO("Setting security context '%s' on '%s' not supported", tcon, path); } + if (optional) + return 1; } } return 0; } static int +SELinuxSetFileconOptional(const char *path, char *tcon) +{ + return SELinuxSetFileconHelper(path, tcon, true); +} + +static int +SELinuxSetFilecon(const char *path, char *tcon) +{ + return SELinuxSetFileconHelper(path, tcon, false); +} + +static int SELinuxFSetFilecon(int fd, char *tcon) { security_context_t econ; @@ -549,7 +566,7 @@ SELinuxRestoreSecurityImageLabelInt(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, { const virSecurityLabelDefPtr secdef = &vm->def->seclabel; - if (secdef->norelabel) + if (secdef->norelabel || disk->noSecurityLabel) return 0; /* Don't restore labels on readoly/shared disks, because @@ -606,21 +623,21 @@ SELinuxSetSecurityFileLabel(virDomainDiskDefPtr disk, if (depth == 0) { if (disk->shared) { - ret = SELinuxSetFilecon(path, default_image_context); + ret = SELinuxSetFileconOptional(path, default_image_context); } else if (disk->readonly) { - ret = SELinuxSetFilecon(path, default_content_context); + ret = SELinuxSetFileconOptional(path, default_content_context); } else if (secdef->imagelabel) { - ret = SELinuxSetFilecon(path, secdef->imagelabel); + ret = SELinuxSetFileconOptional(path, secdef->imagelabel); } else { ret = 0; } } else { - ret = SELinuxSetFilecon(path, default_content_context); + ret = SELinuxSetFileconOptional(path, default_content_context); + } + if (ret == 1) { + disk->noSecurityLabel = 1; + ret = 0; } - if (ret < 0 && - virStorageFileIsSharedFSType(path, - VIR_STORAGE_FILE_SHFS_NFS) == 1) - ret = 0; return ret; } -- 1.7.7.3

2 2

Re: [libvirt] [Xen-devel] [BUG] insufficient quoting between " tap-ctl list " and xend/server/BlktapController.py
by Philipp Hahn 06 Dec '11

06 Dec '11

Hello, On Thursday 01 December 2011 19:31:04 Ian Jackson wrote: > Philipp Hahn writes ("Re: [Xen-devel] [BUG] insufficient quoting between "tap-ctl list" and xend/server/BlktapController.py"): > > As a quick work-around, the attached patch fixes the problem for me. That > > is, until tap-ctl changes it's output format. > > Thanks, I have applied it. Thanks for applying. On Thursday 01 December 2011 20:51:05 Ian Campbell wrote: > xend is deprecated. This ultimately means that xend will go away. If you > are dependent on these features then you need put effort into ensuring > that they become supported in libxl and xl. For our forthcomming release of UCS-3.0 we really wanted to switch from Xend to xl, but be had to switch back to using Xend, because libvirt still lacks some important features like migration; see <http://libvirt.org/hvsupport.html> for a comparison matrix. Back at the beginning of 2011 Univention sponsored Markus Gross to work on the xl-binding of libvirt, but after the end of his internship I have not seen that much work on the xl-binding in libvirt except from Jim Fehlig. Sincerely Philipp Hahn -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

3 2

[libvirt] [PATCH] Improve error reporting when libvirtd is not installed
by Daniel P. Berrange 06 Dec '11

06 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently if you try to connect to a local libvirtd when libvirtd is not in $PATH, you'll get an error error: internal error invalid use of command API This is because remoteFindDaemonPath() returns NULL, which causes us to pass NULL into virNetSocketConnectUNIX which in turn causes us to pass NULL into virCommandNewArgList. Adding missing error checks improves this to error: internal error Unable to locate libvirtd daemon in $PATH * src/remote/remote_driver.c: Report error if libvirtd cannot be found * src/rpc/virnetsocket.c: Report error if caller requested spawning of daemon, but provided no binary path --- src/remote/remote_driver.c | 8 +++++++- src/rpc/virnetsocket.c | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 1fb0eca..755275a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -321,6 +321,7 @@ doRemoteOpen (virConnectPtr conn, trans_ext, trans_tcp, } transport; + const char *daemonPath; /* We handle *ALL* URIs here. The caller has rejected any * URIs we don't care about */ @@ -588,9 +589,14 @@ doRemoteOpen (virConnectPtr conn, VIR_DEBUG("Proceeding with sockname %s", sockname); } + if (!(daemonPath = remoteFindDaemonPath())) { + remoteError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to locate libvirtd daemon in $PATH")); + goto failed; + } if (!(priv->client = virNetClientNewUNIX(sockname, flags & VIR_DRV_OPEN_REMOTE_AUTOSTART, - remoteFindDaemonPath()))) + daemonPath))) goto failed; priv->is_secure = 1; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2747f66..e5e2473 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -481,6 +481,12 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.len = sizeof(remoteAddr.data.un); + if (spawnDaemon && !binary) { + virNetError(VIR_ERR_INTERNAL_ERROR, + _("Auto-spawn of daemon requested, but not binary specified")); + return -1; + } + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, "%s", _("Failed to create socket")); goto error; -- 1.7.7.3

2 1

[libvirt] [PATCH libvirt-glib] Allow cancelling gvir_stream_send_all & gvir_stream_receive_all
by Daniel P. Berrange 06 Dec '11

06 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add GCancellable parameters to gvir_stream_send_all and gvir_stream_receive_all to allow I/O to be interrupted before completion --- libvirt-gobject/libvirt-gobject-stream.c | 23 +++++++++++++++++++++-- libvirt-gobject/libvirt-gobject-stream.h | 2 ++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index c1ae765..7204f98 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -26,6 +26,7 @@ #include <libvirt/virterror.h> #include <string.h> +#include <errno.h> #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" @@ -330,6 +331,7 @@ struct stream_sink_helper { GVirStream *self; GVirStreamSinkFunc func; gpointer user_data; + GCancellable *cancellable; }; static int @@ -340,12 +342,18 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, { struct stream_sink_helper *helper = opaque; + if (g_cancellable_is_cancelled(helper->cancellable)) { + errno = EIO; + return -1; + } + return helper->func(helper->self, bytes, nbytes, helper->user_data); } /** * gvir_stream_receive_all: * @stream: the stream + * @cancellable: cancellation notifier * @func: (scope notified): the callback for writing data to application * @user_data: (closure): data to be passed to @callback * Returns: the number of bytes consumed or -1 upon error @@ -356,6 +364,7 @@ stream_sink(virStreamPtr st G_GNUC_UNUSED, */ gssize gvir_stream_receive_all(GVirStream *self, + GCancellable *cancellable, GVirStreamSinkFunc func, gpointer user_data, GError **err) @@ -363,7 +372,8 @@ gvir_stream_receive_all(GVirStream *self, struct stream_sink_helper helper = { .self = self, .func = func, - .user_data = user_data + .user_data = user_data, + .cancellable = cancellable, }; int r; @@ -433,6 +443,7 @@ struct stream_source_helper { GVirStream *self; GVirStreamSourceFunc func; gpointer user_data; + GCancellable *cancellable; }; static int @@ -443,12 +454,18 @@ stream_source(virStreamPtr st G_GNUC_UNUSED, { struct stream_source_helper *helper = opaque; + if (g_cancellable_is_cancelled(helper->cancellable)) { + errno = EIO; + return -1; + } + return helper->func(helper->self, bytes, nbytes, helper->user_data); } /** * gvir_stream_send_all: * @stream: the stream + * @cancellable: cancellation notifier * @func: (scope notified): the callback for writing data to application * @user_data: (closure): data to be passed to @callback * Returns: the number of bytes consumed or -1 upon error @@ -459,6 +476,7 @@ stream_source(virStreamPtr st G_GNUC_UNUSED, */ gssize gvir_stream_send_all(GVirStream *self, + GCancellable *cancellable, GVirStreamSourceFunc func, gpointer user_data, GError **err) @@ -466,7 +484,8 @@ gvir_stream_send_all(GVirStream *self, struct stream_source_helper helper = { .self = self, .func = func, - .user_data = user_data + .user_data = user_data, + .cancellable = cancellable, }; int r; diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index 3caadc3..9a02c7a 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -115,6 +115,7 @@ guint gvir_stream_add_watch_full(GVirStream *stream, GDestroyNotify notify); gssize gvir_stream_receive_all(GVirStream *stream, + GCancellable *cancellable, GVirStreamSinkFunc func, gpointer user_data, GError **error); @@ -125,6 +126,7 @@ gssize gvir_stream_receive(GVirStream *stream, GError **error); gssize gvir_stream_send_all(GVirStream *stream, + GCancellable *cancellable, GVirStreamSourceFunc func, gpointer user_data, GError **error); -- 1.7.7.3

3 3

[libvirt] [PATCH libvirt-glib] Add flags for controling how domains are started
by Daniel P. Berrange 06 Dec '11

06 Dec '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- libvirt-gobject/libvirt-gobject-domain.h | 8 ++++++++ libvirt-gobject/libvirt-gobject.sym | 1 + 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 5525d9c..b9e39dd 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -80,6 +80,14 @@ typedef enum { } GVirDomainState; +typedef enum { + GVIR_DOMAIN_START_NONE = 0, + GVIR_DOMAIN_START_PAUSED = (1 << 0), + GVIR_DOMAIN_START_AUTODESTROY = (1 << 1), + GVIR_DOMAIN_START_BYPASS_CACHE = (1 << 2), + GVIR_DOMAIN_START_FORCE_BOOT = (1 << 3), +} GVirDomainStartFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 3727fb7..d0444bd 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -44,6 +44,7 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_domain_handle_get_type; gvir_domain_info_get_type; gvir_domain_state_get_type; + gvir_domain_start_flags_get_type; gvir_domain_get_name; gvir_domain_get_uuid; gvir_domain_get_id; -- 1.7.7.3

2 1

[libvirt] [PATCH 0/5] Interface pools and passthrough mode
by Shradha Shah 06 Dec '11

06 Dec '11

Interface Pools and Passthrough mode: Current Method: The passthrough mode uses a macvtap a direct connection to connect each guest to the network. The physical interface to be used is picked from among those listed in <interface> sub elements of the <forward> element. The current specification for <forward> extends to allow 0 or more <interface> sub-elements: Example: <forward mode='passthrough' dev='eth10'/> <interface dev='eth10'/> <interface dev='eth12'/> <interface dev='eth18'/> <interface dev='eth20'/> </forward> However with an ethernet card with 64 VF's or more, the above method gets tedious on the system. On the other hand, just parameterizing a string (eth%d) is inadequate, eg, when there are multiple non-contiguous ranges. Proposed Method: The 5 patches provided along with this introductory e-mail i) Introduce a structure to store the state of all the virtual functions attached to each physical function ii) Find a free virtual function given the physical function. The forward specification will hence only mention the physical function as the interface sub element: Example: <forward mode='passthrough' dev='eth2'/> <interface dev='eth2'/> </forward> Shradha Shah (5): Moving the declaration of _pciDevice and _pciDeviceList to pci.h Added function pciSysfsFile to enable access to the PCI SYSFS files. Adding functions virNetDevGetVirtualFunctions and virNetDevGetNetName virNetDevGetVirtualFunctions: Gets the BDF of all the Virtual Functions given a physical function virNetDevGetNetName: Gets the interface name of the PCI Device. Addition of a new device structure to store the state of a Virtual Function Modifications to the Physical Device Structure to store state of its Virtual Functions If a system has 64 or more VF's, it is quite tedious to mention each VF in the interface pool. The following modification find a Free VF given a Physical Function when mode=passthrough. We also save the state of each VF. Hence modifications to networkAllocateActualDevice, networkNotifyActualDevice and networkReleaseActualDevice were required. The following patch does just that. src/conf/network_conf.c | 19 ++++- src/conf/network_conf.h | 10 ++ src/network/bridge_driver.c | 208 +++++++++++++++++++++++++++++++++++++------ src/util/pci.c | 52 ++++------- src/util/pci.h | 36 ++++++++ src/util/virnetdev.c | 89 ++++++++++++++++++ src/util/virnetdev.h | 10 ++ 7 files changed, 359 insertions(+), 65 deletions(-) -- 1.7.4.4

3 19

[libvirt] [libvirt-glib PATCHv2 1/5] Add objects for dealing with <console> devices
by Christophe Fergeau 06 Dec '11

06 Dec '11

Add an abstract GVirConfigDomainChardev object for <console>, <serial>, ... devices and a GVirConfigDomainConsole implementation. This needs to be completed with a separate GVirConfigDomainChardevSource inheritance tree which will be specialized to GVirConfigDomainChardevSourcePty, ... and GVirConfigDomainChardev will offer a helper function to attach a GVirConfigDomainChardevSource to a GVirConfigDomainChardev --- libvirt-gconfig/Makefile.am | 4 + libvirt-gconfig/libvirt-gconfig-domain-chardev.c | 48 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-chardev.h | 64 ++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-console.c | 70 ++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-console.h | 67 +++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 6 ++ 7 files changed, 261 insertions(+), 0 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-chardev.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-chardev.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-console.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-console.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 575715e..88fb556 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -13,7 +13,9 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-object.h \ libvirt-gconfig-capabilities.h \ libvirt-gconfig-domain.h \ + libvirt-gconfig-domain-chardev.h \ libvirt-gconfig-domain-clock.h \ + libvirt-gconfig-domain-console.h \ libvirt-gconfig-domain-device.h \ libvirt-gconfig-domain-disk.h \ libvirt-gconfig-domain-filesys.h \ @@ -47,7 +49,9 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-main.c \ libvirt-gconfig-capabilities.c \ libvirt-gconfig-domain.c \ + libvirt-gconfig-domain-chardev.c \ libvirt-gconfig-domain-clock.c \ + libvirt-gconfig-domain-console.c \ libvirt-gconfig-domain-device.c \ libvirt-gconfig-domain-disk.c \ libvirt-gconfig-domain-filesys.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c new file mode 100644 index 0000000..525fc2b --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.c @@ -0,0 +1,48 @@ +/* + * libvirt-gconfig-domain-chardev.c: libvirt domain chardev configuration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" + +#define GVIR_CONFIG_DOMAIN_CHARDEV_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV, GVirConfigDomainChardevPrivate)) + +struct _GVirConfigDomainChardevPrivate +{ + gboolean unused; +}; + +G_DEFINE_ABSTRACT_TYPE(GVirConfigDomainChardev, gvir_config_domain_chardev, GVIR_TYPE_CONFIG_DOMAIN_DEVICE) + +static void gvir_config_domain_chardev_class_init(GVirConfigDomainChardevClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainChardevPrivate)); +} + + +static void gvir_config_domain_chardev_init(GVirConfigDomainChardev *chardev) +{ + g_debug("Init GVirConfigDomainChardev=%p", chardev); + + chardev->priv = GVIR_CONFIG_DOMAIN_CHARDEV_GET_PRIVATE(chardev); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev.h b/libvirt-gconfig/libvirt-gconfig-domain-chardev.h new file mode 100644 index 0000000..91b7f4e --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev.h @@ -0,0 +1,64 @@ +/* + * libvirt-gconfig-domain-chardev.h: libvirt domain chardev configuration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#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_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_CHARDEV_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_CHARDEV (gvir_config_domain_chardev_get_type ()) +#define GVIR_CONFIG_DOMAIN_CHARDEV(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV, GVirConfigDomainChardev)) +#define GVIR_CONFIG_DOMAIN_CHARDEV_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV, GVirConfigDomainChardevClass)) +#define GVIR_IS_CONFIG_DOMAIN_CHARDEV(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV)) +#define GVIR_IS_CONFIG_DOMAIN_CHARDEV_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV)) +#define GVIR_CONFIG_DOMAIN_CHARDEV_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_CHARDEV, GVirConfigDomainChardevClass)) + +typedef struct _GVirConfigDomainChardev GVirConfigDomainChardev; +typedef struct _GVirConfigDomainChardevPrivate GVirConfigDomainChardevPrivate; +typedef struct _GVirConfigDomainChardevClass GVirConfigDomainChardevClass; + +struct _GVirConfigDomainChardev +{ + GVirConfigDomainDevice parent; + + GVirConfigDomainChardevPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainChardevClass +{ + GVirConfigDomainDeviceClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_domain_chardev_get_type(void); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_CHARDEV_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.c b/libvirt-gconfig/libvirt-gconfig-domain-console.c new file mode 100644 index 0000000..d85cc3e --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.c @@ -0,0 +1,70 @@ +/* + * libvirt-gconfig-domain-console.c: libvirt domain console configuration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" + +#define GVIR_CONFIG_DOMAIN_CONSOLE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, GVirConfigDomainConsolePrivate)) + +struct _GVirConfigDomainConsolePrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainConsole, gvir_config_domain_console, GVIR_TYPE_CONFIG_DOMAIN_CHARDEV); + + +static void gvir_config_domain_console_class_init(GVirConfigDomainConsoleClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainConsolePrivate)); +} + + +static void gvir_config_domain_console_init(GVirConfigDomainConsole *console) +{ + g_debug("Init GVirConfigDomainConsole=%p", console); + + console->priv = GVIR_CONFIG_DOMAIN_CONSOLE_GET_PRIVATE(console); +} + +GVirConfigDomainConsole *gvir_config_domain_console_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, + "console", NULL); + return GVIR_CONFIG_DOMAIN_CONSOLE(object); +} + +GVirConfigDomainConsole *gvir_config_domain_console_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, + "console", NULL, xml, error); + if (object == NULL) + return NULL; + return GVIR_CONFIG_DOMAIN_CONSOLE(object); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-console.h b/libvirt-gconfig/libvirt-gconfig-domain-console.h new file mode 100644 index 0000000..6243ecf --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-console.h @@ -0,0 +1,67 @@ +/* + * libvirt-gconfig-domain-console.h: libvirt domain console configuration + * + * Copyright (C) 2011 Red Hat + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#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_CONSOLE_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_CONSOLE_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DOMAIN_CONSOLE (gvir_config_domain_console_get_type ()) +#define GVIR_CONFIG_DOMAIN_CONSOLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, GVirConfigDomainConsole)) +#define GVIR_CONFIG_DOMAIN_CONSOLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, GVirConfigDomainConsoleClass)) +#define GVIR_IS_CONFIG_DOMAIN_CONSOLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE)) +#define GVIR_IS_CONFIG_DOMAIN_CONSOLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE)) +#define GVIR_CONFIG_DOMAIN_CONSOLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DOMAIN_CONSOLE, GVirConfigDomainConsoleClass)) + +typedef struct _GVirConfigDomainConsole GVirConfigDomainConsole; +typedef struct _GVirConfigDomainConsolePrivate GVirConfigDomainConsolePrivate; +typedef struct _GVirConfigDomainConsoleClass GVirConfigDomainConsoleClass; + +struct _GVirConfigDomainConsole +{ + GVirConfigDomainChardev parent; + + GVirConfigDomainConsolePrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainConsoleClass +{ + GVirConfigDomainChardevClass parent_class; + + gpointer padding[20]; +}; + + +GType gvir_config_domain_console_get_type(void); +GVirConfigDomainConsole *gvir_config_domain_console_new(void); +GVirConfigDomainConsole *gvir_config_domain_console_new_from_xml(const gchar *xml, + GError **error); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_CONSOLE_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index c8df278..ca7d2dc 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -30,7 +30,9 @@ #include <libvirt-gconfig/libvirt-gconfig-object.h> #include <libvirt-gconfig/libvirt-gconfig-capabilities.h> #include <libvirt-gconfig/libvirt-gconfig-domain.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-chardev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-clock.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-console.h> #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-disk.h> #include <libvirt-gconfig/libvirt-gconfig-domain-filesys.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 9547db1..345dd42 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -29,6 +29,8 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_set_virt_type; gvir_config_domain_virt_type_get_type; + gvir_config_domain_chardev_get_type; + gvir_config_domain_clock_get_type; gvir_config_domain_clock_offset_get_type; gvir_config_domain_clock_new; @@ -37,6 +39,10 @@ LIBVIRT_GCONFIG_0.0.1 { gvir_config_domain_clock_set_timezone; gvir_config_domain_clock_set_variable_offset; + gvir_config_domain_console_get_type; + gvir_config_domain_console_new; + gvir_config_domain_console_new_from_xml; + gvir_config_domain_device_get_type; gvir_config_domain_disk_get_type; -- 1.7.7.3

2 5