From 88a63cbe3a76a50f3a1f10591a2c7b39b698a433 Mon Sep 17 00:00:00 2001
From: Wojtek Porczyk <woju@invisiblethingslab.com>
Date: Wed, 24 Feb 2016 01:08:32 +0100
Subject: [PATCH] qubes/vm/qubesvm: do not clone VM-specific properties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is reworked
    core: do not clone VM-unique identifiers in clone_properties
by Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
---
 qubes/__init__.py   | 11 ++++++++---
 qubes/vm/qubesvm.py |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/qubes/__init__.py b/qubes/__init__.py
index 3af0e46c..616c1503 100644
--- a/qubes/__init__.py
+++ b/qubes/__init__.py
@@ -550,6 +550,8 @@ class property(object): # pylint: disable=redefined-builtin,invalid-name
     :param int load_stage: stage when property should be loaded (see \
         :py:class:`Qubes` for description of stages)
     :param int order: order of evaluation (bigger order values are later)
+    :param bool clone: :py:meth:`PropertyHolder.clone_properties` will not \
+        include this property by default if :py:obj:`False`
     :param str ls_head: column head for :program:`qvm-ls`
     :param int ls_width: column width in :program:`qvm-ls`
     :param str doc: docstring; this should be one paragraph of plain RST, no \
@@ -584,7 +586,7 @@ class property(object): # pylint: disable=redefined-builtin,invalid-name
 
     def __init__(self, name, setter=None, saver=None, type=None,
             default=_NO_DEFAULT, write_once=False, load_stage=2, order=0,
-            save_via_ref=False,
+            save_via_ref=False, clone=True,
             ls_head=None, ls_width=None, doc=None):
         # pylint: disable=redefined-builtin
         self.__name__ = name
@@ -597,6 +599,7 @@ class property(object): # pylint: disable=redefined-builtin,invalid-name
         self.order = order
         self.load_stage = load_stage
         self.save_via_ref = save_via_ref
+        self.clone = clone
         self.__doc__ = doc
         self._attr_name = '_qubesprop_' + name
 
@@ -969,11 +972,13 @@ class PropertyHolder(qubes.events.Emitter):
 
         :param PropertyHolder src: source object
         :param list proplist: list of properties \
-            (:py:obj:`None` for all properties)
+            (:py:obj:`None` or omit for all properties except those with \
+            :py:attr:`property.clone` set to :py:obj:`False`)
         '''
 
         if proplist is None:
-            proplist = self.property_list()
+            proplist = [prop for prop in self.property_list()
+                if prop.clone]
         else:
             proplist = [prop for prop in self.property_list()
                 if prop.__name__ in proplist or prop in proplist]
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index fafe4827..1527298c 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -151,15 +151,18 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
 
     qid = qubes.property('qid', type=int, write_once=True,
         setter=_setter_qid,
+        clone=False,
         ls_width=3,
         doc='''Internal, persistent identificator of particular domain. Note
             this is different from Xen domid.''')
 
     name = qubes.property('name', type=str,
+        clone=False,
         ls_width=31,
         doc='User-specified name of the domain.')
 
     uuid = qubes.property('uuid', type=uuid.UUID, write_once=True,
+        clone=False,
         ls_width=36,
         doc='UUID from libvirt.')