Hello community, here is the log from the commit of package kvm for openSUSE:11.4 checked in at Mon Feb 21 14:37:56 CET 2011.
-------- --- old-versions/11.4/all/kvm/kvm.changes 2011-02-05 22:43:00.000000000 +0100 +++ 11.4/kvm/kvm.changes 2011-02-21 03:25:45.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Feb 21 02:17:30 UTC 2011 - [email protected] + +- update to latest pre 0.14.0 rc. (Includes the qemu 0.14.0 code as + a basis) +- more parallel makes + +------------------------------------------------------------------- +Thu Feb 10 05:59:21 UTC 2011 - [email protected] + +- update to rc1 of qemu-kvm version 0.14.0 +- provide missing video bios files (bnc#669912) +- fix issues with using i82559er emulated nic +- be explicit about more configure options +- enable vnc threading + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- kvm-qemu-preXX-slirp-fix-buffer-overrun.patch qemu-kvm-0.14.0.rc0.tar.bz2 New: ---- kvm-qemu-preXX-eepro100-pad-to-ensure-minimum-packet-size.patch kvm-qemu-preXX-fix-rom-file-name-for-e100-nic.patch qemu-img-vmdk-scsi.patch qemu-kvm-0.14.0.tar.bz2 seabios-fix-parallel-make.patch vgabios-0.6c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.hgPznV/_old 2011-02-21 14:37:51.000000000 +0100 +++ /var/tmp/diff_new_pack.hgPznV/_new 2011-02-21 14:37:51.000000000 +0100 @@ -20,16 +20,18 @@ %bcond_with vde +# qemu-kvm git id 8eef0b +%define package_base_version 0.14.0 +%define package_extra_version .rcX %define bios_id seabios-0.6.1.2 %define pxe_rom_id gpxe-1.0.1 -#%define vgabios_id vgabios-0.6c +%define vgabios_id vgabios-0.6c # note that this list doesn't include the gpxe roms since they get handled # individually and not as a group -%define firmware_files {bios.bin vgabios.bin vgabios-cirrus.bin optionrom/extboot.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/vapic.bin} +%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} -#ExclusiveArch: %ix86 x86_64 ia64 s390x -ExclusiveArch: %ix86 x86_64 s390x +ExclusiveArch: %ix86 x86_64 ia64 s390x %ifarch %ix86 x86_64 # choice of building all from source or using provided binary x86 blobs @@ -59,7 +61,7 @@ BuildRequires: glibc-32bit %endif %endif -%if %suse_version > 1110 +%if 0%{?suse_version} > 1110 BuildRequires: acpica %else BuildRequires: pmtools @@ -70,19 +72,16 @@ BuildRequires: vde2-devel %endif Requires: python-curses -%if %suse_version < 1110 +%if 0%{?suse_version} < 1110 Requires: kvm-kmp %endif -%if 0%{?suse_version} >= 1130 -Requires: libbrlapi0_5 -%endif License: BSD3c ; GPLv2 ; GPLv2+ ; LGPLv2.1+ ; MIT Group: System/Kernel Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ -Version: 0.14.0.rc0 -Release: 1 -Source0: qemu-%{name}-%{version}.tar.bz2 +Version: %{package_base_version}%{package_extra_version} +Release: 1.<RELEASE2> +Source0: qemu-%{name}-%{package_base_version}.tar.bz2 Source1: 60-kvm.rules Source2: qemu-ifup Source4: win-virtio-drivers.iso @@ -90,16 +89,18 @@ Source6: %{bios_id}.tar.bz2 Source7: %{pxe_rom_id}.tar.bz2 Source8: bcc-0.16.17-2.i486.rpm -#Source9: %{vgabios_id}.tar.bz2 +Source9: %{vgabios_id}.tar.bz2 Source10: kvm-supported.txt Source11: s390-zipl.rom # common and X86 patches Patch01: gpxe-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 +Patch03: seabios-fix-parallel-make.patch +Patch04: vgabios-bcc-paths.patch +Patch05: qemu-datadir.diff +Patch06: kvm-qemu-default-memsize.patch +Patch07: kvm-qemu-user-space-tool-name.patch +Patch08: kvm-qemu-preXX-fix-rom-file-name-for-e100-nic.patch # Mac OS X patches Patch20: kvm-qemu-lpc.patch @@ -111,7 +112,8 @@ 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-slirp-fix-buffer-overrun.patch +Patch103: kvm-qemu-preXX-eepro100-pad-to-ensure-minimum-packet-size.patch +Patch104: qemu-img-vmdk-scsi.patch Patch200: kvm-studio-slirp-nooutgoing.patch Patch201: kvm-studio-vnc.patch @@ -171,8 +173,7 @@ %setup -q -T -D -n %{pxe_rom_id} -b 7 %patch01 -p1 %endif -%setup -q -n qemu-%{name}-%{version} -a 6 -#%setup -q -n qemu-%{name}-%{version} -a 6 -a 9 +%setup -q -n qemu-%{name}-%{package_base_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 @@ -181,11 +182,13 @@ done %patch02 -p1 %patch03 -p1 +%patch04 -p1 %endif cp %{SOURCE10} . -%patch04 -p1 %patch05 -p1 %patch06 -p1 +%patch07 -p1 +%patch08 -p1 # Mac OS X guest %if %{mac_bios} %if %{mac_patches_ported} @@ -206,6 +209,7 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 # Studio addons %patch200 -p1 @@ -229,57 +233,94 @@ cp %{SOURCE11} pc-bios/ %build +# change from devel version to actual version +echo "%{package_base_version}" > VERSION echo "kvm-%{version}-%{release}" > KVM_VERSION -./configure --prefix=%{_prefix} \ - --enable-werror \ +./configure \ + --prefix=%{_prefix} \ --sysconfdir=/etc \ - --audio-card-list="ac97 adlib cs4231a gus" \ -%if %{build_fw_from_source} - --disable-blobs \ -%endif -%if %suse_version >= 1100 + --extra-cflags="%{optflags}" \ + --disable-debug-tcg \ + --disable-sparse \ + --disable-strip \ + --enable-werror \ + --enable-sdl \ +%if 0%{?suse_version} >= 1100 --audio-drv-list="alsa sdl pa oss" \ %else --audio-drv-list="alsa sdl oss" \ %endif + --audio-card-list="ac97 adlib cs4231a gus" \ %ifarch ia64 --target-list="ia64-softmmu" --disable-cpu-emulation \ -%endif +%else %ifarch s390x --target-list="s390x-softmmu" \ +%else + --target-list="x86_64-softmmu" \ %endif - --extra-cflags="%{optflags}" \ - --disable-strip \ - --disable-werror -sed -i 's/CFLAGS =/CFLAGS +=/' kvm/vgabios/Makefile -# NYI - there is another that needs it +%endif + --disable-xen \ + --enable-vnc-tls \ + --disable-vnc-sasl \ + --disable-vnc-jpeg \ + --disable-vnc-png \ + --enable-vnc-thread \ + --enable-curses \ + --enable-curl \ + --disable-fdt \ + --disable-bluez \ + --enable-kvm \ + --enable-kvm-pit \ + --enable-kvm-device-assignment \ + --disable-user \ + --disable-vde \ +%if %{build_fw_from_source} + --disable-blobs \ +%endif + --enable-docs \ +%if 0%{?suse_version} >= 1130 + --enable-brlapi \ + --enable-linux-aio \ + --enable-vhost-net \ +%else + --disable-brlapi \ + --disable-linux-aio \ + --disable-vhost-net \ +%endif + --disable-spice + +sed -i 's/CFLAGS =/CFLAGS +=/' roms/vgabios/Makefile # userspace: -make config-host.h make %{?jobs:-j%jobs} + # Firmware %ifarch %ix86 x86_64 -make -C roms/seabios +%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 +make -C roms/seabios-mac %{?jobs:-j%jobs} %endif -%if %{build_fw_from_source} -make -C kvm/vgabios -cp kvm/vgabios/VGABIOS-lgpl-latest.cirrus.bin pc-bios/vgabios-cirrus.bin -cp kvm/vgabios/VGABIOS-lgpl-latest.bin pc-bios/vgabios.bin + +make -C roms/vgabios %{?jobs:-j%jobs} +cp roms/vgabios/VGABIOS-lgpl-latest.bin pc-bios/vgabios.bin +cp roms/vgabios/VGABIOS-lgpl-latest.cirrus.bin pc-bios/vgabios-cirrus.bin +cp roms/vgabios/VGABIOS-lgpl-latest.stdvga.bin pc-bios/vgabios-stdvga.bin +cp roms/vgabios/VGABIOS-lgpl-latest.vmware.bin pc-bios/vgabios-vmware.bin +cp roms/vgabios/VGABIOS-lgpl-latest.qxl.bin pc-bios/vgabios-qxl.bin cd ../%{pxe_rom_id}/src -make bin/blib.a -make bin/8086100e.rom -make bin/10222000.rom -make bin/10500940.rom -make bin/10ec8139.rom -make bin/80861209.rom -make bin/1af41000.rom +make bin/8086100e.rom %{?jobs:-j%jobs} +make bin/10222000.rom %{?jobs:-j%jobs} +make bin/10500940.rom %{?jobs:-j%jobs} +make bin/10ec8139.rom %{?jobs:-j%jobs} +make bin/80861209.rom %{?jobs:-j%jobs} +make bin/1af41000.rom %{?jobs:-j%jobs} %endif %endif %install -make DESTDIR=%{buildroot} KVM_KMOD="no" 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 @@ -291,7 +332,6 @@ do install -m 644 pc-bios/$i %{buildroot}%{_datadir}/qemu-kvm/ done - install_rom() { install -m 644 $1.rom %{buildroot}%{_datadir}/qemu-kvm/$2.bin } ++++++ kvm-qemu-preXX-eepro100-pad-to-ensure-minimum-packet-size.patch ++++++ >From d03acc0a2f2e7b04941575ffe3d3dfff39d4c9d8 Mon Sep 17 00:00:00 2001 From: Bruce Rogers <[email protected]> Date: Fri, 11 Feb 2011 11:40:41 -0700 Subject: [PATCH] eepro100: pad to ensure minimum packet size Recent gpxe e100pro drivers will drop small packets because the emulated nic will report an error for small frames. In the qemu model we should instead have the e100pro pad out the received frames to be the minimum size and not report this case as an error. Signed-off-by: Bruce Rogers <[email protected]> --- hw/eepro100.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index edf48f6..03b6934 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1645,6 +1645,8 @@ static int nic_can_receive(VLANClientState *nc) #endif } +#define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */ + static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size) { /* TODO: @@ -1653,6 +1655,7 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size */ EEPRO100State *s = DO_UPCAST(NICState, nc, nc)->opaque; uint16_t rfd_status = 0xa000; + uint8_t min_buf[MIN_BUF_SIZE]; static const uint8_t broadcast_macaddr[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; @@ -1660,15 +1663,15 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size /* CSMA is disabled. */ logout("%p received while CSMA is disabled\n", s); return -1; - } else if (size < 64 && (s->configuration[7] & BIT(0))) { - /* Short frame and configuration byte 7/0 (discard short receive) set: - * Short frame is discarded */ - logout("%p received short frame (%zu byte)\n", s, size); - s->statistics.rx_short_frame_errors++; -#if 0 - return -1; -#endif - } else if ((size > MAX_ETH_FRAME_SIZE + 4) && !(s->configuration[18] & BIT(3))) { + } + /* Pad to minimum Ethernet frame length */ + if (size < sizeof(min_buf)) { + memcpy(min_buf, buf, size); + memset(&min_buf[size], 0, sizeof(min_buf) - size); + buf = min_buf; + size = sizeof(min_buf); + } + if ((size > MAX_ETH_FRAME_SIZE + 4) && !(s->configuration[18] & BIT(3))) { /* Long frame and configuration byte 18/3 (long receive ok) not set: * Long frames are discarded. */ logout("%p received long frame (%zu byte), ignored\n", s, size); @@ -1744,7 +1747,7 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size "(%zu bytes); data truncated\n", rfd_size, size); size = rfd_size; } - if (size < 64) { + if (size < MIN_BUF_SIZE) { rfd_status |= 0x0080; } TRACE(OTHER, logout("command 0x%04x, link 0x%08x, addr 0x%08x, size %u\n", -- 1.6.0.2 ++++++ kvm-qemu-preXX-fix-rom-file-name-for-e100-nic.patch ++++++ >From cec201142f2386319f857c9f4d8433eda4d1cd8e Mon Sep 17 00:00:00 2001 From: Bruce Rogers <[email protected]> Date: Mon, 7 Feb 2011 16:33:22 -0700 Subject: [PATCH] fix rom file name for e100 nic --- hw/eepro100.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index edf48f6..437a06c 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -2054,7 +2054,7 @@ static void eepro100_register_devices(void) PCIDeviceInfo *pci_dev = &e100_devices[i].pci; /* We use the same rom file for all device ids. QEMU fixes the device id during rom load. */ - pci_dev->romfile = "gpxe-eepro100-80861209.rom"; + pci_dev->romfile = "pxe-i82559er.bin"; pci_dev->init = e100_nic_init; pci_dev->exit = pci_nic_uninit; pci_dev->qdev.props = e100_properties; -- 1.6.0.2 ++++++ kvm-qemu-user-space-tool-name.patch ++++++ --- /var/tmp/diff_new_pack.hgPznV/_old 2011-02-21 14:37:51.000000000 +0100 +++ /var/tmp/diff_new_pack.hgPznV/_new 2011-02-21 14:37:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: qemu-kvm-0.14.0.rc0/vl.c +Index: qemu-kvm-0.14.0/vl.c =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/vl.c -+++ qemu-kvm-0.14.0.rc0/vl.c -@@ -1507,7 +1507,7 @@ static void help(int exitcode) +--- qemu-kvm-0.14.0.orig/vl.c ++++ qemu-kvm-0.14.0/vl.c +@@ -1519,7 +1519,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-studio-slirp-nooutgoing.patch ++++++ --- /var/tmp/diff_new_pack.hgPznV/_old 2011-02-21 14:37:51.000000000 +0100 +++ /var/tmp/diff_new_pack.hgPznV/_new 2011-02-21 14:37:51.000000000 +0100 @@ -1,7 +1,7 @@ -Index: qemu-kvm-0.14.0.rc0/vl.c +Index: qemu-kvm-0.14.0/vl.c =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/vl.c -+++ qemu-kvm-0.14.0.rc0/vl.c +--- qemu-kvm-0.14.0.orig/vl.c ++++ qemu-kvm-0.14.0/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; -@@ -2339,6 +2340,14 @@ int main(int argc, char **argv, char **e +@@ -2351,6 +2352,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.0.rc0/slirp/tcp_subr.c +Index: qemu-kvm-0.14.0/slirp/tcp_subr.c =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/slirp/tcp_subr.c -+++ qemu-kvm-0.14.0.rc0/slirp/tcp_subr.c +--- qemu-kvm-0.14.0.orig/slirp/tcp_subr.c ++++ qemu-kvm-0.14.0/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,10 +73,10 @@ /* 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.0.rc0/slirp/socket.c +Index: qemu-kvm-0.14.0/slirp/socket.c =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/slirp/socket.c -+++ qemu-kvm-0.14.0.rc0/slirp/socket.c +--- qemu-kvm-0.14.0.orig/slirp/socket.c ++++ qemu-kvm-0.14.0/slirp/socket.c @@ -529,6 +529,8 @@ sorecvfrom(struct socket *so) } /* if ping packet */ } @@ -99,10 +99,10 @@ /* 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.0.rc0/qemu-options.hx +Index: qemu-kvm-0.14.0/qemu-options.hx =================================================================== ---- qemu-kvm-0.14.0.rc0.orig/qemu-options.hx -+++ qemu-kvm-0.14.0.rc0/qemu-options.hx +--- qemu-kvm-0.14.0.orig/qemu-options.hx ++++ qemu-kvm-0.14.0/qemu-options.hx @@ -1913,6 +1913,16 @@ Store the QEMU process PID in @var{file} from a script. ETEXI ++++++ qemu-img-vmdk-scsi.patch ++++++ >From 09686f619707ec98e073bf671b0334a2f65934ad Mon Sep 17 00:00:00 2001 From: Ulrich Hecht <[email protected]> Date: Tue, 14 Apr 2009 16:37:42 +0200 Subject: [PATCH 11/17] qemu-img-vmdk-scsi Support creation of SCSI VMDK images in qemu-img. Signed-off-by: Ulrich Hecht <[email protected]> --- block.c | 5 ++++- block/vmdk.c | 7 +++++-- block_int.h | 2 ++ qemu-img.c | 8 +++++++- 4 files changed, 18 insertions(+), 4 deletions(-) Index: qemu-kvm-0.14.0/block.c =================================================================== --- qemu-kvm-0.14.0.orig/block.c +++ qemu-kvm-0.14.0/block.c @@ -2792,7 +2792,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; BlockDriverState *bs = NULL; BlockDriver *drv, *proto_drv; BlockDriver *backing_drv = NULL; @@ -2901,6 +2901,9 @@ int bdrv_img_create(const char *filename printf("Formatting '%s', fmt=%s ", filename, fmt); print_option_parameters(param); + scsi = get_option_parameter(param, BLOCK_OPT_SCSI); + if (scsi && scsi->value.n) + printf(", SCSI"); puts(""); ret = bdrv_create(drv, filename, param); Index: qemu-kvm-0.14.0/block/vmdk.c =================================================================== --- qemu-kvm-0.14.0.orig/block/vmdk.c +++ qemu-kvm-0.14.0/block/vmdk.c @@ -685,7 +685,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; + } 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" }, + { + .name = BLOCK_OPT_SCSI, + .type = OPT_FLAG, + .help = "SCSI image" + }, { NULL } }; Index: qemu-kvm-0.14.0/block_int.h =================================================================== --- qemu-kvm-0.14.0.orig/block_int.h +++ qemu-kvm-0.14.0/block_int.h @@ -30,10 +30,12 @@ #define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_COMPAT6 4 +#define BLOCK_FLAG_SCSI 8 #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" #define BLOCK_OPT_COMPAT6 "compat6" +#define BLOCK_OPT_SCSI "scsi" #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.0/qemu-img.c =================================================================== --- qemu-kvm-0.14.0.orig/qemu-img.c +++ qemu-kvm-0.14.0/qemu-img.c @@ -576,7 +576,7 @@ static int img_convert(int argc, char ** const uint8_t *buf1; BlockDriverInfo bdi; QEMUOptionParameter *param = NULL, *create_options = NULL; - QEMUOptionParameter *out_baseimg_param; + QEMUOptionParameter *out_baseimg_param, *scsi; char *options = NULL; const char *snapshot_name = NULL; @@ -731,6 +731,12 @@ static int img_convert(int argc, char ** } } + if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) { + error_report("SCSI devices not supported for this file format"); + ret = -1; + goto out; + } + /* Create the new image */ ret = bdrv_create(drv, out_filename, param); if (ret < 0) { ++++++ qemu-kvm-0.14.0.rc0.tar.bz2 -> qemu-kvm-0.14.0.tar.bz2 ++++++ ++++ 8872 lines of diff (skipped) ++++++ seabios-fix-parallel-make.patch ++++++ commit 32aa9f362b2265279daafcba26bc574324479c93 Author: Stefan Reinauer <[email protected]> Date: Thu Jan 27 18:39:01 2011 -0800 fix parallel compilation of SeaBIOS See patch. Signed-off-by: Stefan Reinauer <[email protected]> Index: qemu-kvm-0.14.0/roms/seabios/Makefile =================================================================== --- qemu-kvm-0.14.0.orig/roms/seabios/Makefile +++ qemu-kvm-0.14.0/roms/seabios/Makefile @@ -128,7 +128,7 @@ $(OUT)code16.o: romlayout.S $(OUT)ccode. @echo " Compiling (16bit) $@" $(Q)$(CC) $(CFLAGS16INC) -c -D__ASSEMBLY__ $< -o $@ -$(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)code16.o tools/layoutrom.py +$(OUT)romlayout16.lds: $(OUT)ccode32flat.o $(OUT)code32seg.o $(OUT)code16.o tools/layoutrom.py @echo " Building ld scripts (version \"$(VERSION)\")" $(Q)echo 'const char VERSION[] = "$(VERSION)";' > $(OUT)version.c $(Q)$(CC) $(CFLAGS32FLAT) -c $(OUT)version.c -o $(OUT)version.o @@ -138,6 +138,9 @@ $(OUT)romlayout16.lds $(OUT)romlayout32s $(Q)$(OBJDUMP) -thr $(OUT)code16.o > $(OUT)code16.o.objdump $(Q)./tools/layoutrom.py $(OUT)code16.o.objdump $(OUT)code32seg.o.objdump $(OUT)code32flat.o.objdump $(OUT)romlayout16.lds $(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds +# These are actually built by tools/layoutrom.py above, but by pulling them +# into an extra rule we prevent make -j from spawning layoutrom.py 4 times. +$(OUT)romlayout32seg.lds $(OUT)romlayout32flat.lds $(OUT)code32flat.o: $(OUT)romlayout16.lds $(OUT)rom16.o: $(OUT)code16.o $(OUT)romlayout16.lds @echo " Linking $@" ++++++ vgabios-bcc-paths.patch ++++++ --- /var/tmp/diff_new_pack.hgPznV/_old 2011-02-21 14:37:52.000000000 +0100 +++ /var/tmp/diff_new_pack.hgPznV/_new 2011-02-21 14:37:52.000000000 +0100 @@ -1,7 +1,7 @@ Index: qemu-kvm-0.13.0/kvm/vgabios/Makefile =================================================================== ---- qemu-kvm-0.13.0.orig/kvm/vgabios/Makefile -+++ qemu-kvm-0.13.0/kvm/vgabios/Makefile +--- qemu-kvm-0.13.0.orig/roms/vgabios/Makefile ++++ qemu-kvm-0.13.0/roms/vgabios/Makefile @@ -5,7 +5,7 @@ CFLAGS = -g -O2 -Wall -Wstrict-prototyp LDFLAGS = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
