[pve-devel] r6458 - in pve-qemu-kvm/pve2: . debian debian/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Aug 11 10:20:18 CEST 2011


Author: dietmar
Date: 2011-08-11 10:20:18 +0200 (Thu, 11 Aug 2011)
New Revision: 6458

Removed:
   pve-qemu-kvm/pve2/debian/roms/
Modified:
   pve-qemu-kvm/pve2/Makefile
   pve-qemu-kvm/pve2/debian/changelog
   pve-qemu-kvm/pve2/debian/patches/adjust-path.diff
   pve-qemu-kvm/pve2/debian/patches/fairsched.diff
   pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff
   pve-qemu-kvm/pve2/debian/patches/keymap.diff
   pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff
   pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
   pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch
   pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff
   pve-qemu-kvm/pve2/debian/rules
Log:
  * update to upstream 0.15.0

  * use pxe roms from upstream qemu-kvm



Modified: pve-qemu-kvm/pve2/Makefile
===================================================================
--- pve-qemu-kvm/pve2/Makefile	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/Makefile	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,7 +1,7 @@
 RELEASE=2.0
 
 # also update debian/changelog
-KVMVER=0.14.1
+KVMVER=0.15.0
 KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm

Modified: pve-qemu-kvm/pve2/debian/changelog
===================================================================
--- pve-qemu-kvm/pve2/debian/changelog	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/changelog	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,3 +1,11 @@
+pve-qemu-kvm (0.15.0-1) unstable; urgency=low
+
+  * update to upstream 0.15.0
+
+  * use pxe roms from upstream qemu-kvm
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 11 Aug 2011 10:00:44 +0200
+
 pve-qemu-kvm (0.14.1-1) unstable; urgency=low
 
   * update to upstream 0.14.1

Modified: pve-qemu-kvm/pve2/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/adjust-path.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/adjust-path.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,8 +1,8 @@
-Index: qemu-new/net.h
+Index: new/net.h
 ===================================================================
---- qemu-new.orig/net.h	2010-10-25 12:46:09.000000000 +0200
-+++ qemu-new/net.h	2010-10-25 12:46:11.000000000 +0200
-@@ -167,8 +167,8 @@
+--- new.orig/net.h	2011-08-11 10:04:51.000000000 +0200
++++ new/net.h	2011-08-11 10:09:49.000000000 +0200
+@@ -172,8 +172,8 @@
  int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
  int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
  
@@ -13,23 +13,23 @@
  #ifdef __sun__
  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
  #else
-Index: qemu-new/configure
+Index: new/configure
 ===================================================================
---- qemu-new.orig/configure	2010-10-25 12:46:09.000000000 +0200
-+++ qemu-new/configure	2010-10-25 12:46:11.000000000 +0200
-@@ -300,7 +300,7 @@
- docdir="\${prefix}/share/doc/qemu"
+--- new.orig/configure	2011-08-11 10:04:51.000000000 +0200
++++ new/configure	2011-08-11 10:09:49.000000000 +0200
+@@ -157,7 +157,7 @@
  bindir="\${prefix}/bin"
+ libdir="\${prefix}/lib"
  sysconfdir="\${prefix}/etc"
 -confsuffix="/qemu"
 +confsuffix="/kvm"
  slirp="yes"
  fmod_lib=""
  fmod_inc=""
-Index: qemu-new/net/tap.h
+Index: new/net/tap.h
 ===================================================================
---- qemu-new.orig/net/tap.h	2010-10-25 12:46:29.000000000 +0200
-+++ qemu-new/net/tap.h	2010-10-25 12:46:53.000000000 +0200
+--- new.orig/net/tap.h	2011-08-11 10:04:51.000000000 +0200
++++ new/net/tap.h	2011-08-11 10:09:49.000000000 +0200
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
  #include "qemu-option.h"

Modified: pve-qemu-kvm/pve2/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,8 +1,8 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx	2011-02-25 08:23:43.000000000 +0100
-+++ new/qemu-options.hx	2011-02-25 08:27:35.000000000 +0100
-@@ -74,6 +74,12 @@
+--- new.orig/qemu-options.hx	2011-08-11 10:04:51.000000000 +0200
++++ new/qemu-options.hx	2011-08-11 10:09:56.000000000 +0200
+@@ -89,6 +89,12 @@
  are split equally.
  ETEXI
  
@@ -17,9 +17,9 @@
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/vl.c	2011-02-25 08:28:14.000000000 +0100
-@@ -153,6 +153,8 @@
+--- new.orig/vl.c	2011-08-11 10:04:51.000000000 +0200
++++ new/vl.c	2011-08-11 10:09:56.000000000 +0200
+@@ -150,6 +150,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
  
@@ -28,7 +28,7 @@
  #include "disas.h"
  
  #include "qemu_socket.h"
-@@ -205,6 +207,7 @@
+@@ -203,6 +205,7 @@
  int rtc_td_hack = 0;
  int usb_enabled = 0;
  int singlestep = 0;
@@ -36,7 +36,7 @@
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -1933,6 +1936,7 @@
+@@ -2074,6 +2077,7 @@
  {
      const char *gdbstub_dev = NULL;
      int i;
@@ -44,7 +44,7 @@
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -2622,6 +2626,20 @@
+@@ -2768,6 +2772,20 @@
                      exit(1);
                  }
                  break;
@@ -63,9 +63,9 @@
 +                }
 +                break;
  	    case QEMU_OPTION_vnc:
+ #ifdef CONFIG_VNC
                  display_remote++;
- 		vnc_display = optarg;
-@@ -2972,6 +2990,39 @@
+@@ -3141,6 +3159,39 @@
      if (ram_size == 0)
          ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
  
@@ -108,7 +108,7 @@
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h	2011-02-25 08:27:35.000000000 +0100
++++ new/vzsyscalls.h	2011-08-11 10:09:56.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

Modified: pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,7 +1,7 @@
 Index: new/pc-bios/keymaps/fr-ca
 ===================================================================
---- new.orig/pc-bios/keymaps/fr-ca	2011-02-25 07:01:03.000000000 +0100
-+++ new/pc-bios/keymaps/fr-ca	2011-02-25 07:07:08.000000000 +0100
+--- new.orig/pc-bios/keymaps/fr-ca	2011-08-11 10:04:51.000000000 +0200
++++ new/pc-bios/keymaps/fr-ca	2011-08-11 10:09:38.000000000 +0200
 @@ -14,22 +14,31 @@
  twosuperior 0x9 altgr
  threesuperior 0xa altgr

Modified: pve-qemu-kvm/pve2/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/keymap.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/keymap.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/ui/vnc.c	2011-02-25 08:28:27.000000000 +0100
-@@ -1476,6 +1476,10 @@
+--- new.orig/ui/vnc.c	2011-08-11 10:04:51.000000000 +0200
++++ new/ui/vnc.c	2011-08-11 10:10:00.000000000 +0200
+@@ -1444,6 +1444,10 @@
  
  static void do_key_event(VncState *vs, int down, int keycode, int sym)
  {
@@ -13,7 +13,7 @@
      /* QEMU console switch */
      switch(keycode) {
      case 0x2a:                          /* Left Shift */
-@@ -1546,12 +1550,42 @@
+@@ -1514,12 +1518,42 @@
      }
  
      if (is_graphic_console()) {
@@ -56,7 +56,7 @@
      } else {
          /* QEMU console emulation */
          if (down) {
-@@ -1659,7 +1693,8 @@
+@@ -1627,7 +1661,8 @@
          lsym = lsym - 'A' + 'a';
      }
  

Modified: pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,8 +1,8 @@
 Index: new/arch_init.c
 ===================================================================
---- new.orig/arch_init.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/arch_init.c	2011-02-25 08:28:34.000000000 +0100
-@@ -249,9 +249,10 @@
+--- new.orig/arch_init.c	2011-08-11 10:04:51.000000000 +0200
++++ new/arch_init.c	2011-08-11 10:10:04.000000000 +0200
+@@ -251,9 +251,10 @@
  int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
  {
      ram_addr_t addr;
@@ -14,7 +14,7 @@
  
      if (stage < 0) {
          cpu_physical_memory_set_dirty_tracking(0);
-@@ -291,10 +292,10 @@
+@@ -293,10 +294,10 @@
              qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));
              qemu_put_be64(f, block->length);
          }
@@ -27,7 +27,7 @@
  
      while (!qemu_file_rate_limit(f)) {
          int bytes_sent;
-@@ -306,8 +307,8 @@
+@@ -308,8 +309,8 @@
          }
      }
  
