dist-git conversion

daniel

.abignore

@@ -1,31 +0,0 @@
-[suppress_function]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_function]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*

.gitignore

@@ -1,5 +1,24 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz
+libvirt-0.2.3.tar.gz
+libvirt-0.3.0.tar.gz
+libvirt-0.3.1.tar.gz
+libvirt-0.3.2.tar.gz
+libvirt-0.3.3.tar.gz

0001-Fix-off-by-one-error-in-udevListInterfacesByStatus.patch

@@ -1,40 +0,0 @@
-From 6f3ee0c553bafec957e69df7fc42f83985d55c0f Mon Sep 17 00:00:00 2001
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 27 Feb 2024 16:20:12 +0100
-Subject: [PATCH] Fix off-by-one error in udevListInterfacesByStatus
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Ever since this function was introduced in 2012 it could've tried
-filling in an extra interface name.  That was made worse in 2019 when
-the caller functions started accepting NULL arrays of size 0.
-
-This is assigned CVE-2024-1441.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reported-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
-Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca
-Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c664015fe3a7bf59db26686e9ed69af011c6ebb8)
----
- src/interface/interface_backend_udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
-index ef334f175b..abeb766294 100644
---- a/src/interface/interface_backend_udev.c
-+++ b/src/interface/interface_backend_udev.c
-@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
-         g_autoptr(virInterfaceDef) def = NULL;
- 
-         /* Ensure we won't exceed the size of our array */
--        if (count > names_len)
-+        if (count >= names_len)
-             break;
- 
-         path = udev_list_entry_get_name(dev_entry);
--- 
-2.43.0
-

0001-interface-fix-udev_device_get_sysattr_value-return-v.patch

@@ -1,90 +0,0 @@
-From 13ea81b22cde0a429aa1de8b58655296084ce8d7 Mon Sep 17 00:00:00 2001
-From: Dmitry Frolov <frolov@swemel.ru>
-Date: Tue, 12 Sep 2023 15:56:47 +0300
-Subject: [PATCH] interface: fix udev_device_get_sysattr_value return value
- check
-
-Reviewing the code I found that return value of function
-udev_device_get_sysattr_value() is dereferenced without a check.
-udev_device_get_sysattr_value() may return NULL by number of reasons.
-
-v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE()
-v3: More checks added, to skip earlier. More verbose VIR_DEBUG.
-
-Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 2ca94317ac642a70921947150ced8acc674ccdc8)
----
- src/interface/interface_backend_udev.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
-index 54b43fb999..ef334f175b 100644
---- a/src/interface/interface_backend_udev.c
-+++ b/src/interface/interface_backend_udev.c
-@@ -23,6 +23,7 @@
- #include <dirent.h>
- #include <libudev.h>
- 
-+#include "virlog.h"
- #include "virerror.h"
- #include "virfile.h"
- #include "datatypes.h"
-@@ -40,6 +41,8 @@
- 
- #define VIR_FROM_THIS VIR_FROM_INTERFACE
- 
-+VIR_LOG_INIT("interface.interface_backend_udev");
-+
- struct udev_iface_driver {
-     struct udev *udev;
-     /* pid file FD, ensures two copies of the driver can't use the same root */
-@@ -354,11 +357,20 @@ udevConnectListAllInterfaces(virConnectPtr conn,
-         const char *macaddr;
-         g_autoptr(virInterfaceDef) def = NULL;
- 
--        path = udev_list_entry_get_name(dev_entry);
--        dev = udev_device_new_from_syspath(udev, path);
--        name = udev_device_get_sysname(dev);
-+        if (!(path = udev_list_entry_get_name(dev_entry))) {
-+            VIR_DEBUG("Skipping interface, path == NULL");
-+            continue;
-+        }
-+        if (!(dev = udev_device_new_from_syspath(udev, path))) {
-+            VIR_DEBUG("Skipping interface '%s', dev == NULL", path);
-+            continue;
-+        }
-+        if (!(name = udev_device_get_sysname(dev))) {
-+            VIR_DEBUG("Skipping interface '%s', name == NULL", path);
-+            continue;
-+        }
-         macaddr = udev_device_get_sysattr_value(dev, "address");
--        status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
-+        status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
- 
-         def = udevGetMinimalDefForDevice(dev);
-         if (!virConnectListAllInterfacesCheckACL(conn, def)) {
-@@ -962,9 +974,9 @@ udevGetIfaceDef(struct udev *udev, const char *name)
- 
-     /* MTU */
-     mtu_str = udev_device_get_sysattr_value(dev, "mtu");
--    if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
-+    if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--                _("Could not parse MTU value '%s'"), mtu_str);
-+                       _("Could not parse MTU value '%s'"), NULLSTR(mtu_str));
-         goto error;
-     }
-     ifacedef->mtu = mtu;
-@@ -1087,7 +1099,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
-        goto cleanup;
- 
-     /* Check if it's active or not */
--    status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
-+    status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
- 
-     udev_device_unref(dev);
- 
--- 
-2.43.0
-

0001-qemuProcessRefreshDisks-Don-t-skip-filling-of-disk-i.patch

@@ -1,58 +0,0 @@
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 9 Feb 2023 09:40:32 +0100
-Subject: [PATCH] qemuProcessRefreshDisks: Don't skip filling of disk
- information if tray state didn't change
-Content-type: text/plain
-
-Commit 5ef2582646eb98 added emitting of even when refreshign disk state,
-where it wanted to avoid sending the event if disk state didn't change.
-This was achieved by using 'continue' in the loop filling the
-information. Unfortunately this skips extraction of whether the device
-has a tray which is propagated into internal structures, which in turn
-broke cdrom media change as the code thought there's no tray for the
-device.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2166411
-Fixes: 5ef2582646eb98af208ce37355f82bdef39931fa
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
-(cherry picked from commit 86cfe93ef7fdc2d665a2fc88b79af89e7978ba78)
----
- src/qemu/qemu_process.c | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index ee9f0784d3..0c408ee547 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -8724,16 +8724,13 @@ qemuProcessRefreshDisks(virDomainObj *vm,
-             continue;
- 
-         if (info->removable) {
--            virObjectEvent *event = NULL;
-+            bool emitEvent = info->tray_open != disk->tray_status;
-             int reason;
- 
-             if (info->empty)
-                 virDomainDiskEmptySource(disk);
- 
-             if (info->tray) {
--                if (info->tray_open == disk->tray_status)
--                    continue;
--
-                 if (info->tray_open) {
-                     reason = VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN;
-                     disk->tray_status = VIR_DOMAIN_DISK_TRAY_OPEN;
-@@ -8742,8 +8739,10 @@ qemuProcessRefreshDisks(virDomainObj *vm,
-                     disk->tray_status = VIR_DOMAIN_DISK_TRAY_CLOSED;
-                 }
- 
--                event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason);
--                virObjectEventStateQueue(driver->domainEventState, event);
-+                if (emitEvent) {
-+                    virObjectEvent *event = virDomainEventTrayChangeNewFromObj(vm, disk->info.alias, reason);
-+                    virObjectEventStateQueue(driver->domainEventState, event);
-+                }
-             }
-         }
- 

0002-ch-use-CURLOPT_UPLOAD-instead-of-CURLOPT_PUT.patch

@@ -1,39 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 18 Jan 2023 09:45:52 +0000
-Subject: [PATCH] ch: use CURLOPT_UPLOAD instead of CURLOPT_PUT
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Content-type: text/plain
-
-The CURLOPT_PUT constant causes a deprecation warning when compiling on
-Alpine Edge.  The docs indicate it is deprecated since 7.2.1
-
-  https://curl.se/libcurl/c/CURLOPT_PUT.html
-
-Since 7.87 the deprecation is now exposed at build time via a compiler
-warning.
-
-We already use CURLOPT_UPLOAD in the ESX driver, so this brings the CH
-driver into line.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 9cd70fb25cad171e415fb05a4e01f244304c602e)
----
- src/ch/ch_monitor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c
-index 8d8654332f..7b8f0a8077 100644
---- a/src/ch/ch_monitor.c
-+++ b/src/ch/ch_monitor.c
-@@ -660,7 +660,7 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint)
- 
-     curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpath);
-     curl_easy_setopt(mon->handle, CURLOPT_URL, url);
--    curl_easy_setopt(mon->handle, CURLOPT_PUT, true);
-+    curl_easy_setopt(mon->handle, CURLOPT_UPLOAD, 1L);
-     curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, NULL);
- 
-     responseCode = virCHMonitorCurlPerform(mon->handle);

0003-storage-Fix-returning-of-locked-objects-from-virStor.patch

