pool/libguestfs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restore previous version, upstream patch depends on other changes

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=128
This commit is contained in:
Olaf Hering 2012-10-09 12:46:10 +00:00 committed by Git OBS Bridge
parent 73c4e38eee
commit ebb2537f46
1 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
0001-launch-appliance-is-optional.patch
View File

@ -1,6 +1,6 @@
From f93f1538649d96d1b11eb7a4368aac0496acc2bc Mon Sep 17 00:00:00 2001 From 7abe52ae73d918b515098842b19cb54888729b72 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olaf@aepfle.de> From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 8 Oct 2012 20:10:36 +0200 Date: Mon, 8 Oct 2012 19:51:38 +0200
Subject: [PATCH] launch: appliance is optional Subject: [PATCH] launch: appliance is optional
# virt-filesystems -v -d 6326ad4e-5805-2ab4-1338-d1dad8c76162 --all # virt-filesystems -v -d 6326ad4e-5805-2ab4-1338-d1dad8c76162 --all
@ -18,57 +18,24 @@ libguestfs: closing guestfs handle 0x656270 (state 0)
Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Olaf Hering <olaf@aepfle.de>
--- ---
src/launch-libvirt.c | 22 ++++++++++++++-------- src/launch-libvirt.c | 4 ++++
1 file changed, 14 insertions(+), 8 deletions(-) 1 file changed, 4 insertions(+)
diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 5b7897d..183008e 100644 index d678266..5914642 100644
--- a/src/launch-libvirt.c --- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c +++ b/src/launch-libvirt.c
@@ -194,10 +194,13 @@ launch_libvirt (guestfs_h *g, const char *libvirt_uri) @@ -936,6 +936,10 @@ construct_libvirt_xml_appliance (guestfs_h *g, xmlTextWriterPtr xo,
char drive_name[64] = "sd";
char scsi_target[64];
/* Create overlays for read-only drives and the appliance. This + /* appliance is optional */
* works around lack of support for <transient/> disks in libvirt. + if (appliance == NULL)
+ * Note that appliance can be NULL if using the old-style appliance. + return 0;
*/ +
- appliance_overlay = make_qcow2_overlay (g, appliance, "raw"); guestfs___drive_name (drv_index, &drive_name[2]);
- if (!appliance_overlay) snprintf (scsi_target, sizeof scsi_target, "%zu", drv_index);
- goto cleanup;
+ if (appliance) {
+ appliance_overlay = make_qcow2_overlay (g, appliance, "raw");
+ if (!appliance_overlay)
+ goto cleanup;
+ }
ITER_DRIVES (g, i, drv) {
if (make_qcow2_overlay_for_drive (g, drv) == -1)
@@ -393,7 +396,8 @@ launch_libvirt (guestfs_h *g, const char *libvirt_uri)
goto cleanup;
}
- guestfs___add_dummy_appliance_drive (g);
+ if (appliance)
+ guestfs___add_dummy_appliance_drive (g);
TRACE0 (launch_libvirt_end);
@@ -739,10 +743,12 @@ construct_libvirt_xml_devices (guestfs_h *g, xmlTextWriterPtr xo,
goto err;
}
- /* Appliance disk. */
- if (construct_libvirt_xml_appliance (g, xo, appliance_overlay,
- appliance_index) == -1)
- goto err;
+ if (appliance_overlay) {
+ /* Appliance disk. */
+ if (construct_libvirt_xml_appliance (g, xo, appliance_overlay,
+ appliance_index) == -1)
+ goto err;
+ }
/* Console. */
XMLERROR (-1, xmlTextWriterStartElement (xo, BAD_CAST "serial"));
-- --
1.7.10.4 1.7.12.2