← Back to branch summary

~nova-coresec/ubuntu/maverick/libvirt/nova-ppa

« back to all changes in this revision

Viewing changes to debian/patches/9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch

  • Committer: Soren Hansen
  • Date: 2010-08-31 09:44:39 UTC
  • Revision ID: soren.hansen@rackspace.com-20100831094439-vmulffyq6h08gsu9
Update 9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch
based on a small last-minute change upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch
1
 
From 8df6210974a4766eeb09d62c818ad4a69bd74651 Mon Sep 17 00:00:00 2001
 
1
From 5c3eec9ffbe962d2f517cd642ed27c36760e3ce8 Mon Sep 17 00:00:00 2001
2
2
From: Soren Hansen <soren@linux2go.dk>
3
 
Date: Thu, 19 Aug 2010 14:46:08 +0200
 
3
Date: Mon, 23 Aug 2010 11:31:27 +0200
4
4
Subject: [PATCH 2/2] Support virDomainAttachDevice and virDomainDetachDevice for disks in UML
5
5
 
6
6
UML supports hot plugging and unplugging of various devices. This patch
8
8
 
9
9
Signed-off-by: Soren Hansen <soren@linux2go.dk>
10
10
---
11
 
 src/uml/uml_driver.c |  239 +++++++++++++++++++++++++++++++++++++++++++++++++-
12
 
 1 files changed, 235 insertions(+), 4 deletions(-)
 
11
 src/uml/uml_driver.c |  236 +++++++++++++++++++++++++++++++++++++++++++++++++-
 
12
 1 files changed, 232 insertions(+), 4 deletions(-)
13
13
 
14
14
Index: libvirt-0.8.3/src/uml/uml_driver.c
15
15
===================================================================
16
 
--- libvirt-0.8.3.orig/src/uml/uml_driver.c     2010-08-23 14:28:16.804428000 +0200
17
 
+++ libvirt-0.8.3/src/uml/uml_driver.c  2010-08-23 14:28:16.854428000 +0200
18
 
@@ -1692,6 +1692,237 @@
 
16
--- libvirt-0.8.3.orig/src/uml/uml_driver.c     2010-08-25 11:56:13.814570003 +0200
 
17
+++ libvirt-0.8.3/src/uml/uml_driver.c  2010-08-25 11:56:16.104570004 +0200
 
18
@@ -1692,6 +1692,234 @@
19
19
 }
20
20
 
21
21
 
23
23
+                                  virDomainObjPtr vm,
24
24
+                                  virDomainDiskDefPtr disk)
25
25
+{
26
 
+    int i, ret;
 
26
+    int i;
27
27
+    char *cmd = NULL;
28
28
+    char *reply = NULL;
29
29
+
54
54
+        goto error;
55
55
+    }
56
56
+
57
 
+    if (ret < 0)
58
 
+        goto error;
59
 
+
60
57
+    virDomainDiskInsertPreAlloced(vm->def, disk);
61
58
+
62
59
+    VIR_FREE(reply);
253
250
 
254
251
 static int umlDomainGetAutostart(virDomainPtr dom,
255
252
                             int *autostart) {
256
 
@@ -1906,10 +2137,10 @@
 
253
@@ -1906,10 +2134,10 @@
257
254
     umlDomainStartWithFlags, /* domainCreateWithFlags */
258
255
     umlDomainDefine, /* domainDefineXML */
259
256
     umlDomainUndefine, /* domainUndefine */