[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/19] expose QemuOpt and QemuOpts struct definition
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 06/19] expose QemuOpt and QemuOpts struct definitions to interested parties |
Date: |
Mon, 23 Jul 2012 12:50:31 +0100 |
From: Laszlo Ersek <address@hidden>
The only clients should be the existent "qemu-option.c", and the upcoming
"qapi/opts-visitor.c".
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qemu-option-internal.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++
qemu-option.c | 24 +---------------------
2 files changed, 54 insertions(+), 23 deletions(-)
create mode 100644 qemu-option-internal.h
diff --git a/qemu-option-internal.h b/qemu-option-internal.h
new file mode 100644
index 0000000..19fdc1c
--- /dev/null
+++ b/qemu-option-internal.h
@@ -0,0 +1,53 @@
+/*
+ * Commandline option parsing functions
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright (c) 2009 Kevin Wolf <address@hidden>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef QEMU_OPTIONS_INTERNAL_H
+#define QEMU_OPTIONS_INTERNAL_H
+
+#include "qemu-option.h"
+
+struct QemuOpt {
+ const char *name;
+ const char *str;
+
+ const QemuOptDesc *desc;
+ union {
+ bool boolean;
+ uint64_t uint;
+ } value;
+
+ QemuOpts *opts;
+ QTAILQ_ENTRY(QemuOpt) next;
+};
+
+struct QemuOpts {
+ char *id;
+ QemuOptsList *list;
+ Location loc;
+ QTAILQ_HEAD(QemuOptHead, QemuOpt) head;
+ QTAILQ_ENTRY(QemuOpts) next;
+};
+
+#endif
diff --git a/qemu-option.c b/qemu-option.c
index bb3886c..8334190 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -29,9 +29,9 @@
#include "qemu-common.h"
#include "qemu-error.h"
#include "qemu-objects.h"
-#include "qemu-option.h"
#include "error.h"
#include "qerror.h"
+#include "qemu-option-internal.h"
/*
* Extracts the name of an option from the parameter string (p points at the
@@ -511,28 +511,6 @@ void print_option_help(QEMUOptionParameter *list)
/* ------------------------------------------------------------------ */
-struct QemuOpt {
- const char *name;
- const char *str;
-
- const QemuOptDesc *desc;
- union {
- bool boolean;
- uint64_t uint;
- } value;
-
- QemuOpts *opts;
- QTAILQ_ENTRY(QemuOpt) next;
-};
-
-struct QemuOpts {
- char *id;
- QemuOptsList *list;
- Location loc;
- QTAILQ_HEAD(QemuOptHead, QemuOpt) head;
- QTAILQ_ENTRY(QemuOpts) next;
-};
-
static QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name)
{
QemuOpt *opt;
--
1.7.10.4
- [Qemu-devel] [PATCH 08/19] qapi schema: remove trailing whitespace, (continued)
- [Qemu-devel] [PATCH 08/19] qapi schema: remove trailing whitespace, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 14/19] convert net_init_slirp() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 11/19] convert net_client_init() to OptsVisitor, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 10/19] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated), Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 16/19] convert net_init_vde() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 15/19] convert net_init_socket() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 17/19] convert net_init_tap() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 05/19] qapi: introduce "size" type, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 18/19] convert net_init_bridge() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 13/19] convert net_init_dump() to NetClientOptions, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 06/19] expose QemuOpt and QemuOpts struct definitions to interested parties,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 07/19] qapi: introduce OptsVisitor, Stefan Hajnoczi, 2012/07/23
- [Qemu-devel] [PATCH 09/19] qapi schema: add Netdev types, Stefan Hajnoczi, 2012/07/23