Re: Problems with VNC with upstream Qemu

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]

On Mon, Jun 13, 2011 at 01:04:22PM -0400, Konrad Rzeszutek Wilk wrote:
> On Mon, Jun 13, 2011 at 11:19:26PM +0900, Daniel Castro wrote:
> > On Mon, Jun 13, 2011 at 6:19 PM, Wei Liu <liuw@liuw.name> wrote:
> > > On Mon, 2011-06-13 at 18:08 +0900, Daniel Castro wrote:
> > >>
> > >> I need to use the same qemu upstream and use that same repository! :(
> > >>
> > >
> > > Anthony is responsible for developing xen support in qemu upstream. Some
> > > of his changesets have been upstreamed. So I think it is ok to use his
> > > repository. I'm doing upstream qemu development, too.
> > >
> > > If you insist using the upstream qemu repository, you'd better post
> > > complete log here and CC Anthony <anthony.perard@citrix.com> for help.
> > >
> > > Wei.
> > >
> > >
> > 
> > Well I decided to recompile following Anthony's wiki page, and
> > stumbled on this error:
> > This is extracted from configure.log on
> > /usr/include/xenctrl.h:970:21: fatal error: xc_e820.h: No such file or directory
> > compilation terminated.
> > xe3nctrl.h is found at the location but xc_e820 is not found there.
> 
> Hmmm..Let me send you a patch for that.

Can you try the attached file please?

[-- Attachment #2: tools-fix-compile-error-out-of-tree.patch --]
[-- Type: text/x-diff, Size: 3469 bytes --]

# HG changeset patch
# Parent 5d31bd0eb8d040c0b44fe2a3b737fd752a607e74
Squash xc_e820.h (and delete) into xenctrl.h

.. as there is no need to keep that internal header file anymore.
We export two functions xc_domain_[set|get]_memory_map which
depend on the 'struct e820entry' defined in 'xc_e820.h'.

We move the contents of the 'xc_e820.h' to the 'xenctrl.h' fixing
compiler errors when applications outside the Xen tree are trying
to compile against the libraries.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff -r 5d31bd0eb8d0 tools/libxc/xc_core_x86.c
--- a/tools/libxc/xc_core_x86.c	Wed Jun 01 16:10:50 2011 -0400
+++ b/tools/libxc/xc_core_x86.c	Mon Jun 13 13:41:31 2011 -0400
@@ -20,7 +20,7 @@
 
 #include "xg_private.h"
 #include "xc_core.h"
-#include "xc_e820.h"
+#include <xen/hvm/e820.h>
 
 #define GET_FIELD(_p, _f) ((dinfo->guest_width==8) ? ((_p)->x64._f) : ((_p)->x32._f))
 
diff -r 5d31bd0eb8d0 tools/libxc/xc_domain_save.c
--- a/tools/libxc/xc_domain_save.c	Wed Jun 01 16:10:50 2011 -0400
+++ b/tools/libxc/xc_domain_save.c	Mon Jun 13 13:41:31 2011 -0400
@@ -32,7 +32,6 @@
 #include "xg_save_restore.h"
 
 #include <xen/hvm/params.h>
-#include "xc_e820.h"
 
 /*
 ** Default values for important tuning parameters. Can override by passing
diff -r 5d31bd0eb8d0 tools/libxc/xc_e820.h
--- a/tools/libxc/xc_e820.h	Wed Jun 01 16:10:50 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __XC_E820_H__
-#define __XC_E820_H__
-
-#include <xen/hvm/e820.h>
-
-/*
- * PC BIOS standard E820 types and structure.
- */
-#define E820_RAM          1
-#define E820_RESERVED     2
-#define E820_ACPI         3
-#define E820_NVS          4
-#define E820_UNUSABLE     5
-
-#define E820MAX           (128)
-
-struct e820entry {
-    uint64_t addr;
-    uint64_t size;
-    uint32_t type;
-} __attribute__((packed));
-
-#endif /* __XC_E820_H__ */
diff -r 5d31bd0eb8d0 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h	Wed Jun 01 16:10:50 2011 -0400
+++ b/tools/libxc/xenctrl.h	Mon Jun 13 13:41:31 2011 -0400
@@ -967,7 +967,22 @@ int xc_domain_set_memmap_limit(xc_interf
                                unsigned long map_limitkb);
 
 #if defined(__i386__) || defined(__x86_64__)
-#include "xc_e820.h"
+/*
+ * PC BIOS standard E820 types and structure.
+ */
+#define E820_RAM          1
+#define E820_RESERVED     2
+#define E820_ACPI         3
+#define E820_NVS          4
+#define E820_UNUSABLE     5
+
+#define E820MAX           (128)
+
+struct e820entry {
+    uint64_t addr;
+    uint64_t size;
+    uint32_t type;
+} __attribute__((packed));
 int xc_domain_set_memory_map(xc_interface *xch,
                                uint32_t domid,
                                struct e820entry entries[],

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel