Users can choose between minimum and recommended values for VCPU count and amount of RAM. Moreover, recommended values should inherit defaults from the minimum. --- examples/virtxml.c | 23 +++++++ libvirt-designer/libvirt-designer-domain.c | 91 ++++++++++++++++++++++++++++ libvirt-designer/libvirt-designer-domain.h | 10 +++ libvirt-designer/libvirt-designer.sym | 2 + 4 files changed, 126 insertions(+), 0 deletions(-) diff --git a/examples/virtxml.c b/examples/virtxml.c index 623ff60..c582d0b 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -491,6 +491,8 @@ main(int argc, char *argv[]) static char *platform_str = NULL; static char *arch_str = NULL; static char *connect_uri = NULL; + static char *resources_str = NULL; + GVirDesignerDomainResources resources; GOptionContext *context; static GOptionEntry entries[] = @@ -511,6 +513,8 @@ main(int argc, char *argv[]) "add disk to domain with PATH being source and FORMAT its format", "PATH[,FORMAT]"}, {"interface", 'i', 0, G_OPTION_ARG_CALLBACK, add_iface_str, "add interface with NETWORK source. Possible ARGs: mac, link={up,down}", "NETWORK[,ARG=VAL]"}, + {"resources", 'r', 0, G_OPTION_ARG_STRING, &resources_str, + "Set minimal or recommended values for cpu count and RAM amount", "{minimal|recommended}"}, {NULL} }; @@ -567,6 +571,25 @@ main(int argc, char *argv[]) CHECK_ERROR; } + if (resources_str) { + if (g_str_equal(resources_str, "minimal") || + g_str_equal(resources_str, "min")) + resources = GVIR_DESIGNER_DOMAIN_RESOURCES_MINIMAL; + else if (g_str_equal(resources_str, "recommended") || + g_str_equal(resources_str, "rec")) + resources = GVIR_DESIGNER_DOMAIN_RESOURCES_RECOMMENDED; + else { + print_error("Unknown value '%s' for resources", resources_str); + goto cleanup; + } + gvir_designer_domain_setup_resources(domain, resources, &error); + CHECK_ERROR; + } else { + gvir_designer_domain_setup_resources(domain, + GVIR_DESIGNER_DOMAIN_RESOURCES_RECOMMENDED, + NULL); + } + g_list_foreach(disk_str_list, add_disk, domain); g_list_foreach(iface_str_list, add_iface, domain); diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index 194fdf5..1f734de 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -1033,3 +1033,94 @@ gvir_designer_domain_add_interface_network(GVirDesignerDomain *design, return ret; } + + +static void +gvir_designer_domain_get_resources(OsinfoResourcesList *res_list, + const gchar *design_arch, + gint *design_n_cpus, + gint64 *design_ram) +{ + GList *elem_list, *elem_iterator; + + if (!res_list) + return; + + elem_list = osinfo_list_get_elements(OSINFO_LIST(res_list)); + for (elem_iterator = elem_list; elem_iterator; elem_iterator = elem_iterator->next) { + OsinfoResources *res = OSINFO_RESOURCES(elem_iterator->data); + const char *arch = osinfo_resources_get_architecture(res); + gint n_cpus = -1; + gint64 ram = -1; + + if (g_str_equal(arch, "all") || + g_str_equal(arch, design_arch)) { + n_cpus = osinfo_resources_get_n_cpus(res); + ram = osinfo_resources_get_ram(res); + if (n_cpus > 0) { + *design_n_cpus = n_cpus; + } + if (ram > 0) { + /* libosinfo returns RAM in B, libvirt-gconfig takes it in KB */ + *design_ram = ram / 1024; + } + break; + } + } +} + + +/** + * gvir_designer_domain_setup_resources: + * @design: (transfer none): the domain designer instance + * @req: (transfer none): requirements to set + * + * Set minimal or recommended resources on @design. + * + * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. + */ +gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, + GVirDesignerDomainResources req, + GError **error) +{ + g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); + gboolean ret = FALSE; + OsinfoResourcesList *res_list_min = NULL, *res_list_rec = NULL; + GVirConfigDomainOs *os = gvir_config_domain_get_os(design->priv->config); + const gchar *design_arch = os ? gvir_config_domain_os_get_arch(os) : ""; + gint n_cpus = -1; + gint64 ram = -1; + + /* If user request recommended settings those may just override + * only a few settings when compared to minimal. So we must implement + * inheritance here. */ + res_list_min = osinfo_os_get_minimum_resources(design->priv->os); + res_list_rec = osinfo_os_get_recommended_resources(design->priv->os); + if (req ==GVIR_DESIGNER_DOMAIN_RESOURCES_MINIMAL) { + gvir_designer_domain_get_resources(res_list_min, design_arch, + &n_cpus, &ram); + } else if (req == GVIR_DESIGNER_DOMAIN_RESOURCES_RECOMMENDED) { + gvir_designer_domain_get_resources(res_list_min, design_arch, + &n_cpus, &ram); + gvir_designer_domain_get_resources(res_list_rec, design_arch, + &n_cpus, &ram); + } else { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "Unknown resources argument: '%d'", req); + goto cleanup; + } + + if ((n_cpus <= 0) && (ram <= 0)) { + g_set_error(error, GVIR_DESIGNER_DOMAIN_ERROR, 0, + "Unable to find resources in libosinfo database"); + goto cleanup; + } + + if (n_cpus > 0) + gvir_config_domain_set_vcpus(design->priv->config, n_cpus); + if (ram > 0) + gvir_config_domain_set_memory(design->priv->config, ram); + +cleanup: + return ret; +} diff --git a/libvirt-designer/libvirt-designer-domain.h b/libvirt-designer/libvirt-designer-domain.h index 5097393..7c837e0 100644 --- a/libvirt-designer/libvirt-designer-domain.h +++ b/libvirt-designer/libvirt-designer-domain.h @@ -39,6 +39,11 @@ G_BEGIN_DECLS #define GVIR_DESIGNER_IS_DOMAIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_DESIGNER_TYPE_DOMAIN)) #define GVIR_DESIGNER_DOMAIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_DESIGNER_TYPE_DOMAIN, GVirDesignerDomainClass)) +typedef enum { + GVIR_DESIGNER_DOMAIN_RESOURCES_MINIMAL, + GVIR_DESIGNER_DOMAIN_RESOURCES_RECOMMENDED, +} GVirDesignerDomainResources; + typedef struct _GVirDesignerDomain GVirDesignerDomain; typedef struct _GVirDesignerDomainPrivate GVirDesignerDomainPrivate; typedef struct _GVirDesignerDomainClass GVirDesignerDomainClass; @@ -104,6 +109,11 @@ GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *d GVirConfigDomainInterface *gvir_designer_domain_add_interface_network(GVirDesignerDomain *design, const char *network, GError **error); + +gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, + GVirDesignerDomainResources req, + GError **error); + G_END_DECLS #endif /* __LIBVIRT_DESIGNER_DOMAIN_H__ */ diff --git a/libvirt-designer/libvirt-designer.sym b/libvirt-designer/libvirt-designer.sym index 317a07b..79db09f 100644 --- a/libvirt-designer/libvirt-designer.sym +++ b/libvirt-designer/libvirt-designer.sym @@ -13,6 +13,8 @@ LIBVIRT_DESIGNER_0.0.1 { gvir_designer_domain_add_disk_file; gvir_designer_domain_add_disk_device; gvir_designer_domain_add_interface_network; + gvir_designer_domain_setup_resources; + gvir_designer_domain_resources_get_type; gvir_designer_domain_setup_machine; gvir_designer_domain_setup_machine_full; -- 1.7.8.6

