Skip to content
Snippets Groups Projects
Commit ee3590ae authored by Guido Günther's avatar Guido Günther Committed by Guido Günther
Browse files

drop patches, fixed upstream 

0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch
0005-fix-define-vs.-defined-typos.patch
parent 98c4cc79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/patches/0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch deleted 100644 → 0
+ 0
− 38
View file @ 98c4cc79
From b52ad525b45385d20a827becc055621c70a12b3b Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Thu, 2 Oct 2008 21:12:20 +0200
Subject: [PATCH] support virtio and scsi disks in qemudDomainBlockStats
---
src/qemu_driver.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index 9d8f75a..58530aa 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3416,6 +3416,8 @@ qemudDomainBlockStats (virDomainPtr dom,
* hd[a-] to ide0-hd[0-]
* cdrom to ide1-cd0
* fd[a-] to floppy[0-]
+ * vd[a-] to virtio[0-]
+ * sd[a-] to scsi0-hd[0-]
*/
if (STRPREFIX (path, "hd") && c_islower(path[2]))
snprintf (qemu_dev_name, sizeof (qemu_dev_name),
@@ -3425,6 +3427,12 @@ qemudDomainBlockStats (virDomainPtr dom,
else if (STRPREFIX (path, "fd") && c_islower(path[2]))
snprintf (qemu_dev_name, sizeof (qemu_dev_name),
"floppy%d", path[2] - 'a');
+ else if (STRPREFIX (path, "vd") && c_islower(path[2]))
+ snprintf (qemu_dev_name, sizeof (qemu_dev_name),
+ "virtio%d", path[2] - 'a');
+ else if (STRPREFIX (path, "sd") && c_islower(path[2]))
+ snprintf (qemu_dev_name, sizeof (qemu_dev_name),
+ "scsi0-hd%d", path[2] - 'a');
else {
qemudReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_ARG,
_("invalid path: %s"), path);
--
1.6.0.1
debian/patches/0006-xen-prefer-xenstoraged-driver-for-listDomains.patch → debian/patches/0004-xen-prefer-xenstoraged-driver-for-listDomains.patch
+ 11
− 11
View file @ ee3590ae
From 20cd80189d752d5dc630afa8d29a3ebf0ac51649 Mon Sep 17 00:00:00 2001
From 47cfd0a5ebb19ea222d6ec758c44878c9e8714cd Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 26 Nov 2008 10:54:51 +0100
Subject: [PATCH] xen: prefer xenstoraged driver for listDomains
......@@ -14,10 +14,10 @@ using the HV driver.
5 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index 1378559..daf1193 100644
index 2e801d9..0254ebc 100644
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -37,7 +37,6 @@ static int xenProxyOpen(virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr aut
@@ -40,7 +40,6 @@ static int xenProxyOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags);
static int xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer);
static int xenProxyNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info);
static char *xenProxyGetCapabilities(virConnectPtr conn);
......@@ -25,7 +25,7 @@ index 1378559..daf1193 100644
static int xenProxyNumOfDomains(virConnectPtr conn);
static unsigned long xenProxyDomainGetMaxMemory(virDomainPtr domain);
static int xenProxyDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);
@@ -581,7 +580,7 @@ xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer)
@@ -566,7 +565,7 @@ xenProxyGetVersion(virConnectPtr conn, unsigned long *hvVer)
*
* Returns the number of domain found or -1 in case of error
*/
......@@ -35,7 +35,7 @@ index 1378559..daf1193 100644
{
virProxyPacket req;
diff --git a/src/proxy_internal.h b/src/proxy_internal.h
index 0e66c1c..693b10b 100644
index 56dc867..0f31752 100644
--- a/src/proxy_internal.h
+++ b/src/proxy_internal.h
@@ -94,4 +94,6 @@ extern virDomainPtr xenProxyLookupByName(virConnectPtr conn,
......@@ -46,10 +46,10 @@ index 0e66c1c..693b10b 100644
+ int maxids);
#endif /* __LIBVIR_PROXY_H__ */
diff --git a/src/xen_unified.c b/src/xen_unified.c
index 5807391..0fb5d73 100644
index cce608c..456fe46 100644
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -485,14 +485,31 @@ static int
@@ -505,14 +505,31 @@ static int
xenUnifiedListDomains (virConnectPtr conn, int *ids, int maxids)
{
GET_PRIVATE(conn);
......@@ -88,10 +88,10 @@ index 5807391..0fb5d73 100644
}
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 2e1a8d1..9f1ad42 100644
index 55eaf94..b839497 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -3455,7 +3455,7 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
@@ -3411,7 +3411,7 @@ xenDaemonGetVersion(virConnectPtr conn, unsigned long *hvVer)
*
* Returns the number of domain found or -1 in case of error
*/
......@@ -101,10 +101,10 @@ index 2e1a8d1..9f1ad42 100644
{
struct sexpr *root = NULL;
diff --git a/src/xend_internal.h b/src/xend_internal.h
index 12fa379..af90290 100644
index 20645fb..768964f 100644
--- a/src/xend_internal.h
+++ b/src/xend_internal.h
@@ -178,5 +178,6 @@ int xenDaemonDomainMigratePrepare (virConnectPtr dconn, char **cookie, int *cook
@@ -179,5 +179,6 @@ int xenDaemonDomainMigratePrepare (virConnectPtr dconn, char **cookie, int *cook
int xenDaemonDomainMigratePerform (virDomainPtr domain, const char *cookie, int cookielen, const char *uri, unsigned long flags, const char *dname, unsigned long resource);
int xenDaemonDomainBlockPeek (virDomainPtr domain, const char *path, unsigned long long offset, size_t size, void *buffer);
......
debian/patches/0005-fix-define-vs.-defined-typos.patch deleted 100644 → 0
+ 0
− 69
View file @ 98c4cc79
From 049aa77897ca49732101e39ccd63b6fc8a29a94c Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Fri, 14 Nov 2008 14:50:32 +0100
Subject: [PATCH] fix #define vs. #defined typos
affects non linux architectures and fixes the build with gcc 4.4
Closes: #505607
---
src/xen_internal.c | 8 ++++----
src/xs_internal.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/xen_internal.c b/src/xen_internal.c
index 3cfc5e3..d80ecfb 100644
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -73,7 +73,7 @@ typedef struct v1_hypercall_struct
#define XEN_V1_IOCTL_HYPERCALL_CMD \
_IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t))
typedef v1_hypercall_t hypercall_t;
-#elif define(__sun__)
+#elif defined(__sun__)
typedef privcmd_hypercall_t hypercall_t;
#else
#error "unsupported platform"
@@ -338,7 +338,7 @@ lock_pages(void *addr, size_t len)
{
#ifdef __linux__
return (mlock(addr, len));
-#elif define(__sun)
+#elif defined(__sun)
return (0);
#endif
}
@@ -348,7 +348,7 @@ unlock_pages(void *addr, size_t len)
{
#ifdef __linux__
return (munlock(addr, len));
-#elif define(__sun)
+#elif defined(__sun)
return (0);
#endif
}
@@ -664,7 +664,7 @@ typedef struct xen_op_v2_dom xen_op_v2_dom;
#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
#define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities"
#define CPUINFO "/proc/cpuinfo"
-#elif define(__sun__)
+#elif defined(__sun__)
#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd"
#define HYPERVISOR_CAPABILITIES ""
#define CPUINFO "/dev/cpu/self/cpuid"
diff --git a/src/xs_internal.c b/src/xs_internal.c
index 316604a..3cb67db 100644
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -34,7 +34,7 @@
#ifdef __linux__
#define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd"
-#elif define(__sun__)
+#elif defined(__sun__)
#define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd"
#else
#error "unsupported platform"
--
1.6.0.3
debian/patches/series
+ 1
− 3
View file @ ee3590ae
0001-remove-RHism.diff.patch
0002-qemu-disable-network.diff.patch
0003-allow-libvirt-group-to-access-the-socket.patch
0004-support-virtio-and-scsi-disks-in-qemudDomainBlockSta.patch
0005-fix-define-vs.-defined-typos.patch
0006-xen-prefer-xenstoraged-driver-for-listDomains.patch
0004-xen-prefer-xenstoraged-driver-for-listDomains.patch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment