Hello community,
here is the log from the commit of package kvm for openSUSE:Factory
checked in at Mon Aug 8 15:35:53 CEST 2011.
--------
--- kvm/kvm.changes 2011-07-08 19:01:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/kvm/kvm.changes 2011-08-05 15:17:20.000000000 +0200
@@ -1,0 +2,21 @@
+Sun Jul 31 23:30:40 UTC 2011 - brogers@novell.com
+
+- update to v0.15.0 rc1
+- update to latest ipxe and seabios upstream development sources
+- build seabios with ahci support enabled
+- add a BuildRequires for xfsprogs-devel so trim/discard is enabled
+ for raw images.
+- add braile support
+- enable linux AIO
+- pulse audio is now first in list - making it the default interface
+
+-------------------------------------------------------------------
+Thu Jul 14 14:18:51 CEST 2011 - agraf@suse.de
+
+- fix RAM limit on s390x (bnc#689081)
+- automatically load kvm kernel module on s390x (bnc#691668)
+- make dzip big-endian safe (bnc#692217)
+- fix potential endless loop in dictzip (bnc#693592)
+- update s390 patches to fit with 0.15
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
0001-qxl-spice-display-move-pipe-to-ssd.patch
0002-qxl-implement-get_command-in-vga-mode-without-locks.patch
0003-qxl-spice-remove-qemu_mutex_-un-lock_iothread-around.patch
0004-hw-qxl-render-drop-cursor-locks-replace-with-pipe.patch
S390-0002-S390-Tell-user-why-VM-creation-failed.patch
S390-0004-Always-notify-consumers-of-char-devices-if-they-re-o.patch
S390-0005--S390-Implement-virtio-reset.patch
S390-0006--S390-Add-firmware-code.patch
S390-qemu-kvm.patch
gpxe-1.0.1.tar.bz2
gpxe-add_unused_attribute.patch
gpxe-arbel-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-ath5k-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-atl1e-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-e1000-Remove-unused-variable-when-ICR-register-is.patch
gpxe-eepro-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-epic100-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-etherfabric-Avoid-unused-variable-warning-in-gcc-4.patch
gpxe-forcedeth-Avoid-unused-but-set-variable-warning-in.patch
gpxe-hermon-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-ns83820-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-pcbios-interface-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-phantom-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-rom-settings.patch
gpxe-sis190-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-sis900-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-sky2-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-smc9000-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-uri-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-via-velocity-Avoid-unused-variable-warning-in-gcc.patch
gpxe-virtio-net-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-vxge-Avoid-unused-variable-warning-in-gcc-4.6.patch
gpxe-w89c840-Avoid-unused-variable-warning-in-gcc-4.6.patch
kvm-bios.patch
kvm-qemu-ide-ich6.patch
kvm-qemu-lpc.patch
kvm-qemu-macmodel.patch
kvm-qemu-no-hot-unplug-for-certain-devices.patch
kvm-qemu-preXX-Fix-performance-regression-in-qemu_get_ram.patch
kvm-qemu-preXX-bitmap-add-a-generic-bitmap-and-bitops-lib.patch
kvm-qemu-preXX-device-assignment-detect-pre-fectchable-me.patch
kvm-qemu-preXX-e1000-check-buffer-availability.patch
kvm-qemu-preXX-e1000-clear-EOP-for-multi-buffer-descripto.patch
kvm-qemu-preXX-e1000-fix-multi-descriptor-packet-checksum.patch
kvm-qemu-preXX-e1000-multi-buffer-packet-support.patch
kvm-qemu-preXX-e1000-verify-we-have-buffers-upfront.patch
kvm-qemu-preXX-eepro100-pad-to-ensure-minimum-packet-size.patch
kvm-qemu-preXX-fix-linuxboot.bin-and-multiboot.bin-to-not.patch
kvm-qemu-preXX-fix-rom-file-name-for-e100-nic.patch
kvm-qemu-preXX-fix-vnc-regression.patch
kvm-qemu-preXX-hw-pcnet.c-Fix-EPROM-contents-to-suit-AMD-.patch
kvm-qemu-preXX-kvm-Mark-VCPU-state-dirty-on-creation.patch
kvm-qemu-preXX-net-fix-qemu_can_send_packet-logic.patch
kvm-qemu-preXX-qemu-kvm-Mark-VCPU-state-dirty-on-creation.patch
kvm-qemu-preXX-severe-memory-leak-caused-by-broken-palett.patch
kvm-qemu-preXX-ui-vnc-enc-tight.c-Fix-compile-failure-if-.patch
kvm-qemu-preXX-validate-virtqueue.patch
kvm-qemu-preXX-virtio-guard-against-negative-vq-notifies.patch
kvm-qemu-preXX-virtio-serial-don-t-crash-on-invalid-input.patch
kvm-qemu-preXX-vnc-Add-ZRLE-and-ZYWRLE-encodings.patch
kvm-qemu-preXX-vnc-Fix-stack-corruption-and-other-bitmap-.patch
kvm-qemu-preXX-vnc-add-a-way-to-get-the-update-frequency-.patch
kvm-qemu-preXX-vnc-don-t-set-the-quality-if-lossy-encodin.patch
kvm-qemu-preXX-vnc-fix-a-memory-leak-in-threaded-vnc-serv.patch
kvm-qemu-preXX-vnc-fix-build-error-from-VNC_DIRTY_WORDS.patch
kvm-qemu-preXX-vnc-fix-lossy-rect-refreshing.patch
kvm-qemu-preXX-vnc-fix-uint8_t-comparisons-with-negative-.patch
kvm-qemu-preXX-vnc-palette-add-palette_init-calls.patch
kvm-qemu-preXX-vnc-palette-and-fill-and-color-calls.patch
kvm-qemu-preXX-vnc-palette-use-a-pool-to-reduce-memory-al.patch
kvm-qemu-preXX-vnc-refresh-lossy-rect-after-a-given-timeo.patch
kvm-qemu-preXX-vnc-tight-use-the-update-frequency-to-choo.patch
kvm-qemu-preXX-vnc-use-the-new-generic-bitmap-functions.patch
kvm-qemu-rtl8139-link.patch
kvm-seabios-gcc46-fixes.patch
qemu-kvm-0.14.1.tar.bz2
s390-zipl.rom
seabios-0.6.2.tar.bz2
New:
----
S390-hp-0001--S390-Add-hotplug-support.patch
S390-hp-0002-Compile-device-hotplug-on-all-targets.patch
S390-hp-0003-Add-generic-drive-hotplugging.patch
S390-hp-0004-Expose-drive_add-on-all-architectures.patch
S390-no-tpr.patch
ipxe-git-149b502.tar.bz2
ipxe-rom-settings.patch
kvm-qemu-preXX-console.patch
kvm-seabios-enable-ahci.patch
qemu-kvm-0.15.rc1.tar.bz2
qemu-kvm-common-code-fixes-for-s390-build.patch
seabios-git-e0f87ce.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kvm.spec ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:55.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:55.000000000 +0200
@@ -20,13 +20,13 @@
%bcond_with spice
-%define package_base_version 0.14.1
-%define package_extra_version .0
-%define bios_id seabios-0.6.2
-%define pxe_rom_id gpxe-1.0.1
+%define package_true_version 0.15.rc1
+%define package_base_version 0.15.0
+%define bios_id seabios-git-e0f87ce
+%define pxe_rom_id ipxe-git-149b502
%define vgabios_id vgabios-0.6c
-# note that this list doesn't include the gpxe roms since they get handled
+# note that this list doesn't include the ipxe roms since they get handled
# individually and not as a group
%define firmware_files {bios.bin vgabios.bin vgabios-cirrus.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin optionrom/extboot.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/vapic.bin}
@@ -35,23 +35,18 @@
%ifarch %ix86 x86_64
# choice of building all from source or using provided binary x86 blobs
%define build_fw_from_source 1
-# build the Mac BIOS on x86 platforms
-%define mac_bios 1
%else
%define build_fw_from_source 0
-# build no Mac BIOS on others
-%define mac_bios 0
%endif
-%define mac_patches_ported 0
%define using_buildservice 0%{?opensuse_bs}
Name: kvm
BuildRequires: SDL-devel alsa alsa-devel gnutls-devel libaio-devel
BuildRequires: libcurl-devel libpulse-devel ncurses-devel pciutils-devel perl
-BuildRequires: python texinfo
+BuildRequires: glib2-devel libattr-devel python texinfo xfsprogs-devel
%if 0%{?suse_version} >= 1130
-BuildRequires: brlapi-devel libattr-devel
+BuildRequires: brlapi-devel
%endif
%ifarch %ix86 x86_64 ia64
%if %{build_fw_from_source}
@@ -83,126 +78,58 @@
%if 0%{?suse_version} < 1110
Requires: kvm-kmp
%endif
-Requires(pre): pwdutils
License: BSD3c ; GPLv2 ; GPLv2+ ; LGPLv2.1+ ; MIT
Group: System/Kernel
Summary: Kernel-based Virtual Machine
-Url: http://kvm.qumranet.com/
-Version: %{package_base_version}%{package_extra_version}
-Release: 9
-Source0: qemu-%{name}-%{package_base_version}.tar.bz2
+Url: http://www.linux-kvm.org
+Version: %{package_true_version}
+Release: 1
+Source0: qemu-%{name}-%{package_true_version}.tar.bz2
Source1: 60-kvm.rules
Source2: qemu-ifup
+Source3: kvm-supported.txt
Source4: win-virtio-drivers.iso
Source5: win-virtio-drivers-src.tar.bz2
Source6: %{bios_id}.tar.bz2
Source7: %{pxe_rom_id}.tar.bz2
Source8: bcc-0.16.17-2.i486.rpm
Source9: %{vgabios_id}.tar.bz2
-Source10: kvm-supported.txt
-Source11: s390-zipl.rom
# common and X86 patches
-Patch01: gpxe-rom-settings.patch
-Patch02: gpxe-add_unused_attribute.patch
-Patch03: gpxe-atl1e-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch04: gpxe-smc9000-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch05: gpxe-vxge-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch06: gpxe-uri-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch07: gpxe-phantom-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch08: gpxe-hermon-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch09: gpxe-pcbios-interface-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch10: gpxe-forcedeth-Avoid-unused-but-set-variable-warning-in.patch
-Patch11: gpxe-ath5k-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch12: gpxe-arbel-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch13: gpxe-w89c840-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch14: gpxe-via-velocity-Avoid-unused-variable-warning-in-gcc.patch
-Patch15: gpxe-sky2-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch16: gpxe-sis900-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch17: gpxe-sis190-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch18: gpxe-etherfabric-Avoid-unused-variable-warning-in-gcc-4.patch
-Patch19: gpxe-epic100-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch20: gpxe-eepro-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch21: gpxe-virtio-net-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch22: gpxe-ns83820-Avoid-unused-variable-warning-in-gcc-4.6.patch
-Patch23: gpxe-e1000-Remove-unused-variable-when-ICR-register-is.patch
-
-Patch40: seabios-sanitize-version.patch
-
-Patch50: vgabios-bcc-paths.patch
-
-Patch60: qemu-datadir.diff
-Patch61: kvm-qemu-default-memsize.patch
-Patch62: kvm-qemu-user-space-tool-name.patch
-Patch63: kvm-qemu-preXX-fix-rom-file-name-for-e100-nic.patch
-Patch64: kvm-qemu-fix-unused-but-set.patch
-Patch65: kvm-seabios-gcc46-fixes.patch
-
-# Mac OS X patches
-Patch90: kvm-qemu-lpc.patch
-Patch91: kvm-qemu-ide-ich6.patch
-Patch92: kvm-qemu-macmodel.patch
-Patch93: kvm-qemu-rtl8139-link.patch
-Patch94: kvm-bios.patch
+Patch01: ipxe-rom-settings.patch
+Patch02: seabios-sanitize-version.patch
+Patch03: vgabios-bcc-paths.patch
+Patch04: qemu-datadir.diff
+Patch05: kvm-qemu-default-memsize.patch
+Patch06: kvm-qemu-user-space-tool-name.patch
+Patch07: kvm-seabios-enable-ahci.patch
+Patch08: kvm-qemu-fix-unused-but-set.patch
+
# Post-release upstream patches
Patch100: kvm-qemu-preXX-dictzip1.patch
Patch101: kvm-qemu-preXX-dictzip2.patch
Patch102: kvm-qemu-preXX-report-default-mac-used.patch
-Patch103: kvm-qemu-preXX-eepro100-pad-to-ensure-minimum-packet-size.patch
-Patch104: kvm-qemu-preXX-vnc-fix-a-memory-leak-in-threaded-vnc-serv.patch
-Patch105: kvm-qemu-preXX-device-assignment-detect-pre-fectchable-me.patch
-Patch106: kvm-qemu-preXX-qemu-kvm-Mark-VCPU-state-dirty-on-creation.patch
-Patch107: kvm-qemu-preXX-net-fix-qemu_can_send_packet-logic.patch
-Patch108: kvm-qemu-preXX-hw-pcnet.c-Fix-EPROM-contents-to-suit-AMD-.patch
-Patch109: kvm-qemu-preXX-fix-linuxboot.bin-and-multiboot.bin-to-not.patch
-Patch110: kvm-qemu-preXX-Fix-performance-regression-in-qemu_get_ram.patch
-Patch111: kvm-qemu-preXX-kvm-Mark-VCPU-state-dirty-on-creation.patch
-Patch112: kvm-qemu-preXX-virtio-serial-don-t-crash-on-invalid-input.patch
-Patch113: kvm-qemu-preXX-e1000-multi-buffer-packet-support.patch
-Patch114: kvm-qemu-preXX-e1000-clear-EOP-for-multi-buffer-descripto.patch
-Patch115: kvm-qemu-preXX-e1000-verify-we-have-buffers-upfront.patch
-Patch116: kvm-qemu-preXX-e1000-fix-multi-descriptor-packet-checksum.patch
-Patch117: kvm-qemu-preXX-e1000-check-buffer-availability.patch
-Patch118: kvm-qemu-preXX-vnc-don-t-set-the-quality-if-lossy-encodin.patch
-Patch119: kvm-qemu-preXX-vnc-add-a-way-to-get-the-update-frequency-.patch
-Patch120: kvm-qemu-preXX-vnc-refresh-lossy-rect-after-a-given-timeo.patch
-Patch121: kvm-qemu-preXX-vnc-tight-use-the-update-frequency-to-choo.patch
-Patch122: kvm-qemu-preXX-vnc-palette-use-a-pool-to-reduce-memory-al.patch
-Patch123: kvm-qemu-preXX-vnc-palette-add-palette_init-calls.patch
-Patch124: kvm-qemu-preXX-vnc-palette-and-fill-and-color-calls.patch
-Patch125: kvm-qemu-preXX-vnc-Add-ZRLE-and-ZYWRLE-encodings.patch
-Patch126: kvm-qemu-preXX-vnc-fix-uint8_t-comparisons-with-negative-.patch
-Patch127: kvm-qemu-preXX-vnc-fix-lossy-rect-refreshing.patch
-Patch128: kvm-qemu-preXX-bitmap-add-a-generic-bitmap-and-bitops-lib.patch
-Patch129: kvm-qemu-preXX-ui-vnc-enc-tight.c-Fix-compile-failure-if-.patch
-Patch130: kvm-qemu-preXX-vnc-use-the-new-generic-bitmap-functions.patch
-Patch131: kvm-qemu-preXX-vnc-Fix-stack-corruption-and-other-bitmap-.patch
-Patch132: kvm-qemu-preXX-fix-vnc-regression.patch
-Patch133: kvm-qemu-preXX-vnc-fix-build-error-from-VNC_DIRTY_WORDS.patch
-Patch134: kvm-qemu-preXX-severe-memory-leak-caused-by-broken-palett.patch
-Patch135: kvm-qemu-no-hot-unplug-for-certain-devices.patch
-Patch136: kvm-qemu-preXX-virtio-guard-against-negative-vq-notifies.patch
-Patch137: kvm-qemu-preXX-validate-virtqueue.patch
+Patch103: kvm-qemu-preXX-console.patch
+
+Patch155: qemu-kvm-common-code-fixes-for-s390-build.patch
Patch200: qemu-img-vmdk-scsi.patch
Patch201: kvm-studio-slirp-nooutgoing.patch
Patch202: kvm-studio-vnc.patch
+
# for IA64
Source500: ia64-fix-pagesize.pl
Patch500: IA64-kvm-suse.patch
Patch501: IA64-compile-fix-suse.patch
+
# for S390
-Patch700: S390-qemu-kvm.patch
+Patch700: S390-no-tpr.patch
Patch701: S390-qemu-early-printk.patch
-Patch702: S390-0002-S390-Tell-user-why-VM-creation-failed.patch
-Patch703: S390-0003-Make-char-muxer-more-robust-wrt-small-FIFOs.patch
-Patch704: S390-0004-Always-notify-consumers-of-char-devices-if-they-re-o.patch
-Patch705: S390-0005--S390-Implement-virtio-reset.patch
-Patch706: S390-0006--S390-Add-firmware-code.patch
-#Fix QXL locking issues for spice:
-Patch800: 0001-qxl-spice-display-move-pipe-to-ssd.patch
-Patch801: 0002-qxl-implement-get_command-in-vga-mode-without-locks.patch
-Patch802: 0003-qxl-spice-remove-qemu_mutex_-un-lock_iothread-around.patch
-Patch803: 0004-hw-qxl-render-drop-cursor-locks-replace-with-pipe.patch
+Patch702: S390-0003-Make-char-muxer-more-robust-wrt-small-FIFOs.patch
+Patch703: S390-hp-0001--S390-Add-hotplug-support.patch
+Patch704: S390-hp-0002-Compile-device-hotplug-on-all-targets.patch
+Patch705: S390-hp-0003-Add-generic-drive-hotplugging.patch
+Patch706: S390-hp-0004-Expose-drive_add-on-all-architectures.patch
+
# For upstream patches:
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: /usr/sbin/groupadd
@@ -222,7 +149,7 @@
features outside the processor such as iommu and sr-iov are used by KVM
allowing for improved performance.
-The seabios, vgabios and gpxe open source projects are also pulled from
+The seabios, vgabios and ipxe open source projects are also pulled from
to provide the firmware components included.
To increase performance over emulated hardware devices virtio drivers
@@ -232,6 +159,7 @@
libvirt, virt-manager and vm-install.
+
Authors:
--------
Avi Kivity
@@ -245,105 +173,36 @@
rpm2cpio %{SOURCE8} | cpio -id ./usr/bin/bcc ./usr/lib/bcc/bcc-cc1
%setup -q -T -D -n %{pxe_rom_id} -b 7
%patch01 -p1
-%patch02 -p1
-%patch03 -p1
-%patch04 -p1
-%patch05 -p1
-%patch06 -p1
-%patch07 -p1
-%patch08 -p1
-%patch09 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
%endif
-%setup -q -n qemu-%{name}-%{package_base_version} -a 6 -a 9
+%setup -q -n qemu-%{name}-%{package_true_version} -a 6 -a 9
%if %{build_fw_from_source}
#ensure that we only end up with the ones we built
for i in %firmware_files
do
rm -f pc-bios/$i
done
-%patch40 -p1
-%patch50 -p1
-%endif
-cp %{SOURCE10} .
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-# Mac OS X guest
-%if %{mac_bios}
-%if %{mac_patches_ported}
-%patch90 -p1
-%endif
-%patch91 -p1
-%if %{mac_patches_ported}
-%patch92 -p1
-%patch93 -p1
-%endif
-cp -a roms/seabios roms/seabios-mac
-%if %{mac_patches_ported}
-%patch94 -p1 -b .bios-mac
-%endif
+%patch02 -p1
+%patch03 -p1
%endif
+cp %{SOURCE3} .
+%patch04 -p1
+%patch05 -p1
+%patch06 -p1
+%patch07 -p1
+%patch08 -p1
# Post-release patches
%patch100 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
-%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
-%patch134 -p1
-%patch135 -p1
-%patch136 -p1
-%patch137 -p1
+
+%patch155 -p1
# Studio addons
%patch200 -p1
%patch201 -p1
%patch202 -p1
+
# IA64 support
%ifarch ia64
%patch500 -p1
@@ -360,13 +219,6 @@
%patch706 -p1
%endif
-%patch800 -p1
-%patch801 -p1
-%patch802 -p1
-%patch803 -p1
-
-cp %{SOURCE11} pc-bios/
-
%build
# change from devel version to actual version
echo "%{package_base_version}" > VERSION
@@ -440,9 +292,6 @@
%if %{build_fw_from_source}
make -C roms/seabios %{?jobs:-j%jobs}
cp roms/seabios/out/bios.bin pc-bios/bios.bin
-%if %{mac_bios}
-make -C roms/seabios-mac %{?jobs:-j%jobs}
-%endif
make -C roms/vgabios %{?jobs:-j%jobs}
cp roms/vgabios/VGABIOS-lgpl-latest.bin pc-bios/vgabios.bin
@@ -462,11 +311,9 @@
%install
make DESTDIR=%{buildroot} install %{?jobs:-j%jobs}
-%if %{mac_bios}
-install -m 644 roms/seabios-mac/out/bios.bin %{buildroot}%{_datadir}/qemu-kvm/bios-mac.bin
-%endif
mkdir -p %{buildroot}%{_docdir}/kvm
cp qemu-doc.html qemu-kvm.html
+cp qemu-tech.html qemu-kvm-tech.html
install -m 755 kvm/kvm_stat %{buildroot}%{_bindir}/
%if %{build_fw_from_source}
for i in %firmware_files
@@ -474,28 +321,29 @@
install -m 644 pc-bios/$i %{buildroot}%{_datadir}/qemu-kvm/
done
install_rom() {
- install -m 644 $1.rom %{buildroot}%{_datadir}/qemu-kvm/$2.bin
+ install -m 644 $1.rom %{buildroot}%{_datadir}/qemu-kvm/$2.rom
}
cd ../%{pxe_rom_id}/src/bin/
install_rom 8086100e pxe-e1000
install_rom 10222000 pxe-pcnet
install_rom 10500940 pxe-ne2k_pci
install_rom 10ec8139 pxe-rtl8139
-install_rom 80861209 pxe-i82559er
+install_rom 80861209 pxe-eepro100
install_rom 1af41000 pxe-virtio
%endif
cd %{buildroot}
rm -r .{%_bindir/qemu-io,%_bindir/qemu-nbd,%_datadir/doc/qemu}
mv .%_bindir/qemu-img{,-kvm}
%if !%{build_fw_from_source}
-rm -r .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,video.x,bamboo.dtb,petalogix-s3adsp1800.dtb}
+rm -r .%_datadir/qemu-kvm/{openbios-sparc32,openbios-sparc64,ppc_rom.bin,openbios-ppc,bamboo.dtb,petalogix-ml605.dtb,petalogix-s3adsp1800.dtb}
%endif
%ifarch ia64 s390x
-rm -f .%_datadir/qemu-kvm/bios.bin
+rm .%_datadir/qemu-kvm/bios.bin
%endif
-rm -r .{%_mandir/man1/qemu-img.1,%_mandir/man8/qemu-nbd.8}
+rm -r .%_mandir/man8/qemu-nbd.8
mv .%_bindir/{qemu-system*,qemu-kvm}
mv .%_mandir/man1/{qemu.1,qemu-kvm.1}
+mv .%_mandir/man1/{qemu-img.1,qemu-img-kvm.1}
chmod 644 .%_mandir/man1/*
install -D -m 644 %{SOURCE1} %{buildroot}/etc/udev/rules.d/60-kvm.rules
install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu-kvm/qemu-ifup
@@ -516,15 +364,16 @@
%files
%defattr(-,root,root)
-%doc qemu-kvm.html kvm-supported.txt
+%doc qemu-kvm.html qemu-kvm-tech.html kvm-supported.txt
%attr(755,root,kvm) %{_bindir}/qemu-kvm
%attr(755,root,kvm) %{_bindir}/qemu-img-kvm
+%attr(755,root,kvm) %{_bindir}/qemu-ga
%attr(755,root,kvm) %{_bindir}/kvm_stat
%{_datadir}/qemu-kvm
%dir %attr(0700, root, kvm) %{_sysconfdir}/qemu-kvm/
-%attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf
-%config %{_sysconfdir}/qemu-kvm/target-x86_64.conf
+%config %attr(644,root,kvm) %{_sysconfdir}/qemu-kvm/target-x86_64.conf
%config %{_sysconfdir}/udev/rules.d/60-kvm.rules
%_mandir/man1/qemu-kvm.1.gz
+%_mandir/man1/qemu-img-kvm.1.gz
%changelog
++++++ S390-0003-Make-char-muxer-more-robust-wrt-small-FIFOs.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:55.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:55.000000000 +0200
@@ -45,7 +45,7 @@
+ /* We're still not able to sync producer and consumer, so let's wait a bit
+ and try again by then. */
+ if (d->prod[m] != d->cons[m]) {
-+ qemu_mod_timer(d->accept_timer, qemu_get_clock(vm_clock)
++ qemu_mod_timer(d->accept_timer, qemu_get_clock_ns(vm_clock)
+ + (int64_t)100000);
+ }
}
@@ -55,7 +55,7 @@
chr->opaque = d;
d->drv = drv;
d->focus = -1;
-+ d->accept_timer = qemu_new_timer(vm_clock,
++ d->accept_timer = qemu_new_timer_ns(vm_clock,
+ (QEMUTimerCB*)mux_chr_accept_input, chr);
chr->chr_write = mux_chr_write;
chr->chr_update_read_handler = mux_chr_update_read_handler;
++++++ S390-hp-0001--S390-Add-hotplug-support.patch ++++++
From 2ec0061923fd7ec30d51a1cf5a7ab0df2d227c9c Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 23 Aug 2010 18:58:34 +0200
Subject: [PATCH 1/4] [S390] Add hotplug support
I just submitted a few patches that enable the s390 virtio bus to receive
a hotplug add event. This patch implements the qemu side of it, so that new
hotplug events can be submitted to the guest.
Signed-off-by: Alexander Graf
---
v1 -> v2:
- make s390 virtio hoplug code emulate-capable
---
hw/s390-virtio-bus.c | 24 +++++++++++++++++++-----
hw/s390-virtio-bus.h | 5 +++++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index e2f3e32..0adbddb 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -82,12 +82,24 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size)
bus->dev_offs = bus->dev_page;
bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE;
+ /* Enable hotplugging */
+ _bus->allow_hotplug = 1;
+
/* Allocate RAM for VirtIO device pages (descriptors, queues, rings) */
*ram_size += S390_DEVICE_PAGES * TARGET_PAGE_SIZE;
return bus;
}
+static void s390_virtio_irq(CPUState *env, int config_change, uint64_t token)
+{
+ if (kvm_enabled()) {
+ kvm_s390_virtio_irq(env, config_change, token);
+ } else {
+ cpu_inject_ext(env, VIRTIO_EXT_CODE, config_change, token);
+ }
+}
+
static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev)
{
VirtIOS390Bus *bus;
@@ -109,6 +121,11 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev)
dev->host_features = vdev->get_features(vdev, dev->host_features);
s390_virtio_device_sync(dev);
+ if (dev->qdev.hotplugged) {
+ CPUState *env = s390_cpu_addr2state(0);
+ s390_virtio_irq(env, VIRTIO_PARAM_DEV_ADD, dev->dev_offs);
+ }
+
return 0;
}
@@ -313,11 +330,7 @@ static void virtio_s390_notify(void *opaque, uint16_t vector)
uint64_t token = s390_virtio_device_vq_token(dev, vector);
CPUState *env = s390_cpu_addr2state(0);
- if (kvm_enabled()) {
- kvm_s390_virtio_irq(env, 0, token);
- } else {
- cpu_inject_ext(env, VIRTIO_EXT_CODE, 0, token);
- }
+ s390_virtio_irq(env, 0, token);
}
static unsigned virtio_s390_get_features(void *opaque)
@@ -385,6 +398,7 @@ static void s390_virtio_bus_register_withprop(VirtIOS390DeviceInfo *info)
{
info->qdev.init = s390_virtio_busdev_init;
info->qdev.bus_info = &s390_virtio_bus_info;
+ info->qdev.unplug = qdev_simple_unplug_cb;
assert(info->qdev.size >= sizeof(VirtIOS390Device));
qdev_register(&info->qdev);
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
index f1bece7..d02a907 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390-virtio-bus.h
@@ -35,6 +35,11 @@
#define VIRTIO_RING_LEN (TARGET_PAGE_SIZE * 3)
#define S390_DEVICE_PAGES 512
+#define VIRTIO_PARAM_MASK 0xff
+#define VIRTIO_PARAM_VRING_INTERRUPT 0x0
+#define VIRTIO_PARAM_CONFIG_CHANGED 0x1
+#define VIRTIO_PARAM_DEV_ADD 0x2
+
typedef struct VirtIOS390Device {
DeviceState qdev;
ram_addr_t dev_offs;
--
1.6.0.2
++++++ S390-hp-0002-Compile-device-hotplug-on-all-targets.patch ++++++
From 7594628857b0b0c8d8dd8a424ba1e289c8f2f952 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 23 Aug 2010 23:40:28 +0200
Subject: [PATCH 2/4] Compile device-hotplug on all targets
All guest targets could potentially implement hotplugging. With the next
patches in this set I will also reflect this in the monitor interface.
So let's always compile it in. It shouldn't hurt.
Signed-off-by: Alexander Graf
---
Makefile.target | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Index: qemu-kvm-0.14.50/Makefile.target
===================================================================
--- qemu-kvm-0.14.50.orig/Makefile.target
+++ qemu-kvm-0.14.50/Makefile.target
@@ -236,12 +236,15 @@ ifeq ($(CONFIG_KVM), y)
endif
obj-$(CONFIG_IVSHMEM) += ivshmem.o
+# Generic hotplugging
+obj-y += device-hotplug.o
+
# Hardware support
obj-i386-y += vga.o
obj-i386-y += mc146818rtc.o i8259.o pc.o
obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o
obj-i386-y += vmport.o
-obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
+obj-i386-y += pci-hotplug.o smbios.o wdt_ib700.o
obj-i386-y += extboot.o
obj-i386-y += debugcon.o multiboot.o
obj-i386-y += pc_piix.o
++++++ S390-hp-0003-Add-generic-drive-hotplugging.patch ++++++
From 3a47b885cb83565a684caeda37494cdfa01fb884 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 23 Aug 2010 23:43:10 +0200
Subject: [PATCH 3/4] Add generic drive hotplugging
The monitor command for hotplugging is in i386 specific code. This is just
plain wrong, as S390 just learned how to do hotplugging too and needs to
get drives for that.
So let's add a generic copy to generic code that handles drive_add in a
way that doesn't have pci dependencies. All pci specific code can then
be handled in a pci specific function.
Signed-off-by: Alexander Graf
---
v1 -> v2:
- align generic drive_add to pci specific one
- rework to split between generic and pci code
---
hw/device-hotplug.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
hw/pci-hotplug.c | 24 ++++--------------------
sysemu.h | 6 +++++-
3 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 8b2ed7a..eb6dd0e 100644
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -26,6 +26,9 @@
#include "boards.h"
#include "net.h"
#include "blockdev.h"
+#include "qemu-config.h"
+#include "sysemu.h"
+#include "monitor.h"
DriveInfo *add_init_drive(const char *optstr)
{
@@ -44,3 +47,51 @@ DriveInfo *add_init_drive(const char *optstr)
return dinfo;
}
+
+#if !defined(TARGET_I386)
+int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
+ DriveInfo *dinfo, int type)
+{
+ /* On non-x86 we don't do PCI hotplug */
+ monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
+ return -1;
+}
+#endif
+
+/*
+ * This version of drive_hot_add does not know anything about PCI specifics.
+ * It is used as fallback on architectures that don't implement pci-hotplug.
+ */
+void drive_hot_add(Monitor *mon, const QDict *qdict)
+{
+ int type;
+ DriveInfo *dinfo = NULL;
+ const char *opts = qdict_get_str(qdict, "opts");
+
+ dinfo = add_init_drive(opts);
+ if (!dinfo) {
+ goto err;
+ }
+ if (dinfo->devaddr) {
+ monitor_printf(mon, "Parameter addr not supported\n");
+ goto err;
+ }
+ type = dinfo->type;
+
+ switch (type) {
+ case IF_NONE:
+ monitor_printf(mon, "OK\n");
+ break;
+ default:
+ if (pci_drive_hot_add(mon, qdict, dinfo, type)) {
+ goto err;
+ }
+ }
+ return;
+
+err:
+ if (dinfo) {
+ drive_put_ref(dinfo);
+ }
+ return;
+}
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index b59be2a..f08d367 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -103,24 +103,13 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
return 0;
}
-void drive_hot_add(Monitor *mon, const QDict *qdict)
+int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
+ DriveInfo *dinfo, int type)
{
int dom, pci_bus;
unsigned slot;
- int type;
PCIDevice *dev;
- DriveInfo *dinfo = NULL;
const char *pci_addr = qdict_get_str(qdict, "pci_addr");
- const char *opts = qdict_get_str(qdict, "opts");
-
- dinfo = add_init_drive(opts);
- if (!dinfo)
- goto err;
- if (dinfo->devaddr) {
- monitor_printf(mon, "Parameter addr not supported\n");
- goto err;
- }
- type = dinfo->type;
switch (type) {
case IF_SCSI:
@@ -137,19 +126,14 @@ void drive_hot_add(Monitor *mon, const QDict *qdict)
goto err;
}
break;
- case IF_NONE:
- monitor_printf(mon, "OK\n");
- break;
default:
monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
goto err;
}
- return;
+ return 0;
err:
- if (dinfo)
- drive_put_ref(dinfo);
- return;
+ return -1;
}
static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
diff --git a/sysemu.h b/sysemu.h
index d3013f5..9c8e50f 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -144,9 +144,13 @@ extern unsigned int nb_prom_envs;
/* pci-hotplug */
void pci_device_hot_add(Monitor *mon, const QDict *qdict);
-void drive_hot_add(Monitor *mon, const QDict *qdict);
+int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
+ DriveInfo *dinfo, int type);
void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);
+/* generic hotplug */
+void drive_hot_add(Monitor *mon, const QDict *qdict);
+
/* pcie aer error injection */
void pcie_aer_inject_error_print(Monitor *mon, const QObject *data);
int do_pcie_aer_inejct_error(Monitor *mon,
--
1.6.0.2
++++++ S390-hp-0004-Expose-drive_add-on-all-architectures.patch ++++++
From 6c81f693d143e28357a27d6c732a31e5e6130f11 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Wed, 13 Jul 2011 14:08:32 +0200
Subject: [PATCH 4/4] Expose drive_add on all architectures
All architectures can now use drive_add on the monitor. This of course
does not mean that there is hotplug support for the specific platform,
so in order to actually make use of the new drives you still need to
have a hotplug capable device.
Signed-off-by: Alexander Graf
---
hmp-commands.hx | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 6ad8806..e275f88 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -857,7 +857,6 @@ STEXI
Snapshot device, using snapshot file as target if provided
ETEXI
-#if defined(TARGET_I386)
{
.name = "drive_add",
.args_type = "pci_addr:s,opts:s",
@@ -869,7 +868,6 @@ ETEXI
.help = "add drive to PCI storage controller",
.mhandler.cmd = drive_hot_add,
},
-#endif
STEXI
@item drive_add
--
1.6.0.2
++++++ S390-no-tpr.patch ++++++
Index: qemu-kvm-0.14.50/Makefile.target
===================================================================
--- qemu-kvm-0.14.50.orig/Makefile.target
+++ qemu-kvm-0.14.50/Makefile.target
@@ -81,7 +81,7 @@ libobj-y += cpuid.o
endif
libobj-$(CONFIG_NEED_MMU) += mmu.o
-libobj-$(CONFIG_KVM) += kvm-tpr-opt.o
+#libobj-$(CONFIG_KVM) += kvm-tpr-opt.o
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
++++++ S390-qemu-early-printk.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:55.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:55.000000000 +0200
@@ -16,11 +16,11 @@
hw/virtio-console.h | 2 ++
3 files changed, 12 insertions(+), 0 deletions(-)
-diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
-index 50ffc82..df19729 100644
---- a/hw/s390-virtio.c
-+++ b/hw/s390-virtio.c
-@@ -97,6 +97,9 @@ int s390_virtio_hypercall(CPUState *env)
+Index: qemu-kvm-0.14.50/hw/s390-virtio.c
+===================================================================
+--- qemu-kvm-0.14.50.orig/hw/s390-virtio.c
++++ qemu-kvm-0.14.50/hw/s390-virtio.c
+@@ -99,6 +99,9 @@ int s390_virtio_hypercall(CPUState *env,
}
} else {
/* Early printk */
@@ -30,35 +30,47 @@
}
break;
case KVM_S390_VIRTIO_RESET:
-diff --git a/hw/virtio-console.c b/hw/virtio-console.c
-index 57f8f89..cd6cf20 100644
---- a/hw/virtio-console.c
-+++ b/hw/virtio-console.c
-@@ -105,6 +105,13 @@ static void vcon_event(void *opaque, int event)
- /* we will ignore any event for the time being */
- }
+Index: qemu-kvm-0.14.50/hw/virtio-console.c
+===================================================================
+--- qemu-kvm-0.14.50.orig/hw/virtio-console.c
++++ qemu-kvm-0.14.50/hw/virtio-console.c
+@@ -19,6 +19,14 @@ typedef struct VirtConsole {
+ CharDriverState *chr;
+ } VirtConsole;
+void virtio_console_print_early(VirtIODevice *vdev, uint8_t *buf)
+{
-+ VirtIOConsole *s = to_virtio_console(vdev);
++ VirtIOSerial *vser = (void*)vdev;
++ VirtIOSerialPort *port = find_port_by_id(vser, 0);
++ VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port);
+
-+ qemu_chr_write(s->chr, buf, strlen((char*)buf));
++ qemu_chr_write(vcon->chr, buf, strlen((char*)buf));
+}
-+
- static void virtio_console_save(QEMUFile *f, void *opaque)
- {
- VirtIOConsole *s = opaque;
-diff --git a/hw/virtio-console.h b/hw/virtio-console.h
-index 84d0717..f3ccc3c 100644
---- a/hw/virtio-console.h
-+++ b/hw/virtio-console.h
-@@ -16,4 +16,6 @@
- /* The ID for virtio console */
- #define VIRTIO_ID_CONSOLE 3
+
+ /* Callback function that's called when the guest sends us data */
+ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len)
+Index: qemu-kvm-0.14.50/hw/virtio-serial.h
+===================================================================
+--- qemu-kvm-0.14.50.orig/hw/virtio-serial.h
++++ qemu-kvm-0.14.50/hw/virtio-serial.h
+@@ -204,4 +204,7 @@ size_t virtio_serial_guest_ready(VirtIOS
+ */
+ void virtio_serial_throttle_port(VirtIOSerialPort *port, bool throttle);
+void virtio_console_print_early(VirtIODevice *vdev, uint8_t *buf);
++VirtIOSerialPort *find_port_by_id(VirtIOSerial *vser, uint32_t id);
+
#endif
---
-1.6.0.2
-
+Index: qemu-kvm-0.14.50/hw/virtio-serial-bus.c
+===================================================================
+--- qemu-kvm-0.14.50.orig/hw/virtio-serial-bus.c
++++ qemu-kvm-0.14.50/hw/virtio-serial-bus.c
+@@ -51,7 +51,7 @@ struct VirtIOSerial {
+ struct virtio_console_config config;
+ };
+
+-static VirtIOSerialPort *find_port_by_id(VirtIOSerial *vser, uint32_t id)
++VirtIOSerialPort *find_port_by_id(VirtIOSerial *vser, uint32_t id)
+ {
+ VirtIOSerialPort *port;
+
++++++ ipxe-rom-settings.patch ++++++
Index: ipxe-git-3fc139362c75eb69e02989241755ec894533f675/src/config/general.h
===================================================================
--- ipxe-git-3fc139362c75eb69e02989241755ec894533f675.orig/src/config/general.h
+++ ipxe-git-3fc139362c75eb69e02989241755ec894533f675/src/config/general.h
@@ -31,7 +31,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
* Timer configuration
*
*/
-#define BANNER_TIMEOUT 20 /* Tenths of a second for which the shell
+#define BANNER_TIMEOUT 0 /* Tenths of a second for which the shell
banner should appear */
/*
@@ -93,7 +93,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
* you want to use.
*
*/
-//#define IMAGE_NBI /* NBI image support */
+#define IMAGE_NBI /* NBI image support */
//#define IMAGE_ELF /* ELF image support */
//#define IMAGE_FREEBSD /* FreeBSD kernel image support */
//#define IMAGE_MULTIBOOT /* MultiBoot image support */
++++++ kvm-qemu-default-memsize.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,8 +1,8 @@
-Index: qemu-kvm-0.14.0.rc0/vl.c
+Index: qemu-kvm-0.14.50/vl.c
===================================================================
---- qemu-kvm-0.14.0.rc0.orig/vl.c
-+++ qemu-kvm-0.14.0.rc0/vl.c
-@@ -169,7 +169,7 @@ int main(int argc, char **argv)
+--- qemu-kvm-0.14.50.orig/vl.c
++++ qemu-kvm-0.14.50/vl.c
+@@ -167,7 +167,7 @@ int main(int argc, char **argv)
//#define DEBUG_NET
//#define DEBUG_SLIRP
++++++ kvm-qemu-fix-unused-but-set.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,7 +1,7 @@
-Index: qemu-kvm-0.14.0/hw/adlib.c
+Index: qemu-kvm-0.14.50/hw/adlib.c
===================================================================
---- qemu-kvm-0.14.0.orig/hw/adlib.c
-+++ qemu-kvm-0.14.0/hw/adlib.c
+--- qemu-kvm-0.14.50.orig/hw/adlib.c
++++ qemu-kvm-0.14.50/hw/adlib.c
@@ -119,7 +119,6 @@ static IO_WRITE_PROTO (adlib_write)
{
AdlibState *s = opaque;
@@ -21,70 +21,4 @@
+ OPLWrite (s->opl, a, val);
#endif
}
-
-Index: qemu-kvm-0.14.0/target-i386/kvm.c
-===================================================================
---- qemu-kvm-0.14.0.orig/target-i386/kvm.c
-+++ qemu-kvm-0.14.0/target-i386/kvm.c
-@@ -918,7 +918,7 @@ static int kvm_get_xsave(CPUState *env)
- #ifdef KVM_CAP_XSAVE
- struct kvm_xsave* xsave;
- int ret, i;
-- uint16_t cwd, swd, twd, fop;
-+ uint16_t cwd, swd, twd /* , fop */;
-
- if (!kvm_has_xsave()) {
- return kvm_get_fpu(env);
-@@ -934,7 +934,7 @@ static int kvm_get_xsave(CPUState *env)
- cwd = (uint16_t)xsave->region[0];
- swd = (uint16_t)(xsave->region[0] >> 16);
- twd = (uint16_t)xsave->region[1];
-- fop = (uint16_t)(xsave->region[1] >> 16);
-+/* fop = (uint16_t)(xsave->region[1] >> 16); */
- env->fpstt = (swd >> 11) & 7;
- env->fpus = swd;
- env->fpuc = cwd;
-Index: qemu-kvm-0.14.0/tcg/tcg.c
-===================================================================
---- qemu-kvm-0.14.0.orig/tcg/tcg.c
-+++ qemu-kvm-0.14.0/tcg/tcg.c
-@@ -553,7 +553,7 @@ void tcg_register_helper(void *func, con
- void tcg_gen_callN(TCGContext *s, TCGv_ptr func, unsigned int flags,
- int sizemask, TCGArg ret, int nargs, TCGArg *args)
- {
--#ifdef TCG_TARGET_I386
-+#if defined(TCG_TARGET_I386) && TCG_TARGET_REG_BITS < 64
- int call_type;
- #endif
- int i;
-@@ -580,7 +580,7 @@ void tcg_gen_callN(TCGContext *s, TCGv_p
-
- *gen_opc_ptr++ = INDEX_op_call;
- nparam = gen_opparam_ptr++;
--#ifdef TCG_TARGET_I386
-+#if defined(TCG_TARGET_I386) && TCG_TARGET_REG_BITS < 64
- call_type = (flags & TCG_CALL_TYPE_MASK);
- #endif
- if (ret != TCG_CALL_DUMMY_ARG) {
-Index: qemu-kvm-0.14.0/hw/device-assignment.c
-===================================================================
---- qemu-kvm-0.14.0.orig/hw/device-assignment.c
-+++ qemu-kvm-0.14.0/hw/device-assignment.c
-@@ -1718,7 +1718,7 @@ static void reset_assigned_device(Device
- static int assigned_initfn(struct PCIDevice *pci_dev)
- {
- AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
-- uint8_t e_device, e_intx;
-+ uint8_t /*e_device, */ e_intx;
- int r;
-
- if (!kvm_enabled()) {
-@@ -1745,7 +1745,7 @@ static int assigned_initfn(struct PCIDev
- goto out;
-
- /* handle interrupt routing */
-- e_device = (dev->dev.devfn >> 3) & 0x1f;
-+/* e_device = (dev->dev.devfn >> 3) & 0x1f; */
- e_intx = dev->dev.config[0x3d] - 1;
- dev->intpin = e_intx;
- dev->run = 0;
+
++++++ kvm-qemu-preXX-console.patch ++++++
From 9fe485676fd2fb5fd60603ffe10b05fcb2008e14 Mon Sep 17 00:00:00 2001
From: Alexander Graf
Date: Mon, 6 Jun 2011 06:53:52 +0200
Subject: [PATCH] console: add question-mark escape operator
Some termcaps (found using SLES11SP1) use [? sequences. According to man
console_codes (http://linux.die.net/man/4/console_codes) the question mark
is a nop and should simply be ignored.
This patch does exactly that, rendering screen output readable when
outputting guest serial consoles to the graphical console emulator.
Signed-off-by: Alexander Graf
---
console.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/console.c b/console.c
index 871c1d4..5e8e35d 100644
--- a/console.c
+++ b/console.c
@@ -905,7 +905,7 @@ static void console_putchar(TextConsole *s, int ch)
}
} else {
s->nb_esc_params++;
- if (ch == ';')
+ if (ch == ';' || ch == '?')
break;
#ifdef DEBUG_CONSOLE
fprintf(stderr, "escape sequence CSI%d;%d%c, %d parameters\n",
--
1.6.0.2
++++++ kvm-qemu-preXX-report-default-mac-used.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,8 +1,8 @@
-Index: qemu-kvm-0.14.1/net.c
+Index: qemu-kvm-0.15.rc0/net.c
===================================================================
---- qemu-kvm-0.14.1.orig/net.c
-+++ qemu-kvm-0.14.1/net.c
-@@ -173,6 +173,27 @@ void qemu_format_nic_info_str(VLANClient
+--- qemu-kvm-0.15.rc0.orig/net.c
++++ qemu-kvm-0.15.rc0/net.c
+@@ -132,6 +132,27 @@ void qemu_format_nic_info_str(VLANClient
macaddr[3], macaddr[4], macaddr[5]);
}
@@ -16,10 +16,10 @@
+ {
+ if (!nd_table[i].used)
+ continue;
-+ if (memcmp(nd_table[i].macaddr, def_mac.a, 5))
++ if (memcmp(nd_table[i].macaddr.a, def_mac.a, 5))
+ continue;
-+ if (nd_table[i].macaddr[5] >= 0x56 &&
-+ nd_table[i].macaddr[5] < 0x56 + MAX_NICS && !warned) {
++ if (nd_table[i].macaddr.a[5] >= 0x56 &&
++ nd_table[i].macaddr.a[5] < 0x56 + MAX_NICS && !warned) {
+ warned = 1;
+ fprintf(stderr, "Warning: default mac address being used, creating "
+ "potential for address conflict\n");
@@ -30,7 +30,7 @@
void qemu_macaddr_default_if_unset(MACAddr *macaddr)
{
static int index = 0;
-@@ -1417,6 +1438,7 @@ int net_init_clients(void)
+@@ -1411,6 +1432,7 @@ int net_init_clients(void)
if (qemu_opts_foreach(net, net_init_client, NULL, 1) == -1) {
return -1;
}
++++++ kvm-qemu-user-space-tool-name.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,8 +1,8 @@
-Index: qemu-kvm-0.14.0/vl.c
+Index: qemu-kvm-0.15.rc0/vl.c
===================================================================
---- qemu-kvm-0.14.0.orig/vl.c
-+++ qemu-kvm-0.14.0/vl.c
-@@ -1507,7 +1507,7 @@ static void help(int exitcode)
+--- qemu-kvm-0.15.rc0.orig/vl.c
++++ qemu-kvm-0.15.rc0/vl.c
+@@ -1450,7 +1450,7 @@ static void help(int exitcode)
"ctrl-alt toggle mouse and keyboard grab\n"
"\n"
"When using -nographic, press 'ctrl-a h' to get some help.\n",
++++++ kvm-seabios-enable-ahci.patch ++++++
Index: qemu-kvm-0.15.rc0/roms/seabios/src/Kconfig
===================================================================
--- qemu-kvm-0.15.rc0.orig/roms/seabios/src/Kconfig
+++ qemu-kvm-0.15.rc0/roms/seabios/src/Kconfig
@@ -104,7 +104,7 @@ menu "Hardware support"
config AHCI
depends on DRIVES
bool "AHCI controllers"
- default n
+ default y
help
Support for AHCI disk code.
config VIRTIO_BLK
++++++ kvm-studio-slirp-nooutgoing.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,7 +1,7 @@
-Index: qemu-kvm-0.14.1/vl.c
+Index: qemu-kvm-0.15.rc0/vl.c
===================================================================
---- qemu-kvm-0.14.1.orig/vl.c
-+++ qemu-kvm-0.14.1/vl.c
+--- qemu-kvm-0.15.rc0.orig/vl.c
++++ qemu-kvm-0.15.rc0/vl.c
@@ -213,6 +213,7 @@ const char *vnc_display;
int acpi_enabled = 1;
int no_hpet = 0;
@@ -10,7 +10,7 @@
int no_reboot = 0;
int no_shutdown = 0;
int cursor_hide = 1;
-@@ -2341,6 +2342,14 @@ int main(int argc, char **argv, char **e
+@@ -2497,6 +2498,14 @@ int main(int argc, char **argv, char **e
case QEMU_OPTION_singlestep:
singlestep = 1;
break;
@@ -25,10 +25,10 @@
case QEMU_OPTION_S:
autostart = 0;
break;
-Index: qemu-kvm-0.14.1/slirp/tcp_subr.c
+Index: qemu-kvm-0.15.rc0/slirp/tcp_subr.c
===================================================================
---- qemu-kvm-0.14.1.orig/slirp/tcp_subr.c
-+++ qemu-kvm-0.14.1/slirp/tcp_subr.c
+--- qemu-kvm-0.15.rc0.orig/slirp/tcp_subr.c
++++ qemu-kvm-0.15.rc0/slirp/tcp_subr.c
@@ -317,6 +317,9 @@ tcp_sockclosed(struct tcpcb *tp)
* nonblocking. Connect returns after the SYN is sent, and does
* not wait for ACK+SYN.
@@ -73,11 +73,11 @@
/* Translate connections from localhost to the real hostname */
if (so->so_faddr.s_addr == 0 || so->so_faddr.s_addr == loopback_addr.s_addr)
so->so_faddr = slirp->vhost_addr;
-Index: qemu-kvm-0.14.1/slirp/socket.c
+Index: qemu-kvm-0.15.rc0/slirp/socket.c
===================================================================
---- qemu-kvm-0.14.1.orig/slirp/socket.c
-+++ qemu-kvm-0.14.1/slirp/socket.c
-@@ -529,6 +529,8 @@ sorecvfrom(struct socket *so)
+--- qemu-kvm-0.15.rc0.orig/slirp/socket.c
++++ qemu-kvm-0.15.rc0/slirp/socket.c
+@@ -531,6 +531,8 @@ sorecvfrom(struct socket *so)
} /* if ping packet */
}
@@ -86,7 +86,7 @@
/*
* sendto() a socket
*/
-@@ -559,6 +561,12 @@ sosendto(struct socket *so, struct mbuf
+@@ -561,6 +563,12 @@ sosendto(struct socket *so, struct mbuf
DEBUG_MISC((dfd, " sendto()ing, addr.sin_port=%d, addr.sin_addr.s_addr=%.16s\n", ntohs(addr.sin_port), inet_ntoa(addr.sin_addr)));
@@ -99,11 +99,11 @@
/* Don't care what port we get */
ret = sendto(so->s, m->m_data, m->m_len, 0,
(struct sockaddr *)&addr, sizeof (struct sockaddr));
-Index: qemu-kvm-0.14.1/qemu-options.hx
+Index: qemu-kvm-0.15.rc0/qemu-options.hx
===================================================================
---- qemu-kvm-0.14.1.orig/qemu-options.hx
-+++ qemu-kvm-0.14.1/qemu-options.hx
-@@ -1913,6 +1913,16 @@ Store the QEMU process PID in @var{file}
+--- qemu-kvm-0.15.rc0.orig/qemu-options.hx
++++ qemu-kvm-0.15.rc0/qemu-options.hx
+@@ -1991,6 +1991,16 @@ Store the QEMU process PID in @var{file}
from a script.
ETEXI
++++++ kvm-studio-vnc.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,7 +1,7 @@
-Index: qemu-kvm-0.14.0/ui/vnc.c
+Index: qemu-kvm-0.15.rc0/ui/vnc.c
===================================================================
---- qemu-kvm-0.14.0.orig/ui/vnc.c
-+++ qemu-kvm-0.14.0/ui/vnc.c
+--- qemu-kvm-0.15.rc0.orig/ui/vnc.c
++++ qemu-kvm-0.15.rc0/ui/vnc.c
@@ -43,6 +43,7 @@ static const struct timeval VNC_REFRESH_
static VncDisplay *vnc_display; /* needed for info vnc */
@@ -32,7 +32,7 @@
}
int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -2676,6 +2685,39 @@ char *vnc_display_local_addr(DisplayStat
+@@ -2698,6 +2707,39 @@ char *vnc_display_local_addr(DisplayStat
return vnc_socket_local_addr("%s:%s", vs->lsock);
}
@@ -72,7 +72,7 @@
int vnc_display_open(DisplayState *ds, const char *display)
{
VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
-@@ -2707,7 +2749,36 @@ int vnc_display_open(DisplayState *ds, c
+@@ -2729,7 +2771,36 @@ int vnc_display_open(DisplayState *ds, c
while ((options = strchr(options, ','))) {
options++;
if (strncmp(options, "password", 8) == 0) {
++++++ kvm-supported.txt ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -8,8 +8,8 @@
SLES 11 GA included kvm at a technical preview status level.
Kvm has matured in the SLE 11 SP1 development time frame to the level of being supportable
for select guests and virtualization features. This document provides information about
- kvm supportability for use by the customer support team, quality engineering, and other
- interested parties.
+ kvm supportability for use by the customer support team, quality engineering, end user,
+ and other interested parties.
Kvm consists of two main components:
* A set of kernel modules (kvm.ko, kvm-intel.ko, and kvm-amd.ko) that provides the core
virtualization infrastructure and processor specific drivers.
@@ -95,6 +95,7 @@
RHEL 4.x FV Yes see RedHat Best Effort See footnote
RHEL 5.x website for details
+RHEL 6.x
Win XP SP3+ FV virtio-net, Best Effort
Win 2K3 SP2+ virtio-blk,
@@ -309,12 +310,13 @@
The following qemu-kvm command line options are supported:
NOTE: only raw disk images (file), logical volumes, physical partitions or physical disks may be used.
+(iSCSI and various virt-manager managed storage solutions are included.)
-h
-help
-version
-M [pc|pc-0.12]
--cpu [?|kvm64 ]
+-cpu [?|qemu64 ]
-smp ...
-fda/-fdb ...
-hda/-hdb/-hdc/-hdd ...
@@ -327,7 +329,7 @@
-audio-help
-usb
-usbdevice [tablet|mouse]
--device driver [isa-serial|isa-parallel|isa-fdc|ide-drive|VGA|cirrus-vga|rtl8139|virtio-net-pci|virtio-blk-pci|virtio-balloon-pci] ...
+-device [isa-serial|isa-parallel|isa-fdc|ide-drive|VGA|cirrus-vga|rtl8139|virtio-net-pci|virtio-blk-pci|virtio-balloon-pci] ...
-name ...
-uuid ..
-nographic
@@ -343,7 +345,7 @@
-no-hpet
-balloon ...
-smbios ...
--net [nic|user|tap|none] ... (for mode= only rtl8139 and virtio are supported)
+-net [nic|user|tap|none] ... (for model= only rtl8139 and virtio are supported)
-netdev ...
-chardev ..
-kernel ...
@@ -411,10 +413,10 @@
Conversely, the following qemu-kvm command line options are not supported:
-M [pc-0.11|pc-0.10|isapc|mac]
--cpu [phenom|core2duo|qemu32|qemu64|coreduo|486|pentium|pentium2|pentium3|athlon|n270]
+-cpu [phenom|core2duo|qemu32|kvm64|coreduo|486|pentium|pentium2|pentium3|athlon|n270]
-numa ...
-set ...
--drive ,if=scsi|mtd|pflash], snapshot=yes, format=[anything besides raw]
+-drive ,if=scsi|mtd|pflash], snapshot=on, format=[anything besides raw]
-mtdblock ...
-sd ...
-pflash ...
@@ -428,7 +430,7 @@
-vga [vmware|xenfb]
-win2k-hack
-no-fd-bootchk
--osk
+-osk ...
-acpitable ...
-net socket ...
-net dump ...
@@ -479,7 +481,6 @@
hostfwd_add ...
hostfwd_remove ...
set_link ...
-watchdog_action ...
acl_show ...
acl_policy ...
acl_add ...
++++++ qemu-datadir.diff ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,8 +1,8 @@
-Index: qemu-kvm-0.14.0.rc0/configure
+Index: qemu-kvm-0.15.rc0/configure
===================================================================
---- qemu-kvm-0.14.0.rc0.orig/configure
-+++ qemu-kvm-0.14.0.rc0/configure
-@@ -151,7 +151,7 @@ mingw32="no"
+--- qemu-kvm-0.15.rc0.orig/configure
++++ qemu-kvm-0.15.rc0/configure
+@@ -152,7 +152,7 @@ mingw32="no"
EXESUF=""
prefix="/usr/local"
mandir="\${prefix}/share/man"
@@ -10,12 +10,12 @@
+datadir="\${prefix}/share/qemu-kvm"
docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin"
- sysconfdir="\${prefix}/etc"
-Index: qemu-kvm-0.14.0.rc0/os-posix.c
+ libdir="\${prefix}/lib"
+Index: qemu-kvm-0.15.rc0/os-posix.c
===================================================================
---- qemu-kvm-0.14.0.rc0.orig/os-posix.c
-+++ qemu-kvm-0.14.0.rc0/os-posix.c
-@@ -89,7 +89,7 @@ void os_setup_signal_handling(void)
+--- qemu-kvm-0.15.rc0.orig/os-posix.c
++++ qemu-kvm-0.15.rc0/os-posix.c
+@@ -83,7 +83,7 @@ void os_setup_signal_handling(void)
/* Find a likely location for support files using the location of the binary.
For installed binaries this will be "$bindir/../share/qemu". When
running from the build tree this will be "$bindir/../pc-bios". */
@@ -24,11 +24,11 @@
#define BUILD_SUFFIX "/pc-bios"
char *os_find_datadir(const char *argv0)
{
-Index: qemu-kvm-0.14.0.rc0/Makefile
+Index: qemu-kvm-0.15.rc0/Makefile
===================================================================
---- qemu-kvm-0.14.0.rc0.orig/Makefile
-+++ qemu-kvm-0.14.0.rc0/Makefile
-@@ -231,8 +231,8 @@ ifdef CONFIG_POSIX
+--- qemu-kvm-0.15.rc0.orig/Makefile
++++ qemu-kvm-0.15.rc0/Makefile
+@@ -261,8 +261,8 @@ ifdef CONFIG_POSIX
endif
install-sysconfig:
++++++ qemu-img-vmdk-scsi.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -13,20 +13,20 @@
qemu-img.c | 8 +++++++-
4 files changed, 18 insertions(+), 4 deletions(-)
-Index: qemu-kvm-0.14.1/block.c
+Index: qemu-0.15.0/block.c
===================================================================
---- qemu-kvm-0.14.1.orig/block.c
-+++ qemu-kvm-0.14.1/block.c
-@@ -2808,7 +2808,7 @@ int bdrv_img_create(const char *filename
+--- qemu-0.15.0.orig/block.c
++++ qemu-0.15.0/block.c
+@@ -2900,7 +2900,7 @@ int bdrv_img_create(const char *filename
char *options, uint64_t img_size, int flags)
{
QEMUOptionParameter *param = NULL, *create_options = NULL;
-- QEMUOptionParameter *backing_fmt, *backing_file;
-+ QEMUOptionParameter *backing_fmt, *backing_file, *scsi;
+- QEMUOptionParameter *backing_fmt, *backing_file, *size;
++ QEMUOptionParameter *backing_fmt, *backing_file, *size, *scsi;
BlockDriverState *bs = NULL;
BlockDriver *drv, *proto_drv;
BlockDriver *backing_drv = NULL;
-@@ -2917,6 +2917,9 @@ int bdrv_img_create(const char *filename
+@@ -3010,6 +3010,9 @@ int bdrv_img_create(const char *filename
printf("Formatting '%s', fmt=%s ", filename, fmt);
print_option_parameters(param);
@@ -36,41 +36,41 @@
puts("");
ret = bdrv_create(drv, filename, param);
-Index: qemu-kvm-0.14.1/block/vmdk.c
+Index: qemu-0.15.0/block/vmdk.c
===================================================================
---- qemu-kvm-0.14.1.orig/block/vmdk.c
-+++ qemu-kvm-0.14.1/block/vmdk.c
-@@ -685,7 +685,7 @@ static int vmdk_create(const char *filen
+--- qemu-0.15.0.orig/block/vmdk.c
++++ qemu-0.15.0/block/vmdk.c
+@@ -1134,7 +1134,7 @@ static int vmdk_create(const char *filen
"ddb.geometry.cylinders = \"%" PRId64 "\"\n"
"ddb.geometry.heads = \"16\"\n"
"ddb.geometry.sectors = \"63\"\n"
- "ddb.adapterType = \"ide\"\n";
+ "ddb.adapterType = \"%s\"\n";
- char desc[1024];
- const char *real_filename, *temp_str;
- int64_t total_size = 0;
-@@ -701,6 +701,8 @@ static int vmdk_create(const char *filen
- backing_file = options->value.s;
- } else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) {
- flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0;
+
+ if (filename_decompose(filename, path, prefix, postfix, PATH_MAX)) {
+ return -EINVAL;
+@@ -1149,6 +1149,8 @@ static int vmdk_create(const char *filen
+ flags |= options->value.n ? BLOCK_FLAG_COMPAT6 : 0;
+ } else if (!strcmp(options->name, BLOCK_OPT_SUBFMT)) {
+ fmt = options->value.s;
+ } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) {
+ flags |= options->value.n ? BLOCK_FLAG_SCSI: 0;
}
options++;
}
-@@ -798,7 +800,8 @@ static int vmdk_create(const char *filen
- snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
- total_size, real_filename,
- (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
-- total_size / (int64_t)(63 * 16));
-+ total_size / (int64_t)(63 * 16),
-+ flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
-
- /* write the descriptor */
- lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);
-@@ -844,6 +847,11 @@ static QEMUOptionParameter vmdk_create_o
- .type = OPT_FLAG,
- .help = "VMDK version 6 image"
+@@ -1238,7 +1240,8 @@ static int vmdk_create(const char *filen
+ parent_desc_line,
+ ext_desc_lines,
+ (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
+- total_size / (int64_t)(63 * 16 * 512));
++ total_size / (int64_t)(63 * 16 * 512),
++ flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
+ if (split || flat) {
+ fd = open(
+ filename,
+@@ -1336,6 +1339,11 @@ static QEMUOptionParameter vmdk_create_o
+ "VMDK flat extent format, can be one of "
+ "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat} "
},
+ {
+ .name = BLOCK_OPT_SCSI,
@@ -80,10 +80,10 @@
{ NULL }
};
-Index: qemu-kvm-0.14.1/block_int.h
+Index: qemu-0.15.0/block_int.h
===================================================================
---- qemu-kvm-0.14.1.orig/block_int.h
-+++ qemu-kvm-0.14.1/block_int.h
+--- qemu-0.15.0.orig/block_int.h
++++ qemu-0.15.0/block_int.h
@@ -30,10 +30,12 @@
#define BLOCK_FLAG_ENCRYPT 1
@@ -97,11 +97,11 @@
#define BLOCK_OPT_BACKING_FILE "backing_file"
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
-Index: qemu-kvm-0.14.1/qemu-img.c
+Index: qemu-0.15.0/qemu-img.c
===================================================================
---- qemu-kvm-0.14.1.orig/qemu-img.c
-+++ qemu-kvm-0.14.1/qemu-img.c
-@@ -576,7 +576,7 @@ static int img_convert(int argc, char **
+--- qemu-0.15.0.orig/qemu-img.c
++++ qemu-0.15.0/qemu-img.c
+@@ -636,7 +636,7 @@ static int img_convert(int argc, char **
const uint8_t *buf1;
BlockDriverInfo bdi;
QEMUOptionParameter *param = NULL, *create_options = NULL;
@@ -109,8 +109,8 @@
+ QEMUOptionParameter *out_baseimg_param, *scsi;
char *options = NULL;
const char *snapshot_name = NULL;
-
-@@ -731,6 +731,12 @@ static int img_convert(int argc, char **
+ float local_progress;
+@@ -802,6 +802,12 @@ static int img_convert(int argc, char **
}
}
++++++ qemu-kvm-common-code-fixes-for-s390-build.patch ++++++
Index: qemu-kvm-0.14.50/qemu-kvm.c
===================================================================
--- qemu-kvm-0.14.50.orig/qemu-kvm.c
+++ qemu-kvm-0.14.50/qemu-kvm.c
@@ -227,6 +227,7 @@ int kvm_deassign_pci_device(KVMState *s,
}
#endif
+#if defined(__i386__) || defined(__x86_64__)
int kvm_reinject_control(KVMState *s, int pit_reinject)
{
#ifdef KVM_CAP_REINJECT_CONTROL
@@ -242,6 +243,7 @@ int kvm_reinject_control(KVMState *s, in
#endif
return -ENOSYS;
}
+#endif
int kvm_has_gsi_routing(void)
{
@@ -468,6 +470,7 @@ int kvm_get_irq_route_gsi(void)
return -ENOSPC;
}
+#ifdef KVM_CAP_DEVICE_MSI
static void kvm_msi_routing_entry(struct kvm_irq_routing_entry *e,
KVMMsiMessage *msg)
@@ -523,6 +526,7 @@ int kvm_msi_message_update(KVMMsiMessage
return 1;
}
+#endif
#ifdef KVM_CAP_DEVICE_MSIX
@@ -563,6 +567,12 @@ int kvm_arch_init_irq_routing(void)
{
return 0;
}
+
+int kvm_arch_set_ioport_access(unsigned long start, unsigned long size,
+ bool enable)
+{
+ return -ENOSYS;
+}
#endif
#ifdef CONFIG_KVM_DEVICE_ASSIGNMENT
++++++ seabios-sanitize-version.patch ++++++
--- /var/tmp/diff_new_pack.tZlyoM/_old 2011-08-08 15:33:56.000000000 +0200
+++ /var/tmp/diff_new_pack.tZlyoM/_new 2011-08-08 15:33:56.000000000 +0200
@@ -1,13 +1,13 @@
-Index: qemu-kvm-0.14.0/roms/seabios/Makefile
+Index: qemu-kvm-0.14.50/roms/seabios/Makefile
===================================================================
---- qemu-kvm-0.14.0.orig/roms/seabios/Makefile
-+++ qemu-kvm-0.14.0/roms/seabios/Makefile
+--- qemu-kvm-0.14.50.orig/roms/seabios/Makefile
++++ qemu-kvm-0.14.50/roms/seabios/Makefile
@@ -5,7 +5,7 @@
# This file may be distributed under the terms of the GNU LGPLv3 license.
# Program version
--VERSION=0.6.2-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname)
-+VERSION=0.6.2-$(shell date +"%Y%m%d_%H%M%S")
+-VERSION=pre-0.6.3-$(shell date +"%Y%m%d_%H%M%S")-$(shell hostname)
++VERSION=pre-0.6.3-$(shell date +"%Y%m%d_%H%M%S")
# Output directory
OUT=out/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org