--- a/usr/src/apis/hypervisor.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
--->
-
-<interface xmlns="http://www.opensolaris.org/ns/adr" name="hypervisor">
-
- <pragma domain="java" name="package"
- value="org.opensolaris.os.vp.panels.hypervisor.common" />
-
- <api name="Hypervisor">
- <version major="0" minor="1" stability="private" />
-
- <!-- In megabytes, should be long -->
- <property type="integer" name="PlatformMemory" access="ro" />
- <property type="integer" name="PlatformCPUs" access="ro" />
- </api>
-
-</interface>
--- a/usr/src/cmd/applications/Makefile Tue Jan 04 15:20:51 2011 -0500
+++ b/usr/src/cmd/applications/Makefile Fri Jan 07 14:00:18 2011 -0800
@@ -29,7 +29,6 @@
APPS= vp-apache.desktop \
vp-coreadm.desktop \
vp-firewall.desktop \
- vp-hypervisor.desktop \
vp-shares.desktop \
vp-svcs.desktop \
vp-sysmon.desktop \
--- a/usr/src/cmd/applications/vp-hypervisor.desktop Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Hypervisor
-Comment=Configure your hypervisor
-Exec=/usr/bin/java -client -jar /usr/share/vpanels/vpanels-client.jar hypervisor
-Icon=/usr/share/gnome-system-tools/pixmaps/services.png
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Application;System;Settings;
-StartupNotify=true
-Encoding=UTF-8
--- a/usr/src/cmd/rad/mod/Makefile Tue Jan 04 15:20:51 2011 -0500
+++ b/usr/src/cmd/rad/mod/Makefile Fri Jan 07 14:00:18 2011 -0800
@@ -43,7 +43,7 @@
usermgr \
zones
MODULE_SUBDIRS_sparc = $(MODULE_SUBDIRS)
-MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS) hypervisor
+MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS)
SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA))
--- a/usr/src/cmd/rad/mod/hypervisor/Makefile Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-
-include ../Makefile.env
-
-LDLIBS += -lvirt
-
-MOD_APIS=hypervisor
-MOD_OBJS=mod_hypervisor.o
-MOD_LIBNAME=mod_hypervisor.so
-MOD_INSTALLDIR=$(RADDIR_MODULE)
-
-include ../Makefile.com
--- a/usr/src/cmd/rad/mod/hypervisor/mod_hypervisor.c Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-#include <sys/types.h>
-#include <sys/processor.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <libvirt/libvirt.h>
-#include <libvirt/virterror.h>
-
-#include <rad/adr.h>
-#include <rad/rad_modapi.h>
-
-#include "api_hypervisor.h"
-
-static void
-errorfunc(void *userData, virErrorPtr vep)
-{
- rad_log(RL_DEBUG, "libvirt error: %s\n", vep->message);
-}
-
-static boolean_t
-gethyperinfo(virNodeInfoPtr nip)
-{
- virConnectPtr p = virConnectOpenReadOnly("xen:///");
-
- if (p == NULL)
- return (B_FALSE);
-
- int res = virNodeGetInfo(p, nip);
- (void) virConnectClose(p);
- return (res == 0);
-}
-
-/* ARGSUSED */
-conerr_t
-api_Hypervisor_read_PlatformMemory(rad_instance_t *inst,
- adr_attribute_t *attr, data_t **data, data_t **error)
-{
- virNodeInfo vni;
- if (gethyperinfo(&vni)) {
- *data = data_new_integer(vni.memory / 1024);
- return (ce_ok);
- }
-
- long long bytes = ((long long)sysconf(_SC_PAGESIZE)) *
- sysconf(_SC_PHYS_PAGES);
- long long mb = bytes / (1024 * 1024);
- *data = data_new_integer((int)mb);
- return (ce_ok);
-}
-
-/* ARGSUSED */
-conerr_t
-api_Hypervisor_read_PlatformCPUs(rad_instance_t *inst, adr_attribute_t *attr,
- data_t **data, data_t **error)
-{
- processorid_t cpuid_max;
- processor_info_t pi;
- virNodeInfo vni;
- if (gethyperinfo(&vni)) {
- *data = data_new_integer(vni.cpus);
- return (ce_ok);
- }
-
- cpuid_max = sysconf(_SC_CPUID_MAX);
- int count = 0;
- for (processorid_t i = 0; i <= cpuid_max; i++)
- if (processor_info(i, &pi) == 0)
- count++;
-
- *data = data_new_integer(count);
- return (ce_ok);
-}
-
-static rad_modinfo_t modinfo = { "hypervisor", "Hypervisor panel support" };
-
-int
-_rad_init(void *handle)
-{
- if (rad_module_register(handle, RAD_MODVERSION, &modinfo) == -1)
- return (-1);
-
- if (rad_isproxy)
- return (0);
-
- /*
- * Unfortunately, error handling appears to be process-wide.
- */
- virSetErrorFunc(NULL, errorfunc);
-
- /*
- * Proxying means that an unprivileged user gets information
- * for the domain, not for the hypervisor. But this is what
- * the original Java version did.
- */
- (void) cont_insert_singleton(rad_container, adr_name_fromstr(
- "org.opensolaris.os.vp.panels.hypervisor:type=Hypervisor"),
- &api_Hypervisor_svr);
-
- return (0);
-}
--- a/usr/src/java/vpanels/panels/hypervisor/build-hypervisor.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
--->
-
-<project name="vpanels-panels-hypervisor" default="jar">
- <import file="../build-panels.xml" />
-
- <path id="classpath.javac">
- <fileset refid="ws.extlibs" />
- <path refid="classpath.panels" />
- <pathelement location="${ws.java}/rad/rad.jar" />
- <pathelement location="${ws.java}/adr/adr.jar" />
- </path>
-
- <target name="generate_project" depends="panelsdef.generate_project">
- <generate.adr api="hypervisor.xml" />
- </target>
-</project>
--- a/usr/src/java/vpanels/panels/hypervisor/build.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
--->
-
-<project default="jar">
- <macrodef name="runant">
- <attribute name="target" />
- <attribute name="panel" />
- <attribute name="class" />
- <attribute name="name" default="(none)" />
- <sequential>
- <ant antfile="build-hypervisor.xml" target="@{target}">
- <property name="panel.panel" value="@{panel}" />
- <property name="panel.class" value="@{class}" />
- <property name="panel.name" value="@{name}" />
- </ant>
- </sequential>
- </macrodef>
-
- <macrodef name="runant-all">
- <attribute name="target" />
- <sequential>
- <runant target="@{target}"
- panel="hypervisor"
- class="org.opensolaris.os.vp.panels.hypervisor.client.swing.HypervisorPanelDescriptor"/>
- </sequential>
- </macrodef>
-
- <target name="install">
- <runant-all target="install"/>
- </target>
-
- <target name="jar">
- <runant-all target="jar"/>
- </target>
-
- <target name="javadoc">
- <runant-all target="javadoc"/>
- </target>
-
- <target name="compile">
- <runant-all target="compile"/>
- </target>
-
- <target name="all">
- <runant-all target="all"/>
- </target>
-
- <target name="lint">
- <runant-all target="lint"/>
- </target>
-
- <target name="clean">
- <runant-all target="clean"/>
- </target>
-
- <target name="clobber">
- <runant-all target="clobber"/>
- </target>
-</project>
--- a/usr/src/java/vpanels/panels/hypervisor/nbproject/project.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <name>vpanels-panels-hypervisor</name>
- </general-data>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>vpanels-panels-hypervisor</name>
- <properties/>
- <folders>
- <source-folder>
- <label>Source Packages</label>
- <location>.</location>
- <includes>org/</includes>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>Source Packages</label>
- <type>java</type>
- <location>.</location>
- <includes>org/</includes>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>build/gen</label>
- <type>java</type>
- <location>build/gen</location>
- <includes>org/</includes>
- <encoding>UTF-8</encoding>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>jar</target>
- </action>
- <action name="clean">
- <target>clobber</target>
- </action>
- <action name="javadoc">
- <target>javadoc</target>
- </action>
- <action name="rebuild">
- <target>clobber</target>
- <target>jar</target>
- </action>
- </ide-actions>
- <export>
- <type>jar</type>
- <location>vpanels-panels-hypervisor.jar</location>
- <build-target>jar</build-target>
- </export>
- <view>
- <items>
- <source-folder style="packages">
- <label>Source Packages</label>
- <location>.</location>
- <includes>org/</includes>
- </source-folder>
- <source-folder style="packages">
- <label>build/gen</label>
- <location>build/gen</location>
- <includes>org/</includes>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="javadoc"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>.</package-root>
- <package-root>build/gen</package-root>
- <classpath mode="compile">../../../scf/common/scf-common.jar:../../../util/vpanels-util.jar:../../common/vpanels-common.jar:../../panel/vpanels-panel.jar:../../../lib/swingx-0.9.3.jar</classpath>
- <built-to>vpanels-panels-hypervisor.jar</built-to>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/HypervisorControl.java Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,175 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-package org.opensolaris.os.vp.panels.hypervisor.client.swing;
-
-import java.net.URL;
-import java.util.*;
-import java.util.logging.*;
-import org.opensolaris.os.vp.panel.common.action.*;
-import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.common.smf.SmfMutableProperty;
-import org.opensolaris.os.vp.panel.swing.control.SettingsControl;
-import org.opensolaris.os.vp.util.misc.property.*;
-
-public class HypervisorControl
- extends SettingsControl<HypervisorPanelDescriptor, HypervisorPanel> {
-
- //
- // Static data
- //
-
- public static final String ID = "main";
-
- //
- // Instance data
- //
-
- private Map<SmfMutableProperty, MutableProperty>propMap =
- new HashMap<SmfMutableProperty, MutableProperty>();
-
- //
- // Constructors
- //
-
- public HypervisorControl(HypervisorPanelDescriptor descriptor) {
- super(ID, null, descriptor);
-
- // Add null values to property map
- propMap.put(descriptor.getEnabledProperty(), null);
- propMap.put(descriptor.dom0Property, null);
- propMap.put(descriptor.vcpuProperty, null);
- propMap.put(descriptor.pinProperty, null);
- propMap.put(descriptor.watProperty, null);
- }
-
- //
- // Control methods
- //
-
- @Override
- public URL getHelpURL() {
- return buildHelpURL("help/xenconfig.html", "#xenconfig");
- }
-
- @Override
- protected void save() throws ActionAbortedException, ActionFailedException,
- ActionUnauthorizedException {
-
- HypervisorPanel panel = getComponent();
-
- // Update the SMF properties with the values of the UI
- HypervisorPanelDescriptor desc = getPanelDescriptor();
- updateModelFromPanel();
- // Save the properties to the repo
- desc.saveToRepo();
- // Save the UI properties
- super.save();
- }
-
- @Override
- public void start(Navigator navigator, Map<String, String> parameters)
- throws NavigationAbortedException, InvalidParameterException {
-
- setPropertyChangeSource(getPanelDescriptor());
- super.start(navigator, parameters);
- }
-
-
- //
- // SwingControl methods
- //
-
- @Override
- protected void configComponent(HypervisorPanel panel) {
- super.configComponent(panel);
- // addDefaultOkayAction(true);
- addDefaultHelpAction(true);
- addDefaultApplyAction();
- // addDefaultCancelAction(true);
- addDefaultResetAction();
- }
-
- @Override
- protected HypervisorPanel createComponent() {
- HypervisorPanelDescriptor desc = getPanelDescriptor();
- HypervisorPanel panel = new HypervisorPanel(desc);
- return panel;
- }
-
- @Override
- protected void initComponent() {
- // Configure the component
-
- HypervisorPanelDescriptor desc = getPanelDescriptor();
- HypervisorPanel panel = getComponent();
-
- // Associate Model properties with Panel properties
- assocModelPropWithPanelProp(panel.setHypProp);
- assocModelPropWithPanelProp(panel.setMemProp);
- assocModelPropWithPanelProp(panel.setVCPUProp);
- assocModelPropWithPanelProp(panel.setPinProp);
- assocModelPropWithPanelProp(panel.setWatProp);
-
- // Initialise Panel properties from Model properties
- panel.setHypProperty(desc.getEnabledProperty().getValue());
- panel.setDom0Property(desc.dom0Property.getFirstValue());
- panel.setVCPUProperty(desc.vcpuProperty.getFirstValue());
- panel.setPinProperty(desc.pinProperty.getFirstValue());
- panel.setWatProperty(desc.watProperty.getFirstValue());
-
- }
- //
- // Package methods
- //
-
- void assocModelPropWithPanelProp(BasicMutableProperty<?> p) {
- Iterator<SmfMutableProperty> iter = propMap.keySet().iterator();
-
- while (iter.hasNext()) {
- SmfMutableProperty m = iter.next();
- if (m.getPropertyName().equals(p.getPropertyName())) {
- propMap.put(m, p);
- return;
- }
- }
- getLog().log(Level.WARNING,
- "Couldn't find a match for: " + p.getPropertyName());
- }
-
- void updateModelFromPanel() {
- HypervisorPanelDescriptor desc = getPanelDescriptor();
- desc.getEnabledProperty().setValue(
- (Boolean)propMap.get(desc.getEnabledProperty()).getValue());
- desc.dom0Property.setFirstValue(
- (Integer)propMap.get(desc.dom0Property).getValue());
- desc.vcpuProperty.setFirstValue(
- (Integer)propMap.get(desc.vcpuProperty).getValue());
- desc.pinProperty.setFirstValue(
- (Boolean)propMap.get(desc.pinProperty).getValue());
- desc.watProperty.setFirstValue(
- (Boolean)propMap.get(desc.watProperty).getValue());
- }
-}
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/HypervisorPanel.java Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,286 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-package org.opensolaris.os.vp.panels.hypervisor.client.swing;
-
-import java.awt.Font;
-import javax.swing.*;
-import javax.swing.event.*;
-import org.opensolaris.os.vp.panel.swing.view.ChangeIndicator;
-import org.opensolaris.os.vp.util.misc.*;
-import org.opensolaris.os.vp.util.misc.finder.Finder;
-import org.opensolaris.os.vp.util.misc.property.*;
-import org.opensolaris.os.vp.util.swing.property.*;
-import org.opensolaris.os.vp.util.swing.SettingsPanel;
-
-@SuppressWarnings({"serial"})
-public class HypervisorPanel extends SettingsPanel {
-
- //
- // Instance data
- //
- private HypervisorBasicPanel basic;
- private HypervisorAdvancedPanel advanced;
- private JTabbedPane tabber;
- private HypervisorPanelDescriptor descriptor;
-
- BooleanProperty setHypProp =
- new BooleanProperty(HypervisorPanelDescriptor.PROPERTY_HYP);
- IntegerProperty setMemProp =
- new IntegerProperty(HypervisorPanelDescriptor.PROPERTY_DOM0);
- IntegerProperty setVCPUProp =
- new IntegerProperty(HypervisorPanelDescriptor.PROPERTY_VCPUS);
- BooleanProperty setPinProp =
- new BooleanProperty(HypervisorPanelDescriptor.PROPERTY_PIN);
- BooleanProperty setWatProp =
- new BooleanProperty(HypervisorPanelDescriptor.PROPERTY_WAT);
-
- //
- // Constructors
- //
-
- public HypervisorPanel(HypervisorPanelDescriptor descriptor) {
-
- this.descriptor = descriptor;
-
- tabber = new JTabbedPane();
- basic = new HypervisorBasicPanel(this);
- tabber.addTab(Finder.getString("panel.tab.basic"), basic);
- advanced = new HypervisorAdvancedPanel(this);
- tabber.addTab(Finder.getString("panel.tab.advanced"), advanced);
-
- setContent(tabber, true, false);
- }
-
- //
- // HypervisorPanel methods
- //
-
- void setHypProperty(Boolean value) {
- setHypProp.update(value, false);
- }
-
- void setDom0Property(Integer value) {
- setMemProp.update(value, false);
- }
-
- void setVCPUProperty(Integer value) {
- setVCPUProp.update(value, false);
- }
-
- void setPinProperty(Boolean value) {
- setPinProp.update(value, false);
- }
-
- void setWatProperty(Boolean value) {
- setWatProp.update(value, false);
- }
-
- int getPlatformMemory() {
- return (descriptor.getPlatformMemory());
- }
-
- int getPlatformCPUs() {
- return (descriptor.getPlatformCPUs());
- }
-
-}
-
-class HypervisorBasicPanel extends JPanel {
-
- private DefaultBoundedRangeModel memModel;
-
- // Application Properties
-
- public HypervisorBasicPanel(HypervisorPanel parent) {
-
- ChangeableAggregator aggregator = parent.getChangeableAggregator();
- // Enable Hypervisor
- JCheckBox hypervisor =
- new JCheckBox(Finder.getString("hypervisor.label.hypervisor"));
-
- new CheckBoxPropertySynchronizer(parent.setHypProp, hypervisor);
- parent.setHypProp.addChangeListener(new ChangeIndicator());
- aggregator.addChangeables(parent.setHypProp);
-
- // dom0 memory
- JLabel lmemory =
- new JLabel(Finder.getString("hypervisor.label.memory"));
-
- int max = parent.getPlatformMemory();
-
- JLabel lmemValue = new JLabel(Integer.toString(max / 2));
- memModel = new DefaultBoundedRangeModel(max / 2, 0, 0, max);
- JSlider memory = new JSlider(memModel);
-
- memory.addChangeListener(new JSliderListener(lmemValue, "MB"));
- memory.setMinorTickSpacing((max / 8 >= 128) ? max / 8 : 128);
- memory.setMajorTickSpacing((max / 4 >= 1) ? max / 4 : 256);
- memory.setPaintTicks(true);
- memory.setPaintLabels(true);
- // memory.setSnapToTicks(true);
-
- new DefaultBoundedRangeModelPropertySynchronizer(parent.setMemProp,
- memModel);
- parent.setMemProp.addChangeListener(new ChangeIndicator());
- aggregator.addChangeables(parent.setMemProp);
-
- GroupLayout layout = new GroupLayout(this);
- setLayout(layout);
- layout.setAutoCreateGaps(true);
- layout.setAutoCreateContainerGaps(true);
-
- // int memWidth = (int) memory.getMinimumSize().getWidth();
- // int memHeight = (int) memory.getMinimumSize().getHeight();
-
- layout.setHorizontalGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addGap(1)
- .addGroup(
- layout.createSequentialGroup()
- .addComponent(lmemory)
- .addComponent(lmemValue)))
- .addGroup(layout.createParallelGroup()
- .addComponent(hypervisor)
- .addComponent(memory)));
-
- layout.setVerticalGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addGap(1)
- .addComponent(hypervisor))
- .addGroup(layout.createParallelGroup()
- .addComponent(lmemory)
- .addComponent(memory)
- .addComponent(lmemValue)));
- }
-}
-
-class HypervisorAdvancedPanel extends JPanel {
-
- private DefaultBoundedRangeModel vcpuModel;
-
- // Application Properties
-
- public HypervisorAdvancedPanel(HypervisorPanel parent) {
-
- ChangeableAggregator aggregator = parent.getChangeableAggregator();
-
- // Limiting the number of VCPUs
- JLabel lvcpus = new JLabel(Finder.getString("hypervisor.label.vcpus"));
- JLabel lvcpuValue = new JLabel(" 0");
- int max = parent.getPlatformCPUs();
- vcpuModel = new DefaultBoundedRangeModel(0, 0, 0, max);
- JSlider vcpus = new JSlider(vcpuModel);
-
- vcpus.addChangeListener(new JSliderListener(lvcpuValue));
- vcpus.setMinorTickSpacing((max / 8 >= 1) ? max / 8 : 1);
- vcpus.setMajorTickSpacing((max / 4 >= 1) ? max / 4 : 2);
- vcpus.setPaintTicks(true);
- vcpus.setPaintLabels(true);
- // vcpus.setSnapToTicks(true);
-
- new DefaultBoundedRangeModelPropertySynchronizer(parent.setVCPUProp,
- vcpuModel);
- parent.setVCPUProp.addChangeListener(new ChangeIndicator());
- aggregator.addChangeables(parent.setVCPUProp);
-
- // Pinning VCPUs
- JCheckBox pinning =
- new JCheckBox(Finder.getString("hypervisor.label.pinning"));
-
- new CheckBoxPropertySynchronizer(parent.setPinProp, pinning);
- parent.setPinProp.addChangeListener(new ChangeIndicator());
- aggregator.addChangeables(parent.setPinProp);
-
- // Watchdog
- JCheckBox watchdog =
- new JCheckBox(Finder.getString("hypervisor.label.watchdog"));
-
- new CheckBoxPropertySynchronizer(parent.setWatProp, watchdog);
- parent.setWatProp.addChangeListener(new ChangeIndicator());
- aggregator.addChangeables(parent.setWatProp);
-
- JLabel loptions =
- new JLabel(Finder.getString("hypervisor.label.options"));
-
- GroupLayout layout = new GroupLayout(this);
- setLayout(layout);
- layout.setAutoCreateGaps(true);
- layout.setAutoCreateContainerGaps(true);
-
- layout.setHorizontalGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addGroup(
- layout.createSequentialGroup()
- .addComponent(lvcpus)
- .addComponent(lvcpuValue))
- .addComponent(loptions))
- .addGroup(layout.createParallelGroup()
- .addComponent(vcpus)
- .addGroup(
- layout.createSequentialGroup()
- .addComponent(pinning)
- .addComponent(watchdog))));
-
- layout.setVerticalGroup(layout.createSequentialGroup()
- .addGroup(layout.createParallelGroup()
- .addComponent(lvcpus)
- .addComponent(vcpus)
- .addComponent(lvcpuValue))
- .addGroup(layout.createParallelGroup()
- .addComponent(loptions)
- .addComponent(pinning)
- .addComponent(watchdog)));
- }
-}
-
-class JSliderListener implements ChangeListener {
-
- private JLabel field;
- private String append = "";
-
- public JSliderListener() {
- }
-
- public JSliderListener(JLabel field) {
- this(field, null);
- }
-
- public JSliderListener(JLabel field, String append) {
- this.field = field;
- if (append != null)
- this.append = append;
- Font ofont = field.getFont();
- Font nfont =
- new Font(Font.MONOSPACED, ofont.getStyle(), ofont.getSize());
- field.setFont(nfont);
- }
-
- public void stateChanged(ChangeEvent e) {
- JSlider source = (JSlider)e.getSource();
- if (field != null)
- field.setText(String.format("%6d", source.getValue()) + append);
- }
-}
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/HypervisorPanelDescriptor.java Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- */
-
-package org.opensolaris.os.vp.panels.hypervisor.client.swing;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.logging.*;
-import javax.management.InstanceNotFoundException;
-import javax.swing.*;
-import org.opensolaris.os.scf.common.ScfException;
-import org.opensolaris.os.vp.panel.common.*;
-import org.opensolaris.os.vp.panel.common.control.*;
-import org.opensolaris.os.vp.panel.common.model.*;
-import org.opensolaris.os.vp.panel.common.smf.*;
-import org.opensolaris.os.vp.panel.swing.control.PanelFrameControl;
-import org.opensolaris.os.vp.panel.swing.model.SwingPanelDescriptor;
-import org.opensolaris.os.vp.panels.hypervisor.common.*;
-import org.opensolaris.os.vp.util.misc.finder.Finder;
-import org.opensolaris.os.vp.util.misc.property.MutableProperty;
-import org.opensolaris.os.vp.util.swing.HasIcons;
-
-public class HypervisorPanelDescriptor
- extends ServicePanelDescriptor<ManagedObject>
- implements SwingPanelDescriptor<ManagedObject>, HasIcons, SmfPropertyInfo {
-
- public static final String PROPERTY_DOM0 = "dom0_mem";
- public static final String PROPERTY_VCPUS = "vcpu_count";
- public static final String PROPERTY_PIN = "pin_vcpus";
- public static final String PROPERTY_WAT = "watchdog";
- public static final String PROPERTY_HYP = "enabled"; // Don't change
-
- protected static final List<ImageIcon> icons = Finder.getIcons(
- "images/hypervisor-disabled-16.png",
- "images/hypervisor-enabled-16.png",
- "images/hypervisor-disabled-24.png",
- "images/hypervisor-enabled-24.png",
- "images/hypervisor-disabled-32.png",
- "images/hypervisor-enabled-32.png");
-
- public static final String SMF_GROUP = "hypervisor";
-
- private static final String SERVICE = "milestone/xvm";
- private static final String INSTANCE = "default";
-
- public BasicSmfMutableProperty<Integer> dom0Property =
- new IntegerSmfProperty(PROPERTY_DOM0, this);
- public BasicSmfMutableProperty<Integer> vcpuProperty =
- new IntegerSmfProperty(PROPERTY_VCPUS, this);
- public BasicSmfMutableProperty<Boolean> pinProperty =
- new BooleanSmfProperty(PROPERTY_PIN, this);
- public BasicSmfMutableProperty<Boolean> watProperty =
- new BooleanSmfProperty(PROPERTY_WAT, this);
-
- //
- // Instance data
- //
-
- private DefaultControl control;
- private MXBeanTracker<HypervisorMXBean> beanTracker;
-
- //
- // Constructors
- //
-
- /**
- * Constructs a {@code HypervisorPanelDescriptor}.
- *
- * @param id
- * a unique identifier for this Panel, taken from the panel
- * registration
- *
- * @param context
- * a handle to interact with the Visual Panels client
- */
- public HypervisorPanelDescriptor(String id, ClientContext context)
- throws IOException, InstanceNotFoundException,
- ScfException, InvalidScfDataException, MissingScfDataException {
-
- super(id, context, SERVICE, INSTANCE);
-
- beanTracker = new MXBeanTracker<HypervisorMXBean>(
- HypervisorMXBean.class, context, HypervisorUtil.OBJECT_NAME);
-
- refresh(true);
-
- // Initialise Properties
- if (dom0Property.getExistsInRepo())
- dom0Property.updateFromRepo(true);
- else
- dom0Property.setFirstValue(2048);
-
- if (vcpuProperty.getExistsInRepo())
- vcpuProperty.updateFromRepo(true);
- else
- vcpuProperty.setFirstValue(0);
-
- if (pinProperty.getExistsInRepo())
- pinProperty.updateFromRepo(true);
- else
- pinProperty.setFirstValue(false);
-
- if (watProperty.getExistsInRepo())
- watProperty.updateFromRepo(true);
- else
- watProperty.setFirstValue(false);
-
- addProperties(getEnabledProperty());
- addProperties(dom0Property);
- addProperties(vcpuProperty);
- addProperties(pinProperty);
- addProperties(watProperty);
-
- control = new PanelFrameControl<HypervisorPanelDescriptor>(this);
- control.addChildren(new HypervisorControl(this));
-
- // Calculate an appropriate default value for dom0 reservation. This
- // logic is also present in the svc-milestone method and changes
- // to the calculation of this value here must be replicated there
- // to keep the behaviour consistent.
-
- if (dom0Property.getFirstValue() == 0) {
- int max = getPlatformMemory();
- int val = (max / 2 < 2048) ? max /2 : 2048;
- dom0Property.setFirstValue(val);
- try {
- saveToRepo();
- } catch (Exception e) {
- System.err.println("ERROR NUMBER 5628139.2");
- }
- }
- }
-
- //
- // ManagedObject methods
- //
-
- /**
- * Stops monitoring the connection to the remote host.
- */
- @Override
- public void dispose() {
- beanTracker.dispose();
- super.dispose();
- }
-
- @Override
- public String getName() {
- return Finder.getString("panel.hypervisor.name");
- }
-
- //
- // HasIcons methods
- //
-
- @Override
- public List<? extends Icon> getIcons() {
- return icons;
- }
-
- //
- // SmfPropertyGroupInfo methods
- //
-
- @Override
- public String getPropertyGroupName() {
- return SMF_GROUP;
- }
-
- //
- // SmfPropertyInfo methods
- //
-
- @Override
- public String getPropertyName() {
- // Use the default property names
- return null;
- }
-
- //
- // PanelDescriptor methods
- //
-
- @Override
- public Control getControl() {
- return control;
- }
-
- //
- // HypervisorPanelDescriptor methods
- //
-
- public HypervisorMXBean getHypervisorBean() {
- return beanTracker.getBean();
- }
-
- public int getPlatformMemory() {
- return (getHypervisorBean().getPlatformMemory());
- }
-
- public int getPlatformCPUs() {
- return (getHypervisorBean().getPlatformCPUs());
- }
-
- static void saveToRepo(HypervisorPanelDescriptor desc,
- Runnable runnable) {
-
- AggregatedRefreshService service = desc.getService();
-
- synchronized (service) {
- boolean needLock = !service.isPaused();
- if (needLock) {
- service.pause();
- }
- boolean success = false;
- try {
- runnable.run();
- success = true;
- } finally {
- if (needLock) {
- if (success) {
- // Throws ScfException
- try {
- service.unpause();
- } catch (ScfException scfe) {
- Logger.getLogger(HypervisorPanelDescriptor.class.
- getPackage().getName()).log(Level.SEVERE,
- "SCF exception: " + scfe.toString());
- }
- } else {
- // Unlock, refresh if needed, ignore any exceptions
- // since we are already in the midst of throwing one
- try {
- service.unpause();
- } catch (Throwable ignore) {
- }
- }
- }
- }
- }
- }
-
- void saveToRepo() {
- HypervisorPanelDescriptor.saveToRepo(this, new Runnable() {
- @Override
- public void run() {
- for (MutableProperty<?> property : getProperties()) {
- if (property.isChanged()) {
- try {
- ((SmfMutableProperty)property).saveToRepo();
- } catch (ScfException scfe) {
- getLog().log(Level.SEVERE, "SCF exception: "
- + scfe.toString());
- }
- }
- }
- }
- });
- }
-}
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/DOCS has changed
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/DOCS.TAB Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-e���������������������������������������������������������������������������������������u����������������������@����������������������������������������������������������������������������������������������������ꪪ�������
\ No newline at end of file
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/OFFSETS Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-�$kbЀ�CF�B� �6Ov�
\ No newline at end of file
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/POSITIONS has changed
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/SCHEMA Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-JavaSearch 1.0
-TMAP bs=2048 rt=1 fl=-1 id1=449 id2=1
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/JavaHelpSearch/TMAP has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/advanced.html has changed
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/app.hs Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- ident "%Z%%M% %I% %E% SMI" -->
-<!DOCTYPE helpset PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp HelpSet Version 2.0//EN" "helpset_1_0.dtd">
-
-<helpset version="2.0" xml:lang="en">
-<title>Sun xVM Visual Panel Help</title>
-<maps>
- <homeID></homeID>
- <mapref location="map.jhm"/>
-</maps>
-<view>
- <name>TOC</name>
- <label>Contents</label>
- <type>javax.help.TOCView</type>
- <data>toc.xml</data>
-</view>
-<view>
- <name>Index</name>
- <label>Index</label>
- <type>javax.help.IndexView</type>
- <data>index.xml</data>
-</view>
-<view>
- <name>Search</name>
- <label>Search</label>
- <type>javax.help.SearchView</type>
- <data engine="com.sun.java.help.search.DefaultSearchEngine">JavaHelpSearch</data>
-</view>
-</helpset>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/basic.html Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-US">
-
-<!--
-CDDL HEADER START
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
-
-CDDL HEADER END
-
--->
-
-<head>
-<!-- GenHTML revision 23224-->
-
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <!-- ident "%Z%%M% %I% %E% SMI" -->
-
- <title>The Hypervisor Configuration: Basic Tab - Sun xVM Visual Panel Help
- </title>
- <script language="JavaScript1.2">
- linktag = window.parent.frames[0].document.getElementsByTagName('link');
- for (var i = 0; i < linktag.length; i++) {
- if (linktag[i].rel == "stylesheet") {
- var s = "<link rel=" + linktag[i].rel + " type='text/css' href=" + linktag[i].href + " />";
- document.write(s);
- }
- }
- </script>
-
-</head>
-
-<body class="HlpBdy">
-
-<a name="basic"></a><h4>The Hypervisor Configuration: Basic Tab</h4>
-<p>The basic tab provides a checkbox that is used to configure whether the
-OpenSolaris OS should boot normally on hardware, or boot under the control of
-the hypervisor. </p><p>Setting the "Enable Hypervisor" checkbox to <tt>true</tt> will update the <tt>grub</tt>(5) menu listing
-so that booting into the hypervisor is enabled. De-selecting the check box will
-update the menu listing so that Solaris is booted on hardware.</p><p>The tab also provides a menu used to control the amount of
-memory that should be reserved for domain 0. </p><p>The "Reserved Memory" menu configures the GRUB menu item so that the specified
-amount of memory is reserved for use by domain 0. The default
-value is the lower of 1/2 of total installed memory, or 2048 MB.</p>
-<br/>
-
-</body>
-</html>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/docinfo.html Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-US">
-
-<!--
-CDDL HEADER START
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
-
-CDDL HEADER END
-
--->
-
-<head>
-<!-- GenHTML revision 23224-->
-
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <!-- ident "%Z%%M% %I% %E% SMI" -->
-
- <title>Document Information - Sun xVM Visual Panel Help
- </title>
- <script language="JavaScript1.2">
- linktag = window.parent.frames[0].document.getElementsByTagName('link');
- for (var i = 0; i < linktag.length; i++) {
- if (linktag[i].rel == "stylesheet") {
- var s = "<link rel=" + linktag[i].rel + " type='text/css' href=" + linktag[i].href + " />";
- document.write(s);
- }
- }
- </script>
-
-</head>
-
-<body class="HlpBdy">
-
-<a name="documentinfo"></a><p>Part No: </p><p>March 2010</p><p>Copyright 2010</p><p>Help
-for xVM Visual Panel</p><p>Sun Microsystems, Inc. has intellectual property rights relating to technology
-embodied in the product that is described in this document. In particular, and
-without limitation, these intellectual property rights may include one or more U.S. patents
-or pending patent applications in the U.S. and in other countries.</p><p>U.S. Government Rights
-– Commercial software. Government users are subject to the Sun Microsystems, Inc. standard
-license agreement and applicable provisions of the FAR and its supplements.</p><p>This distribution may
-include materials developed by third parties.</p><p>Parts of the product may be derived from
-Berkeley BSD systems, licensed from the University of California. UNIX is a registered trademark
-in the U.S. and other countries, exclusively licensed through X/Open Company, Ltd.</p><p>Sun, Sun
-Microsystems, the Sun logo, the Solaris logo, the Java Coffee Cup logo, docs.sun.com,
- SunOS, SunSolve, StarOffice, CacheFS Java, and Solaris are trademarks or registered trademarks of
-Sun Microsystems, Inc. in the U.S. and other countries. All SPARC trademarks are
-used under license and are trademarks or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC trademarks are based upon an
-architecture developed by Sun Microsystems, Inc. </p><p>The OPEN LOOK and Sun<sup>TM</sup> Graphical
-User Interface was developed by Sun Microsystems, Inc. for its users and licensees.
-Sun acknowledges the pioneering efforts of Xerox in researching and developing the concept of
-visual or graphical user interfaces for the computer industry. Sun holds a non-exclusive
-license from Xerox to the Xerox Graphical User Interface, which license also covers
-Sun's licensees who implement OPEN LOOK GUIs and otherwise comply with Sun's written
-license agreements.</p><p>Products covered by and information contained in this publication are controlled by U.S.
-Export Control laws and may be subject to the export or import
-laws in other countries. Nuclear, missile, chemical or biological weapons or nuclear maritime end
-uses or end users, whether direct or indirect, are strictly prohibited. Export or
-reexport to countries subject to U.S. embargo or to entities identified on U.S.
-export exclusion lists, including, but not limited to, the denied persons and specially
-designated nationals lists is strictly prohibited.</p><p>DOCUMENTATION IS PROVIDED “AS IS” AND ALL
-EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT
-SUCH DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.</p><p></p><p>Sun Microsystems, Inc. détient les
-droits de propriété intellectuelle relatifs à la technologie incorporée dans le produit qui est
-décrit dans ce document. En particulier, et ce sans limitation, ces droits de
-propriété intellectuelle peuvent inclure un ou plusieurs brevets américains ou des applications de
-brevet en attente aux Etats-Unis et dans d'autres pays.</p><p>Cette distribution peut comprendre des composants
-développés par des tierces personnes.</p><p>Certaines composants de ce produit peuvent être dérivées du
-logiciel Berkeley BSD, licenciés par l'Université de Californie. UNIX est une marque déposée
-aux Etats-Unis et dans d'autres pays; elle est licenciée exclusivement par X/Open Company,
-Ltd. </p><p>Sun, Sun Microsystems, le logo Sun, le logo Solaris, le logo
-Java Coffee Cup, docs.sun.com, SunOS, SunSolve, StarOffice, CacheFS, Java, et Solaris sont des
-marques de fabrique ou des marques déposées de Sun Microsystems, Inc. aux Etats-Unis et
-dans d'autres pays. Toutes les marques SPARC sont utilisées sous licence et sont
-des marques de fabrique ou des marques déposées de SPARC International, Inc. aux
-Etats-Unis et dans d'autres pays. Les produits portant les marques SPARC sont basés
-sur une architecture développée par Sun Microsystems, Inc.</p><p>L'interface d'utilisation graphique OPEN LOOK et Sun
-a été développée par Sun Microsystems, Inc. pour ses utilisateurs et licenciés. Sun reconnaît
-les efforts de pionniers de Xerox pour la recherche et le développement du
-concept des interfaces d'utilisation visuelle ou graphique pour l'industrie de l'informatique. Sun détient
-une licence non exclusive de Xerox sur l'interface d'utilisation graphique Xerox, cette licence
-couvrant également les licenciés de Sun qui mettent en place l'interface d'utilisation graphique OPEN
-LOOK et qui, en outre, se conforment aux licences écrites de Sun.</p><p>Les produits
-qui font l'objet de cette publication et les informations qu'il contient sont régis
-par la legislation américaine en matière de contrôle des exportations et peuvent être soumis
-au droit d'autres pays dans le domaine des exportations et importations. Les utilisations
-finales, ou utilisateurs finaux, pour des armes nucléaires, des missiles, des armes chimiques
-ou biologiques ou pour le nucléaire maritime, directement ou indirectement, sont strictement interdites.
-Les exportations ou réexportations vers des pays sous embargo des Etats-Unis, ou vers des
-entités figurant sur les listes d'exclusion d'exportation américaines, y compris, mais de manière
-non exclusive, la liste de personnes qui font objet d'un ordre de ne
-pas participer, d'une façon directe ou indirecte, aux exportations des produits ou des
-services qui sont régis par la legislation américaine en matière de contrôle des exportations
-et la liste de ressortissants spécifiquement designés, sont rigoureusement interdites.</p><p>LA DOCUMENTATION EST FOURNIE
-"EN L'ETAT" ET TOUTES AUTRES CONDITIONS, DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
-EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT TOUTE
-GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE A UNE UTILISATION PARTICULIERE
-OU A L'ABSENCE DE CONTREFACON. </p>
-<br/>
-
-</body>
-</html>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/index.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- ident "%Z%%M% %I% %E% SMI" -->
-<!DOCTYPE index PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Index Version 2.0//EN" "index_1_0.dtd">
-<index version="2.0">
-</index>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/map.jhm Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- ident "%Z%%M% %I% %E% SMI" -->
-<!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 2.0//EN" "map_1_0.dtd">
-<map version="2.0">
- <mapID target="xen-1" url="xen-1.html"/>
- <mapID target="docinfo" url="docinfo.html"/>
- <mapID target="xenconfig" url="xenconfig.html"/>
- <mapID target="basic" url="basic.html"/>
- <mapID target="advanced" url="advanced.html"/>
-</map>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/toc.xml Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- ident "%Z%%M% %I% %E% SMI" -->
-<!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 2.0//EN" "toc_1_0.dtd">
-<toc version="2.0">
-
- <tocitem target="xenconfig" text="Sun xVM Visual Panel Hypervisor Configuration" expand="false">
- <tocitem target="basic" text="The Hypervisor Configuration: Basic Tab" expand="false"></tocitem>
- <tocitem target="advanced" text="The Hypervisor Configuration: Advanced Tab" expand="false"></tocitem>
-</tocitem>
-</toc>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/xen-1.html Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-US">
-
-<!--
-CDDL HEADER START
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
-
-CDDL HEADER END
-
--->
-
-<head>
-<!-- GenHTML revision 23224-->
-
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <!-- ident "%Z%%M% %I% %E% SMI" -->
-
- <title>Sun xVM Visual Panel Help
- </title>
- <script language="JavaScript1.2">
- linktag = window.parent.frames[0].document.getElementsByTagName('link');
- for (var i = 0; i < linktag.length; i++) {
- if (linktag[i].rel == "stylesheet") {
- var s = "<link rel=" + linktag[i].rel + " type='text/css' href=" + linktag[i].href + " />";
- document.write(s);
- }
- }
- </script>
-
-</head>
-
-<body class="HlpBdy">
-
-<h1>Sun xVM Visual Panel Help</h1>
-
-<br/>
-
-</body>
-</html>
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/help/xenconfig.html Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-US">
-
-<!--
-CDDL HEADER START
-
-The contents of this file are subject to the terms of the
-Common Development and Distribution License (the "License").
-You may not use this file except in compliance with the License.
-
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
-
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
-
-CDDL HEADER END
-
--->
-
-<head>
-<!-- GenHTML revision 23224-->
-
- <meta http-equiv="Content-type" content="text/html; charset=utf-8">
- <!-- ident "%Z%%M% %I% %E% SMI" -->
-
- <title>Sun xVM Visual Panel Hypervisor Configuration - Sun xVM Visual Panel Help
- </title>
- <script language="JavaScript1.2">
- linktag = window.parent.frames[0].document.getElementsByTagName('link');
- for (var i = 0; i < linktag.length; i++) {
- if (linktag[i].rel == "stylesheet") {
- var s = "<link rel=" + linktag[i].rel + " type='text/css' href=" + linktag[i].href + " />";
- document.write(s);
- }
- }
- </script>
-
-</head>
-
-<body class="HlpBdy">
-
-<a name="xenconfig"></a><h3>Sun xVM Visual Panel Hypervisor Configuration</h3>
-<p>The hypervisor configuration can be used to enable, disable and configure the hypervisor.
-See the <tt>xVM</tt>(5) man page for more details and terminology definitions.</p><p>The following topics are included:</p>
-<ul><li><p>The Hypervisor Configuration: Basic Tab</p></li>
-<li><p>The Hypervisor Configuration: Advanced Tab</p></li></ul>
-
-<br/>
-
-</body>
-</html>
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-disabled-16.png has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-disabled-24.png has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-disabled-32.png has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-enabled-16.png has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-enabled-24.png has changed
Binary file usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/images/hypervisor-enabled-32.png has changed
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/client/swing/resources/Resources.properties Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
-#
-
-panel.hypervisor.name = Hypervisor Settings
-
-panel.tab.basic = Basic
-panel.tab.advanced = Advanced
-
-hypervisor.label.hypervisor = Enable Hypervisor
-hypervisor.label.memory = Reserved Memory:
-hypervisor.label.pinning = Pin VCPUs
-hypervisor.label.vcpus = VCPU Limit:
-hypervisor.label.watchdog = Watchdog
-hypervisor.label.options = Options:
-
--- a/usr/src/java/vpanels/panels/hypervisor/org/opensolaris/os/vp/panels/hypervisor/common/HypervisorUtil.java Tue Jan 04 15:20:51 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-
-/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-package org.opensolaris.os.vp.panels.hypervisor.common;
-
-import javax.management.*;
-import org.opensolaris.os.vp.common.panel.MBeanUtil;
-
-public class HypervisorUtil {
- //
- // Static data
- //
-
- public static final String DOMAIN =
- MBeanUtil.VP_PANEL_DOMAIN + ".hypervisor";
- public static final ObjectName OBJECT_NAME =
- MBeanUtil.makeObjectName(DOMAIN, "Hypervisor");
-}
