Changeset 4410

Timestamp:

10/10/08 13:20:04 (3 months ago)

Author:

martin

Message:

set guest-specific kernel parameters
removed memory setting, use mem= instead

Files:

• trunk/src/dumm/dumm.c (modified) (2 diffs)
• trunk/src/dumm/dumm.h (modified) (1 diff)
• trunk/src/dumm/ext/dumm.c (modified) (2 diffs)
• trunk/src/dumm/guest.c (modified) (9 diffs)
• trunk/src/dumm/guest.h (modified) (1 diff)
• trunk/src/dumm/main.c (modified) (7 diffs)

trunk/src/dumm/dumm.c

@@ -53 +53 @@
- */
-static guest_t* create_guest(private_dumm_t *this, char *name, char *kernel, 
-int mem
-
-
-
-mem
+char *args
+
+
+
+args
-    if (guest)
-    {
@@ -259 +259 @@
-    private_dumm_t *this = malloc_thing(private_dumm_t);
-    
-int
+char*
-    this->public.create_guest_enumerator = (enumerator_t*(*)(dumm_t*))create_guest_enumerator;
-    this->public.delete_guest = (void(*)(dumm_t*,guest_t*))delete_guest;

trunk/src/dumm/dumm.h

@@ -41 +41 @@
-     * @param kernel    UML kernel to use for guest
-     * @param master    mounted read only master filesystem
-mem      amount of memory for guest, in MB
+args     additional args to pass to kernel
-     * @return          guest if started, NULL if failed
-     */
-    guest_t* (*create_guest) (dumm_t *this, char *name, char *kernel, 
-int mem
+char *args
-    
-    /**

trunk/src/dumm/ext/dumm.c

@@ -47 +47 @@
-    pid_t pid;
-    
-    args[argc++] = "con0=xterm";
-    args[argc++] = "xterm=gnome-terminal,-t,-x";
-    
-    pid = fork();
-    switch (pid)
@@ -146 +143 @@
-
-static VALUE guest_new(VALUE class, VALUE name, VALUE kernel,
-mem
+args
-{
-    guest_t *guest;
-    
-    guest = dumm->create_guest(dumm, StringValuePtr(name), StringValuePtr(kernel),
-FIX2INT(mem
+StringValuePtr(args
-    if (!guest)
-    {

trunk/src/dumm/guest.c

@@ -43 +43 @@
-#define DIFF_DIR "diff"
-#define UNION_DIR "union"
-MEMORY_FILE "mem
+ARGS_FILE "args
-#define PID_FILE "pid"
-#define KERNEL_FILE "linux"
@@ -61 +61 @@
-    /** directory name of guest */
-    char *dirname;
-mount of memory for guest, in MB
-int mem
+dditional args to pass to guest
+char *args
-    /** pid of guest child process */
-    int pid;
@@ -266 +266 @@
-    args[i++] = write_arg(&pos, &left, "uml_dir=%s", this->dirname);
-    args[i++] = write_arg(&pos, &left, "umid=%s", this->name);
-    args[i++] = write_arg(&pos, &left, "mem=%dM", this->mem);
-    args[i++] = write_arg(&pos, &left, "mconsole=notify:%s", notify);
-    args[i++] = write_arg(&pos, &left, "con=null");
+    if (this->args)
+    {
+        args[i++] = this->args;
+    }
-      
-    this->pid = invoke(data, &this->public, args, i);
@@ -491 +494 @@
-
-/**
-memory
-
-int loadmem
+args
+
+char *loadargs
-{
-    FILE *file;
-int mem = 0
-
-MEMORY
+char buf[512], *args = NULL
+
+ARGS
-    if (file)
-    {
-scanf(file, "%d", &mem) <= 0
-
-mem = 0
+gets(buf, sizeof(buf), file)
+
+args = strdup(buf)
-        }
-        fclose(file);
-    }
-mem
-
-
-
-memory
-
-mem(private_guest_t *this, int mem
+args
+
+
+
+args
+
+args(private_guest_t *this, char *args
-{
-    FILE *file;
-    bool retval = FALSE;
-    
-MEMORY
+ARGS
-                         PERM), "w");
-    if (file)
-    {
-d", mem
+s", args
-        {
-            retval = TRUE;
@@ -544 +547 @@
-    this->ifaces->destroy(this->ifaces);
-    free(this->dirname);
+    free(this->args);
-    free(this->name);
-    free(this);
@@ -595 +599 @@
-    this->mconsole = NULL;
-    this->ifaces = linked_list_create();
-mem = 0
+args = NULL
-    this->name = strdup(name);
-    this->cowfs = NULL;
@@ -626 +630 @@
- */
-guest_t *guest_create(char *parent, char *name, char *kernel,
-int mem
+char *args
-{
-    private_guest_t *this = guest_create_generic(parent, name, TRUE);
@@ -651 +655 @@
-    }
-    
-mem = mem
-!savemem(this, mem
+args = args
+args && !saveargs(this, args
-    {
-        destroy(this);
@@ -679 +683 @@
-    }
-    
-mem = loadmem
-if (this->mem == 0)
-{
-   DBG1("unable to open memory configuration file: %m", name);
+args = loadargs
+
+if (!mount_unionfs(this))
+{
-        destroy(this);
-        return NULL;
-    }
-    
-    if (!mount_unionfs(this))
-    {
-        destroy(this);
-        return NULL;
-    }
-    
-    return &this->public;
-}

trunk/src/dumm/guest.h

@@ -188 +188 @@
- * @param kernel    kernel this guest uses
- * @param master    read-only master filesystem for guest
+ * @param args      additional args to pass to kernel
- * @param mem       amount of memory to give the guest
- */
-guest_t *guest_create(char *parent, char *name, char *kernel,
-int mem
+char *args
-
-/**

trunk/src/dumm/main.c

@@ -101 +101 @@
-                    char *args[], int argc)
-{
-    args[argc] = "con0=fd:0,fd:1";
-    return vte_terminal_fork_command(VTE_TERMINAL(vte), args[0], args, NULL,
-                                     NULL, FALSE, FALSE, FALSE);
@@ -375 +374 @@
-{
-    guest_t *guest;
-memory
+args
-    
-    dialog = gtk_dialog_new_with_buttons("Create new guest", GTK_WINDOW(window),
@@ -397 +396 @@
-    gtk_widget_show(label);
-    
-Memory (MB)
+Kernel arguments
-    gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, 0, 0, 0, 0);
-    gtk_widget_show(label);
@@ -418 +417 @@
-    gtk_widget_show(master);
-    
-
-
-
+
+
-                     GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0, 0);
-memory
+args
-    
-    gtk_widget_show(table);
@@ -432 +430 @@
-            case GTK_RESPONSE_ACCEPT:
-            {
-
+, *sargs
-                page_t *page;
-                
@@ -438 +436 @@
-                skernel = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(kernel));
-                smaster = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(master));
+                sargs = (char*)gtk_entry_get_text(GTK_ENTRY(args));
-            
-                if (!sname[0] || !skernel || !smaster)
@@ -443 +442 @@
-                    continue;
-                }
-
-
+
-                if (!guest)
-                {