[Xen-changelog] [xen-unstable] Remove the boot-type implementation -- now replaced by the HVM and PV boot

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID bd102b60c43bc4be403117b27ad41eeecf4c857d
# Parent  0ee4e33b4401be41ba3a30811eeefe05ae2aca3b
Remove the boot-type implementation -- now replaced by the HVM and PV boot
configuration.

Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
 tools/libxen/include/xen_boot_type.h          |   87 --------------------------
 tools/libxen/include/xen_boot_type_internal.h |   37 -----------
 tools/libxen/src/xen_boot_type.c              |   83 ------------------------
 3 files changed, 207 deletions(-)

diff -r 0ee4e33b4401 -r bd102b60c43b tools/libxen/include/xen_boot_type.h
--- a/tools/libxen/include/xen_boot_type.h      Thu Dec 14 18:24:14 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2006, XenSource Inc.
- *
- * 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
- */
-
-#ifndef XEN_BOOT_TYPE_H
-#define XEN_BOOT_TYPE_H
-
-
-#include "xen_common.h"
-
-
-enum xen_boot_type
-{
-    /**
-     * boot an HVM guest using an emulated BIOS
-     */
-    XEN_BOOT_TYPE_BIOS,
-
-    /**
-     * boot from inside the machine using grub
-     */
-    XEN_BOOT_TYPE_GRUB,
-
-    /**
-     * boot from an external kernel
-     */
-    XEN_BOOT_TYPE_KERNEL_EXTERNAL,
-
-    /**
-     * boot from a kernel inside the guest filesystem
-     */
-    XEN_BOOT_TYPE_KERNEL_INTERNAL
-};
-
-
-typedef struct xen_boot_type_set
-{
-    size_t size;
-    enum xen_boot_type contents[];
-} xen_boot_type_set;
-
-/**
- * Allocate a xen_boot_type_set of the given size.
- */
-extern xen_boot_type_set *
-xen_boot_type_set_alloc(size_t size);
-
-/**
- * Free the given xen_boot_type_set.  The given set must have been
- * allocated by this library.
- */
-extern void
-xen_boot_type_set_free(xen_boot_type_set *set);
-
-
-/**
- * Return the name corresponding to the given code.  This string must
- * not be modified or freed.
- */
-extern const char *
-xen_boot_type_to_string(enum xen_boot_type val);
-
-
-/**
- * Return the correct code for the given string, or set the session
- * object to failure and return an undefined value if the given string does
- * not match a known code.
- */
-extern enum xen_boot_type
-xen_boot_type_from_string(xen_session *session, const char *str);
-
-
-#endif
diff -r 0ee4e33b4401 -r bd102b60c43b 
tools/libxen/include/xen_boot_type_internal.h
--- a/tools/libxen/include/xen_boot_type_internal.h     Thu Dec 14 18:24:14 
2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2006, XenSource Inc.
- *
- * 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
- */
-
-
-/*
- * Declarations of the abstract types used during demarshalling of enum
- * xen_boot_type.  Internal to this library -- do not use from outside.
- */
-
-
-#ifndef XEN_BOOT_TYPE_INTERNAL_H
-#define XEN_BOOT_TYPE_INTERNAL_H
-
-
-#include "xen_internal.h"
-
-
-extern const abstract_type xen_boot_type_abstract_type_;
-extern const abstract_type xen_boot_type_set_abstract_type_;
-
-
-#endif
diff -r 0ee4e33b4401 -r bd102b60c43b tools/libxen/src/xen_boot_type.c
--- a/tools/libxen/src/xen_boot_type.c  Thu Dec 14 18:24:14 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2006, XenSource Inc.
- *
- * 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
- */
-
-#include <string.h>
-
-#include "xen_internal.h"
-#include "xen_boot_type.h"
-#include "xen_boot_type_internal.h"
-
-
-/*
- * Maintain this in the same order as the enum declaration!
- */
-static const char *lookup_table[] =
-{
-    "bios",
-    "grub",
-    "kernel_external",
-    "kernel_internal"
-};
-
-
-extern xen_boot_type_set *
-xen_boot_type_set_alloc(size_t size)
-{
-    return calloc(1, sizeof(xen_boot_type_set) +
-                  size * sizeof(enum xen_boot_type));
-}
-
-
-extern void
-xen_boot_type_set_free(xen_boot_type_set *set)
-{
-    free(set);
-}
-
-
-const char *
-xen_boot_type_to_string(enum xen_boot_type val)
-{
-    return lookup_table[val];
-}
-
-
-extern enum xen_boot_type
-xen_boot_type_from_string(xen_session *session, const char *str)
-{
-    return ENUM_LOOKUP(session, str, lookup_table);
-}
-
-
-const abstract_type xen_boot_type_abstract_type_ =
-    {
-        .typename = ENUM,
-        .enum_marshaller =
-             (const char *(*)(int))&xen_boot_type_to_string,
-        .enum_demarshaller =
-             (int (*)(xen_session *, const char *))&xen_boot_type_from_string
-    };
-
-
-const abstract_type xen_boot_type_set_abstract_type_ =
-    {
-        .typename = SET,
-        .child = &xen_boot_type_abstract_type_
-    };
-
-

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog