xhyve-ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba6d16639d9f006d9eb0ab93ac6d9e0f021fd56b
-  data.tar.gz: 55a094bea177b871630409572dbdc99875a0007d
+  metadata.gz: 39b350054bcc76d6bb4069ece51fb1754af1ca15
+  data.tar.gz: da559becc2b5ea86ffef4144d930e8c627df8380
 SHA512:
-  metadata.gz: b03d16d068d6b5201d0d9402d362d0361f2036f2ddc9820eff6351c308439942cd89cae4ca9c1f77d635cf6b0117e5d65224b1df7d92e1cd8e31f88c93238b26
-  data.tar.gz: eade397da6b782fe3fe932f4a30bee66fb6a614d86793ce627c582e4bd3b1e2be84db135c1fece003592f36a81bd125d512034e4236df9723051ddfd65a24024
+  metadata.gz: ccf4a15f9a25a23ba835a352f59b709695684d401e67485a86cd25d373f0ce4b6d576315b1727e1c7c44cbf6b49af70563e8e7eb60a6590ea1e283be73f25b4a
+  data.tar.gz: 0cb1070d717ce4792252ba65eece64a63deb53124efa52de3daf3d144c742e2fd9ca8d80767ec8ef0cc634edd11cb084dce917569d74d3202455566e65f250df

data/lib/rubygems_plugin.rb

@@ -0,0 +1,7 @@
+Gem.post_install do
+  if Gem::Platform.local.os =~ /darwin/
+    # Required until https://github.com/mist64/xhyve/issues/60 is resolved
+    bin = File.expand_path('../xhyve/vendor/xhyve', __FILE__)
+    `/usr/bin/osascript -e 'do shell script "chown root #{bin} && chmod +s #{bin}" with administrator privileges'`
+  end
+end

data/lib/xhyve.rb

@@ -1,5 +1,4 @@
 $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 
 require 'xhyve/version'
-require 'xhyve/vmnet/vmnet.bundle'
 require 'xhyve/guest'

data/lib/xhyve/guest.rb

@@ -1,5 +1,5 @@
 require 'securerandom'
-require 'pty'
+require 'io/console'
 
 require 'xhyve/dhcp'
 
@@ -11,6 +11,7 @@ module Xhyve
   # object oriented interface to a hypervisor guest
   class Guest
     PCI_BASE = 3
+    NULLDEV = '/dev/null'
 
     attr_reader :pid, :uuid, :mac
 
@@ -24,13 +25,21 @@ module Xhyve
       @uuid = opts[:uuid] || SecureRandom.uuid
       @serial = opts[:serial] || 'com1'
       @acpi = opts[:acpi] || true
-      @sudo = opts[:sudo] || true
+      @networking = opts[:networking] || true
+      @foreground = opts[:foreground] || false
       @command = build_command
-      @mac = VMNet.uuid_to_mac(@uuid)
+      @mac = find_mac
     end
 
     def start
-      @r, @w, @pid = PTY.getpty(@command.join(' '))
+      outfile, infile = redirection
+      @pid = spawn(@command, [:out, :err] => outfile, in: infile)
+      if @foreground
+        Process.wait(@pid) 
+        outfile.cooked!
+        infile.cooked!
+      end
+      @pid
     end
 
     def stop
@@ -38,7 +47,7 @@ module Xhyve
     end
 
     def running?
-      PTY.check(@pid).nil?
+      (true if Process.kill(0, @pid) rescue false)
     end
 
     def ip
@@ -47,23 +56,32 @@ module Xhyve
 
     private
 
+    def redirection
+      if @foreground
+        [$stdout.raw!, $stdin.raw! ]
+      else
+        [NULLDEV, NULLDEV]
+      end
+    end
+
+    def find_mac
+      `#{@command} -M`.gsub(/MAC:\s+/,'')
+    end
+
     def build_command
       [
-        "#{'sudo' if @sudo}",
         "#{BINARY_PATH}",
         "#{'-A' if @acpi}",
         '-U', @uuid,
         '-m', @memory,
         '-c', @processors,
         '-s', '0:0,hostbridge',
+        "#{"-s #{PCI_BASE - 1}:0,virtio-net" if @networking }" ,
+        "#{"#{@blockdevs.each_with_index.map { |p, i| "-s #{PCI_BASE + i},virtio-blk,#{p}" }.join(' ')}" unless @blockdevs.empty? }",
         '-s', '31,lpc',
         '-l', "#{@serial},stdio",
-        '-s', "#{PCI_BASE - 1}:0,virtio-net",
-        "#{"#{@blockdevs.each_with_index.map { |p, i| "-s #{PCI_BASE + i},virtio-blk,#{p}" }.join(' ')}" unless @blockdevs.empty? }",
         '-f' "kexec,#{@kernel},#{@initrd},'#{@cmdline}'"
-      ].compact
+      ].join(' ')
     end
   end
