Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory
checked in at Sun Oct 2 10:17:00 CEST 2011.
--------
--- openSUSE:Factory/libvirt/libvirt.changes 2011-09-23 02:11:05.000000000 +0200
+++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2011-09-26 05:28:28.000000000 +0200
@@ -1,0 +2,30 @@
+Thu Sep 22 21:08:11 MDT 2011 - jfehlig@suse.com
+
+- Revert upstream commit f84aedad, which is not needed since
+ affected SUSE kvm packages have the necessary qemu fix
+ f84aedad-revert.patch
+
+-------------------------------------------------------------------
+Thu Sep 22 20:43:51 MDT 2011 - jfehlig@suse.com
+
+- Update to libvirt 0.9.6
+ - Fix shutdown regression with buggy qemu
+
+-------------------------------------------------------------------
+Wed Sep 21 20:12:16 UTC 2011 - andrea.turrini@gmail.com
+
+- Fixed typos in libvirt.spec
+
+-------------------------------------------------------------------
+Tue Sep 20 11:51:44 MDT 2011 - jfehlig@suse.com
+
+- Update to libvirt 0.9.5
+ - many snapshot improvements
+ - latency: Define new public API and structure
+ - USB2 and various USB improvements
+ - storage: Add fs pool formatting
+ - Add public API for getting migration speed
+ - Add basic driver for Microsoft Hyper-V
+ - Many bug fixes and improvements
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
0257ba8f-mig-speed-7.patch
1282bd80-mig-speed-2.patch
32620dab-fix-xen-err-msg.patch
57c95175-xend-buff-size.patch
6f84e110-mig-speed-3.patch
6ff9fc26-quiet-libxl-logging.patch
7e5f6a51-rpc-generator.patch
7f2498ef-no-log-invalid.patch
829bce17-mig-speed-4.patch
8fc40c51-mig-speed-5.patch
9e093f0b-libvirtd-sighup.patch
b12354be-mig-speed-1.patch
ef1065cf-mig-speed-6.patch
libvirt-0.9.4.tar.bz2
New:
----
f84aedad-revert.patch
libvirt-0.9.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.I1umH9/_old 2011-10-02 10:16:53.000000000 +0200
+++ /var/tmp/diff_new_pack.I1umH9/_new 2011-10-02 10:16:53.000000000 +0200
@@ -48,6 +48,7 @@
%define with_phyp 0%{!?_without_phyp:0}
%define with_esx 0%{!?_without_esx:1}
%define with_xenapi 0%{!?_without_xenapi:1}
+%define with_hyperv 0%{!?_without_hyperv:0}
# Then the secondary host drivers
%define with_network 0%{!?_without_network:%{server_drivers}}
@@ -246,6 +247,9 @@
%if %{with_esx}
BuildRequires: libcurl-devel
%endif
+%if %{with_hyperv}
+BuildRequires: libwsman-devel >= 2.2.3
+%endif
%if %{with_capng}
BuildRequires: libcap-ng-devel >= 0.5.0
%endif
@@ -302,9 +306,9 @@
License: LGPLv2.1+
Group: Development/Libraries/C and C++
AutoReqProv: yes
-Version: 0.9.4
-Release: 3
-Summary: A C toolkit to interract with the virtualization capabilities of Linux
+Version: 0.9.6
+Release: 1
+Summary: A C toolkit to interact with the virtualization capabilities of Linux
Conflicts: kvm < 0.14.1
# The client side, i.e. shared libs and virsh are in a subpackage
@@ -370,19 +374,6 @@
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
-Patch0: 9e093f0b-libvirtd-sighup.patch
-Patch1: 32620dab-fix-xen-err-msg.patch
-Patch2: 57c95175-xend-buff-size.patch
-Patch3: 6ff9fc26-quiet-libxl-logging.patch
-Patch4: 7f2498ef-no-log-invalid.patch
-Patch5: 7e5f6a51-rpc-generator.patch
-Patch6: b12354be-mig-speed-1.patch
-Patch7: 1282bd80-mig-speed-2.patch
-Patch8: 6f84e110-mig-speed-3.patch
-Patch9: 829bce17-mig-speed-4.patch
-Patch10: 8fc40c51-mig-speed-5.patch
-Patch11: ef1065cf-mig-speed-6.patch
-Patch12: 0257ba8f-mig-speed-7.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@@ -391,6 +382,9 @@
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: use-init-script-redhat.patch
+# This patch reverts commit f84aedad, which is not needed since
+# affected SUSE kvm packages have the necessary qemu fix.
+Patch202: f84aedad-revert.patch
%if %{with_apparmor}
Patch250: install-apparmor-profiles.patch
%endif
@@ -429,7 +423,7 @@
Recommends: netcat-openbsd
%description client
-Libvirt is a C toolkit to interract with the virtualization
+Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-client package contains shared
libraries and client binaries needed to access the virtualization
capabilities of recent versions of Linux (and other OSes).
@@ -443,7 +437,7 @@
%package devel
License: LGPLv2.1+
-Summary: A C toolkit to interract with the virtualization capabilities of Linux
+Summary: A C toolkit to interact with the virtualization capabilities of Linux
Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release} libxml2-devel
Requires: pkg-config
@@ -452,7 +446,7 @@
%endif
%description devel
-Libvirt is a C toolkit to interract with the virtualization
+Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-devel package contains headers
and libraries needed for developing libvirt applications.
@@ -465,13 +459,13 @@
%package doc
License: LGPLv2.1+
-Summary: A C toolkit to interract with the virtualization capabilities of Linux
+Summary: A C toolkit to interact with the virtualization capabilities of Linux
Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release}
%description doc
-Libvirt is a C toolkit to interract with the virtualization
-capabilities of Linux. The libvirt-doc packages contains documentation
+Libvirt is a C toolkit to interact with the virtualization
+capabilities of Linux. The libvirt-doc package contains documentation
for the libvirt API and tools.
@@ -482,15 +476,16 @@
Karel Zak
%if %{with_python}
+
%package python
License: LGPLv2.1+
-Summary: A C toolkit to interract with the virtualization capabilities of Linux
+Summary: A C toolkit to interact with the virtualization capabilities of Linux
Group: Development/Libraries/C and C++
Requires: %{name}-client = %{version}-%{release}
%py_requires
%description python
-Libvirt is a C toolkit to interract with the virtualization
+Libvirt is a C toolkit to interact with the virtualization
capabilities of Linux. The libvirt-python package provides python
bindings for the libvirt C API.
@@ -504,25 +499,13 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
%patch100 -p1
%patch101
%patch102 -p1
%patch103 -p1
%patch200 -p1
%patch201 -p1
+%patch202 -p1
%if %{with_apparmor}
%patch250 -p1
%endif
@@ -561,6 +544,9 @@
%if ! %{with_vmware}
%define _without_vmware --without-vmware
%endif
+%if ! %{with_hyperv}
+%define _without_hyperv --without-hyperv
+%endif
%if ! %{with_libxl}
%define _without_libxl --without-libxl
%endif
@@ -644,6 +630,7 @@
%{?_without_phyp} \
%{?_without_esx} \
%{?_without_vmware} \
+ %{?_without_hyperv} \
%{?_without_libxl} \
%{?_without_libvirtd} \
%{?_without_storage_fs} \
@@ -794,6 +781,7 @@
%postun client -p /sbin/ldconfig
%if %{with_libvirtd}
+
%files
%defattr(-, root, root)
%{_sbindir}/libvirtd
@@ -889,19 +877,20 @@
%dir %{_datadir}/libvirt/
%dir %{_datadir}/libvirt/schemas/
+%{_datadir}/libvirt/schemas/basictypes.rng
+%{_datadir}/libvirt/schemas/capability.rng
%{_datadir}/libvirt/schemas/domain.rng
+%{_datadir}/libvirt/schemas/domaincommon.rng
+%{_datadir}/libvirt/schemas/domainsnapshot.rng
+%{_datadir}/libvirt/schemas/interface.rng
%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
+%{_datadir}/libvirt/schemas/networkcommon.rng
%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/capability.rng
-%{_datadir}/libvirt/schemas/interface.rng
+%{_datadir}/libvirt/schemas/nwfilter.rng
%{_datadir}/libvirt/schemas/secret.rng
%{_datadir}/libvirt/schemas/storageencryption.rng
-%{_datadir}/libvirt/schemas/nwfilter.rng
-%{_datadir}/libvirt/schemas/domainsnapshot.rng
-%{_datadir}/libvirt/schemas/basictypes.rng
-%{_datadir}/libvirt/schemas/networkcommon.rng
+%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagevol.rng
%{_datadir}/libvirt/cpu_map.xml
%if %{with_sasl}
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
@@ -923,10 +912,12 @@
%doc %{_docdir}/%{name}/html
%if %{with_python}
+
%files python
%defattr(-, root, root)
%doc %{_docdir}/%{name}-python
%{py_sitedir}/libvirt.py*
+%{_libdir}/python*/site-packages/libvirt_qemu.py*
%{py_sitedir}/libvirtmod*
%endif
++++++ clone.patch ++++++
--- /var/tmp/diff_new_pack.I1umH9/_old 2011-10-02 10:16:53.000000000 +0200
+++ /var/tmp/diff_new_pack.I1umH9/_new 2011-10-02 10:16:53.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- src/lxc/lxc_container.c.orig
+++ src/lxc/lxc_container.c
-@@ -991,6 +991,9 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1183,6 +1183,9 @@ int lxcContainerStart(virDomainDefPtr de
handshakefd};
/* allocate a stack for the container */
@@ -12,7 +12,7 @@
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError();
return -1;
-@@ -1009,7 +1012,11 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -1201,7 +1204,11 @@ int lxcContainerStart(virDomainDefPtr de
cflags |= CLONE_NEWNET;
}
@@ -24,7 +24,7 @@
VIR_FREE(stack);
VIR_DEBUG("clone() completed, new container PID is %d", pid);
-@@ -1036,6 +1043,7 @@ int lxcContainerAvailable(int features)
+@@ -1228,6 +1235,7 @@ int lxcContainerAvailable(int features)
char *childStack;
char *stack;
int childStatus;
@@ -32,7 +32,7 @@
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
-@@ -1043,14 +1051,21 @@ int lxcContainerAvailable(int features)
+@@ -1235,14 +1243,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
++++++ f84aedad-revert.patch ++++++
commit f887b0c4913b81c33a7d0a8cce3da09caf88ecbb
Author: Jim Fehlig
Date: Thu Sep 22 20:48:07 2011 -0600
Revert "qemu: Fix shutdown regression with buggy qemu"
This reverts commit f84aedad090da1e05ccc5651815febba013eb3ad.
The commit is not needed since the affected SUSE kvm packages
have the necessary qemu patch
http://lists.nongnu.org/archive/html/qemu-devel/2011-09/msg01757.html
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 850d46e..36f47a9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -136,7 +136,6 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST,
"pci-ohci",
"usb-redir",
"usb-hub",
- "no-shutdown",
);
struct qemu_feature_flags {
@@ -1009,13 +1008,6 @@ qemuCapsComputeCmdFlags(const char *help,
qemuCapsSet(flags, QEMU_CAPS_VHOST_NET);
}
- /* Do not use -no-shutdown if qemu doesn't support it or SIGTERM handling
- * is most likely buggy when used with -no-shutdown (which applies for qemu
- * 0.14.* and 0.15.*)
- */
- if (strstr(help, "-no-shutdown") && (version < 14000 || version > 15999))
- qemuCapsSet(flags, QEMU_CAPS_NO_SHUTDOWN);
-
/*
* Handling of -incoming arg with varying features
* -incoming tcp (kvm >= 79, qemu >= 0.10.0)
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 74d3ab2..96b7a3b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -110,7 +110,6 @@ enum qemuCapsFlags {
QEMU_CAPS_PCI_OHCI = 71, /* -device pci-ohci */
QEMU_CAPS_USB_REDIR = 72, /* -device usb-redir */
QEMU_CAPS_USB_HUB = 73, /* -device usb-hub */
- QEMU_CAPS_NO_SHUTDOWN = 74, /* usable -no-shutdown */
QEMU_CAPS_LAST, /* this must always be the last item */
};
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0adc56a..ee4b52b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3574,7 +3574,7 @@ qemuBuildCommandLine(virConnectPtr conn,
* when QEMU stops. If we use no-shutdown, then we can
* watch for this event and do a soft/warm reboot.
*/
- if (monitor_json && qemuCapsGet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN))
+ if (monitor_json)
virCommandAddArg(cmd, "-no-shutdown");
if (!(def->features & (1 << VIR_DOMAIN_FEATURE_ACPI)))
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0d0bea2..f87af06 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1556,12 +1556,6 @@ static int qemuDomainReboot(virDomainPtr dom, unsigned int flags) {
priv = vm->privateData;
if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON)) {
- if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_NO_SHUTDOWN)) {
- qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
- _("Reboot is not supported with this QEMU binary"));
- goto cleanup;
- }
-
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 933d556..f0b0879 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -152,8 +152,7 @@ mymain(void)
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_FORMAT,
QEMU_CAPS_MEM_PATH,
- QEMU_CAPS_TDF,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_TDF);
DO_TEST("kvm-83-rhel56", 9001, 1, 83,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -178,8 +177,7 @@ mymain(void)
QEMU_CAPS_TDF,
QEMU_CAPS_DRIVE_READONLY,
QEMU_CAPS_SMBIOS_TYPE,
- QEMU_CAPS_SPICE,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_SPICE);
DO_TEST("qemu-0.10.5", 10005, 0, 0,
QEMU_CAPS_KQEMU,
QEMU_CAPS_VNC_COLON,
@@ -198,8 +196,7 @@ mymain(void)
QEMU_CAPS_SDL,
QEMU_CAPS_RTC_TD_HACK,
QEMU_CAPS_NO_HPET,
- QEMU_CAPS_VGA_NONE,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_VGA_NONE);
DO_TEST("qemu-kvm-0.10.5", 10005, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -224,8 +221,7 @@ mymain(void)
QEMU_CAPS_NO_KVM_PIT,
QEMU_CAPS_TDF,
QEMU_CAPS_NESTING,
- QEMU_CAPS_VGA_NONE,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_VGA_NONE);
DO_TEST("kvm-86", 10050, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -250,8 +246,7 @@ mymain(void)
QEMU_CAPS_TDF,
QEMU_CAPS_NESTING,
QEMU_CAPS_SMBIOS_TYPE,
- QEMU_CAPS_VGA_NONE,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_VGA_NONE);
DO_TEST("qemu-kvm-0.11.0-rc2", 10092, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -281,8 +276,7 @@ mymain(void)
QEMU_CAPS_NESTING,
QEMU_CAPS_NAME_PROCESS,
QEMU_CAPS_SMBIOS_TYPE,
- QEMU_CAPS_VGA_NONE,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_VGA_NONE);
DO_TEST("qemu-0.12.1", 12001, 0, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -312,8 +306,7 @@ mymain(void)
QEMU_CAPS_SMBIOS_TYPE,
QEMU_CAPS_VGA_NONE,
QEMU_CAPS_MIGRATE_QEMU_FD,
- QEMU_CAPS_DRIVE_AIO,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_DRIVE_AIO);
DO_TEST("qemu-kvm-0.12.1.2-rhel60", 12001, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -357,8 +350,7 @@ mymain(void)
QEMU_CAPS_DEVICE_SPICEVMC,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_PIIX4_USB_UHCI,
- QEMU_CAPS_USB_HUB,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_USB_HUB);
DO_TEST("qemu-kvm-0.12.3", 12003, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -395,8 +387,7 @@ mymain(void)
QEMU_CAPS_SMBIOS_TYPE,
QEMU_CAPS_VGA_NONE,
QEMU_CAPS_MIGRATE_QEMU_FD,
- QEMU_CAPS_DRIVE_AIO,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_DRIVE_AIO);
DO_TEST("qemu-kvm-0.13.0", 13000, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -448,8 +439,7 @@ mymain(void)
QEMU_CAPS_PIIX4_USB_UHCI,
QEMU_CAPS_VT82C686B_USB_UHCI,
QEMU_CAPS_PCI_OHCI,
- QEMU_CAPS_USB_HUB,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_USB_HUB);
DO_TEST("qemu-kvm-0.12.1.2-rhel61", 12001, 1, 0,
QEMU_CAPS_VNC_COLON,
QEMU_CAPS_NO_REBOOT,
@@ -497,8 +487,7 @@ mymain(void)
QEMU_CAPS_VIRTIO_IOEVENTFD,
QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_PIIX4_USB_UHCI,
- QEMU_CAPS_USB_HUB,
- QEMU_CAPS_NO_SHUTDOWN);
+ QEMU_CAPS_USB_HUB);
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
index e04cdec..8d8e43e 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args
@@ -1,5 +1,5 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \
pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev socket,\
id=charmonitor,path=/tmp/test-monitor,server,nowait -mon chardev=charmonitor,\
-id=monitor,mode=control -no-acpi -boot c -hda /dev/hda1 -usb -device \
+id=monitor,mode=control -no-shutdown -no-acpi -boot c -hda /dev/hda1 -usb -device \
virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
deleted file mode 100644
index 1464d09..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args
+++ /dev/null
@@ -1,21 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-/usr/bin/qemu \
--S \
--M pc \
--m 214 \
--smp 1 \
--nographic \
--nodefconfig \
--nodefaults \
--chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--no-shutdown \
--no-acpi \
--boot c \
--hda /dev/hda1 \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml
deleted file mode 100644
index 1901715..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='qemu'>
- <name>encryptdisk</name>
- <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
- <memory>219100</memory>
- <currentMemory>219100</currentMemory>
- <vcpu>1</vcpu>
- <os>
- <type arch='i686' machine='pc'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- destroy
- restart
- destroy
- <devices>
- <emulator>/usr/bin/qemu</emulator>
- <disk type='file' device='disk'>
- <driver name='qemu' type='qcow2'/>
- <source file='/dev/hda1'/>
- <target dev='hda'/>
- </disk>
- <memballoon model='virtio'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1dc6a01..fcb20bb 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -578,9 +578,6 @@ mymain(void)
json = true;
DO_TEST("monitor-json", false, QEMU_CAPS_DEVICE,
QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG);
- DO_TEST("no-shutdown", false, QEMU_CAPS_DEVICE,
- QEMU_CAPS_CHARDEV, QEMU_CAPS_MONITOR_JSON, QEMU_CAPS_NODEFCONFIG,
- QEMU_CAPS_NO_SHUTDOWN);
json = false;
free(driver.stateDir);
++++++ libvirt-0.9.4.tar.bz2 -> libvirt-0.9.6.tar.bz2 ++++++
openSUSE:Factory/libvirt/libvirt-0.9.4.tar.bz2 /mounts/work_src_done/STABLE/libvirt/libvirt-0.9.6.tar.bz2 differ: char 11, line 1
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.I1umH9/_old 2011-10-02 10:16:53.000000000 +0200
+++ /var/tmp/diff_new_pack.I1umH9/_new 2011-10-02 10:16:53.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.4/configure.ac
+Index: libvirt-0.9.6/configure.ac
===================================================================
---- libvirt-0.9.4.orig/configure.ac
-+++ libvirt-0.9.4/configure.ac
+--- libvirt-0.9.6.orig/configure.ac
++++ libvirt-0.9.6/configure.ac
@@ -63,6 +63,7 @@ AVAHI_REQUIRED="0.6.0"
POLKIT_REQUIRED="0.6"
PARTED_REQUIRED="1.8.0"
@@ -10,7 +10,7 @@
UDEV_REQUIRED=145
PCIACCESS_REQUIRED=0.10.0
XMLRPC_REQUIRED=1.14.0
-@@ -1591,6 +1592,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
+@@ -1593,6 +1594,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit
AC_SUBST([NETCF_CFLAGS])
AC_SUBST([NETCF_LIBS])
@@ -49,7 +49,7 @@
AC_ARG_WITH([secrets],
AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes])
-@@ -2460,6 +2493,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
+@@ -2517,6 +2550,7 @@ AC_MSG_NOTICE([ Remote: $with_remote])
AC_MSG_NOTICE([ Network: $with_network])
AC_MSG_NOTICE([Libvirtd: $with_libvirtd])
AC_MSG_NOTICE([ netcf: $with_netcf])
@@ -57,7 +57,7 @@
AC_MSG_NOTICE([ macvtap: $with_macvtap])
AC_MSG_NOTICE([virtport: $with_virtualport])
AC_MSG_NOTICE([])
-@@ -2586,6 +2620,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
+@@ -2648,6 +2682,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $
else
AC_MSG_NOTICE([ netcf: no])
fi
@@ -69,10 +69,10 @@
if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
else
-Index: libvirt-0.9.4/daemon/Makefile.am
+Index: libvirt-0.9.6/daemon/Makefile.am
===================================================================
---- libvirt-0.9.4.orig/daemon/Makefile.am
-+++ libvirt-0.9.4/daemon/Makefile.am
+--- libvirt-0.9.6.orig/daemon/Makefile.am
++++ libvirt-0.9.6/daemon/Makefile.am
@@ -141,6 +141,10 @@ endif
if WITH_NETCF
@@ -84,11 +84,11 @@
endif
if WITH_NODE_DEVICES
-Index: libvirt-0.9.4/daemon/libvirtd.c
+Index: libvirt-0.9.6/daemon/libvirtd.c
===================================================================
---- libvirt-0.9.4.orig/daemon/libvirtd.c
-+++ libvirt-0.9.4/daemon/libvirtd.c
-@@ -74,6 +74,10 @@
+--- libvirt-0.9.6.orig/daemon/libvirtd.c
++++ libvirt-0.9.6/daemon/libvirtd.c
+@@ -75,6 +75,10 @@
# endif
# ifdef WITH_NETCF
# include "interface/netcf_driver.h"
@@ -99,7 +99,7 @@
# endif
# ifdef WITH_STORAGE_DIR
# include "storage/storage_driver.h"
-@@ -428,6 +432,10 @@ static void daemonInitialize(void)
+@@ -393,6 +397,10 @@ static void daemonInitialize(void)
# endif
# ifdef WITH_NETCF
interfaceRegister();
@@ -110,11 +110,11 @@
# endif
# ifdef WITH_STORAGE_DIR
storageRegister();
-Index: libvirt-0.9.4/src/Makefile.am
+Index: libvirt-0.9.6/src/Makefile.am
===================================================================
---- libvirt-0.9.4.orig/src/Makefile.am
-+++ libvirt-0.9.4/src/Makefile.am
-@@ -870,6 +870,24 @@ libvirt_driver_interface_la_LIBADD += ..
+--- libvirt-0.9.6.orig/src/Makefile.am
++++ libvirt-0.9.6/src/Makefile.am
+@@ -923,6 +923,24 @@ libvirt_driver_interface_la_LIBADD += ..
libvirt_driver_interface_la_LDFLAGS += -module -avoid-version
endif
libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES)
@@ -139,10 +139,10 @@
endif
if WITH_SECRETS
-Index: libvirt-0.9.4/src/interface/netcf_driver.c
+Index: libvirt-0.9.6/src/interface/netcf_driver.c
===================================================================
---- libvirt-0.9.4.orig/src/interface/netcf_driver.c
-+++ libvirt-0.9.4/src/interface/netcf_driver.c
+--- libvirt-0.9.6.orig/src/interface/netcf_driver.c
++++ libvirt-0.9.6/src/interface/netcf_driver.c
@@ -23,7 +23,13 @@
#include
@@ -208,11 +208,11 @@
/* open netcf */
if (ncf_init(&driverState->netcf, NULL) != 0)
{
-Index: libvirt-0.9.4/tools/virsh.c
+Index: libvirt-0.9.6/tools/virsh.c
===================================================================
---- libvirt-0.9.4.orig/tools/virsh.c
-+++ libvirt-0.9.4/tools/virsh.c
-@@ -14904,6 +14904,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
+--- libvirt-0.9.6.orig/tools/virsh.c
++++ libvirt-0.9.6/tools/virsh.c
+@@ -16011,6 +16011,10 @@ vshShowVersion(vshControl *ctl ATTRIBUTE
#endif
#ifdef WITH_NETCF
vshPrint(ctl, " Netcf");
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.I1umH9/_old 2011-10-02 10:16:53.000000000 +0200
+++ /var/tmp/diff_new_pack.I1umH9/_new 2011-10-02 10:16:53.000000000 +0200
@@ -1,7 +1,7 @@
-Index: libvirt-0.9.4/daemon/libvirtd.conf
+Index: libvirt-0.9.6/daemon/libvirtd.conf
===================================================================
---- libvirt-0.9.4.orig/daemon/libvirtd.conf
-+++ libvirt-0.9.4/daemon/libvirtd.conf
+--- libvirt-0.9.6.orig/daemon/libvirtd.conf
++++ libvirt-0.9.6/daemon/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 @@
# Override the default mDNS advertizement name. This must be
# unique on the immediate broadcast network.
-Index: libvirt-0.9.4/daemon/libvirtd.c
+Index: libvirt-0.9.6/daemon/libvirtd.c
===================================================================
---- libvirt-0.9.4.orig/daemon/libvirtd.c
-+++ libvirt-0.9.4/daemon/libvirtd.c
-@@ -881,7 +881,7 @@ daemonConfigNew(bool privileged ATTRIBUT
+--- libvirt-0.9.6.orig/daemon/libvirtd.c
++++ libvirt-0.9.6/daemon/libvirtd.c
+@@ -846,7 +846,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}
@@ -41,7 +41,7 @@
data->listen_tcp = 0;
if (!(data->tls_port = strdup(LIBVIRTD_TLS_PORT)))
-@@ -918,7 +918,7 @@ daemonConfigNew(bool privileged ATTRIBUT
+@@ -883,7 +883,7 @@ daemonConfigNew(bool privileged ATTRIBUT
#endif
data->auth_tls = REMOTE_AUTH_NONE;
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.I1umH9/_old 2011-10-02 10:16:53.000000000 +0200
+++ /var/tmp/diff_new_pack.I1umH9/_new 2011-10-02 10:16:53.000000000 +0200
@@ -13,10 +13,10 @@
This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive.
-Index: libvirt-0.9.4/src/xen/xend_internal.c
+Index: libvirt-0.9.6/src/xen/xend_internal.c
===================================================================
---- libvirt-0.9.4.orig/src/xen/xend_internal.c
-+++ libvirt-0.9.4/src/xen/xend_internal.c
+--- libvirt-0.9.6.orig/src/xen/xend_internal.c
++++ libvirt-0.9.6/src/xen/xend_internal.c
@@ -60,6 +60,7 @@
static int
@@ -25,7 +25,7 @@
virDomainDeviceDefPtr dev,
char *class,
char *ref,
-@@ -2805,7 +2806,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
+@@ -2749,7 +2750,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@@ -34,7 +34,7 @@
/* device doesn't exist, define it */
ret = xend_op(domain->conn, domain->name, "op", "device_create",
"config", sexpr, NULL);
-@@ -2926,7 +2927,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
+@@ -2870,7 +2871,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@@ -43,7 +43,7 @@
virXendError(VIR_ERR_OPERATION_INVALID, "%s",
_("requested device does not exist"));
goto cleanup;
-@@ -3021,7 +3022,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
+@@ -2965,7 +2966,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE)))
goto cleanup;
@@ -52,7 +52,7 @@
goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
-@@ -3977,6 +3978,7 @@ struct xenUnifiedDriver xenDaemonDriver
+@@ -3915,6 +3916,7 @@ struct xenUnifiedDriver xenDaemonDriver
*/
static int
virDomainXMLDevID(virDomainPtr domain,
@@ -60,7 +60,7 @@
virDomainDeviceDefPtr dev,
char *class,
char *ref,
-@@ -3985,8 +3987,12 @@ virDomainXMLDevID(virDomainPtr domain,
+@@ -3923,8 +3925,12 @@ virDomainXMLDevID(virDomainPtr domain,
xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref;
char *tmp;
@@ -73,7 +73,7 @@
if (dev->data.disk->driverName &&
STREQ(dev->data.disk->driverName, "tap"))
strcpy(class, "tap");
-@@ -3996,19 +4002,21 @@ virDomainXMLDevID(virDomainPtr domain,
+@@ -3934,19 +3940,21 @@ virDomainXMLDevID(virDomainPtr domain,
else
strcpy(class, "vbd");
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org