qemu-io: Interface cleanup
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/cmd.h b/include/qemu-io.h
similarity index 68%
rename from cmd.h
rename to include/qemu-io.h
index 9907795..a418b46 100644
--- a/cmd.h
+++ b/include/qemu-io.h
@@ -14,35 +14,33 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __COMMAND_H__
-#define __COMMAND_H__
+
+#ifndef QEMU_IO_H
+#define QEMU_IO_H
#include "qemu-common.h"
-#define CMD_FLAG_GLOBAL ((int)0x80000000) /* don't iterate "args" */
-
-extern BlockDriverState *qemuio_bs;
+#define CMD_FLAG_GLOBAL ((int)0x80000000) /* don't iterate "args" */
typedef int (*cfunc_t)(BlockDriverState *bs, int argc, char **argv);
typedef void (*helpfunc_t)(void);
typedef struct cmdinfo {
- const char *name;
- const char *altname;
- cfunc_t cfunc;
- int argmin;
- int argmax;
- int canpush;
- int flags;
- const char *args;
- const char *oneline;
- helpfunc_t help;
+ const char* name;
+ const char* altname;
+ cfunc_t cfunc;
+ int argmin;
+ int argmax;
+ int canpush;
+ int flags;
+ const char *args;
+ const char *oneline;
+ helpfunc_t help;
} cmdinfo_t;
-void qemuio_add_command(const cmdinfo_t *ci);
+bool qemuio_command(BlockDriverState *bs, const char *cmd);
+void qemuio_add_command(const cmdinfo_t *ci);
int qemuio_command_usage(const cmdinfo_t *ci);
-bool qemuio_command(const char *cmd);
-
-#endif /* __COMMAND_H__ */
+#endif /* QEMU_IO_H */
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 05ce342..ffbcf31 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -8,9 +8,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu-common.h"
+#include "qemu-io.h"
#include "block/block_int.h"
-#include "cmd.h"
#define CMD_NOFILE_OK 0x01
@@ -50,11 +49,12 @@
return 1;
}
-static int command(const cmdinfo_t *ct, int argc, char **argv)
+static int command(BlockDriverState *bs, const cmdinfo_t *ct, int argc,
+ char **argv)
{
char *cmd = argv[0];
- if (!init_check_command(qemuio_bs, ct)) {
+ if (!init_check_command(bs, ct)) {
return 0;
}
@@ -75,7 +75,7 @@
return 0;
}
optind = 0;
- return ct->cfunc(qemuio_bs, argc, argv);
+ return ct->cfunc(bs, argc, argv);
}
static const cmdinfo_t *find_command(const char *cmd)
@@ -2068,7 +2068,7 @@
.oneline = "help for one or all commands",
};
-bool qemuio_command(const char *cmd)
+bool qemuio_command(BlockDriverState *bs, const char *cmd)
{
char *input;
const cmdinfo_t *ct;
@@ -2081,7 +2081,7 @@
if (c) {
ct = find_command(v[0]);
if (ct) {
- done = command(ct, c, v);
+ done = command(bs, ct, c, v);
} else {
fprintf(stderr, "command \"%s\" not found\n", v[0]);
}
diff --git a/qemu-io.c b/qemu-io.c
index eec8cbc..514edcb 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -14,10 +14,9 @@
#include <getopt.h>
#include <libgen.h>
-#include "qemu-common.h"
+#include "qemu-io.h"
#include "qemu/main-loop.h"
#include "block/block_int.h"
-#include "cmd.h"
#include "trace/control.h"
#define VERSION "0.0.1"
@@ -273,7 +272,7 @@
char *input;
for (i = 0; !done && i < ncmdline; i++) {
- done = qemuio_command(cmdline[i]);
+ done = qemuio_command(qemuio_bs, cmdline[i]);
}
if (cmdline) {
g_free(cmdline);
@@ -298,7 +297,7 @@
if (input == NULL) {
break;
}
- done = qemuio_command(input);
+ done = qemuio_command(qemuio_bs, input);
g_free(input);
prompted = 0;