@@ -38,7 +38,7 @@
  
      /* if we haven't transferred anything this round, force expected_time to a
       * a very high value, but without crashing */
-@@ -328,6 +329,10 @@
+@@ -330,6 +331,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

Modified: pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,7 +1,7 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-02-25 08:28:27.000000000 +0100
-+++ new/ui/vnc.c	2011-02-25 08:29:06.000000000 +0100
+--- new.orig/ui/vnc.c	2011-08-11 10:10:00.000000000 +0200
++++ new/ui/vnc.c	2011-08-11 10:10:30.000000000 +0200
 @@ -31,6 +31,8 @@
  #include "qemu-timer.h"
  #include "acl.h"
@@ -11,9 +11,9 @@
  
  #define VNC_REFRESH_INTERVAL_BASE 30
  #define VNC_REFRESH_INTERVAL_INC  50
-@@ -46,6 +48,125 @@
-     } \
- }
+@@ -41,6 +43,125 @@
+ #include "vnc_keysym.h"
+ #include "d3des.h"
  
 +static int pve_vmid = 0;
 +
@@ -137,7 +137,7 @@
  static VncDisplay *vnc_display; /* needed for info vnc */
  static DisplayChangeListener *dcl;
  
-@@ -1829,7 +1950,7 @@
+@@ -1810,7 +1931,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
      if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -146,7 +146,7 @@
          !memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
          vs->write_pixels = vnc_write_pixels_copy;
          vnc_hextile_set_pixel_conversion(vs, 0);
-@@ -1915,7 +2036,7 @@
+@@ -1896,7 +2017,7 @@
          vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -155,7 +155,7 @@
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_unlock_output(vs);
-@@ -2572,7 +2693,7 @@
+@@ -2729,7 +2850,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -164,7 +164,7 @@
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
-@@ -2621,6 +2742,7 @@
+@@ -2778,6 +2899,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -172,7 +172,7 @@
              x509 = 1; /* Require x509 certificates */
              if (strncmp(options, "x509verify", 10) == 0)
                  vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -2643,10 +2765,12 @@
+@@ -2800,10 +2922,12 @@
                  }
                  qemu_free(path);
              } else {
@@ -189,7 +189,7 @@
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -2697,10 +2821,10 @@
+@@ -2856,10 +2980,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -204,8 +204,8 @@
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c	2011-02-25 08:29:06.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c	2011-08-11 10:04:51.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c	2011-08-11 10:10:30.000000000 +0200
 @@ -25,7 +25,107 @@
   */
  
@@ -329,12 +329,12 @@
         VNC_DEBUG("Start TLS auth VNC\n");
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h	2011-02-25 08:23:43.000000000 +0100
-+++ new/ui/vnc.h	2011-02-25 08:29:06.000000000 +0100
-@@ -217,6 +217,8 @@
- 
+--- new.orig/ui/vnc.h	2011-08-11 10:04:51.000000000 +0200
++++ new/ui/vnc.h	2011-08-11 10:12:42.000000000 +0200
+@@ -260,6 +260,8 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
+     int subauth; /* Used by VeNCrypt */
 +    int username_len;
 +    int password_len;
      VncStateTLS tls;
@@ -342,8 +342,8 @@
  #ifdef CONFIG_VNC_SASL
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c	2011-02-25 08:23:43.000000000 +0100
-+++ new/ui/vnc-tls.c	2011-02-25 08:29:06.000000000 +0100
+--- new.orig/ui/vnc-tls.c	2011-08-11 10:04:51.000000000 +0200
++++ new/ui/vnc-tls.c	2011-08-11 10:10:30.000000000 +0200
 @@ -291,6 +291,14 @@
      static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0};
      static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
