- Devel - libvirt List Archives

Re: [libvirt] Consultation of the patch "util: Prepare helpers for unpriv_sgio setting"
by yuxh 21 Mar '13

21 Mar '13

On 03/13/2013 11:33 AM, Osier Yang wrote: > On 2013年03月13日 11:04, yuxh wrote: >> To Osier Yang >> >> Sorry for disturbing you on the working time, but I really need your >> help. >> I met a problem when I do the virtualization test on the environment of >> (Host: RHEL6.4GA. Guest: RHEL6.4GA) and it seems to have relationship >> with your patch of "util: Prepare helpers for unpriv_sgio setting". > > Never mind, it's the bug I produced. :( > >> >> I added a disk to virtio-scsi bus through the VM's XML file like this: >> <disk type='block' device='disk'> >> <driver name='qemu' type='raw' io='threads'/> >> <source dev='/mnt/test.raw'/> >> <target dev='sdb' bus='scsi'/> >> <shareable/> >> </disk> >> >> Then when I started the VM, I met the error. >> [root@build SOURCES]# virsh start pan64ga >> error: Failed to start domain pan64ga >> error: Unable to get minor number of device '/mnt/test.raw': Invalid >> argument >> >> [root@build SOURCES]# >> >> I tried other source files and other way of using if and I found: >> 1). If we use the files which format is raw, qed and qcow2 as the disk >> this error occur again. >> 2). If we use partition(such as /dev/sdb1) or whole disk(such as >> /dev/sdb) this error doesn't occur. >> 3). If we delete the "<shareable/>" then files, partition and disk all >> can be used correctly. >> >> And I investigate the error msg. it is returned by qemuGetSharedDiskKey >> fuction. >> char * >> qemuGetSharedDiskKey(const char *disk_path) >> { >> ... >> // error occur here. return value is -22 >> if ((rc = virGetDeviceID(disk_path, &maj, &min)) < 0) { >> virReportSystemError(-rc, >> _("Unable to get minor number of device '%s'"), >> disk_path); >> return NULL; >> } >> ... >> } >> >> Go on the virGetDeviceID fuction: >> int >> virGetDeviceID(const char *path, int *maj, int *min) >> { >> ... >> >> if (!S_ISBLK(sb.st_mode)) { >> VIR_FREE(canonical_path); >> return -EINVAL; // error occur here and it return -22 >> } >> ... >> } >> >> So the error occur place is "S_ISBLK(sb.st_mode)" and I tried compiled >> the libvirt with these lines deleted and the error didn't happen again. >> Also I checked the disk if VM and it worked well. >> I found this fuction virGetDeviceID is come from your patch of "util: >> Prepare helpers for unpriv_sgio setting". But I am not familiar with >> libvirt. >> So I have to consult with you about whether this "S_ISBLK" check is >> vital and If we can delete it or >> find out some method to avoid this error so we can use the file as >> shared disk in VM. > > It's fixd by > https://www.redhat.com/archives/libvir-list/2013-February/msg01024.html, > which is already committed to upstream, and backported > to 6.4.z. You will see the fix in the new build, which will come soon. > > Regards, > Osier Sorry, I have tried the the libvirt's upstream code and it still have this error. According to the code, if we use "<disk type='block' device='disk'> " and "<shareable/> " to set the disk's configuration in VM's XML file, it will go through like below: int qemuAddSharedDisk(virQEMUDriverPtr driver, virDomainDiskDefPtr disk, const char *name) { ... if (!(key = qemuGetSharedDiskKey(disk->src))) goto cleanup; ... } char * qemuGetSharedDiskKey(const char *disk_path) { ... if ((rc = virGetDeviceID(disk_path, &maj, &min)) < 0) { virReportSystemError(-rc, _("Unable to get minor number of device '%s'"), disk_path); return NULL; } ... } int virGetDeviceID(const char *path, int *maj, int *min) { struct stat sb; if (stat(path, &sb) < 0) return -errno; if (!S_ISBLK(sb.st_mode)) return -EINVAL; if (maj) *maj = major(sb.st_rdev); if (min) *min = minor(sb.st_rdev); return 0; } To make a long story short, the virGetDeviceID fuction want to get the maj and min number of the source file which we provided as the VM's disk. But the file such as /mnt/test.raw doesn't have the maj and min number. So virGetDeviceID return " -EINVAL" and qemuGetSharedDiskKey print the error message of "Unable to get minor number of device /mnt/test.raw". That's the reason the VM can't be started. So I just want to know now, if the way I used a file to act as VM's disk and set "<disk type='block' device='disk'>" , "<shareable/> " at the same time is reasonable. Thanks yuxh > > -- 以上第一软件事业部第一开发部 driver组于星海 Best Regards -------------------------------------------------- Yu Xinghai Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8533 FUJITSU INTERNAL: 7998-8533 FAX: +86+25-83317685 MAIL: yuxinghai(a)cn.fujitsu.com --------------------------------------------------