and update to reflect virtxml binary. --- libvirt-designer.spec.in | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index b4107ea..1d5f4b6 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -21,6 +21,7 @@ URL: http://libvirt.org/ Source0: http://libvirt.org/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libvirt-gconfig-devel >= 0.0.9 +BuildRequires: libvirt-gobject-devel >= 0.1.3 %if %{with_introspection} BuildRequires: gobject-introspection-devel %endif @@ -64,7 +65,6 @@ headers %install rm -rf $RPM_BUILD_ROOT -chmod a-x examples/*.py examples/*.pl examples/*.js %__make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-designer-1.0.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-designer-1.0.la @@ -77,23 +77,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_sysconfdir}/bash_completion.d/virt-designer-service-bash-completion.sh -%config(noreplace) %{_sysconfdir}/cron.daily/virt-designer-service.logrotate -%dir %{_sysconfdir}/libvirt-designer/services -%{_bindir}/virt-designer -%{_bindir}/virt-designer-service -%{_mandir}/man1/virt-designer.1* -%{_mandir}/man1/virt-designer-service.1* +%{_bindir}/virtxml %files libs %defattr(-,root,root,-) %doc README COPYING AUTHORS ChangeLog NEWS -%dir %{_sysconfdir}/libvirt-designer -%dir %{_sysconfdir}/libvirt-designer/scratch -%config %{_sysconfdir}/libvirt-designer/scratch/README -%{_libexecdir}/libvirt-designer-init-common -%{_libexecdir}/libvirt-designer-init-lxc -%{_libexecdir}/libvirt-designer-init-qemu %{_libdir}/libvirt-designer-1.0.so.* %if %{with_introspection} %{_libdir}/girepository-1.0/LibvirtDesigner-1.0.typelib @@ -101,10 +89,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc examples/virt-designer.pl -%doc examples/virt-designer.py -%doc examples/virt-designer.js -%doc examples/virt-designer-mkinitrd.py %{_libdir}/libvirt-designer-1.0.so %{_libdir}/pkgconfig/libvirt-designer-1.0.pc %dir %{_includedir}/libvirt-designer-1.0 @@ -114,6 +98,6 @@ rm -rf $RPM_BUILD_ROOT %if %{with_introspection} %{_datadir}/gir-1.0/LibvirtDesigner-1.0.gir %endif -%{_datadir}/gtk-doc/html/Libvirt-designer +%{_datadir}/gtk-doc/html/libvirt-designer %changelog -- 1.7.8.6

