All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [PATCH] Remove tabs from xm/main.py
@ 2007-03-21 11:53 Masaki Kanno
  2007-03-22  2:01 ` Masaki Kanno
  0 siblings, 1 reply; 6+ messages in thread
From: Masaki Kanno @ 2007-03-21 11:53 UTC (permalink / raw)
  To: xen-devel

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 143 bytes --]

Hi,

This patch replaces tab with 4 whitespaces in xm/main.py.

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

Best regards,
 Kan


[-- Attachment #2: remove_tabs_from_main.py.patch --]
[-- Type: application/octet-stream, Size: 568 bytes --]

diff -r 2216a45bf058 tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py	Tue Mar 20 15:19:38 2007 -0600
+++ b/tools/python/xen/xm/main.py	Wed Mar 21 20:47:01 2007 +0900
@@ -700,7 +700,7 @@ def getDomains(domain_names, state, full
                             'vcpus':    dom_metrics['vcpus_number'],
                             'state':    '-----',
                             'cpu_time': dom_metrics['vcpus_utilisation']})
-			
+            
             doms_sxp.append(['domain'] + map2sxp(dom_rec))
             doms_dict.append(dom_rec)
             

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH] Remove tabs from xm/main.py
  2007-03-21 11:53 [PATCH] [PATCH] Remove tabs from xm/main.py Masaki Kanno
@ 2007-03-22  2:01 ` Masaki Kanno
  2007-03-23 11:13   ` Ewan Mellor
  0 siblings, 1 reply; 6+ messages in thread
From: Masaki Kanno @ 2007-03-22  2:01 UTC (permalink / raw)
  To: xen-devel

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 578 bytes --]

Hi,

I checked other python codes too. Because I found that many tabs 
are included in some python codes, I send patches more. 

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

Best regards,
 Kan

>Hi,
>
>This patch replaces tab with 4 whitespaces in xm/main.py.
>
>Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
>
>Best regards,
> Kan
>
>
>-------------------------------text/plain-------------------------------
>_______________________________________________
>Xen-devel mailing list
>Xen-devel@lists.xensource.com
>http://lists.xensource.com/xen-devel

[-- Attachment #2: remove_tabs_from_xm-test.patch --]
[-- Type: application/octet-stream, Size: 18519 bytes --]

diff -r 3fd9b0c71b8c tools/xm-test/lib/XmTestLib/NetConfig.py
--- a/tools/xm-test/lib/XmTestLib/NetConfig.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/NetConfig.py	Thu Mar 22 00:24:28 2007 +0900
@@ -87,7 +87,7 @@ class NetConfig:
         else:
             self.netmask = NETMASK
             self.network = NETWORK
-	    s_ip = ''
+            s_ip = ''
 
             # Get starting ip and max ip from configured ip range
             s_ip = NETWORK_IP_RANGE
diff -r 3fd9b0c71b8c tools/xm-test/lib/XmTestLib/XenDevice.py
--- a/tools/xm-test/lib/XmTestLib/XenDevice.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/XenDevice.py	Thu Mar 22 00:19:45 2007 +0900
@@ -98,8 +98,8 @@ class XenDevice:
         self.domain = domain
         self.configNode = None
         # Commands run when domain is started or devices added and removed.
-	self.dom0_cmds = []
-	self.domU_cmds = []
+        self.dom0_cmds = []
+        self.domU_cmds = []
 
     def __str__(self):
         """Convert device config to XenConfig node compatible string"""
@@ -178,7 +178,7 @@ class XenNetDevice(XenDevice):
         self.dom0_alias_ip = None
 
         if domain.getDomainType() == "HVM":
-	    self.config["type"] = "ioemu"
+            self.config["type"] = "ioemu"
             if not self.config.has_key('bridge'):
                 self.config["bridge"] = "xenbr0"
 
@@ -252,7 +252,7 @@ class XenNetDevice(XenDevice):
         if (self.ip and not ip) or ((self.ip and ip) and (self.ip != ip)): 
             self.releaseNetDevIP()
 
-	if not self.netmask:
+        if not self.netmask:
             self.netmask = xmtest_netconf.getNetMask()
 
         if not self.network:
diff -r 3fd9b0c71b8c tools/xm-test/lib/XmTestLib/arch.py
--- a/tools/xm-test/lib/XmTestLib/arch.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/arch.py	Thu Mar 22 00:20:51 2007 +0900
@@ -94,7 +94,7 @@ def ppc_checkBuffer(buffer):
     for i in range(0, len(checks)):
         check=checks[i]
         if check.get('pattern').search(buffer):
-		FAIL(check.get('message'))
+            FAIL(check.get('message'))
 
     return
 
diff -r 3fd9b0c71b8c tools/xm-test/lib/XmTestReport/OSReport.py
--- a/tools/xm-test/lib/XmTestReport/OSReport.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/lib/XmTestReport/OSReport.py	Thu Mar 22 00:29:50 2007 +0900
@@ -149,16 +149,16 @@ class OperatingSystem:
             return None, None
 
     def __debianStyleRelease(self):
-	if os.access("/etc/debian_version", os.R_OK):
-	    rFile = file("/etc/debian_version")
-	else:
-	    rFile = None
-
-	if not rFile:
-	    return None, None
-
-	line = rFile.readline()
-	return "Debian", line.rstrip("\n");
+        if os.access("/etc/debian_version", os.R_OK):
+            rFile = file("/etc/debian_version")
+        else:
+            rFile = None
+
+        if not rFile:
+            return None, None
+
+        line = rFile.readline()
+        return "Debian", line.rstrip("\n");
 
     def __lsbStyleRelease(self):
         if os.access("/etc/lsb-release", os.R_OK):
diff -r 3fd9b0c71b8c tools/xm-test/lib/XmTestReport/Report.py
--- a/tools/xm-test/lib/XmTestReport/Report.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/lib/XmTestReport/Report.py	Thu Mar 22 00:25:32 2007 +0900
@@ -86,7 +86,7 @@ def encodeForm(fieldList):
 
 def postResults(report_server, results):
     if not re.match('http://', report_server):
-	report_server = 'http://'+report_server
+        report_server = 'http://'+report_server
     (report_host,report_url) = urlparse(report_server)[1:3]
     conn = httplib.HTTPConnection(report_host)
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/create/04_create_conflictname_neg.py
--- a/tools/xm-test/tests/create/04_create_conflictname_neg.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/create/04_create_conflictname_neg.py	Thu Mar 22 00:09:46 2007 +0900
@@ -34,8 +34,8 @@ except DomainError, e:
 except DomainError, e:
     eyecatcher = "Fail"
     # Stop the domain1 (nice shutdown)
-    domain1.stop()	
+    domain1.stop()
 
 if eyecatcher != "Fail":
-	domain2.stop()
-	FAIL("xm create let me create a duplicate-named domain!") 
+    domain2.stop()
+    FAIL("xm create let me create a duplicate-named domain!") 
diff -r 3fd9b0c71b8c tools/xm-test/tests/create/06_create_mem_neg.py
--- a/tools/xm-test/tests/create/06_create_mem_neg.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/create/06_create_mem_neg.py	Thu Mar 22 00:05:59 2007 +0900
@@ -16,7 +16,7 @@ from XmTestLib import *
 
 rdpath = os.environ.get("RD_PATH")
 if not rdpath:
-	rdpath = "../ramdisk"
+    rdpath = "../ramdisk"
 
 # Test 1: create a domain with mem=0
 config1 = {"memory": 0}
@@ -29,8 +29,8 @@ except DomainError, e:
     eyecatcher1 = "Fail"
 
 if eyecatcher1 != "Fail":
-	domain1.stop()
-        FAIL("xm create let me create a domain with 0 memory")
+    domain1.stop()
+    FAIL("xm create let me create a domain with 0 memory")
 
 
 # Test 2: create a domain with mem>sys_mem
@@ -48,6 +48,6 @@ except DomainError, e:
     eyecatcher2 = "Fail"
 
 if eyecatcher2 != "Fail":
-        domain2.stop()
-        FAIL("xm create let me create a domain with mem > sys_mem")
+    domain2.stop()
+    FAIL("xm create let me create a domain with mem > sys_mem")
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/create/07_create_mem64_pos.py
--- a/tools/xm-test/tests/create/07_create_mem64_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/create/07_create_mem64_pos.py	Thu Mar 22 00:10:46 2007 +0900
@@ -15,12 +15,12 @@ from XmTestLib import *
 
 rdpath = os.environ.get("RD_PATH")
 if not rdpath:
-        rdpath = "../ramdisk"
+    rdpath = "../ramdisk"
 
 #get current free memory info
 mem = int(getInfo("free_memory"))
 if mem < 64:
-	SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem)
+    SKIP("This test needs 64 MB of free memory (%i MB avail)" % mem)
 
 #create a domain with mem=64
 config = {"memory": 64}
@@ -39,11 +39,11 @@ except DomainError, e:
 
 eyecatcher1 = str(isDomainRunning(domain_mem64.getName()))
 if eyecatcher1 != "True":
-	FAIL("Failed to verify that a 64MB domain started")
+    FAIL("Failed to verify that a 64MB domain started")
 
 eyecatcher2 = getDomMem(domain_mem64.getName())
 if eyecatcher2 not in range(62, 65):
-	FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2)
+    FAIL("Started domain with 64MB, but it got %i MB" % eyecatcher2)
 
 #stop the domain (nice shutdown)
 domain_mem64.stop()
diff -r 3fd9b0c71b8c tools/xm-test/tests/create/08_create_mem128_pos.py
--- a/tools/xm-test/tests/create/08_create_mem128_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/create/08_create_mem128_pos.py	Thu Mar 22 00:08:45 2007 +0900
@@ -15,12 +15,12 @@ from XmTestLib import *
 
 rdpath = os.environ.get("RD_PATH")
 if not rdpath:
-        rdpath = "../ramdisk"
+    rdpath = "../ramdisk"
 
 #get current free memory info
 mem = int(getInfo("free_memory"))
 if mem < 128:
-        SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem)
+    SKIP("This test needs 128 MB of free memory (%i MB avail)" % mem)
 
 #create a domain with mem=128
 config={"memory": 128}
@@ -39,11 +39,11 @@ except DomainError, e:
 
 eyecatcher1 = str(isDomainRunning(domain_mem128.getName()))
 if eyecatcher1 != "True":
-	FAIL("Failed to verify that a 128MB domain started")
+    FAIL("Failed to verify that a 128MB domain started")
 
 eyecatcher2 = getDomMem(domain_mem128.getName())
 if eyecatcher2 not in range(126, 129):
-	FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2)
+    FAIL("Started domain with 128MB, but it got %i MB" % eyecatcher2)
 
 #stop the domain (nice shutdown)
 domain_mem128.stop()
diff -r 3fd9b0c71b8c tools/xm-test/tests/create/09_create_mem256_pos.py
--- a/tools/xm-test/tests/create/09_create_mem256_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/create/09_create_mem256_pos.py	Thu Mar 22 00:07:55 2007 +0900
@@ -15,12 +15,12 @@ from XmTestLib import *
 
 rdpath = os.environ.get("RD_PATH")
 if not rdpath:
-        rdpath = "../ramdisk"
+    rdpath = "../ramdisk"
 
 #get current free memory info
 mem = int(getInfo("free_memory"))
 if mem < 256:
-        SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem)
+    SKIP("This test needs 256 MB of free memory (%i MB avail)" % mem)
 
 #create a domain with mem=256
 config = {"memory": 256}
@@ -39,11 +39,11 @@ except DomainError, e:
 
 eyecatcher1 = str(isDomainRunning(domain_mem256.getName()))
 if eyecatcher1 != "True":
-	FAIL("Failed to verify that a 256MB domain started")
+    FAIL("Failed to verify that a 256MB domain started")
 
 eyecatcher2 = getDomMem(domain_mem256.getName())
 if eyecatcher2 not in range(254, 257):
-	FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2)
+    FAIL("Started domain with 256MB, but it got %i MB" % eyecatcher2)
 
 #stop the domain (nice shutdown)
 domain_mem256.stop()
diff -r 3fd9b0c71b8c tools/xm-test/tests/migrate/01_migrate_localhost_pos.py
--- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py	Wed Mar 21 23:51:10 2007 +0900
@@ -51,12 +51,12 @@ except TimeoutError, e:
     FAIL(str(e))
     
 if status != 0:
-	FAIL("xm migrate returned invalid %i != 0" % status)
+    FAIL("xm migrate returned invalid %i != 0" % status)
 
 new_domid = domid(domain.getName())
 
 if (old_domid == new_domid):
-	FAIL("xm migrate failed, domain id is still %s" % old_domid)
+    FAIL("xm migrate failed, domain id is still %s" % old_domid)
 
 # Attach a console to it
 try:
diff -r 3fd9b0c71b8c tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py
--- a/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/network-attach/04_network_attach_baddomain_neg.py	Wed Mar 21 23:52:01 2007 +0900
@@ -10,6 +10,6 @@ eyecatcher = "Error"
 eyecatcher = "Error"
 where = output.find(eyecatcher)
 if status == 0:
-	FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status )
+    FAIL("xm network-attach returned bad status, expected non 0, status is: %i" % status )
 elif where == -1:
-	FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output )
+    FAIL("xm network-attach returned bad output, expected Error, output is: %s" % output )
diff -r 3fd9b0c71b8c tools/xm-test/tests/network-attach/network_utils.py
--- a/tools/xm-test/tests/network-attach/network_utils.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/network-attach/network_utils.py	Wed Mar 21 23:52:57 2007 +0900
@@ -51,6 +51,6 @@ def network_detach(domain_name, console,
 
     eths_after = count_eth(console)
     if eths_after != (eths_before-1):
-    	return -2, "Network device was not actually disconnected from domU"
+        return -2, "Network device was not actually disconnected from domU"
 
     return 0, None
diff -r 3fd9b0c71b8c tools/xm-test/tests/pause/01_pause_basic_pos.py
--- a/tools/xm-test/tests/pause/01_pause_basic_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/pause/01_pause_basic_pos.py	Wed Mar 21 23:54:14 2007 +0900
@@ -39,7 +39,7 @@ domain.closeConsole()
 # Pause the domain
 status, output = traceCommand("xm pause %s" % domain.getName())
 if status != 0:
-	FAIL("xm pause returned invalid %i != 0", status)
+    FAIL("xm pause returned invalid %i != 0", status)
 
 # Try to attach a console to it
 try:
@@ -56,7 +56,7 @@ domain.closeConsole()
 
 status, output = traceCommand("xm unpause %s" % domain.getName())
 if status != 0:
-	FAIL("xm unpause returned invalid %i != 0", status)
+    FAIL("xm unpause returned invalid %i != 0", status)
 
 # Stop the domain (nice shutdown)
 domain.stop()
diff -r 3fd9b0c71b8c tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py
--- a/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/security-acm/06_security-acm_dom_block_attach.py	Thu Mar 22 00:13:37 2007 +0900
@@ -46,9 +46,9 @@ block_utils.block_attach(domain, resourc
 block_utils.block_attach(domain, resource1, "xvda1")
 
 try:
-	run1 = console.runCmd("cat /proc/partitions")
+    run1 = console.runCmd("cat /proc/partitions")
 except ConsoleError, e:
-	FAIL(str(e))
+    FAIL(str(e))
 
 #Explicitly label the 2nd resource
 ACMLabelResource(resource2, resourcelabel2)
@@ -62,9 +62,9 @@ for i in range(10):
     time.sleep(1)
 
 try:
-	run2 = console.runCmd("cat /proc/partitions")
+    run2 = console.runCmd("cat /proc/partitions")
 except ConsoleError, e:
-	FAIL(str(e))
+    FAIL(str(e))
 
 # Close the console
 domain.closeConsole()
diff -r 3fd9b0c71b8c tools/xm-test/tests/unpause/01_unpause_basic_pos.py
--- a/tools/xm-test/tests/unpause/01_unpause_basic_pos.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/unpause/01_unpause_basic_pos.py	Wed Mar 21 23:50:10 2007 +0900
@@ -46,18 +46,17 @@ for i in range(100):
         # Pause the domain
         status, output = traceCommand("xm pause %s" % domain.getName())
         if status != 0:
-	        FAIL("xm pause returned invalid %i != 0", status)
+            FAIL("xm pause returned invalid %i != 0", status)
     else:
         # Unpause the domain
         status, output = traceCommand("xm unpause %s" % domain.getName())
         if status != 0:
-	        FAIL("xm unpause returned invalud %i != 0", status)
-	
+            FAIL("xm unpause returned invalud %i != 0", status)
 
 # Make sure the domain is unpaused before we finish up
 status, output = traceCommand("xm unpause %s" % domain.getName())
 if status != 0:
-	FAIL("xm unpause returned invalid %i != 0", status)
+    FAIL("xm unpause returned invalid %i != 0", status)
 
 # Are we still alive after all that?
 try:
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py
--- a/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/02_vtpm-cat_pcrs.py	Thu Mar 22 00:01:50 2007 +0900
@@ -49,4 +49,4 @@ vtpm_cleanup(domName)
 vtpm_cleanup(domName)
 
 if not re.search("PCR-00:",run["output"]):
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+    FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/03_vtpm-susp_res.py
--- a/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/03_vtpm-susp_res.py	Thu Mar 22 00:00:35 2007 +0900
@@ -97,7 +97,7 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     loop += 1
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py
--- a/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/04_vtpm-loc_migr.py	Wed Mar 21 23:56:41 2007 +0900
@@ -91,7 +91,7 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     loop += 1
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py
--- a/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/05_vtpm-loc_migr.py	Wed Mar 21 23:56:12 2007 +0900
@@ -91,7 +91,7 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     loop += 1
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py
--- a/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/06_vtpm-susp_res_pcrs.py	Thu Mar 22 00:00:11 2007 +0900
@@ -122,12 +122,12 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     if not re.search("PCR-00: 1E A7 BD",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
+        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
 
     loop += 1
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py
--- a/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/07_vtpm-mig_pcrs.py	Wed Mar 21 23:59:43 2007 +0900
@@ -116,12 +116,12 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     if not re.search("PCR-00: 1E A7 BD",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
+        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
 
     loop += 1
 
diff -r 3fd9b0c71b8c tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py
--- a/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xm-test/tests/vtpm/08_vtpm-mig_pcrs.py	Wed Mar 21 23:57:41 2007 +0900
@@ -116,12 +116,12 @@ while loop < 3:
     if not re.search("PCR-00:",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
+        FAIL("Virtual TPM is not working correctly on /dev/vtpm on backend side")
 
     if not re.search("PCR-00: 1E A7 BD",run["output"]):
         saveLog(console.getHistory())
         vtpm_cleanup(domName)
-	FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
+        FAIL("Virtual TPM lost PCR 0 value: \n%s" % run["output"])
 
     loop += 1
 

[-- Attachment #3: remove_tabs_from_python-logging.patch --]
[-- Type: application/octet-stream, Size: 562 bytes --]

diff -r 3fd9b0c71b8c tools/python/logging/logging-0.4.9.2/test/mymodule.py
--- a/tools/python/logging/logging-0.4.9.2/test/mymodule.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/python/logging/logging-0.4.9.2/test/mymodule.py	Thu Mar 22 00:58:43 2007 +0900
@@ -2,7 +2,7 @@ log = logging.getLogger("MyModule")
 log = logging.getLogger("MyModule")
 
 def doIt():
-	log.debug("Doin' stuff...")
-	#do stuff...
-	raise TypeError, "Bogus type error for testing"
+    log.debug("Doin' stuff...")
+    #do stuff...
+    raise TypeError, "Bogus type error for testing"
 

[-- Attachment #4: remove_tabs_from_python-xen-xend-server.patch --]
[-- Type: application/octet-stream, Size: 3985 bytes --]

diff -r 3fd9b0c71b8c tools/python/xen/xend/server/SrvDomain.py
--- a/tools/python/xen/xend/server/SrvDomain.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/python/xen/xend/server/SrvDomain.py	Thu Mar 22 00:51:25 2007 +0900
@@ -101,10 +101,10 @@ class SrvDomain(SrvDir):
 
     def do_dump(self, _, req):
         fn = FormFn(self.xd.domain_dump,
-	            [['dom',         'int'],
-		     ['file',        'str'],
-		     ['live',        'int'],
-		     ['crash',       'int']])
+                    [['dom',         'int'],
+                     ['file',        'str'],
+                     ['live',        'int'],
+                     ['crash',       'int']])
         return fn(req.args, {'dom': self.dom.domid})
 
     def op_migrate(self, op, req):
@@ -139,9 +139,9 @@ class SrvDomain(SrvDir):
                     [['dom', 'int'],
                      ['period', 'int'],
                      ['slice', 'int'],
-		     ['latency', 'int'],
-		     ['extratime', 'int'],
-		     ['weight', 'int']])
+                     ['latency', 'int'],
+                     ['extratime', 'int'],
+                     ['weight', 'int']])
         val = fn(req.args, {'dom': self.dom.domid})
         return val
     
diff -r 3fd9b0c71b8c tools/python/xen/xend/server/pciquirk.py
--- a/tools/python/xen/xend/server/pciquirk.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/python/xen/xend/server/pciquirk.py	Thu Mar 22 00:57:01 2007 +0900
@@ -74,7 +74,7 @@ class PCIQuirk:
                 self.pci_quirks_config = pci_quirks_config
             except Exception, ex:
                 raise XendError("Reading config file %s: %s" %
-				(QUIRK_CONFIG_FILE, str(ex)))
+                                (QUIRK_CONFIG_FILE, str(ex)))
         else:
             log.info("Config file does not exist: %s" % QUIRK_CONFIG_FILE)
             self.pci_quirks_config = ['xend-pci-quirks']
@@ -83,7 +83,7 @@ class PCIQuirk:
         for dev in devices:
             ids = child_at(child(dev,'pci_ids'),0)
             fields = child_at(child(dev,'pci_config_space_fields'),0)
-	    if self.__matchPCIdev( ids ):
+            if self.__matchPCIdev( ids ):
                 log.info("Quirks found for PCI device [%s]" % self.devid)
                 return fields
 
@@ -93,11 +93,11 @@ class PCIQuirk:
     def __sendQuirks(self):
         for quirk in self.quirks:
             log.debug("Quirk Info: %04x:%02x:%02x.%1x-%s" % (self.domain,
-		    self.bus, self.slot, self.func, quirk))
+                      self.bus, self.slot, self.func, quirk))
             try:
                 f = file(QUIRK_SYSFS_NODE ,"w")
                 f.write( "%04x:%02x:%02x.%1x-%s" % (self.domain, self.bus,
-			self.slot, self.func, quirk) )
+                        self.slot, self.func, quirk) )
                 f.close()
             except Exception, e:
                 raise VmError("pci: failed to open/write/close quirks " +
@@ -118,13 +118,13 @@ class PCIQuirk:
                 self.pci_perm_dev_config = pci_perm_dev_config
             except Exception, ex:
                 raise XendError("Reading config file %s: %s" %
-				(PERMISSIVE_CONFIG_FILE,str(ex)))
+                                (PERMISSIVE_CONFIG_FILE,str(ex)))
         else:
             log.info("Config file does not exist: %s" % PERMISSIVE_CONFIG_FILE)
             self.pci_perm_dev_config = ['xend-pci-perm-devs']
 
         devices = child_at(child(pci_perm_dev_config, 'unconstrained_dev_ids'),0)
-	if self.__matchPCIdev( devices ):
+        if self.__matchPCIdev( devices ):
             log.debug("Permissive mode enabled for PCI device [%s]" %
                       self.devid)
             return True
@@ -133,7 +133,7 @@ class PCIQuirk:
         return False
 
     def __sendPermDevs(self):
-	if self.__devIsUnconstrained( ):
+        if self.__devIsUnconstrained( ):
             log.debug("Unconstrained device: %04x:%02x:%02x.%1x" %
                       (self.domain, self.bus, self.slot, self.func))
             try:

[-- Attachment #5: remove_tabs_from_xenmon.patch --]
[-- Type: application/octet-stream, Size: 1556 bytes --]

diff -r 3fd9b0c71b8c tools/xenmon/xenmon.py
--- a/tools/xenmon/xenmon.py	Tue Mar 20 17:36:18 2007 +0000
+++ b/tools/xenmon/xenmon.py	Wed Mar 21 23:45:01 2007 +0900
@@ -166,7 +166,7 @@ class DomainInfo:
 
     def ec_stats(self, passed):
         total = float(self.exec_count/(float(passed)/10**9))
-	return total
+        return total
 
     def io_stats(self, passed):
         total = float(self.iocount_sum)
@@ -235,7 +235,7 @@ def time_scale(ns):
     elif ns < 1000*1000:
         return "%4.2f us" % (float(ns)/10**3)
     elif ns < 10**9:
-	    return "%4.2f ms" % (float(ns)/10**6)
+        return "%4.2f ms" % (float(ns)/10**6)
     else:
         return "%4.2f s" % (float(ns)/10**9)
 
@@ -534,20 +534,20 @@ def show_livestats(cpu):
 # write does the file get created
 class Delayed(file):
     def __init__(self, filename, mode):
-	self.filename = filename
-	self.saved_mode = mode
-	self.delay_data = ""
-	self.opened = 0
+        self.filename = filename
+        self.saved_mode = mode
+        self.delay_data = ""
+        self.opened = 0
 
     def delayed_write(self, str):
-	self.delay_data = str
+        self.delay_data = str
 
     def write(self, str):
-	if not self.opened:
-	    self.file = open(self.filename, self.saved_mode)
-	    self.opened = 1
+        if not self.opened:
+            self.file = open(self.filename, self.saved_mode)
+            self.opened = 1
             self.file.write(self.delay_data)
-	self.file.write(str)
+        self.file.write(str)
 
     def rename(self, name):
         self.filename = name

[-- Attachment #6: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH] Remove tabs from xm/main.py
  2007-03-22  2:01 ` Masaki Kanno