@@ -1,56 +0,0 @@
-From 9a47442366fcf8a7b6d7422016d7bbb6764a1098 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 13 Jul 2023 16:16:37 +0200
-Subject: [PATCH] storage: Fix returning of locked objects from
- 'virStoragePoolObjListSearch'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2023-3750
-
-'virStoragePoolObjListSearch' explicitly documents that it's returning
-a pointer to a locked and ref'd pool that maches the lookup function.
-
-This was not the case as in commit 0c4b391e2a9 (released in
-libvirt-8.3.0) the code was accidentally converted to use 'VIR_LOCK_GUARD'
-which auto-unlocked it when leaving the scope, even when the code was
-originally "leaking" the lock.
-
-Revert the corresponding conversion and add a comment that this function
-is intentionally leaking a locked object.
-
-Fixes: 0c4b391e2a9
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2221851
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Han Han <hhan@redhat.com>
----
- src/conf/virstorageobj.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
-index 7010e97d61..59fa5da372 100644
---- a/src/conf/virstorageobj.c
-+++ b/src/conf/virstorageobj.c
-@@ -454,11 +454,16 @@ virStoragePoolObjListSearchCb(const void *payload,
-     virStoragePoolObj *obj = (virStoragePoolObj *) payload;
-     struct _virStoragePoolObjListSearchData *data =
-         (struct _virStoragePoolObjListSearchData *)opaque;
--    VIR_LOCK_GUARD lock = virObjectLockGuard(obj);
- 
-+    virObjectLock(obj);
-+
-+    /* If we find the matching pool object we must return while the object is
-+     * locked as the caller wants to return a locked object. */
-     if (data->searcher(obj, data->opaque))
-         return 1;
- 
-+    virObjectUnlock(obj);
-+
-     return 0;
- }
- 
--- 
-2.41.0
-

0004-virpci-Resolve-leak-in-virPCIVirtualFunctionList-cle.patch

@@ -1,51 +0,0 @@
-From 6425a311b8ad19d6f9c0b315bf1d722551ea3585 Mon Sep 17 00:00:00 2001
-From: Tim Shearer <TShearer@adva.com>
-Date: Mon, 1 May 2023 13:15:48 +0000
-Subject: [PATCH] virpci: Resolve leak in virPCIVirtualFunctionList cleanup
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Repeatedly querying an SR-IOV PCI device's capabilities exposes a
-memory leak caused by a failure to free the virPCIVirtualFunction
-array within the parent struct's g_autoptr cleanup.
-
-Valgrind output after getting a single interface's XML description
-1000 times:
-
-==325982== 256,000 bytes in 1,000 blocks are definitely lost in loss record 2,634 of 2,635
-==325982==    at 0x4C3C096: realloc (vg_replace_malloc.c:1437)
-==325982==    by 0x59D952D: g_realloc (in /usr/lib64/libglib-2.0.so.0.5600.4)
-==325982==    by 0x4EE1F52: virReallocN (viralloc.c:52)
-==325982==    by 0x4EE1FB7: virExpandN (viralloc.c:78)
-==325982==    by 0x4EE219A: virInsertElementInternal (viralloc.c:183)
-==325982==    by 0x4EE23B2: virAppendElement (viralloc.c:288)
-==325982==    by 0x4F65D85: virPCIGetVirtualFunctionsFull (virpci.c:2389)
-==325982==    by 0x4F65753: virPCIGetVirtualFunctions (virpci.c:2256)
-==325982==    by 0x505CB75: virNodeDeviceGetPCISRIOVCaps (node_device_conf.c:2969)
-==325982==    by 0x505D181: virNodeDeviceGetPCIDynamicCaps (node_device_conf.c:3099)
-==325982==    by 0x505BC4E: virNodeDeviceUpdateCaps (node_device_conf.c:2677)
-==325982==    by 0x260FCBB2: nodeDeviceGetXMLDesc (node_device_driver.c:355)
-
-Signed-off-by: Tim Shearer <tshearer@adva.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Han Han <hhan@redhat.com>
----
- src/util/virpci.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/virpci.c b/src/util/virpci.c
-index 9e564e4a4f..cc2b07bbba 100644
---- a/src/util/virpci.c
-+++ b/src/util/virpci.c
-@@ -2245,6 +2245,7 @@ virPCIVirtualFunctionListFree(virPCIVirtualFunctionList *list)
-         g_free(list->functions[i].ifname);
-     }
- 
-+    g_free(list->functions);
-     g_free(list);
- }
- 
--- 
-2.41.0
-

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: libvirt
+# $Id$
+NAME := libvirt
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

branch

@@ -0,0 +1 @@
+F-8

libvirt-0.4.4-boot-cdrom.patch