In order to prevent warnings and errors from rpmlint we need to cleanup spec file: capitalization summary and spell check (s/runtime/run-time/) --- libvirt-designer.spec.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index ede7185..a8fefff 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -14,7 +14,7 @@ Name: @PACKAGE@ Version: @VERSION@ Release: 1%{?dist}%{?extra_release} -Summary: libvirt configuration designer +Summary: Libvirt configuration designer Group: Development/Tools License: LGPLv2+ URL: http://libvirt.org/ @@ -28,11 +28,11 @@ BuildRequires: gobject-introspection-devel %package libs Group: Development/Libraries -Summary: libvirt configuration designer libraries +Summary: Libvirt configuration designer libraries %package devel Group: Development/Libraries -Summary: libvirt configuration designer development headers +Summary: Libvirt configuration designer development headers Requires: %{name}-libs = %{version}-%{release} Requires: libvirt-gconfig-devel >= 0.0.9 @@ -41,7 +41,7 @@ This package provides the libvirt configuration designer command line tools. %description libs -This package provides the libvirt configuration designer runtime +This package provides the libvirt configuration designer run-time libraries. %description devel -- 1.7.8.6

--- diff to v1: -move content from virtxml.pod to virtxml.c -wording and spelling as pointed out by Christophe .gitignore | 1 + examples/Makefile.am | 9 +++ examples/virtxml.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ libvirt-designer.spec.in | 1 + 4 files changed, 138 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 4272672..03b75ce 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ docs/*.interfaces docs/*.prerequisites docs/*.signals docs/*.types +examples/*.1 diff --git a/examples/Makefile.am b/examples/Makefile.am index 32549a0..ae2667e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -18,6 +18,15 @@ virtxml_LDFLAGS = \ $(LIBVIRT_GCONFIG_LIBS) \ $(LIBVIRT_GOBJECT_LIBS) +POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" + +%.1: %.c Makefile + $(AM_V_GEN)$(POD2MAN) $< $@ + if WITH_EXAMPLES bin_PROGRAMS = virtxml + +man1_MANS = virtxml.1 + +CLEANFILES = $(man1_MANS) endif diff --git a/examples/virtxml.c b/examples/virtxml.c index c582d0b..2918ee0 100644 --- a/examples/virtxml.c +++ b/examples/virtxml.c @@ -606,3 +606,130 @@ cleanup: gvir_connection_close(conn); return ret; } + +/* +=pod + + +=head1 NAME + +virtxml - Generate domain XML + +=head1 SYNOPSIS + +B<virtxml> [I<OPTION>]... + +=head1 DESCRIPTION + +B<virtxml> is a command line tool for generating XML documents for +libvirt domains. However, it cooperates with libosinfo database to guess +the correct combination of attributes (e.g. disk driver, NIC model). + +B<virtxml> does not feed libvirt with generated XML though. For now, +it's a proof of concept. + +=head1 OPTIONS + +The basic structure of arguments passed to B<virtxml> is: + + virtxml [-c URI] [OPTION] [OPTION] ... + +However, arguments have no pre-defined order so users can type them +in any order they like. + +=head2 General Options + +=over 2 + +=item -c URI, --connect=URI + +The libvirt connection URI which is used for querying capabilities of the +host. + +=item --list-os + +List IDs of operating systems known to libosinfo + +=item --list-platform + +List IDs of platforms known to libosinfo + +=item -o OS, --os=OS + +Specify operating system that will be run on the domain. I<OS> is an ID +which can be obtained via B<--list-os>. + +=item -p PLATFORM, --platform=PLATFORM + +Specify platform (hypervisor) under which the domain will run. I<PLATFORM> +is and ID which can be obtained via I<--list-platform>. + +=item -a ARCH, --architecture=ARCH + +Set domain's architecture + +=item -d PATH[,FORMAT] --disk=PATH[,FORMAT] + +Add I<PATH> as a disk to the domain. To specify its format (e.g. raw, +qcow2, phy) use I<FORMAT>. + +=item -i NETWORK[,ARG=VAL] + +Add an interface of type network with I<NETWORK> source. Moreover, some +other configuration knobs can be set (possible I<ARG>s): I<mac>, +I<link>={up|down} + +=item -r RESOURCE, --resources=RESOURCES + +Set I<minimal> or I<recommended> resources on the domain XML. By default, +the I<recommended> is used. + +=back + +Usually, both B<--os> and B<--platform> are required as they are needed to +make the right decision on driver, model, ... when adding a new device. +However, when adding a disk which is an installation medium (e.g. a CD-ROM or +DVD), B<virtxml> tries to guess the OS. Something similar is done with +platform. Usually, the platform is guessed from the connection URI. + +=head1 EXAMPLES + +Domain with Fedora 17 from locally stored ISO and one NIC with mac +00:11:22:33:44:55 and link set down: + + # virtxml -d Fedora-17-x86_64-Live-KDE.iso \ + -i default,mac=00:11:22:33:44:55,link=down + +To add multiple devices just use appropriate argument multiple times: + + # virtxml -d /tmp/Fedora-17-x86_64-Live-KDE.iso,raw \ + -d /var/lib/libvirt/images/f17.img,qcow2 \ + -i default,mac=00:11:22:33:44:55,link=down \ + -i blue_network \ + -r minimal + +=head1 AUTHORS + +Written by Michal Privoznik, Daniel P. Berrange and team of other +contributors. See the AUTHORS file in the source distribution for the +complete list of credits. + +=head1 BUGS + +Report any bugs discovered to the libvirt community via the mailing +list C<http://libvirt.org/contact.html> or bug tracker C<http://libvirt.org/bugs.html>. +Alternatively report bugs to your software distributor / vendor. + +=head1 COPYRIGHT + +Copyright (C) 2012 Red Hat, Inc. and various contributors. +This is free software. You may redistribute copies of it under the terms of +the GNU General Public License C<http://www.gnu.org/licenses/gpl.html>. There +is NO WARRANTY, to the extent permitted by law. + +=head1 SEE ALSO + +C<virsh(1)>, C<virt-clone(1)>, C<virt-manager(1)>, the project website C<http://virt-manager.org> + +=cut +*/ diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index 1d5f4b6..ede7185 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -78,6 +78,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/virtxml +%{_mandir}/man1/virtxml.1* %files libs %defattr(-,root,root,-) -- 1.7.8.6