[libvirt] PPC Qemu Machine Type Patch

Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige. Thanks, tjb -- ======================================================================= | Thomas Baker email: tjb@unh.edu | | Systems Programmer | | Research Computing Center voice: (603) 862-4490 | | University of New Hampshire fax: (603) 862-1761 | | 332 Morse Hall | | Durham, NH 03824 USA http://wintermute.sr.unh.edu/~tjb | =======================================================================

On Thu, May 28, 2009 at 01:16:30PM -0400, Thomas J. Baker wrote:
Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige.
ACK, although this won't work with older QEMU, those older versions were pretty much fubar on PPC anyway. One day we should just ask qemu what machine types it supported :-) Daniel
diff -ur libvirt-0.6.3/docs/schemas/domain.rng libvirt-0.6.3.tjb/docs/schemas/domain.rng --- libvirt-0.6.3/docs/schemas/domain.rng 2009-04-02 08:54:57.000000000 -0400 +++ libvirt-0.6.3.tjb/docs/schemas/domain.rng 2009-05-27 11:46:47.000000000 -0400 @@ -184,7 +184,7 @@ </attribute> <attribute name="machine"> <choice> - <value>g3bw</value> + <value>g3beige</value> <value>mac99</value> <value>prep</value> </choice> diff -ur libvirt-0.6.3/src/qemu_conf.c libvirt-0.6.3.tjb/src/qemu_conf.c --- libvirt-0.6.3/src/qemu_conf.c 2009-04-20 05:08:15.000000000 -0400 +++ libvirt-0.6.3.tjb/src/qemu_conf.c 2009-05-27 11:45:33.000000000 -0400 @@ -192,7 +192,7 @@ "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 -ur libvirt-0.6.3/tests/capabilityschemadata/caps-qemu-kvm.xml libvirt-0.6.3.tjb/tests/capabilityschemadata/caps-qemu-kvm.xml --- libvirt-0.6.3/tests/capabilityschemadata/caps-qemu-kvm.xml 2009-01-27 10:29:53.000000000 -0500 +++ libvirt-0.6.3.tjb/tests/capabilityschemadata/caps-qemu-kvm.xml 2009-05-27 11:46:21.000000000 -0400 @@ -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'>
-- Libvir-list mailing list Libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
-- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

On Thu, May 28, 2009 at 07:26:15PM +0100, Daniel P. Berrange wrote:
On Thu, May 28, 2009 at 01:16:30PM -0400, Thomas J. Baker wrote:
Here's a patch I was asked to post here that attempts to fix libvirt incorrectly specifying g3bw as the machine type when it calls qemu-system-ppc. The renamed machine type is g3beige. I searched for all occurrences of g3bw and replaced it with g3beige.
ACK, although this won't work with older QEMU, those older versions were pretty much fubar on PPC anyway.
One day we should just ask qemu what machine types it supported :-)
Ideally, but right now just updating sounds the right approach, seems the change was done in qemu upstream end of last year, Applied and commited, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (3)
-
Daniel P. Berrange
-
Daniel Veillard
-
Thomas J. Baker