@@ -400,8 +400,8 @@
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h	2011-02-25 08:23:43.000000000 +0100
-+++ new/ui/vnc-tls.h	2011-02-25 08:29:06.000000000 +0100
+--- new.orig/ui/vnc-tls.h	2011-08-11 10:04:51.000000000 +0200
++++ new/ui/vnc-tls.h	2011-08-11 10:10:30.000000000 +0200
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);
@@ -413,9 +413,9 @@
  
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c	2011-02-25 08:28:14.000000000 +0100
-+++ new/vl.c	2011-02-25 08:29:06.000000000 +0100
-@@ -2628,6 +2628,7 @@
+--- new.orig/vl.c	2011-08-11 10:09:56.000000000 +0200
++++ new/vl.c	2011-08-11 10:10:30.000000000 +0200
+@@ -2774,6 +2774,7 @@
                  break;
              case QEMU_OPTION_id:
                  fairsched_id = atoi(optarg);

Modified: pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch	2011-08-11 08:20:18 UTC (rev 6458)
@@ -1,8 +1,8 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h	2011-02-25 08:27:21.000000000 +0100
-+++ new/net.h	2011-02-25 08:28:42.000000000 +0100
-@@ -124,7 +124,7 @@
+--- new.orig/net.h	2011-08-11 10:09:49.000000000 +0200
++++ new/net.h	2011-08-11 10:10:08.000000000 +0200
+@@ -126,7 +126,7 @@
  
  /* NIC info */
  
@@ -10,4 +10,4 @@
 +#define MAX_NICS 32
  
  struct NICInfo {
-     uint8_t macaddr[6];
+     MACAddr macaddr;

Modified: pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff	2011-08-11 08:20:18 UTC (rev 6458)
@@ -3,8 +3,8 @@
 
 Index: new/kvm/libkvm/libkvm.h
 ===================================================================
---- new.orig/kvm/libkvm/libkvm.h	2011-02-25 08:23:43.000000000 +0100
-+++ new/kvm/libkvm/libkvm.h	2011-02-25 08:28:45.000000000 +0100
+--- new.orig/kvm/libkvm/libkvm.h	2011-08-11 10:04:51.000000000 +0200
++++ new/kvm/libkvm/libkvm.h	2011-08-11 10:10:13.000000000 +0200
 @@ -15,7 +15,7 @@
  #define __user /* temporary, until installed via make headers_install */
  #endif

Modified: pve-qemu-kvm/pve2/debian/rules
===================================================================
--- pve-qemu-kvm/pve2/debian/rules	2011-08-11 07:50:26 UTC (rev 6457)
+++ pve-qemu-kvm/pve2/debian/rules	2011-08-11 08:20:18 UTC (rev 6458)
@@ -83,7 +83,7 @@
 	install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown
 
 	# install gPXE bios images
-	install -m0644 debian/roms/*.bin $(destdir)/usr/share/kvm
+	install -m0644 $(CURDIR)/pc-bios/pxe-*.rom $(destdir)/usr/share/kvm
 
 	for f in bios vgabios vgabios-cirrus vgabios-qxl vgabios-stdvga vgabios-vmware; do \
 		install -m 0644 pc-bios/$$f.bin $(destdir)/usr/share/kvm/$$f.bin; \
@@ -93,6 +93,9 @@
 		install -m 0644 pc-bios/optionrom/$$f.bin $(destdir)/usr/share/kvm/$$f.bin; \
 	done
 
+        # remove guest agent (that is only required for a guest)
+	rm $(destdir)/usr/bin/qemu-ga
+
 	# Remove things we don't package at all, would be a "kvm-dev" package
 	rm -Rf $(destdir)/usr/include/linux/
 	rm -Rf $(destdir)/usr/include



More information about the pve-devel mailing list