@@ -0,0 +1,99 @@
+diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c
+--- libvirt-0.4.4.orig/src/qemu_conf.c	2008-06-19 14:15:02.000000000 +0100
++++ libvirt-0.4.4.new/src/qemu_conf.c	2008-07-08 12:24:07.000000000 +0100
+@@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr 
+                      disk->src, qemudBusIdToName(disk->bus, 1),
+                      media ? media : "",
+                      idx,
+-                     bootable ? ",boot=on" : "");
++                     bootable && disk->device == QEMUD_DISK_DISK
++                     ? ",boot=on" : "");
+ 
+             ADD_ARG_LIT("-drive");
+             ADD_ARG_LIT(opt);
+diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
+--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	1970-01-01 01:00:00.000000000 +0100
++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	2008-07-08 12:25:59.000000000 +0100
+@@ -0,0 +1 @@
++/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
+\ No newline at end of file
+diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
+--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml	1970-01-01 01:00:00.000000000 +0100
++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml	2008-07-08 12:20:42.000000000 +0100
+@@ -0,0 +1,26 @@
++<domain type='qemu'>
++  <name>QEMUGuest1</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory>219200</memory>
++  <currentMemory>219200</currentMemory>
++  <vcpu>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='cdrom'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <disk type='block' device='cdrom'>
++      <source dev='/dev/HostVG/QEMUGuest2'/>
++      <target dev='hdc' bus='ide'/>
++    </disk>
++  </devices>
++</domain>
+diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
+--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	1970-01-01 01:00:00.000000000 +0100
++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	2008-07-08 12:13:15.000000000 +0100
+@@ -0,0 +1 @@
++/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
+\ No newline at end of file
+diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
+--- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml	1970-01-01 01:00:00.000000000 +0100
++++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml	2008-07-08 12:12:41.000000000 +0100
+@@ -0,0 +1,26 @@
++<domain type='qemu'>
++  <name>QEMUGuest1</name>
++  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
++  <memory>219200</memory>
++  <currentMemory>219200</currentMemory>
++  <vcpu>1</vcpu>
++  <os>
++    <type arch='i686' machine='pc'>hvm</type>
++    <boot dev='hd'/>
++  </os>
++  <clock offset='utc'/>
++  <on_poweroff>destroy</on_poweroff>
++  <on_reboot>restart</on_reboot>
++  <on_crash>destroy</on_crash>
++  <devices>
++    <emulator>/usr/bin/qemu</emulator>
++    <disk type='block' device='disk'>
++      <source dev='/dev/HostVG/QEMUGuest1'/>
++      <target dev='hda' bus='ide'/>
++    </disk>
++    <disk type='block' device='cdrom'>
++      <source dev='/dev/HostVG/QEMUGuest2'/>
++      <target dev='hdc' bus='ide'/>
++    </disk>
++  </devices>
++</domain>
+diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c
+--- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c	2008-06-02 10:16:46.000000000 +0100
++++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c	2008-07-08 12:21:53.000000000 +0100
+@@ -158,6 +158,10 @@ mymain(int argc, char **argv)
+             QEMUD_CMD_FLAG_DRIVE_BOOT);
+     DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE |
+             QEMUD_CMD_FLAG_DRIVE_BOOT);
++    DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE |
++            QEMUD_CMD_FLAG_DRIVE_BOOT);
++    DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE |
++            QEMUD_CMD_FLAG_DRIVE_BOOT);
+     DO_TEST("graphics-vnc", 0);
+     DO_TEST("graphics-sdl", 0);
+     DO_TEST("input-usbmouse", 0);

python_make.patch

@@ -0,0 +1,35 @@
+Index: python/Makefile.am
+===================================================================
+RCS file: /data/cvs/libxen/python/Makefile.am,v
+retrieving revision 1.13
+diff -u -p -r1.13 Makefile.am
+--- python/Makefile.am	5 Feb 2008 19:27:37 -0000	1.13
++++ python/Makefile.am	24 Sep 2008 13:21:06 -0000
+@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
+ $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
+ 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
+ 
+-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
++libvirt.py: $(srcdir)/libvir.py $(GENERATED)
+ 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
+ 	mv $@-t $@
+ 
+*** python/Makefile.in.orig	2008-09-24 15:19:20.000000000 +0200
+--- python/Makefile.in	2008-09-24 15:20:07.000000000 +0200
+*************** uninstall-am: uninstall-local uninstall-
+*** 1027,1033 ****
+  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
+  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
+  
+! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
+  @WITH_PYTHON_TRUE@	mv $@-t $@
+  
+--- 1027,1033 ----
+  @WITH_PYTHON_TRUE@$(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
+  @WITH_PYTHON_TRUE@	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
+  
+! @WITH_PYTHON_TRUE@libvirt.py: $(srcdir)/libvir.py $(GENERATED)
+  @WITH_PYTHON_TRUE@	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
+  @WITH_PYTHON_TRUE@	mv $@-t $@
+  

sources

@@ -1 +1 @@
-SHA512 (libvirt-9.0.0.tar.xz) = 135f690f9fe722161c22579166f10a54d52941a371439165fd0e3d391ca7835049a3bcbff33fc81c50153046230db8a5a318d707383bad3141d489d2faa09ecb
+abdf727deaffd868172f7243eb75ffe3  libvirt-0.4.6.tar.gz