Merge pull request #1085 from xiagao/testing1

qemu_guest_agent: modify the qemu_guest_agent code structure for qemu-ga installation.

qemu/tests/cfg/qemu_guest_agent.cfg

@@ -3,7 +3,10 @@
     no Fedora.8, Fedora.9, Fedora.10, Fedora.11, Fedora.12, Fedora.13, Fedora.14, Fedora.15
     type = qemu_guest_agent
     gagent_name = "org.qemu.guest_agent.0"
-    gagent_install_cmd = "rpm -q qemu-guest-agent || yum install -y qemu-guest-agent"
+    gagent_install_cmd = "yum install -y qemu-guest-agent"
+    gagent_start_cmd = "service qemu-guest-agent start"
+    gagent_status_cmd = "service qemu-guest-agent status"
+    gagent_pkg_check_cmd = "rpm -q qemu-guest-agent"
     Windows:
         deps = no
         i386:
@@ -11,10 +14,16 @@
         x86_64:
             qemu_ga_pkg = qemu-ga-x64.msi
         gagent_download_cmd = "wget https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-qemu-ga/${qemu_ga_pkg}  -P /tmp/"
-        gagent_install_cmd = "C:\qemu-ga\${qemu_ga_pkg}  /quiet"
+        gagent_install_cmd = "start /wait C:\qemu-ga\${qemu_ga_pkg}  /quiet"
+        gagent_start_cmd = "net start qemu-ga"
+        gagent_status_cmd = sc query qemu-ga |findstr "RUNNING"
+        gagent_pkg_check_cmd = wmic product get name |findstr "QEMU guest agent"
         gagent_host_path = "/tmp/${qemu_ga_pkg}"
         gagent_guest_dir = "C:\qemu-ga"
         gagent_remove_service_cmd = "net stop qemu-ga & del /f C:\qemu-ga\${qemu_ga_pkg} & echo done"
+    RHEL.6:
+        gagent_start_cmd = "service qemu-ga start"
+        gagent_status_cmd = "service qemu-ga status"
     variants:
         - gagent_install:
             gagent_check_type = install
@@ -110,11 +119,6 @@
             gagent_serial_type = virtio
             virtio_ports += " org.qemu.guest_agent.0"
             virtio_port_type_org.qemu.guest_agent.0 = "serialport"
-            gagent_start_cmd = "service qemu-guest-agent start"
-            RHEL.6:
-                gagent_start_cmd = "service qemu-ga start"
-            Windows:
-                gagent_start_cmd = "net start qemu-ga"
         - isa_serial:
             # Windows guests don't support isa serial, disable it directly.
             no Windows