On Thu, Oct 03, 2013 at 09:41:07AM -0400, Laine Stump wrote:
On 10/03/2013 09:06 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange(a)redhat.com>
>
> None of the virNWFilterDefParse* methods require a virConnectPtr
> arg, so just drop it
>
> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
> ---
> src/conf/nwfilter_conf.c | 15 ++++++---------
> src/conf/nwfilter_conf.h | 6 ++----
> src/nwfilter/nwfilter_driver.c | 2 +-
> src/qemu/qemu_driver.c | 3 +++
> tests/nwfilterxml2xmltest.c | 2 +-
> 5 files changed, 13 insertions(+), 15 deletions(-)
>
[...]
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index e8bc04d..7376ddb 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -612,6 +612,9 @@ qemuStateInitialize(bool privileged,
> if (virAsprintf(&driverConf, "%s/qemu.conf",
cfg->configBaseDir) < 0)
> goto error;
>
> + fprintf(stderr, "Start Sleeping to cause a race\n");
> + sleep(10);
> + fprintf(stderr, "Done Sleeping to cause a race\n");
You probably don't want to push this :-)
ACK with that hunk removed.
Doh, rebase mistake :-)
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 :|