[Libosinfo] [[PATCH v3] 3/6] os: Add variant info API/XML

[Daniel P. Berrange]

On Thu, Nov 28, 2013 at 03:10:21PM +0000, Zeeshan Ali (Khattak) wrote:
> Add:
> 
> * ability to specificy various variants of an OS under the 'os' XML node.

s/specificy/specify/

>   For example:
> 
>   <os id="http://microsoft.com/win/7">
>     <short-id>win7</short-id>
>     <name>Microsoft Windows 7</name>
>     ..
> 
>     <variant id="starter">
>       <name>Microsoft Windows 7 Starter</name>
>     </variant>
>     <variant id="home-basic">
>       <name>Microsoft Windows 7 Home Basic</name>
>     </variant>
>     <variant id="home-premium">
>       <name>Microsoft Windows 7 Home Premium</name>
>     </variant>
>     ..
>   </os>
> 
> * API to add and query variants of an OS.
> ---
>  data/schemas/libosinfo.rng | 13 +++++++++++++
>  osinfo/libosinfo.syms      |  3 +++
>  osinfo/osinfo_loader.c     | 41 +++++++++++++++++++++++++++++++++++++++++
>  osinfo/osinfo_os.c         | 37 +++++++++++++++++++++++++++++++++++++
>  osinfo/osinfo_os.h         |  4 ++++
>  5 files changed, 98 insertions(+)


> diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
> index bb7e9a4..affc49b 100644
> --- a/osinfo/osinfo_loader.c
> +++ b/osinfo/osinfo_loader.c
> @@ -859,6 +859,7 @@ static OsinfoMedia *osinfo_loader_media (OsinfoLoader *loader,
>      xmlChar *installer = xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_INSTALLER);
>      xmlChar *installer_reboots =
>              xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_INSTALLER_REBOOTS);
> +    xmlChar *variant = xmlGetProp(root, BAD_CAST OSINFO_MEDIA_PROP_VARIANT);

This looks bogus - nothing in this patch uses it - was it supposed to be
in a later patch ?

>      const OsinfoEntityKey keys[] = {
>          { OSINFO_MEDIA_PROP_URL, G_TYPE_STRING },
>          { OSINFO_MEDIA_PROP_KERNEL, G_TYPE_STRING },


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|