Accepting request 19439 from Virtualization

Copy from Virtualization/libvirt based on submit request 19439 from user jfehlig

OBS-URL: https://build.opensuse.org/request/show/19439
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=40
This commit is contained in:
OBS User autobuild 2009-09-02 16:42:33 +00:00 committed by Git OBS Bridge
parent a54da721c4
commit 2d4a8769c2
9 changed files with 154 additions and 111 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:996c90b104bfc492d9b6a46d5da10610e1a176306e0beb12306b0c23140e3b4a
size 4726066

3
libvirt-0.7.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b25bbddc4613f000a23bd72a6a9814c4da406c16888f6cf4ff711a87e90bd18c
size 5066192

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Aug 26 15:52:37 MDT 2009 - jfehlig@novell.com
- Updated to version 0.7.0
- Interface implementation based on netcf (disabled on SuSE)
- Add new net filesystem glusterfs
- Initial VMWare ESX driver
- Add support for VBox 3 and event callbacks on vbox
- First version of the Power Hypervisor driver
- Run QEMU guests as an unprivileged user (still root on SuSE)
- Support cgroups in QEMU driver
- QEmu hotplug NIC support
- Storage cloning for LVM and Disk backends
-------------------------------------------------------------------
Tue Jul 7 10:03:37 MDT 2009 - jfehlig@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package libvirt (Version 0.6.5)
# spec file for package libvirt (Version 0.7.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -51,7 +51,7 @@ Url: http://libvirt.org/
License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: yes
Version: 0.6.5
Version: 0.7.0
Release: 1
Summary: A C toolkit to interract with the virtualization capabilities of Linux
Requires: readline
@ -82,6 +82,7 @@ Patch6: detach-disk.patch
Patch7: migrate-params.patch
Patch8: suse-network.patch
Patch9: snapshots.patch
Patch10: sexpr2string.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -183,6 +184,7 @@ Authors:
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
%if ! %{with_xen}

View File

@ -1,7 +1,7 @@
Index: libvirt-0.6.5/qemud/libvirtd.conf
Index: libvirt-0.7.0/qemud/libvirtd.conf
===================================================================
--- libvirt-0.6.5.orig/qemud/libvirtd.conf
+++ libvirt-0.6.5/qemud/libvirtd.conf
--- libvirt-0.7.0.orig/qemud/libvirtd.conf
+++ libvirt-0.7.0/qemud/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -28,11 +28,11 @@ Index: libvirt-0.6.5/qemud/libvirtd.conf
# Override the default mDNS advertizement name. This must be
# unique on the immediate broadcast network.
Index: libvirt-0.6.5/qemud/qemud.c
Index: libvirt-0.7.0/qemud/qemud.c
===================================================================
--- libvirt-0.6.5.orig/qemud/qemud.c
+++ libvirt-0.6.5/qemud/qemud.c
@@ -133,7 +133,7 @@ static char *log_filters = NULL;
--- libvirt-0.7.0.orig/qemud/qemud.c
+++ libvirt-0.7.0/qemud/qemud.c
@@ -138,7 +138,7 @@ static char *log_filters = NULL;
static char *log_outputs = NULL;
/* Defaults for configuration file elements */
@ -41,7 +41,7 @@ Index: libvirt-0.6.5/qemud/qemud.c
static int listen_tcp = 0;
static char *listen_addr = (char *) LIBVIRTD_LISTEN_ADDR;
static char *tls_port = (char *) LIBVIRTD_TLS_PORT;
@@ -155,7 +155,7 @@ static int auth_tcp = REMOTE_AUTH_NONE;
@@ -160,7 +160,7 @@ static int auth_tcp = REMOTE_AUTH_NONE;
#endif
static int auth_tls = REMOTE_AUTH_NONE;

27
sexpr2string.patch Normal file
View File

