[libvirt] [PATCH 04/10] Move QEMU private data & namespace code into separate file

[Eric Blake]

On 12/16/2010 01:31 PM, Eric Blake wrote:
> On 12/16/2010 09:50 AM, Daniel P. Berrange wrote:
>> Move the code for handling the QEMU virDomainObjPtr private
>> data, and custom XML namespace into a separate file
>>
>> * src/qemu/qemu_domain.c, src/qemu/qemu_domain.h: New file
>>   for private data & namespace code
>> * src/qemu/qemu_driver.c, src/qemu/qemu_driver.h: Remove
>>   private data & namespace code
>> * src/qemu/qemu_driver.h, src/qemu/qemu_command.h: Update
>>   includes
>> * src/Makefile.am: Add src/qemu/qemu_domain.c
> 
> ACK, once 3 and 4 are squashed together.

Needs a bit more work; even after this is squashed in, you marked
qemuDomainDefNamespaceParse and friends static, which breaks
testutilsqemu; I'm not sure if you want to declare those in
src/qemu/qemu_domain.h for everyone, or just manually do it in
tests/testutilsqemu.c.

diff --git i/po/POTFILES.in w/po/POTFILES.in
index f71ce2a..eda4aa3 100644
--- i/po/POTFILES.in
+++ w/po/POTFILES.in
@@ -54,6 +54,7 @@ src/qemu/qemu_bridge_filter.c
 src/qemu/qemu_capabilities.c
 src/qemu/qemu_command.c
 src/qemu/qemu_conf.c
+src/qemu/qemu_domain.c
 src/qemu/qemu_driver.c
 src/qemu/qemu_monitor.c
 src/qemu/qemu_monitor_json.c
diff --git i/src/qemu/qemu_command.h w/src/qemu/qemu_command.h
index 9252642..4c42a10 100644
--- i/src/qemu/qemu_command.h
+++ w/src/qemu/qemu_command.h
@@ -28,7 +28,7 @@
 # include "command.h"
 # include "capabilities.h"
 # include "qemu_conf.h"
-#include "qemu_domain.h"
+# include "qemu_domain.h"

 /* Config type for XML import/export conversions */
 # define QEMU_CONFIG_FORMAT_ARGV "qemu-argv"
diff --git i/tests/testutilsqemu.c w/tests/testutilsqemu.c
index 72fc8aa..d01bd8b 100644
--- i/tests/testutilsqemu.c
+++ w/tests/testutilsqemu.c
@@ -8,6 +8,7 @@
 # include "memory.h"
 # include "cpu_conf.h"
 # include "qemu/qemu_driver.h"
+# include "qemu/qemu_domain.h"

 static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines)
 {


-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20101216/0d90c1eb/attachment-0001.sig>