Add code to create new system configuration. Work in progress, but there's

enough functionality to create a configuration for a t1k or t2k running
System Firmware 6.7.x.

1 files changed, 100 insertions, 2 deletions

diff --git a/usr.sbin/ldomctl/ldomctl.h b/usr.sbin/ldomctl/ldomctl.h
index 5c52530730a..008c9b3f01a 100644
--- a/usr.sbin/ldomctl/ldomctl.h
+++ b/usr.sbin/ldomctl/ldomctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldomctl.h,v 1.1 2012/11/05 19:50:54 kettenis Exp $	*/
+/*	$OpenBSD: ldomctl.h,v 1.2 2012/11/24 11:50:45 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2012 Mark Kettenis
@@ -16,19 +16,117 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+struct guest;
+
+struct console {
+	uint64_t ino;
+	uint64_t resource_id;
+
+	struct guest *guest;
+	struct ldc_endpoint *client_endpoint;
+	struct ldc_endpoint *server_endpoint;
+	struct md_node *hv_node;
+	TAILQ_ENTRY(console) link;
+};
+
+struct cpu {
+	uint64_t pid, vid, gid, partid;
+	uint64_t resource_id;
+
+	struct guest *guest;
+	struct md_node *hv_node;
+	TAILQ_ENTRY(cpu) link;
+};
+
+struct mblock {
+	uint64_t membase;
+	uint64_t memsize;
+	uint64_t realbase;
+	uint64_t resource_id;
+
+	struct guest *guest;
+	struct md_node *hv_node;
+	TAILQ_ENTRY(mblock) link;
+};
+
+struct ldc_endpoint {
+	uint64_t target_type;
+	uint64_t target_guest;
+	uint64_t channel;
+	uint64_t target_channel;
+	uint64_t tx_ino;
+	uint64_t rx_ino;
+	uint64_t resource_id;
+	uint64_t private_svc;
+	uint64_t svc_id;
+
+	struct guest *guest;
+	struct md_node *hv_node;
+	TAILQ_ENTRY(ldc_endpoint) link;
+};
+
+struct ldc_channel {
+	struct ldc_endpoint *client_endpoint;
+	struct ldc_endpoint *server_endpoint;
+};
+
 struct guest {
 	const char *name;
 	uint64_t gid;
+	uint64_t pid;
+	uint64_t resource_id;
 	uint64_t mdpa;
 
+	struct md_node *hv_node;
+
+	struct md *md;
+	uint64_t cpu_vid;
+	uint64_t endpoint_id;
+
+	struct console *console;
+	TAILQ_HEAD(, cpu) cpu_list;
 	int num_cpus;
+	TAILQ_HEAD(, mblock) mblock_list;
+	TAILQ_HEAD(, ldc_endpoint) endpoint_list;
+
+	struct ldc_channel domain_services;
+	struct ldc_channel vio[8];
+	int num_vios;
 
 	TAILQ_ENTRY(guest) link;
 };
 
-extern TAILQ_HEAD(guest_head, guest) guests;
+extern TAILQ_HEAD(guest_head, guest) guest_list;
 
 void add_guest(struct md_node *);
 
 extern struct md *hvmd;
 extern uint64_t hv_mdpa;
+
+
+struct vdisk {
+	SIMPLEQ_ENTRY(vdisk)	entry;
+	const char		*path;
+};
+
+struct vnet {
+	SIMPLEQ_ENTRY(vnet)	entry;
+	uint64_t		mac_addr;
+	uint64_t		mtu;
+};
+
+struct domain {
+	SIMPLEQ_ENTRY(domain)	entry;
+	const char *name;
+	uint64_t vcpu;
+	uint64_t memory;
+	SIMPLEQ_HEAD(, vdisk) vdisk_list;
+	SIMPLEQ_HEAD(, vnet) vnet_list;
+} *domain;
+
+struct ldom_config {
+	SIMPLEQ_HEAD(, domain) domain_list;
+};
+
+int parse_config(const char *, struct ldom_config *);
+void build_config(const char *);