-
-  # ./build/xhyve -U $UUID -m ${MEM}G -c ${PROCS} -s 2:0,virtio-net -s 0:0,hostbridge -s 31,lpc -l com2,stdio -A -f kexec,/Volumes/CDROM\ 1/BOOT/VMLINUZ,/Volumes/CDROM\ 1/BOOT/INITRD,"boot=live root=/dev/ram0 live-media=initramfs earlyprintk=serial console=ttyS1,115200 net.ifnames=0 biosdevname=0"
 end

data/lib/xhyve/version.rb

@@ -1,4 +1,4 @@
 # Common Xhyve functionality nampesace
 module Xhyve
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhyve-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dale Hamel
@@ -94,36 +94,18 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.5
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.8
 description: Provides a means of interacting with xhyve from ruby
 email: dale.hamel@srvthe.net
 executables: []
-extensions:
-- ext/vmnet/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- ext/vmnet/extconf.rb
-- ext/vmnet/uuid.h
-- ext/vmnet/vmnet.c
+- lib/rubygems_plugin.rb
 - lib/xhyve.rb
 - lib/xhyve/dhcp.rb
 - lib/xhyve/guest.rb
 - lib/xhyve/vendor/xhyve
 - lib/xhyve/version.rb
-- lib/xhyve/vmnet/vmnet.bundle
 homepage: http://rubygems.org/gems/ruby-xhyve
 licenses:
 - MIT

data/ext/vmnet/extconf.rb

@@ -1,9 +0,0 @@
-require 'mkmf'
-require 'rbconfig'
-
-abort 'Only works on OS X' unless RbConfig::CONFIG['host_os'].downcase.include?('darwin')
-abort 'missing vmnet.h' unless have_header 'uuid.h'
-abort 'missing vmnet.h' unless have_header 'vmnet/vmnet.h'
-abort 'missing vmnet' unless have_framework 'vmnet'
-
-create_makefile 'vmnet/vmnet'

data/ext/vmnet/uuid.h

@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#pragma once
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	_UUID_NODE_LEN 6
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-struct uuid {
-	uint32_t time_low;
-	uint16_t time_mid;
-	uint16_t time_hi_and_version;
-	uint8_t clock_seq_hi_and_reserved;
-	uint8_t clock_seq_low;
-	uint8_t node[_UUID_NODE_LEN];
-};
-#pragma clang diagnostic pop
-
-typedef struct uuid uuid_internal_t;
-
-/*
- * This implementation mostly conforms to the DCE 1.1 specification.
- * See Also:
- *	uuidgen(1), uuidgen(2), uuid(3)
- */
-
-/* Status codes returned by the functions. */
-#define	uuid_s_ok			0
-#define	uuid_s_bad_version		1
-#define	uuid_s_invalid_string_uuid	2
-#define	uuid_s_no_memory		3
-
-/*
- * uuid_create_nil() - create a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create_nil.htm
- */
-static inline void
-uuid_create_nil(uuid_t *u, uint32_t *status)
-{
-	if (status)
-		*status = uuid_s_ok;
-
-	bzero(u, sizeof(*u));
-}
-
-static inline void
-uuid_enc_le(void *buf, uuid_t *uuid)
-{
-	uuid_internal_t *u = (uuid_internal_t *) ((void *) uuid);
-	uint8_t *p = buf;
-	int i;
-
-	memcpy(p, &u->time_low, 4);
-	memcpy(p, &u->time_mid, 2);
-	memcpy(p, &u->time_hi_and_version, 2);
-	p[8] = u->clock_seq_hi_and_reserved;
-	p[9] = u->clock_seq_low;
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		p[10 + i] = u->node[i];
-}
-
-/*
- * uuid_from_string() - convert a string representation of an UUID into
- *			a binary representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_from_string.htm
- *
- * NOTE: The sequence field is in big-endian, while the time fields are in
- *	 native byte order.
- */
-static inline void
-uuid_from_string(const char *s, uuid_t *uuid, uint32_t *status)
-{
-	uuid_internal_t *u = (uuid_internal_t *) ((void *) uuid);
-	int n;
-
-	/* Short-circuit 2 special cases: NULL pointer and empty string. */
-	if (s == NULL || *s == '\0') {
-		uuid_create_nil(((uuid_t *) u), status);
-		return;
-	}
-
-	/* Assume the worst. */
-	if (status != NULL)
-		*status = uuid_s_invalid_string_uuid;
-
-	/* The UUID string representation has a fixed length. */
-	if (strlen(s) != 36)
-		return;
-
-	/*
-	 * We only work with "new" UUIDs. New UUIDs have the form:
-	 *	01234567-89ab-cdef-0123-456789abcdef
-	 * The so called "old" UUIDs, which we don't support, have the form:
-	 *	0123456789ab.cd.ef.01.23.45.67.89.ab
-	 */
-	if (s[8] != '-')
-		return;
-
-	n = sscanf(s,
-	    "%8x-%4hx-%4hx-%2hhx%2hhx-%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx",
-	    &u->time_low, &u->time_mid, &u->time_hi_and_version,
-	    &u->clock_seq_hi_and_reserved, &u->clock_seq_low, &u->node[0],
-	    &u->node[1], &u->node[2], &u->node[3], &u->node[4], &u->node[5]);
-
-	/* Make sure we have all conversions. */
-	if (n != 11)
-		return;
-
-	/* We have a successful scan. Check semantics... */
-	n = u->clock_seq_hi_and_reserved;
-	if ((n & 0x80) != 0x00 &&			/* variant 0? */
-	    (n & 0xc0) != 0x80 &&			/* variant 1? */
-	    (n & 0xe0) != 0xc0) {			/* variant 2? */
-		if (status != NULL)
-			*status = uuid_s_bad_version;
-	} else {
-		if (status != NULL)
-			*status = uuid_s_ok;
-	}
-}