@ 2007-03-23 11:13   ` Ewan Mellor
  2007-03-23 14:25     ` Masaki Kanno
  0 siblings, 1 reply; 6+ messages in thread
From: Ewan Mellor @ 2007-03-23 11:13 UTC (permalink / raw)
  To: Masaki Kanno; +Cc: xen-devel

On Thu, Mar 22, 2007 at 11:01:18AM +0900, Masaki Kanno wrote:

Content-Description: Mail message body
> Hi,
> 
> I checked other python codes too. Because I found that many tabs 
> are included in some python codes, I send patches more. 
> 
> Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>

Thanks for these.  I haven't taken the patch to the logging module, because
that's pristine upstream code, I believe.  I've applied all the rest though.

Ewan.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH] Remove tabs from xm/main.py
  2007-03-23 11:13   ` Ewan Mellor
@ 2007-03-23 14:25     ` Masaki Kanno
  2007-03-23 15:16       ` Tom Wilkie
  0 siblings, 1 reply; 6+ messages in thread
From: Masaki Kanno @ 2007-03-23 14:25 UTC (permalink / raw)
  To: Ewan Mellor; +Cc: xen-devel


>On Thu, Mar 22, 2007 at 11:01:18AM +0900, Masaki Kanno wrote:
>
>Content-Description: Mail message body
>> Hi,
>> 
>> I checked other python codes too. Because I found that many tabs 
>> are included in some python codes, I send patches more. 
>> 
>> Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
>
>Thanks for these.  I haven't taken the patch to the logging module, because
>that's pristine upstream code, I believe.  I've applied all the rest though.
>

Hi Ewan,

Thanks for your reply.  I understood it about the logging module. 
BTW, I know that many tabs are still included in the following files. 
I am making patches to remove tabs from those files.  Are the files 
which I should not fix included?

  tools/python/xen/sv/Main.py
  tools/python/xen/sv/Dominfo.py
  tools/python/xen/sv/CreateDomain.py
  tools/python/xen/sv/util.py
  tools/python/xen/sv/GenTabbed.py
  tools/python/xen/sv/NodeInfo.py
  tools/python/xen/sv/Wizard.py
  tools/security/python/xensec_gen/main.py

Best regards,
 Kan

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH] Remove tabs from xm/main.py
  2007-03-23 14:25     ` Masaki Kanno
