update to 0.8.7 pre-release
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=80
This commit is contained in:
James Fehlig
Git OBS Bridge
parent
d0b1be4418
commit
808ff08ac4
@ -1,18 +0,0 @@
|
||||
commit 45147ca37f3d93ea67b02a6c0e435bdf40b4ddc5
|
||||
Author: Jean-Baptiste Rouault <jean-baptiste.rouault@diateam.net>
|
||||
Date: Wed Dec 1 12:00:32 2010 +0100
|
||||
|
||||
Fix warning when macvtap support is disabled
|
||||
|
||||
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
||||
index b0343c6..7cd0603 100644
|
||||
--- a/src/qemu/qemu_conf.c
|
||||
+++ b/src/qemu/qemu_conf.c
|
||||
@@ -1689,6 +1689,7 @@ qemudPhysIfaceConnect(virConnectPtr conn,
|
||||
(void)qemuCmdFlags;
|
||||
(void)driver;
|
||||
(void)vmuuid;
|
||||
+ (void)vmop;
|
||||
qemuReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
"%s", _("No support for macvtap device"));
|
||||
rc = -1;
|
||||
@ -1,121 +0,0 @@
|
||||
commit 474b1c1487828a17fe9e1025901334d9820ea350
|
||||
Author: Matthias Bolte <matthias.bolte@googlemail.com>
|
||||
Date: Wed Dec 1 15:43:40 2010 +0100
|
||||
|
||||
Fix undefined symbol errors when macvtap support is disabled
|
||||
|
||||
Use macvtap specific functions depending on WITH_MACVTAP.
|
||||
|
||||
Use #if instead of #ifdef to check for WITH_MACVTAP, because
|
||||
WITH_MACVTAP is always defined with value 0 or 1.
|
||||
|
||||
Also export virVMOperationType{To|From}String unconditional,
|
||||
because they are used unconditional in the domain config code.
|
||||
|
||||
Index: libvirt-0.8.6/src/libvirt_macvtap.syms
|
||||
===================================================================
|
||||
--- libvirt-0.8.6.orig/src/libvirt_macvtap.syms
|
||||
+++ libvirt-0.8.6/src/libvirt_macvtap.syms
|
||||
@@ -1,9 +1,10 @@
|
||||
#
|
||||
+# These symbols are dependent on WITH_MACVTAP.
|
||||
+#
|
||||
+
|
||||
|
||||
# macvtap.h
|
||||
delMacvtap;
|
||||
openMacvtapTap;
|
||||
-virVMOperationTypeFromString;
|
||||
-virVMOperationTypeToString;
|
||||
vpAssociatePortProfileId;
|
||||
vpDisassociatePortProfileId;
|
||||
Index: libvirt-0.8.6/src/libvirt_private.syms
|
||||
===================================================================
|
||||
--- libvirt-0.8.6.orig/src/libvirt_private.syms
|
||||
+++ libvirt-0.8.6/src/libvirt_private.syms
|
||||
@@ -503,6 +503,11 @@ virLogStartup;
|
||||
virLogUnlock;
|
||||
|
||||
|
||||
+# macvtap.h
|
||||
+virVMOperationTypeFromString;
|
||||
+virVMOperationTypeToString;
|
||||
+
|
||||
+
|
||||
# memory.h
|
||||
virAlloc;
|
||||
virAllocN;
|
||||
Index: libvirt-0.8.6/src/qemu/qemu_driver.c
|
||||
===================================================================
|
||||
--- libvirt-0.8.6.orig/src/qemu/qemu_driver.c
|
||||
+++ libvirt-0.8.6/src/qemu/qemu_driver.c
|
||||
@@ -11869,6 +11869,7 @@ cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if WITH_MACVTAP
|
||||
static void
|
||||
qemudVPAssociatePortProfiles(virDomainDefPtr def) {
|
||||
int i;
|
||||
@@ -11903,6 +11904,10 @@ err_exit:
|
||||
}
|
||||
}
|
||||
}
|
||||
+#else /* !WITH_MACVTAP */
|
||||
+static void
|
||||
+qemudVPAssociatePortProfiles(virDomainDefPtr def ATTRIBUTE_UNUSED) { }
|
||||
+#endif /* WITH_MACVTAP */
|
||||
|
||||
/* Finish is the third and final step, and it runs on the destination host. */
|
||||
static virDomainPtr
|
||||
Index: libvirt-0.8.6/src/util/macvtap.h
|
||||
===================================================================
|
||||
--- libvirt-0.8.6.orig/src/util/macvtap.h
|
||||
+++ libvirt-0.8.6/src/util/macvtap.h
|
||||
@@ -57,11 +57,6 @@ struct _virVirtualPortProfileParams {
|
||||
} u;
|
||||
};
|
||||
|
||||
-
|
||||
-# if defined(WITH_MACVTAP)
|
||||
-
|
||||
-# include "internal.h"
|
||||
-
|
||||
enum virVMOperationType {
|
||||
VIR_VM_OP_CREATE,
|
||||
VIR_VM_OP_SAVE,
|
||||
@@ -75,6 +70,10 @@ enum virVMOperationType {
|
||||
VIR_VM_OP_LAST
|
||||
};
|
||||
|
||||
+# if WITH_MACVTAP
|
||||
+
|
||||
+# include "internal.h"
|
||||
+
|
||||
int openMacvtapTap(const char *ifname,
|
||||
const unsigned char *macaddress,
|
||||
const char *linkdev,
|
||||
@@ -90,11 +89,9 @@ void delMacvtap(const char *ifname,
|
||||
const char *linkdev,
|
||||
virVirtualPortProfileParamsPtr virtPortProfile);
|
||||
|
||||
-# endif /* WITH_MACVTAP */
|
||||
-
|
||||
-# define MACVTAP_MODE_PRIVATE_STR "private"
|
||||
-# define MACVTAP_MODE_VEPA_STR "vepa"
|
||||
-# define MACVTAP_MODE_BRIDGE_STR "bridge"
|
||||
+# define MACVTAP_MODE_PRIVATE_STR "private"
|
||||
+# define MACVTAP_MODE_VEPA_STR "vepa"
|
||||
+# define MACVTAP_MODE_BRIDGE_STR "bridge"
|
||||
|
||||
int vpAssociatePortProfileId(const char *macvtap_ifname,
|
||||
const unsigned char *macvtap_macaddr,
|
||||
@@ -109,6 +106,8 @@ int vpDisassociatePortProfileId(const ch
|
||||
const virVirtualPortProfileParamsPtr virtPort,
|
||||
enum virVMOperationType vmOp);
|
||||
|
||||
+# endif /* WITH_MACVTAP */
|
||||
+
|
||||
VIR_ENUM_DECL(virVirtualPort)
|
||||
VIR_ENUM_DECL(virVMOperation)
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
commit c58b105625acf3404d75376b070903139e3346a3
|
||||
Author: Jim Fehlig <jfehlig@novell.com>
|
||||
Date: Wed Dec 22 11:15:32 2010 -0700
|
||||
|
||||
Set bitmap size when allocating a bitmap
|
||||
|
||||
I began noticing a race when reserving VNC ports as described here
|
||||
|
||||
https://www.redhat.com/archives/libvir-list/2010-November/msg00379.html
|
||||
|
||||
Turns out that we were not initializing the size field of bitmap
|
||||
struct when allocating the bitmap. This subsequently caused
|
||||
virBitmapSetBit() to fail since bitmap->size is 0, hence we never
|
||||
actually reserved the port.
|
||||
|
||||
diff --git a/src/util/bitmap.c b/src/util/bitmap.c
|
||||
index 1b0c9da..9741668 100644
|
||||
--- a/src/util/bitmap.c
|
||||
+++ b/src/util/bitmap.c
|
||||
@@ -73,6 +73,7 @@ virBitmapPtr virBitmapAlloc(size_t size)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
+ bitmap->size = size;
|
||||
return bitmap;
|
||||
}
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:00392714fb1aca8c75d2dbe88dad91744da0028e7b259918a40ac930edabb0d9
|
||||
size 8912706
|
||||
3
libvirt-0.8.7.tar.bz2
Normal file
3
libvirt-0.8.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:04bfc87bd6f91b5da74d4becab86db6585002a066c70d6ab107510df8def9b33
|
||||
size 9211439
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 3 13:12:21 MST 2010 - jfehlig@novell.com
|
||||
|
||||
- Update to libvirt 0.8.7 (pre-release)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 22 14:41:46 MST 2010 - jfehlig@novell.com
|
||||
|
||||
|
||||
10
libvirt.spec
10
libvirt.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package libvirt (Version 0.8.6)
|
||||
# spec file for package libvirt (Version 0.8.7)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -144,7 +144,7 @@ Url: http://libvirt.org/
|
||||
License: LGPLv2.1+
|
||||
Group: Development/Libraries/C and C++
|
||||
AutoReqProv: yes
|
||||
Version: 0.8.6
|
||||
Version: 0.8.7
|
||||
Release: 1
|
||||
Summary: A C toolkit to interract with the virtualization capabilities of Linux
|
||||
# The client side, i.e. shared libs and virsh are in a subpackage
|
||||
@ -169,9 +169,6 @@ Recommends: PolicyKit >= 0.6
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: libvirtd.init
|
||||
# Upstream patches
|
||||
Patch0: 45147ca3-macvtap-warning.patch
|
||||
Patch1: 474b1c14-macvtap-undefined.patch
|
||||
Patch2: c58b1056-init-bitmap-size.patch
|
||||
# Need to go upstream
|
||||
Patch100: xen-name-for-devid.patch
|
||||
Patch102: clone.patch
|
||||
@ -283,9 +280,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch100 -p1
|
||||
%patch102
|
||||
%patch103 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user