data/ext/vmnet/vmnet.c

@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 2011 NetApp, Inc.
- * Copyright (c) 2015 xhyve developers
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY NETAPP, INC ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL NETAPP, INC OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-/*
- * https://github.com/mirage/ocaml-vmnet/blob/master/lib/vmnet_stubs.c
- *
- * Copyright (C) 2014 Anil Madhavapeddy <anil@recoil.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <ruby.h>
-
-#include <stdio.h>
-
-#include <vmnet/vmnet.h>
-
-#include "uuid.h"
-
-static VALUE
-vmnet_get_mac_address_from_uuid(VALUE self, VALUE guest_uuid_str_ruby) {
-/*
- * from vmn_create() in https://github.com/mist64/xhyve/blob/master/src/pci_virtio_vmnet.c
- */
-  char* guest_uuid_str;
-  xpc_object_t interface_desc;
-  uuid_t uuid;
-  __block interface_ref iface;
-  __block vmnet_return_t iface_status;
-  __block char* mac = malloc(18);
-  dispatch_semaphore_t iface_created, iface_stopped;
-  dispatch_queue_t if_create_q, if_stop_q;
-  uint32_t uuid_status;
-
-  guest_uuid_str = RSTRING_PTR(guest_uuid_str_ruby);
-  interface_desc = xpc_dictionary_create(NULL, NULL, 0);
-  xpc_dictionary_set_uint64(interface_desc, vmnet_operation_mode_key, VMNET_SHARED_MODE);
-
-  uuid_from_string(guest_uuid_str, &uuid, &uuid_status);
-  if (uuid_status != uuid_s_ok) {
-    fprintf(stderr, "Invalid UUID %s\n", guest_uuid_str);
-    return rb_str_new2("");
-  }
-
-  xpc_dictionary_set_uuid(interface_desc, vmnet_interface_id_key, uuid);
-  iface = NULL;
-  iface_status = 0;
-
-  if_create_q = dispatch_queue_create("org.xhyve.vmnet.create", DISPATCH_QUEUE_SERIAL);
-
-  iface_created = dispatch_semaphore_create(0);
-
-  iface = vmnet_start_interface(interface_desc, if_create_q,
-    ^(vmnet_return_t status, xpc_object_t interface_param)
-  {
-    iface_status = status;
-    if (status != VMNET_SUCCESS || !interface_param) {
-      dispatch_semaphore_signal(iface_created);
-      return;
-    }
-
-    //printf("%s\n", xpc_dictionary_get_string(interface_param, vmnet_mac_address_key));
-    const char *macStr = xpc_dictionary_get_string(interface_param, vmnet_mac_address_key);
-    strcpy(mac, macStr);
-
-    dispatch_semaphore_signal(iface_created);
-  });
-
-  dispatch_semaphore_wait(iface_created, DISPATCH_TIME_FOREVER);
-  dispatch_release(if_create_q);
-
-  if (iface == NULL || iface_status != VMNET_SUCCESS) {
-    fprintf(stderr, "virtio_net: Could not create vmnet interface, "
-      "permission denied or no entitlement?\n");
-    return rb_str_new2("");
-  }
-
-  iface_status = 0;
-
-  if_stop_q = dispatch_queue_create("org.xhyve.vmnet.stop", DISPATCH_QUEUE_SERIAL);
-
-  iface_stopped = dispatch_semaphore_create(0);
-
-  iface_status = vmnet_stop_interface(iface, if_stop_q,
-    ^(vmnet_return_t status)
-  {
-    iface_status = status;
-    dispatch_semaphore_signal(iface_stopped);
-  });
-
-  dispatch_semaphore_wait(iface_stopped, DISPATCH_TIME_FOREVER);
-  dispatch_release(if_stop_q);
-
-  if (iface_status != VMNET_SUCCESS) {
-    fprintf(stderr, "virtio_net: Could not stop vmnet interface, "
-      "permission denied or no entitlement?\n");
-    return rb_str_new2("");
-  }
-
-  return rb_str_new2(mac);
-}
-
-void 
-Init_vmnet(void){
-  VALUE cVmnet;
-
-  cVmnet = rb_define_module("VMNet");
-
-  rb_define_singleton_method(cVmnet, "uuid_to_mac", vmnet_get_mac_address_from_uuid, 1);
-}