@ 2007-03-23 15:16       ` Tom Wilkie
  2007-03-26  7:12         ` Masaki Kanno
  0 siblings, 1 reply; 6+ messages in thread
From: Tom Wilkie @ 2007-03-23 15:16 UTC (permalink / raw)
  To: Masaki Kanno; +Cc: Tom Wilkie, xen-devel, Ewan Mellor

All the SV stuff is heavily deprecated.  I think it should disappear  
soon.

Cheers

Tom

On 23 Mar 2007, at 14:25, Masaki Kanno wrote:

>
>> On Thu, Mar 22, 2007 at 11:01:18AM +0900, Masaki Kanno wrote:
>>
>> Content-Description: Mail message body
>>> Hi,
>>>
>>> I checked other python codes too. Because I found that many tabs
>>> are included in some python codes, I send patches more.
>>>
>>> Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
>>
>> Thanks for these.  I haven't taken the patch to the logging  
>> module, because
>> that's pristine upstream code, I believe.  I've applied all the  
>> rest though.
>>
>
> Hi Ewan,
>
> Thanks for your reply.  I understood it about the logging module.
> BTW, I know that many tabs are still included in the following files.
> I am making patches to remove tabs from those files.  Are the files
> which I should not fix included?
>
>   tools/python/xen/sv/Main.py
>   tools/python/xen/sv/Dominfo.py
>   tools/python/xen/sv/CreateDomain.py
>   tools/python/xen/sv/util.py
>   tools/python/xen/sv/GenTabbed.py
>   tools/python/xen/sv/NodeInfo.py
>   tools/python/xen/sv/Wizard.py
>   tools/security/python/xensec_gen/main.py
>
> Best regards,
>  Kan
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] [PATCH] Remove tabs from xm/main.py
  2007-03-23 15:16       ` Tom Wilkie
@ 2007-03-26  7:12         ` Masaki Kanno
  0 siblings, 0 replies; 6+ messages in thread