3 5

[libvirt] [PATCH 1/1] Clean redundant code about VCPU string checking
by Li Zhang 21 Mar '13

21 Mar '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Now that VCPU number are removed from qemu_monitor_text.c. VCPU string checking also should be removed. Report-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor_text.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 1b6efba..3a0c55f 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -527,17 +527,10 @@ int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, */ line = qemucpus; do { - char *offset = strchr(line, '#'); + char *offset = NULL; char *end = NULL; int tid = 0; - /* See if we're all done */ - if (offset == NULL) - break; - - if (end == NULL || *end != ':') - goto error; - /* Extract host Thread ID */ if ((offset = strstr(line, "thread_id=")) == NULL) goto error; -- 1.7.10.1

3 3

[libvirt] [PATCH] Don't fail if SELinux is diabled
by Guido Günther 21 Mar '13

21 Mar '13

but libvirt is built with --with-selinux. In this case getpeercon returns ENOPROTOOPT so dont' return an error in that case but simply don't set seccon. --- src/rpc/virnetsocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 39504ac..c4fd9ee 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1171,7 +1171,7 @@ int virNetSocketGetSecurityContext(virNetSocketPtr sock, virObjectLock(sock); if (getpeercon(sock->fd, &seccon) < 0) { - if (errno == ENOSYS) { + if (errno == ENOSYS || errno == ENOPROTOOPT) { ret = 0; goto cleanup; } -- 1.7.10.4

2 4

[libvirt] [PATCH 0/7] Support NBD volumes with LXC containers
by Daniel P. Berrange 21 Mar '13

21 Mar '13

This series adds support for using non-raw disks with LXC containers by leverging NBD + qemu-nbd as an alternative to the loopback device.

3 19

[libvirt] [PATCH] clarify vmrsh net commands
by Gene Czarcinski 21 Mar '13

21 Mar '13

Clarify that net-create deals with a transient virtual network whereas net-define defines a persistent virtual network definition and will create the network (xml) definition file. Clarify that net-destroy works with both transient and persistent virtual networks. Change the comment about error checking with respect to net-edit and net-define: same error checking and diagnostics. Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- tools/virsh.pod | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a5d8fe6..1fe08f4 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2034,19 +2034,20 @@ The I<--disable> option disable autostarting. =item B<net-create> I<file> -Create a virtual network from an XML I<file>, see the documentation at -L<http://libvirt.org/formatnetwork.html> to get a description of the -XML network format used by libvirt. +Create a transient (temporary) virtual network from an +XML I<file> and instantiate (start) the network. +See the documentation at L<http://libvirt.org/formatnetwork.html> +to get a description of the XML network format used by libvirt. =item B<net-define> I<file> -Define a virtual network from an XML I<file>, the network is just defined but -not instantiated. +Define a persistent virtual network from an XML I<file>, the network is just defined but +not instantiated (started). =item B<net-destroy> I<network> -Destroy (stop) a given virtual network specified by its name or UUID. This -takes effect immediately. +Destroy (stop) a given transient or persistent virtual network +specified by its name or UUID. This takes effect immediately. =item B<net-dumpxml> I<network> [I<--inactive>] @@ -2064,7 +2065,8 @@ This is equivalent to: vi network.xml (or make changes with your other text editor) virsh net-define network.xml -except that it does some error checking. +The same error checking is performed by net-edit and net-define and +the same diagnostic error messages will be issued. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -- 1.8.1.4

2 2

[libvirt] about Application_Development_Guide.pdf
by huyp1024 21 Mar '13

21 Mar '13

HI,buddy. I'm sheldon. I'm trying to develop virtual machine lifecycle management software using libvirt. I found the development guide is very useful,it helps a lot. But this book I download from offical website is a draft,there are a lot of funcitons which are not claimed. I appreciate very much that you give me some document that developers are being in reference to . Best wishes! keep in touch. Yours sincely! .

3 3

[libvirt] [PATCH 1/4] doc/schema: add ocfs2 to storage pool
by Philipp Hahn 21 Mar '13

21 Mar '13

Add ocfs2 for disk pool. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- docs/schemas/storagevol.rng | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index ba95c55..765c5a5 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -179,11 +179,10 @@ <value>vfat</value> <value>hfs+</value> <value>xfs</value> + <value>ocfs2</value> </choice> - </define> - <define name='formatfile'> <choice> <value>unknown</value> -- 1.7.10.4

2 9

[libvirt] [PATCH] Fix typos s/HAVE_SELINUX/WITH_SELINUX/
by Daniel P. Berrange 20 Mar '13

20 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virNetSocket & virIdentity classes accidentally got some conditionals using HAVE_SELINUX instead of WITH_SELINUX. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed under trivial rule --- src/rpc/virnetsocket.c | 4 ++-- src/util/viridentity.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 68aca1b..c86a47a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -40,7 +40,7 @@ #endif #include "c-ctype.h" -#ifdef HAVE_SELINUX +#ifdef WITH_SELINUX # include <selinux/selinux.h> #endif @@ -1160,7 +1160,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, } #endif -#ifdef HAVE_SELINUX +#ifdef WITH_SELINUX int virNetSocketGetSecurityContext(virNetSocketPtr sock, char **context) { diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 2092137..1d40972 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -22,7 +22,7 @@ #include <config.h> #include <unistd.h> -#if HAVE_SELINUX +#if WITH_SELINUX # include <selinux/selinux.h> #endif @@ -135,7 +135,7 @@ virIdentityPtr virIdentityGetSystem(void) char *groupname = NULL; char *seccontext = NULL; virIdentityPtr ret = NULL; -#if HAVE_SELINUX +#if WITH_SELINUX security_context_t con; #endif @@ -144,7 +144,7 @@ virIdentityPtr virIdentityGetSystem(void) if (!(groupname = virGetGroupName(getgid()))) goto cleanup; -#if HAVE_SELINUX +#if WITH_SELINUX if (getcon(&con) < 0) { virReportSystemError(errno, "%s", _("Unable to lookup SELinux process context")); -- 1.8.1.4

1 0

[libvirt] [PATCH] python: Fix emulatorpin API bindings
by Peter Krempa 20 Mar '13

20 Mar '13

The addition of emulator pinning APIs didn't think of doing the right job with python APIs for them. The default generator produced unusable code for this. This patch switches to proper code as in the case of domain Vcpu pining. This change can be classified as a python API-breaker but in the state the code was before I doubt anyone was able to use it successfully. --- python/generator.py | 2 + python/libvirt-override-api.xml | 18 +++++- python/libvirt-override.c | 121 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index 6a25c2d..0aeb675 100755 --- a/python/generator.py +++ b/python/generator.py @@ -418,6 +418,8 @@ skip_impl = ( 'virDomainPinVcpu', 'virDomainPinVcpuFlags', 'virDomainGetVcpuPinInfo', + 'virDomainGetEmulatorPinInfo', + 'virDomainPinEmulator', 'virSecretGetValue', 'virSecretSetValue', 'virSecretGetUUID', diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index 5976fb2..c720610 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -237,10 +237,24 @@ <function name='virDomainGetVcpuPinInfo' file='python'> <info>Query the CPU affinity setting of all virtual CPUs of domain</info> <return type='unsigned char *' info='the array of cpumap'/> - <arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> + </function> + <function name='virDomainGetEmulatorPinInfo' file='python'> + <info>Query the CPU affinity setting of the emulator process of domain</info> + <return type='unsigned char *' info='the array of cpumap'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='flags' type='int' info='an OR'ed set of virDomainModificationImpact'/> </function> - <function name='virDomainSetSchedulerParameters' file='python'> + <function name='virDomainPinEmulator' file='python'> + <info>Dynamically change the real CPUs which can be allocated to the emulator process of a domain. + This function requires privileged access to the hypervisor.</info> + <return type='int' info='0 in case of success, -1 in case of failure.'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object, or NULL for Domain0'/> + <arg name='cpumap' type='unsigned char *' info='pointer to a bit map of real CPUs (in 8-bit bytes) (IN) Each bit set to 1 means that corresponding CPU is usable. Bytes are stored in little-endian order: CPU0-7, 8-15... In each byte, lowest CPU number is least significant bit.'/> + <arg name='flags' type='int' info='flags to specify'/> + </function> + <function name='virDomainSetSchedulerParameters' file='python'> <info>Change the scheduler parameters</info> <return type='int' info='-1 in case of error, 0 in case of success.'/> <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 9637598..07e0221 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -1664,6 +1664,125 @@ cleanup: return VIR_PY_NONE; } + +static PyObject * +libvirt_virDomainPinEmulator(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *pycpumap; + PyObject *ret = VIR_PY_INT_FAIL; + unsigned char *cpumap = NULL; + int cpumaplen, i, tuple_size, cpunum; + int i_retval; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainPinVcpu", + &pyobj_domain, &pycpumap, &flags)) + goto cleanup; + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((cpunum = getPyNodeCPUCount(virDomainGetConnect(domain))) < 0) + goto cleanup; + + cpumaplen = VIR_CPU_MAPLEN(cpunum); + + if (!PyTuple_Check(pycpumap)) { + PyErr_SetString(PyExc_TypeError, "Unexpected type, tuple is required"); + goto cleanup; + } + + if ((tuple_size = PyTuple_Size(pycpumap)) == -1) + goto cleanup; + + if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) + goto cleanup; + + for (i = 0; i < tuple_size; i++) { + PyObject *flag = PyTuple_GetItem(pycpumap, i); + bool b; + + if (!flag || libvirt_boolUnwrap(flag, &b) < 0) + goto cleanup; + + if (b) + VIR_USE_CPU(cpumap, i); + else + VIR_UNUSE_CPU(cpumap, i); + } + + for (; i < cpunum; i++) + VIR_UNUSE_CPU(cpumap, i); + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainPinEmulator(domain, cpumap, cpumaplen, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) + goto cleanup; + + ret = VIR_PY_INT_SUCCESS; + +cleanup: + VIR_FREE(cpumap); + return ret; +} + + +static PyObject * +libvirt_virDomainGetEmulatorPinInfo(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pycpumap = NULL; + unsigned char *cpumap = NULL; + size_t cpumaplen; + size_t pcpu; + unsigned int flags; + int ret; + int cpunum; + + if (!PyArg_ParseTuple(args, (char *)"Oi:virDomainEmulatorPinInfo", + &pyobj_domain, &flags)) + goto error; + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if ((cpunum = getPyNodeCPUCount(virDomainGetConnect(domain))) < 0) + goto error; + + cpumaplen = VIR_CPU_MAPLEN(cpunum); + if (VIR_ALLOC_N(cpumap, cpumaplen) < 0) + goto error; + + LIBVIRT_BEGIN_ALLOW_THREADS; + ret = virDomainGetEmulatorPinInfo(domain, cpumap, cpumaplen, flags); + LIBVIRT_END_ALLOW_THREADS; + if (ret < 0) + goto error; + + if (!(pycpumap = PyTuple_New(cpunum))) + goto error; + + for (pcpu = 0; pcpu < cpunum; pcpu++) + PyTuple_SetItem(pycpumap, pcpu, + PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, + 0, pcpu))); + + VIR_FREE(cpumap); + + return pycpumap; + +error: + VIR_FREE(cpumap); + Py_XDECREF(pycpumap); + + return VIR_PY_NONE; +} + + /************************************************************************ * * * Global error handler at the Python level * @@ -6705,6 +6824,8 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {(char *) "virDomainPinVcpuFlags", libvirt_virDomainPinVcpuFlags, METH_VARARGS, NULL}, {(char *) "virDomainGetVcpuPinInfo", libvirt_virDomainGetVcpuPinInfo, METH_VARARGS, NULL}, + {(char *) "virDomainGetEmulatorPinInfo", libvirt_virDomainGetEmulatorPinInfo, METH_VARARGS, NULL}, + {(char *) "virDomainPinEmulator", libvirt_virDomainPinEmulator, METH_VARARGS, NULL}, {(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedStoragePools", libvirt_virConnectListDefinedStoragePools, METH_VARARGS, NULL}, {(char *) "virConnectListAllStoragePools", libvirt_virConnectListAllStoragePools, METH_VARARGS, NULL}, -- 1.8.1.5

2 1

[libvirt] [libvirt-designer PATCHv2] Add GvirDesignerDomain::osinfo_db
by Christophe Fergeau 20 Mar '13

20 Mar '13

virtxml was doing its own loading of the libosinfo database, and gvir_designer_init() was loading it a second time. By adding a GVirDesignerDomain::osinfo_db property, applications can share the same OsinfoDb as libvirt-designer. The association is made per libvirt-designer domain for more flexibility. If no OsinfoDb is associated with a domain when needed, libvirt-designer will automatically try to load it. --- examples/virtxml.c | 2 ++ libvirt-designer/libvirt-designer-domain.c | 49 +++++++++++++++++++++++++++- libvirt-designer/libvirt-designer-internal.h | 3 -- libvirt-designer/libvirt-designer-main.c | 12 ------- libvirt-designer/libvirt-designer-main.h | 2 ++ libvirt-designer/libvirt-designer.sym | 1 + 6 files changed, 53 insertions(+), 16 deletions(-) diff --git a/examples/virtxml.c b/examples/virtxml.c index a68843d..be6ee7a 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -559,6 +559,8 @@ main(int argc, char *argv[]) } domain = gvir_designer_domain_new(os, platform, caps); + if (db != NULL) + g_object_set(G_OBJECT(domain), "osinfo-db", db, NULL); gvir_designer_domain_setup_machine(domain, &error); CHECK_ERROR; diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 3e31bd1..b78b8d3 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -35,6 +35,7 @@ struct _GVirDesignerDomainPrivate { GVirConfigDomain *config; GVirConfigCapabilities *caps; + OsinfoDb *osinfo_db; OsinfoOs *os; OsinfoPlatform *platform; @@ -66,6 +67,7 @@ enum { PROP_OS, PROP_PLATFORM, PROP_CAPS, + PROP_OSINFO_DB, }; static void gvir_designer_domain_get_property(GObject *object, @@ -83,6 +85,10 @@ static void gvir_designer_domain_get_property(GObject *object, g_value_set_object(value, priv->config); break; + case PROP_OSINFO_DB: + g_value_set_object(value, priv->osinfo_db); + break; + case PROP_OS: g_value_set_object(value, priv->os); break; @@ -112,6 +118,11 @@ static void gvir_designer_domain_set_property(GObject *object, GVirDesignerDomainPrivate *priv = design->priv; switch (prop_id) { + case PROP_OSINFO_DB: + if (priv->osinfo_db) + g_object_unref(priv->osinfo_db); + priv->osinfo_db = g_value_dup_object(value); + break; case PROP_OS: if (priv->os) g_object_unref(priv->os); @@ -147,6 +158,8 @@ static void gvir_designer_domain_finalize(GObject *object) g_object_unref(priv->caps); if (priv->deployment) g_object_unref(priv->deployment); + if (priv->osinfo_db) + g_object_unref(priv->osinfo_db); G_OBJECT_CLASS(gvir_designer_domain_parent_class)->finalize(object); } @@ -171,6 +184,15 @@ static void gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, + PROP_OSINFO_DB, + g_param_spec_object("osinfo-db", + "Osinfo Database", + "libosinfo database", + OSINFO_TYPE_DB, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_STRINGS)); + g_object_class_install_property(object_class, PROP_OS, g_param_spec_object("os", "Os", @@ -709,6 +731,23 @@ cleanup: } +static void gvir_designer_domain_load_osinfo_db(GVirDesignerDomain *domain) +{ + /* Init libosinfo and load databases from default paths */ + /* XXX maybe we want to let users tell a different path via + * env variable or argv */ + OsinfoLoader *osinfo_loader = NULL; + OsinfoDb *db; + + osinfo_loader = osinfo_loader_new(); + osinfo_loader_process_default_path(osinfo_loader, NULL); + + db = osinfo_loader_get_db(osinfo_loader); + if (db != NULL) + g_object_set(G_OBJECT(domain), "osinfo-db", db, NULL); + g_object_unref(G_OBJECT(osinfo_loader)); +} + static OsinfoDeviceLink * gvir_designer_domain_get_preferred_device(GVirDesignerDomain *design, const char *class, @@ -721,7 +760,15 @@ gvir_designer_domain_get_preferred_device(GVirDesignerDomain *design, OsinfoDeviceLink *dev_link = NULL; if (!deployment) { - priv->deployment = deployment = osinfo_db_find_deployment(osinfo_db, + if (!priv->osinfo_db) + gvir_designer_domain_load_osinfo_db(design); + + if (!priv->osinfo_db) { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "Unable to find any deployment in libosinfo database"); + goto cleanup; + } + priv->deployment = deployment = osinfo_db_find_deployment(priv->osinfo_db, priv->os, priv->platform); if (!deployment) { diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index bbef922..e95edfc 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,7 +24,4 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ -extern OsinfoLoader *osinfo_loader; -extern OsinfoDb *osinfo_db; - #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ diff --git a/libvirt-designer/libvirt-designer-main.c b/libvirt-designer/libvirt-designer-main.c index 5c70b57..927eb21 100644 --- a/libvirt-designer/libvirt-designer-main.c +++ b/libvirt-designer/libvirt-designer-main.c @@ -30,9 +30,6 @@ #include <libvirt-designer/libvirt-designer.h> #include <libvirt-gconfig/libvirt-gconfig.h> -OsinfoLoader *osinfo_loader = NULL; -OsinfoDb *osinfo_db = NULL; - /** * gvir_designer_init: * @argc: (inout): pointer to application's argc @@ -57,7 +54,6 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, fprintf(stderr, "%s\n", message); } - /** * gvir_designer_init_check: * @argc: (inout): pointer to application's argc @@ -85,13 +81,5 @@ gboolean gvir_designer_init_check(int *argc, gvir_log_handler, NULL); #endif - /* Init libosinfo and load databases from default paths */ - /* XXX maybe we want to let users tell a different path via - * env variable or argv */ - osinfo_loader = osinfo_loader_new(); - osinfo_loader_process_default_path(osinfo_loader, NULL); - - osinfo_db = osinfo_loader_get_db(osinfo_loader); - return TRUE; } diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 2500ef7..5e82f8a 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -24,6 +24,8 @@ #error "Only <libvirt-gdesigner/libvirt-gdesigner.h> can be included directly." #endif +#include <osinfo/osinfo.h> + #ifndef __LIBVIRT_DESIGNER_MAIN_H__ #define __LIBVIRT_DESIGNER_MAIN_H__ diff --git a/libvirt-designer/libvirt-designer.sym b/libvirt-designer/libvirt-designer.sym index 79db09f..6f63abc 100644 --- a/libvirt-designer/libvirt-designer.sym +++ b/libvirt-designer/libvirt-designer.sym @@ -2,6 +2,7 @@ LIBVIRT_DESIGNER_0.0.1 { global: gvir_designer_init; gvir_designer_init_check; + gvir_designer_get_osinfo_db; gvir_designer_domain_new; gvir_designer_domain_get_type; -- 1.8.1.4

2 1