From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Thu, 29 May 2008 15:03:26 +0000 (+0100)
Subject: declare domain_name and domid (via new config-host.h appendery)
X-Git-Tag: xen-3.3.0-rc1~156
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=556bb83797ac16eed68e6ea0b39d90d4a197ac68;p=qemu-xen-3.4-testing.git

declare domain_name and domid (via new config-host.h appendery)
---

diff --git a/i386-dm/helper2.c b/i386-dm/helper2.c
index 16623e90..b6d6a8db 100644
--- a/i386-dm/helper2.c
+++ b/i386-dm/helper2.c
@@ -74,6 +74,9 @@ int vcpus = 1;
 
 extern int xc_handle;
 
+char domain_name[64] = "Xen-no-name";
+int domid;
+
 long time_offset = 0;
 
 shared_iopage_t *shared_page = NULL;
diff --git a/vl.c b/vl.c
index 94eb3c89..3edb30de 100644
--- a/vl.c
+++ b/vl.c
@@ -7393,6 +7393,7 @@ enum {
     QEMU_OPTION_std_vga,
     QEMU_OPTION_echr,
     QEMU_OPTION_monitor,
+    QEMU_OPTION_domainname,
     QEMU_OPTION_serial,
     QEMU_OPTION_parallel,
     QEMU_OPTION_loadvm,
@@ -7494,6 +7495,7 @@ const QEMUOption qemu_options[] = {
     { "std-vga", 0, QEMU_OPTION_std_vga },
     { "echr", HAS_ARG, QEMU_OPTION_echr },
     { "monitor", HAS_ARG, QEMU_OPTION_monitor },
+    { "domain-name", 1, QEMU_OPTION_domainname },
     { "serial", HAS_ARG, QEMU_OPTION_serial },
     { "parallel", HAS_ARG, QEMU_OPTION_parallel },
     { "loadvm", HAS_ARG, QEMU_OPTION_loadvm },
@@ -8316,6 +8318,10 @@ int main(int argc, char **argv)
             case QEMU_OPTION_semihosting:
                 semihosting_enabled = 1;
                 break;
+            case QEMU_OPTION_domainname:
+                snprintf(domain_name, sizeof(domain_name),
+                         "Xen-%s", optarg);
+                break;
             case QEMU_OPTION_name:
                 qemu_name = optarg;
                 break;
diff --git a/xen-config-host.h b/xen-config-host.h
new file mode 100644
index 00000000..a1ff530a
--- /dev/null
+++ b/xen-config-host.h
@@ -0,0 +1,2 @@
+extern char domain_name[64];
+extern int domid;
diff --git a/xen-setup b/xen-setup
index 2ac9a733..c961f366 100755
--- a/xen-setup
+++ b/xen-setup
@@ -13,3 +13,4 @@ target=i386-dm
 ln -sf ../Makefile.target $target/Makefile
 ln -sf xen-config.mak $target/config.mak
 ln -sf xen-config-host.mak config-host.mak
+echo '#include "xen-config-host.h"' >>config-host.h