[libvirt] [libvirt-gconfig PATCHv2 29/32] Add GVirConfigDeviceInput

-- v2: use enum for input bus type use g_return_if_fail to test function args for sanity --- libvirt-gconfig/Makefile.am | 2 + libvirt-gconfig/libvirt-gconfig-device-input.c | 113 ++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-device-input.h | 82 +++++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 7 ++ libvirt-gconfig/tests/test-domain-create.c | 15 +++- 6 files changed, 217 insertions(+), 3 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-device-input.c create mode 100644 libvirt-gconfig/libvirt-gconfig-device-input.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 4318124..76861a1 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -14,6 +14,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-clock.h \ libvirt-gconfig-device.h \ libvirt-gconfig-device-disk.h \ + libvirt-gconfig-device-input.h \ libvirt-gconfig-domain.h \ libvirt-gconfig-domain-snapshot.h \ libvirt-gconfig-helpers.h \ @@ -36,6 +37,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-clock.c \ libvirt-gconfig-device.c \ libvirt-gconfig-device-disk.c \ + libvirt-gconfig-device-input.c \ libvirt-gconfig-domain.c \ libvirt-gconfig-domain-snapshot.c \ libvirt-gconfig-enum-types.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-device-input.c b/libvirt-gconfig/libvirt-gconfig-device-input.c new file mode 100644 index 0000000..ed654e0 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-device-input.c @@ -0,0 +1,113 @@ +/* + * libvirt-gobject-config-device_input.c: libvirt glib integration + * + * 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)gmail.com&gt; + */ + +#include <config.h> + +#include <string.h> + +#include <libxml/tree.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-helpers-private.h" +#include "libvirt-gconfig/libvirt-gconfig-object-private.h" + +extern gboolean debugFlag; + +#define DEBUG(fmt, ...) do { if (G_UNLIKELY(debugFlag)) g_debug(fmt, ## __VA_ARGS__); } while (0) + +#define GVIR_CONFIG_DEVICE_INPUT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_CONFIG_DEVICE_INPUT, GVirConfigDeviceInputPrivate)) + +struct _GVirConfigDeviceInputPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDeviceInput, gvir_config_device_input, GVIR_TYPE_CONFIG_DEVICE); + + +static void gvir_config_device_input_class_init(GVirConfigDeviceInputClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDeviceInputPrivate)); +} + + +static void gvir_config_device_input_init(GVirConfigDeviceInput *device_input) +{ + GVirConfigDeviceInputPrivate *priv; + + DEBUG("Init GVirConfigDeviceInput=%p", device_input); + + priv = device_input->priv = GVIR_CONFIG_DEVICE_INPUT_GET_PRIVATE(device_input); + + memset(priv, 0, sizeof(*priv)); +} + + +GVirConfigDeviceInput *gvir_config_device_input_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_TYPE_CONFIG_DEVICE_INPUT, + "input", NULL); + return GVIR_CONFIG_DEVICE_INPUT(object); +} + +GVirConfigDeviceInput *gvir_config_device_input_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_TYPE_CONFIG_DEVICE_INPUT, + "input", NULL, xml, error); + return GVIR_CONFIG_DEVICE_INPUT(object); +} + +void gvir_config_device_input_set_device_type(GVirConfigDeviceInput *input, + GVirConfigDeviceInputDeviceType type) +{ + xmlNodePtr node; + const char *type_str; + + g_return_if_fail(GVIR_IS_CONFIG_DEVICE_INPUT(input)); + node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(input)); + g_return_if_fail(node != NULL); + type_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DEVICE_INPUT_DEVICE_TYPE, + type); + g_return_if_fail(type_str != NULL); + xmlNewProp(node, (xmlChar*)"type", (xmlChar*)type_str); +} + +void gvir_config_device_input_set_bus(GVirConfigDeviceInput *input, + GVirConfigDeviceInputBus bus) +{ + xmlNodePtr node; + const char *bus_str; + + g_return_if_fail(GVIR_IS_CONFIG_DEVICE_INPUT(input)); + node = gvir_config_object_get_xml_node(GVIR_CONFIG_OBJECT(input)); + g_return_if_fail(node != NULL); + bus_str = gvir_config_genum_get_nick(GVIR_TYPE_CONFIG_DEVICE_INPUT_BUS, + bus); + g_return_if_fail(bus_str != NULL); + xmlNewProp(node, (xmlChar*)"bus", (xmlChar*)bus_str); +} diff --git a/libvirt-gconfig/libvirt-gconfig-device-input.h b/libvirt-gconfig/libvirt-gconfig-device-input.h new file mode 100644 index 0000000..205ad88 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-device-input.h @@ -0,0 +1,82 @@ +/* + * libvirt-gobject-device-input.c: libvirt gobject integration + * + * 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)gmail.com&gt; + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DEVICE_INPUT_H__ +#define __LIBVIRT_GCONFIG_DEVICE_INPUT_H__ + +G_BEGIN_DECLS + +#define GVIR_TYPE_CONFIG_DEVICE_INPUT (gvir_config_device_input_get_type ()) +#define GVIR_CONFIG_DEVICE_INPUT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_TYPE_CONFIG_DEVICE_INPUT, GVirConfigDeviceInput)) +#define GVIR_CONFIG_DEVICE_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_TYPE_CONFIG_DEVICE_INPUT, GVirConfigDeviceInputClass)) +#define GVIR_IS_CONFIG_DEVICE_INPUT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_TYPE_CONFIG_DEVICE_INPUT)) +#define GVIR_IS_CONFIG_DEVICE_INPUT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_TYPE_CONFIG_DEVICE_INPUT)) +#define GVIR_CONFIG_DEVICE_INPUT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_TYPE_CONFIG_DEVICE_INPUT, GVirConfigDeviceInputClass)) + +typedef struct _GVirConfigDeviceInput GVirConfigDeviceInput; +typedef struct _GVirConfigDeviceInputPrivate GVirConfigDeviceInputPrivate; +typedef struct _GVirConfigDeviceInputClass GVirConfigDeviceInputClass; + +struct _GVirConfigDeviceInput +{ + GVirConfigDevice parent; + + GVirConfigDeviceInputPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDeviceInputClass +{ + GVirConfigDeviceClass parent_class; + + gpointer padding[20]; +}; + +typedef enum { + GVIR_CONFIG_DEVICE_INPUT_DEVICE_MOUSE, + GVIR_CONFIG_DEVICE_INPUT_DEVICE_TABLET +} GVirConfigDeviceInputDeviceType; + +typedef enum { + GVIR_CONFIG_DEVICE_INPUT_BUS_PS2, + GVIR_CONFIG_DEVICE_INPUT_BUS_USB, + GVIR_CONFIG_DEVICE_INPUT_BUS_XEN +} GVirConfigDeviceInputBus; + +GType gvir_config_device_input_get_type(void); + +GVirConfigDeviceInput *gvir_config_device_input_new(void); +GVirConfigDeviceInput *gvir_config_device_input_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_device_input_set_device_type(GVirConfigDeviceInput *input, + GVirConfigDeviceInputDeviceType type); +void gvir_config_device_input_set_bus(GVirConfigDeviceInput *input, + GVirConfigDeviceInputBus bus); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DEVICE_INPUT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index c0deae9..0f0abb7 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -31,6 +31,7 @@ #include <libvirt-gconfig/libvirt-gconfig-clock.h> #include <libvirt-gconfig/libvirt-gconfig-device.h> #include <libvirt-gconfig/libvirt-gconfig-device-disk.h> +#include <libvirt-gconfig/libvirt-gconfig-device-input.h> #include <libvirt-gconfig/libvirt-gconfig-domain-snapshot.h> #include <libvirt-gconfig/libvirt-gconfig-enum-types.h> #include <libvirt-gconfig/libvirt-gconfig-helpers.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 6d7ee0e..326a421 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -29,6 +29,13 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_config_device_disk_set_target_dev; gvir_config_device_disk_set_type; + gvir_config_device_input_get_type; + gvir_config_device_input_device_type_get_type; + gvir_config_device_input_new; + gvir_config_device_input_new_from_xml; + gvir_config_device_input_set_device_type; + gvir_config_device_input_set_bus; + gvir_config_domain_get_type; gvir_config_domain_new; gvir_config_domain_new_from_xml; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index fa949f7..63a625f 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -94,15 +94,24 @@ int main(void) gvir_config_device_disk_set_driver_type(disk, "qcow2"); gvir_config_device_disk_set_target_bus(disk, "ide"); gvir_config_device_disk_set_target_dev(disk, "hda"); - - devices = g_list_append(devices, disk); + devices = g_list_append(devices, GVIR_CONFIG_DEVICE(disk)); /* network interface node */ GVirConfigInterfaceNetwork *interface; interface = gvir_config_interface_network_new(); gvir_config_interface_network_set_source(interface, "default"); - devices = g_list_append(devices, interface); + devices = g_list_append(devices, GVIR_CONFIG_DEVICE(interface)); + + /* input node */ + GVirConfigDeviceInput *input; + + input = gvir_config_device_input_new(); + gvir_config_device_input_set_device_type(input, + GVIR_CONFIG_DEVICE_INPUT_DEVICE_TABLET); + gvir_config_device_input_set_bus(input, GVIR_CONFIG_DEVICE_INPUT_BUS_USB); + devices = g_list_append(devices, GVIR_CONFIG_DEVICE(input)); + gvir_config_domain_set_devices(domain, devices); g_list_free(devices); -- 1.7.7.3