OS-200 need a better mechanism for storing persistent zone_did
OS-511 make zonecfg device resource extensible, like the net resource
OS-224 add more zonecfg net properties

*** 18,27 ****
--- 18,28 ----
  #
  # CDDL HEADER END
  #
  #
  # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright (c) 2011, Joyent Inc. All rights reserved.
  #
  
  #
  # MAPFILE HEADER START
  #
*** 51,60 ****
--- 52,62 ----
          zonecfg_add_ds;
          zonecfg_add_filesystem;
          zonecfg_add_fs_option;
          zonecfg_add_admin;
          zonecfg_add_nwif;
+         zonecfg_add_res_attr;
          zonecfg_add_pkg;
          zonecfg_add_pset;
          zonecfg_add_rctl;
          zonecfg_add_rctl_value;
          zonecfg_add_scratch;
*** 103,112 ****
--- 105,115 ----
          zonecfg_find_mounts;
          zonecfg_find_scratch;
          zonecfg_fini_handle;
          zonecfg_fix_obsolete;
          zonecfg_free_fs_option_list;
+         zonecfg_free_res_attr_list;
          zonecfg_free_rctl_value_list;
          zonecfg_get_aliased_rctl;
          zonecfg_get_attach_handle;
          zonecfg_get_attr_boolean;
          zonecfg_getadminent;
*** 116,125 ****
--- 119,129 ----
          zonecfg_get_attr_uint;
          zonecfg_get_autoboot;
          zonecfg_get_bootargs;
          zonecfg_get_brand;
          zonecfg_get_dflt_sched_class;
+         zonecfg_get_did;
          zonecfg_getdevent;
          zonecfg_getdevperment;
          zonecfg_getdsent;
          zonecfg_getfsent;
          zonecfg_get_fs_allowed;
*** 178,187 ****
--- 182,192 ----
          zonecfg_num_resources;
          zonecfg_open_scratch;
          zonecfg_ping_zoneadmd;
          zonecfg_release_lock_file;
          zonecfg_remove_fs_option;
+         zonecfg_remove_res_attr;
          zonecfg_remove_rctl_value;
          zonecfg_remove_userauths;
          zonecfg_reverse_scratch;
          zonecfg_rm_aliased_rctl;
          zonecfg_rm_detached;
*** 191,200 ****
--- 196,206 ----
          zonecfg_setattrent;
          zonecfg_set_aliased_rctl;
          zonecfg_set_autoboot;
          zonecfg_set_bootargs;
          zonecfg_set_brand;
+         zonecfg_set_did;
          zonecfg_setdevent;
          zonecfg_setdevperment;
          zonecfg_setdsent;
          zonecfg_setfsent;
          zonecfg_set_fs_allowed;
*** 224,233 ****
--- 230,240 ----
          zonecfg_valid_rctlblk;
          zonecfg_valid_rctlname;
          zonecfg_verify_save;
          zonecfg_warn_poold;
          zone_get_brand;
+         zone_get_did;
          zone_get_devroot;
          zone_get_id;
          zone_get_rootpath;
          zone_get_state;
          zone_get_zonepath;