On Wed, Mar 13, 2013 at 02:01:42PM +0100, Peter Krempa wrote: > On 03/12/13 13:50, Daniel P. Berrange wrote: > >On Mon, Mar 11, 2013 at 04:06:37PM +0100, Peter Krempa wrote: > >>This patch removes the emulatorRequired field and associated > >>infrastructure from the virCaps object. Instead the driver specific > >>callbacks are used as this field isn't enforced by all drivers. > >> > >>This patch implements the appropriate callbacks in the qemu and lxc > >>driver and moves to check to that location. > >>--- > >> src/conf/capabilities.c | 10 ---------- > >> src/conf/capabilities.h | 7 ------- > >> src/conf/domain_conf.c | 16 ++++++---------- > >> src/conf/domain_conf.h | 2 ++ > >> src/libvirt_private.syms | 3 +-- > >> src/lxc/lxc_conf.c | 7 +++---- > >> src/lxc/lxc_domain.c | 17 +++++++++++++++++ > >> src/lxc/lxc_domain.h | 1 + > >> src/qemu/qemu_capabilities.c | 3 --- > >> src/qemu/qemu_domain.c | 15 +++++++++++++++ > >> tests/lxcxml2xmldata/lxc-hostdev.xml | 1 + > >> tests/lxcxml2xmldata/lxc-systemd.xml | 1 + > >> 12 files changed, 47 insertions(+), 36 deletions(-) > >> > > [...] > > >>diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > >>index ab66707..0dac95e 100644 > >>--- a/src/conf/domain_conf.h > >>+++ b/src/conf/domain_conf.h > >>@@ -2471,4 +2471,6 @@ int virDomainObjListExport(virDomainObjListPtr doms, > >> virDomainVcpuPinDefPtr virDomainLookupVcpuPin(virDomainDefPtr def, > >> int vcpuid); > >> > >>+char *virDomainDefDefaultEmulator(virDomainDefPtr def, virCapsPtr caps); > > > >s/virDomainDefDefaultEmulator/virDomainDefSetDefaultEmulator) to make it > >clear that this is a setter function. > > Um, it returns the default emulator as string that is then used to > fill a field in the domain definition struct. Do you still consider > that as a setter? Opps, my mistake. Add the word 'Get' in there to clarify that instead. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list