@ -0,0 +1,27 @@
From 1a1f8b9dbb68bf43c831e471ab4308d81a113ecd Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@novell.com>
Date: Tue, 25 Aug 2009 15:54:18 -0600
Subject: [PATCH] Fix sexpr2string() to handle empty list.
S-expression containing empty lists, e.g. (cpus (() () () ())),
was not being handled properly in sexpr2string() serialization.
Emit an empty list when encountering NIL sexpr kind.
---
src/sexpr.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
Index: libvirt-0.7.0/src/sexpr.c
===================================================================
--- libvirt-0.7.0.orig/src/sexpr.c
+++ libvirt-0.7.0/src/sexpr.c
@@ -255,6 +255,10 @@ sexpr2string(const struct sexpr * sexpr,
ret += tmp;
break;
case SEXPR_NIL:
+ tmp = snprintf(buffer + ret, n_buffer - ret, "()");
+ if (tmp == 0)
+ goto error;
+ ret += tmp;
break;
default:
goto error;

View File

@ -1,7 +1,7 @@
Index: libvirt-0.6.5/include/libvirt/libvirt.h.in
Index: libvirt-0.7.0/include/libvirt/libvirt.h.in
===================================================================
--- libvirt-0.6.5.orig/include/libvirt/libvirt.h.in
+++ libvirt-0.6.5/include/libvirt/libvirt.h.in
--- libvirt-0.7.0.orig/include/libvirt/libvirt.h.in
+++ libvirt-0.7.0/include/libvirt/libvirt.h.in
@@ -537,6 +537,21 @@ int virDomainRestore
const char *from);
@ -24,11 +24,11 @@ Index: libvirt-0.6.5/include/libvirt/libvirt.h.in
* Domain core dump
*/
int virDomainCoreDump (virDomainPtr domain,
Index: libvirt-0.6.5/src/libvirt.c
Index: libvirt-0.7.0/src/libvirt.c
===================================================================
--- libvirt-0.6.5.orig/src/libvirt.c
+++ libvirt-0.6.5/src/libvirt.c
@@ -2164,6 +2164,168 @@ error:
--- libvirt-0.7.0.orig/src/libvirt.c
+++ libvirt-0.7.0/src/libvirt.c
@@ -2198,6 +2198,168 @@ error:
return -1;
}
@ -197,11 +197,11 @@ Index: libvirt-0.6.5/src/libvirt.c
/**
* virDomainCoreDump:
* @domain: a domain object
Index: libvirt-0.6.5/src/driver.h
Index: libvirt-0.7.0/src/driver.h
===================================================================
--- libvirt-0.6.5.orig/src/driver.h
+++ libvirt-0.6.5/src/driver.h
@@ -147,6 +147,21 @@ typedef int
--- libvirt-0.7.0.orig/src/driver.h
+++ libvirt-0.7.0/src/driver.h
@@ -149,6 +149,21 @@ typedef int
(*virDrvDomainRestore) (virConnectPtr conn,
const char *from);
typedef int
@ -223,7 +223,7 @@ Index: libvirt-0.6.5/src/driver.h
(*virDrvDomainCoreDump) (virDomainPtr domain,
const char *to,
int flags);
@@ -422,6 +437,11 @@ struct _virDriver {
@@ -424,6 +439,11 @@ struct _virDriver {
virDrvNodeDeviceDettach nodeDeviceDettach;
virDrvNodeDeviceReAttach nodeDeviceReAttach;
virDrvNodeDeviceReset nodeDeviceReset;
@ -235,10 +235,10 @@ Index: libvirt-0.6.5/src/driver.h
};
typedef int
Index: libvirt-0.6.5/src/xen_unified.c
Index: libvirt-0.7.0/src/xen_unified.c
===================================================================
--- libvirt-0.6.5.orig/src/xen_unified.c
+++ libvirt-0.6.5/src/xen_unified.c
--- libvirt-0.7.0.orig/src/xen_unified.c
+++ libvirt-0.7.0/src/xen_unified.c
@@ -952,6 +952,81 @@ xenUnifiedDomainRestore (virConnectPtr c
}
@ -333,10 +333,10 @@ Index: libvirt-0.6.5/src/xen_unified.c
};
/**
Index: libvirt-0.6.5/src/xen_unified.h
Index: libvirt-0.7.0/src/xen_unified.h
===================================================================
--- libvirt-0.6.5.orig/src/xen_unified.h
+++ libvirt-0.6.5/src/xen_unified.h
--- libvirt-0.7.0.orig/src/xen_unified.h
+++ libvirt-0.7.0/src/xen_unified.h
@@ -98,6 +98,11 @@ struct xenUnifiedDriver {
virDrvDomainGetSchedulerType domainGetSchedulerType;
virDrvDomainGetSchedulerParameters domainGetSchedulerParameters;
@ -349,10 +349,10 @@ Index: libvirt-0.6.5/src/xen_unified.h
};
typedef struct xenXMConfCache *xenXMConfCachePtr;
Index: libvirt-0.6.5/src/xend_internal.c
Index: libvirt-0.7.0/src/xend_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/xend_internal.c
+++ libvirt-0.6.5/src/xend_internal.c
--- libvirt-0.7.0.orig/src/xend_internal.c
+++ libvirt-0.7.0/src/xend_internal.c
@@ -53,6 +53,12 @@
#ifndef PROXY
@ -466,10 +466,10 @@ Index: libvirt-0.6.5/src/xend_internal.c
};
/************************************************************************
Index: libvirt-0.6.5/src/proxy_internal.c
Index: libvirt-0.7.0/src/proxy_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/proxy_internal.c
+++ libvirt-0.6.5/src/proxy_internal.c
--- libvirt-0.7.0.orig/src/proxy_internal.c
+++ libvirt-0.7.0/src/proxy_internal.c
@@ -84,6 +84,11 @@ struct xenUnifiedDriver xenProxyDriver =
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@ -482,10 +482,10 @@ Index: libvirt-0.6.5/src/proxy_internal.c
};
Index: libvirt-0.6.5/src/xen_internal.c
Index: libvirt-0.7.0/src/xen_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/xen_internal.c
+++ libvirt-0.6.5/src/xen_internal.c
--- libvirt-0.7.0.orig/src/xen_internal.c
+++ libvirt-0.7.0/src/xen_internal.c
@@ -741,6 +741,11 @@ struct xenUnifiedDriver xenHypervisorDri
xenHypervisorGetSchedulerType, /* domainGetSchedulerType */
xenHypervisorGetSchedulerParameters, /* domainGetSchedulerParameters */
@ -498,10 +498,10 @@ Index: libvirt-0.6.5/src/xen_internal.c
};
#endif /* !PROXY */
Index: libvirt-0.6.5/src/xm_internal.c
Index: libvirt-0.7.0/src/xm_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/xm_internal.c
+++ libvirt-0.6.5/src/xm_internal.c
--- libvirt-0.7.0.orig/src/xm_internal.c
+++ libvirt-0.7.0/src/xm_internal.c
@@ -116,6 +116,11 @@ struct xenUnifiedDriver xenXMDriver = {
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@ -514,10 +514,10 @@ Index: libvirt-0.6.5/src/xm_internal.c
};
#define xenXMError(conn, code, fmt...) \
Index: libvirt-0.6.5/src/xs_internal.c
Index: libvirt-0.7.0/src/xs_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/xs_internal.c
+++ libvirt-0.6.5/src/xs_internal.c
--- libvirt-0.7.0.orig/src/xs_internal.c
+++ libvirt-0.7.0/src/xs_internal.c
@@ -83,6 +83,11 @@ struct xenUnifiedDriver xenStoreDriver =
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@ -530,11 +530,11 @@ Index: libvirt-0.6.5/src/xs_internal.c
};
#endif /* ! PROXY */
Index: libvirt-0.6.5/src/virsh.c
Index: libvirt-0.7.0/src/virsh.c
===================================================================
--- libvirt-0.6.5.orig/src/virsh.c
+++ libvirt-0.6.5/src/virsh.c
@@ -1146,6 +1146,189 @@ cmdSave(vshControl *ctl, const vshCmd *c
--- libvirt-0.7.0.orig/src/virsh.c
+++ libvirt-0.7.0/src/virsh.c
@@ -1167,6 +1167,189 @@ cmdSave(vshControl *ctl, const vshCmd *c
return ret;
}
@ -724,7 +724,7 @@ Index: libvirt-0.6.5/src/virsh.c
/*
* "schedinfo" command
*/
@@ -6293,6 +6476,12 @@ static const vshCmdDef commands[] = {
@@ -6940,6 +7123,12 @@ static const vshCmdDef commands[] = {
{"undefine", cmdUndefine, opts_undefine, info_undefine},
{"uri", cmdURI, NULL, info_uri},
@ -737,11 +737,11 @@ Index: libvirt-0.6.5/src/virsh.c
{"vol-create", cmdVolCreate, opts_vol_create, info_vol_create},
{"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from},
{"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as},
Index: libvirt-0.6.5/src/lxc_driver.c
Index: libvirt-0.7.0/src/lxc_driver.c
===================================================================
--- libvirt-0.6.5.orig/src/lxc_driver.c
+++ libvirt-0.6.5/src/lxc_driver.c
@@ -1497,6 +1497,11 @@ static virDriver lxcDriver = {
--- libvirt-0.7.0.orig/src/lxc_driver.c
+++ libvirt-0.7.0/src/lxc_driver.c
@@ -1929,6 +1929,11 @@ static virDriver lxcDriver = {
NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */
@ -753,10 +753,10 @@ Index: libvirt-0.6.5/src/lxc_driver.c
};
static virStateDriver lxcStateDriver = {
Index: libvirt-0.6.5/src/openvz_driver.c
Index: libvirt-0.7.0/src/openvz_driver.c
===================================================================
--- libvirt-0.6.5.orig/src/openvz_driver.c
+++ libvirt-0.6.5/src/openvz_driver.c
--- libvirt-0.7.0.orig/src/openvz_driver.c
+++ libvirt-0.7.0/src/openvz_driver.c
@@ -1392,6 +1392,11 @@ static virDriver openvzDriver = {
NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */
@ -769,11 +769,11 @@ Index: libvirt-0.6.5/src/openvz_driver.c
};
int openvzRegister(void) {
Index: libvirt-0.6.5/src/qemu_driver.c
Index: libvirt-0.7.0/src/qemu_driver.c
===================================================================
--- libvirt-0.6.5.orig/src/qemu_driver.c
+++ libvirt-0.6.5/src/qemu_driver.c
@@ -5353,6 +5353,11 @@ static virDriver qemuDriver = {
--- libvirt-0.7.0.orig/src/qemu_driver.c
+++ libvirt-0.7.0/src/qemu_driver.c
@@ -6806,6 +6806,11 @@ static virDriver qemuDriver = {
qemudNodeDeviceDettach, /* nodeDeviceDettach */
qemudNodeDeviceReAttach, /* nodeDeviceReAttach */
qemudNodeDeviceReset, /* nodeDeviceReset */
@ -785,11 +785,11 @@ Index: libvirt-0.6.5/src/qemu_driver.c
};
Index: libvirt-0.6.5/src/test.c
Index: libvirt-0.7.0/src/test.c
===================================================================
--- libvirt-0.6.5.orig/src/test.c
+++ libvirt-0.6.5/src/test.c
@@ -3700,6 +3700,11 @@ static virDriver testDriver = {
--- libvirt-0.7.0.orig/src/test.c
+++ libvirt-0.7.0/src/test.c
@@ -4242,6 +4242,11 @@ static virDriver testDriver = {
NULL, /* nodeDeviceDettach */
NULL, /* nodeDeviceReAttach */
NULL, /* nodeDeviceReset */
@ -801,11 +801,11 @@ Index: libvirt-0.6.5/src/test.c
};
static virNetworkDriver testNetworkDriver = {
Index: libvirt-0.6.5/docs/libvirt-api.xml
Index: libvirt-0.7.0/docs/libvirt-api.xml
===================================================================
--- libvirt-0.6.5.orig/docs/libvirt-api.xml
+++ libvirt-0.6.5/docs/libvirt-api.xml
@@ -199,6 +199,11 @@
--- libvirt-0.7.0.orig/docs/libvirt-api.xml
+++ libvirt-0.7.0/docs/libvirt-api.xml
@@ -200,6 +200,11 @@
<exports symbol='virInterfaceDefineXML' type='function'/>
<exports symbol='virDomainMigrate' type='function'/>
<exports symbol='virDomainSuspend' type='function'/>
@ -817,7 +817,7 @@ Index: libvirt-0.6.5/docs/libvirt-api.xml
<exports symbol='virDomainCreateLinux' type='function'/>
<exports symbol='virNodeDeviceGetXMLDesc' type='function'/>
<exports symbol='virEventUpdateHandleFunc' type='function'/>
@@ -1363,6 +1368,36 @@ see note above'/>
@@ -1385,6 +1390,36 @@ see note above'/>
<return type='int' info='0 in case of success and -1 in case of failure.'/>
<arg name='domain' type='virDomainPtr' info='a domain object'/>
</function>
@ -854,10 +854,10 @@ Index: libvirt-0.6.5/docs/libvirt-api.xml
<function name='virDomainUndefine' file='libvirt' module='libvirt'>
<info>Undefine a domain but does not stop it if it is running</info>
<return type='int' info='0 in case of success, -1 in case of error'/>
Index: libvirt-0.6.5/python/libvirt-py.c
Index: libvirt-0.7.0/python/libvirt-py.c
===================================================================
--- libvirt-0.6.5.orig/python/libvirt-py.c
+++ libvirt-0.6.5/python/libvirt-py.c
--- libvirt-0.7.0.orig/python/libvirt-py.c
+++ libvirt-0.7.0/python/libvirt-py.c
@@ -25,6 +25,25 @@ LIBVIRT_END_ALLOW_THREADS;
}
@ -961,10 +961,10 @@ Index: libvirt-0.6.5/python/libvirt-py.c
}
PyObject *
Index: libvirt-0.6.5/python/libvirt-py.h
Index: libvirt-0.7.0/python/libvirt-py.h
===================================================================
--- libvirt-0.6.5.orig/python/libvirt-py.h
+++ libvirt-0.6.5/python/libvirt-py.h
--- libvirt-0.7.0.orig/python/libvirt-py.h
+++ libvirt-0.7.0/python/libvirt-py.h
@@ -1,6 +1,7 @@
/* Generated */
@ -973,11 +973,11 @@ Index: libvirt-0.6.5/python/libvirt-py.h
PyObject * libvirt_virStorageVolGetKey(PyObject *self, PyObject *args);
PyObject * libvirt_virConnectClose(PyObject *self, PyObject *args);
PyObject * libvirt_virDomainDefineXML(PyObject *self, PyObject *args);
Index: libvirt-0.6.5/python/libvirt.py
Index: libvirt-0.7.0/python/libvirt.py
===================================================================
--- libvirt-0.6.5.orig/python/libvirt.py
+++ libvirt-0.6.5/python/libvirt.py
@@ -388,6 +388,12 @@ class virDomain:
--- libvirt-0.7.0.orig/python/libvirt.py
+++ libvirt-0.7.0/python/libvirt.py
@@ -390,6 +390,12 @@ class virDomain:
ret = libvirtmod.virDomainGetName(self._o)
return ret
@ -990,7 +990,7 @@ Index: libvirt-0.6.5/python/libvirt.py
def reboot(self, flags):
"""Reboot a domain, the domain object is still usable there
after but the domain OS is being stopped for a restart.
@@ -476,6 +482,24 @@ class virDomain:
@@ -478,6 +484,24 @@ class virDomain:
if ret == -1: raise libvirtError ('virDomainShutdown() failed', dom=self)
return ret
@ -1015,8 +1015,8 @@ Index: libvirt-0.6.5/python/libvirt.py
def suspend(self):
"""Suspends an active domain, the process is frozen without
further access to CPU resources and I/O but the memory used
@@ -532,6 +556,12 @@ class virDomain:
ret = libvirtmod.virDomainInterfaceStats(self._o, path)
@@ -536,6 +560,12 @@ class virDomain:
if ret is None: raise libvirtError ('virDomainInterfaceStats() failed', dom=self)
return ret
+ def listSnapshots(self):
@ -1028,10 +1028,10 @@ Index: libvirt-0.6.5/python/libvirt.py
def pinVcpu(self, vcpu, cpumap):
"""Dynamically change the real CPUs which can be allocated to
a virtual CPU. This function requires privileged access to
Index: libvirt-0.6.5/python/libvir.c
Index: libvirt-0.7.0/python/libvir.c
===================================================================
--- libvirt-0.6.5.orig/python/libvir.c
+++ libvirt-0.6.5/python/libvir.c
--- libvirt-0.7.0.orig/python/libvir.c
+++ libvirt-0.7.0/python/libvir.c
@@ -1375,6 +1375,35 @@ libvirt_virStoragePoolGetInfo(PyObject *
return(py_retval);
}
@ -1076,10 +1076,10 @@ Index: libvirt-0.6.5/python/libvir.c
{(char *) "virConnectListStoragePools", libvirt_virConnectListStoragePools, METH_VARARGS, NULL},
{(char *) "virConnectListDefinedStoragePools", libvirt_virConnectListDefinedStoragePools, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetAutostart", libvirt_virStoragePoolGetAutostart, METH_VARARGS, NULL},
Index: libvirt-0.6.5/python/libvirt-python-api.xml
Index: libvirt-0.7.0/python/libvirt-python-api.xml
===================================================================
--- libvirt-0.6.5.orig/python/libvirt-python-api.xml
+++ libvirt-0.6.5/python/libvirt-python-api.xml
--- libvirt-0.7.0.orig/python/libvirt-python-api.xml
+++ libvirt-0.7.0/python/libvirt-python-api.xml
@@ -135,6 +135,11 @@
<arg name='domain' type='virDomainPtr' info='pointer to domain object'/>
<arg name='params' type='virSchedParameterPtr' info='pointer to scheduler parameter objects'/>
@ -1092,10 +1092,10 @@ Index: libvirt-0.6.5/python/libvirt-python-api.xml
<function name='virConnectListStoragePools' file='python'>
<info>list the storage pools, stores the pointers to the names in @names</info>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
Index: libvirt-0.6.5/python/generator.py
Index: libvirt-0.7.0/python/generator.py
===================================================================
--- libvirt-0.6.5.orig/python/generator.py
+++ libvirt-0.6.5/python/generator.py
--- libvirt-0.7.0.orig/python/generator.py
+++ libvirt-0.7.0/python/generator.py
@@ -320,6 +320,7 @@ skip_impl = (
'virDomainSetSchedulerParameters',
'virDomainGetVcpus',
@ -1104,10 +1104,10 @@ Index: libvirt-0.6.5/python/generator.py
'virStoragePoolGetUUID',
'virStoragePoolGetUUIDString',
'virStoragePoolLookupByUUID',
Index: libvirt-0.6.5/src/libvirt_public.syms
Index: libvirt-0.7.0/src/libvirt_public.syms
===================================================================
--- libvirt-0.6.5.orig/src/libvirt_public.syms
+++ libvirt-0.6.5/src/libvirt_public.syms
--- libvirt-0.7.0.orig/src/libvirt_public.syms
+++ libvirt-0.7.0/src/libvirt_public.syms
@@ -215,6 +215,11 @@ LIBVIRT_0.4.2 {
LIBVIRT_0.4.5 {
global:

View File

@ -1,8 +1,8 @@
Index: libvirt-0.6.5/src/remote_internal.c
Index: libvirt-0.7.0/src/remote_internal.c
===================================================================
--- libvirt-0.6.5.orig/src/remote_internal.c
+++ libvirt-0.6.5/src/remote_internal.c
@@ -721,12 +721,29 @@ doRemoteOpen (virConnectPtr conn,
--- libvirt-0.7.0.orig/src/remote_internal.c
+++ libvirt-0.7.0/src/remote_internal.c
@@ -726,12 +726,29 @@ doRemoteOpen (virConnectPtr conn,
cmd_argv[j++] = strdup ("none");
}
cmd_argv[j++] = strdup (priv->hostname);

View File

@ -1,7 +1,7 @@
Index: libvirt-0.6.5/src/network_conf.c
Index: libvirt-0.7.0/src/network_conf.c
===================================================================
--- libvirt-0.6.5.orig/src/network_conf.c
+++ libvirt-0.6.5/src/network_conf.c
--- libvirt-0.7.0.orig/src/network_conf.c
+++ libvirt-0.7.0/src/network_conf.c
@@ -771,6 +771,137 @@ error:
return NULL;
}
@ -148,10 +148,10 @@ Index: libvirt-0.6.5/src/network_conf.c
return 0;
}
Index: libvirt-0.6.5/src/network_conf.h
Index: libvirt-0.7.0/src/network_conf.h
===================================================================
--- libvirt-0.6.5.orig/src/network_conf.h
+++ libvirt-0.6.5/src/network_conf.h
--- libvirt-0.7.0.orig/src/network_conf.h
+++ libvirt-0.7.0/src/network_conf.h
@@ -89,6 +89,7 @@ struct _virNetworkObj {
unsigned int active : 1;
unsigned int autostart : 1;
@ -160,11 +160,11 @@ Index: libvirt-0.6.5/src/network_conf.h
virNetworkDefPtr def; /* The current definition */
virNetworkDefPtr newDef; /* New definition to activate at shutdown */
Index: libvirt-0.6.5/src/network_driver.c
Index: libvirt-0.7.0/src/network_driver.c
===================================================================
--- libvirt-0.6.5.orig/src/network_driver.c
+++ libvirt-0.6.5/src/network_driver.c
@@ -903,6 +903,11 @@ static int networkShutdownNetworkDaemon(
--- libvirt-0.7.0.orig/src/network_driver.c
+++ libvirt-0.7.0/src/network_driver.c
@@ -957,6 +957,11 @@ static int networkShutdownNetworkDaemon(
unlink(stateFile);
VIR_FREE(stateFile);
@ -176,7 +176,7 @@ Index: libvirt-0.6.5/src/network_driver.c
if (network->dnsmasqPid > 0)
kill(network->dnsmasqPid, SIGTERM);
@@ -1359,6 +1364,12 @@ static int networkSetAutostart(virNetwor
@@ -1413,6 +1418,12 @@ static int networkSetAutostart(virNetwor
goto cleanup;
}