From: Masaki Kanno @ 2007-03-26  7:12 UTC (permalink / raw)
  To: Tom Wilkie; +Cc: xen-devel, Ewan Mellor

Hi Tom,

Thanks for your reply.  I'm going to remove tabs from xensec_gen/main.py  
only. 

Best regards,
 Kan

>All the SV stuff is heavily deprecated.  I think it should disappear soon.
>
>Cheers
>
>Tom
>
>On 23 Mar 2007, at 14:25, Masaki Kanno wrote:
>
>>
>>> On Thu, Mar 22, 2007 at 11:01:18AM +0900, Masaki Kanno wrote:
>>>
>>> Content-Description: Mail message body
>>>> Hi,
>>>>
>>>> I checked other python codes too. Because I found that many tabs
>>>> are included in some python codes, I send patches more.
>>>>
>>>> Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
>>>
>>> Thanks for these.  I haven't taken the patch to the logging module, 
>>> because
>>> that's pristine upstream code, I believe.  I've applied all the rest 
>>> though.
>>>
>>
>> Hi Ewan,
>>
>> Thanks for your reply.  I understood it about the logging module.
>> BTW, I know that many tabs are still included in the following files.
>> I am making patches to remove tabs from those files.  Are the files
>> which I should not fix included?
>>
>>   tools/python/xen/sv/Main.py
>>   tools/python/xen/sv/Dominfo.py
>>   tools/python/xen/sv/CreateDomain.py
>>   tools/python/xen/sv/util.py
>>   tools/python/xen/sv/GenTabbed.py
>>   tools/python/xen/sv/NodeInfo.py
>>   tools/python/xen/sv/Wizard.py
>>   tools/security/python/xensec_gen/main.py
>>
>> Best regards,
>>  Kan
>>
>>
>>
>> _______________________________________________
>> Xen-devel mailing list
>> Xen-devel@lists.xensource.com
>> http://lists.xensource.com/xen-devel
>
>
>_______________________________________________
>Xen-devel mailing list
>Xen-devel@lists.xensource.com
>http://lists.xensource.com/xen-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-03-26  7:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-21 11:53 [PATCH] [PATCH] Remove tabs from xm/main.py Masaki Kanno
2007-03-22  2:01 ` Masaki Kanno
2007-03-23 11:13   ` Ewan Mellor
2007-03-23 14:25     ` Masaki Kanno
2007-03-23 15:16       ` Tom Wilkie
2007-03-26  7:12         ` Masaki Kanno

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.