PPC Qemu Machine Type update

* src/qemu_conf.c docs/schemas/domain.rng
  tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type
  changed from g3bw to g3beige some time ago, patch by Thomas Baker
Daniel

diff --git a/ChangeLog b/ChangeLog
index 2bee7516ca9f6d9a74c8fa37248d68e58b19b078..c27672483fa68d307613c9bcae0c0c19e9067f8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 29 15:29:32 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/qemu_conf.c docs/schemas/domain.rng
+         tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type
+         changed from g3bw to g3beige some time ago, patch by Thomas Baker
+
 Fri May 29 14:26:30 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Fix regression with network interface parsing

diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
index 204c6333d9c92804b8c1b92c3c3c542d9c479434..11cf04acf27cfda5e832c51d881b495c4a97249b 100644 (file)
--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
@@ -184,7 +184,7 @@
       </attribute>
       <attribute name="machine">
         <choice>
-          <value>g3bw</value>
+          <value>g3beige</value>
           <value>mac99</value>
           <value>prep</value>
         </choice>

diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 18156cdd9fda71423b4e01c2788fcc62a775ee4b..d54f2cac003e858175c56ee94ca5fb6c1b321282 100644 (file)
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -193,7 +193,7 @@ static const char *const arch_info_hvm_sparc_machines[] = {
     "sun4m"
 };
 static const char *const arch_info_hvm_ppc_machines[] = {
-    "g3bw", "mac99", "prep"
+    "g3beige", "mac99", "prep"
 };
 
 static const char *const arch_info_xen_x86_machines[] = {

diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
index fd8523e2d30e6fbb19ee254257516f0fb00bead3..893f9ed98cf55411d1e6577cc710761f4eb42082 100644 (file)
--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
@@ -81,7 +81,7 @@
     <arch name='ppc'>
       <wordsize>32</wordsize>
       <emulator>/usr/bin/qemu-system-ppc</emulator>
-      <machine>g3bw</machine>
+      <machine>g3beige</machine>
       <machine>mac99</machine>
       <machine>prep</machine>
       <domain type='qemu'>