From 525c3d40a97a1ccce7c4dc314d2dd9e780b50d41 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Fri, 29 May 2009 13:32:06 +0000
Subject: [PATCH] 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

---
 ChangeLog                                    | 6 ++++++
 docs/schemas/domain.rng                      | 2 +-
 src/qemu_conf.c                              | 2 +-
 tests/capabilityschemadata/caps-qemu-kvm.xml | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2bee7516ca..c27672483f 100644
--- 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 204c6333d9..11cf04acf2 100644
--- 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 18156cdd9f..d54f2cac00 100644
--- 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 fd8523e2d3..893f9ed98c 100644
--- 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'>
-- 
GitLab