diff --git a/qubes/backup.py b/qubes/backup.py index 770ba8b6..266978a1 100644 --- a/qubes/backup.py +++ b/qubes/backup.py @@ -1958,7 +1958,7 @@ class BackupRestore(object): "template": {"func": "'n/a' if not hasattr(vm, 'template') is None " "else vm_info.template"}, - "netvm": {"func": "'n/a' if vm.is_netvm() and not vm.is_proxyvm() else\ + "netvm": {"func": "'n/a' if vm.is_netvm() else\ ('*' if vm.property_is_default('netvm') else '') +\ vm_info.netvm if vm_info.netvm is not None " "else '-'"}, diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py index 22e32106..008a0613 100644 --- a/qubes/vm/qubesvm.py +++ b/qubes/vm/qubesvm.py @@ -386,11 +386,6 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM): return os.path.join(self.dir_path, 'libvirt.xml') # XXX I don't know what to do with these; probably should be isinstance(...) - def is_proxyvm(self): - warnings.warn('vm.is_proxyvm() is deprecated', - DeprecationWarning) - return self.netvm is not None and self.provides_network - def is_disposablevm(self): warnings.warn('vm.is_disposable() is deprecated, use isinstance()', DeprecationWarning)