Skip to contentSkip to conversation

Patch Round-up for stable 1.4.1, freeze next Tuesday

Qemu-devel New Michael Roth 11 participants 52 messages Apr 2, 2013 – Apr 8, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Testing/feedback is greatly appreciated.

Thanks!

Andreas Färber (2):
target-ppc: Fix "G2leGP3" PVR
target-ppc: Fix CPU_POWERPC_MPC8547E

Christian Borntraeger (2):
Allow virtio-net features for legacy s390 virtio bus
virtio-blk: fix unplug + virsh reboot

Cole Robinson (1):
rtc-test: Fix test failures with recent glib

Cornelia Huck (1):
virtio-ccw: Queue sanity check for notify hypercall.

David Gibson (2):
pseries: Add compatible property to root of device tree
pseries: Add cleanup hook for PAPR virtual LAN device

Gerd Hoffmann (2):
vga: fix byteswapping.
update seabios to 1.7.2.1

Igor Mitsyanko (1):
qemu-char.c: fix waiting for telnet connection message

Jason Wang (3):
tap: forbid creating multiqueue tap when hub is used
net: reduce the unnecessary memory allocation of multiqueue
help: add docs for multiqueue tap options

John Rigby (2):
linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex
linux-user: fix futex strace of FUTEX_CLOCK_REALTIME

Mark Cave-Ayland (1):
ide/macio: Fix macio DMA initialisation.

Markus Armbruster (1):
qmp: netdev_add is like -netdev, not -net, fix documentation

Michael Roth (2):
qemu-ga: make guest-sync-delimited available during fsfreeze
qemu-ga: use key-value store to avoid recycling fd handles after restart

Michal Privoznik (1):
configure: Require at least spice-protocol-0.12.3

Orit Wasserman (1):
Fix page_cache leak in cache_resize

Paolo Bonzini (7):
coroutine: trim down nesting level in perf_nesting test
scsi-disk: handle io_canceled uniformly and correctly
iscsi: look for pkg-config file too
scsi: do not call scsi_read_data/scsi_write_data for a canceled request
scsi-disk: do not complete canceled UNMAP requests
qcow2: make is_allocated return true for zero clusters
qemu-bridge-helper: force usage of a very high MAC address for the bridge

Peter Crosthwaite (1):
qga/main.c: Don't use g_key_file_get/set_int64

Peter Lieven (2):
block: complete all IOs before .bdrv_truncate
page_cache: fix memory leak

Peter Maydell (2):
linux-user: make bogus negative iovec lengths fail EINVAL linux-user/syscall.c: Don't warn about unimplemented get_robust_list

Stefan Hajnoczi (2):
qcow2: flush refcount cache correctly in alloc_refcount_block()
qcow2: flush refcount cache correctly in qcow2_write_snapshots()

Yeongkyoon Lee (1):
tcg: Fix occasional TCG broken problem when ldst optimization enabled

 block.c                     |    4 +
 block/qcow2-cluster.c       |    3 +
 block/qcow2-refcount.c      |   10 ++-
 block/qcow2-snapshot.c      |    5 +-
 block/qcow2.c               |    6 +-
 configure                   |   10 ++-
 hw/macio.c                  |    2 +-
 hw/qxl-render.c             |    3 +-
 hw/s390x/s390-virtio-bus.c  |    1 +
 hw/s390x/s390-virtio-ccw.c  |    3 +
 hw/scsi-bus.c               |    4 +
 hw/scsi-disk.c              |   36 +++++++--
 hw/spapr.c                  |    1 +
 hw/spapr_llan.c             |    8 ++
 hw/vga.c                    |   18 ++---
 hw/virtio-blk.c             |    4 +-
 hw/virtio-net.c             |    6 +-
 hw/vmware_vga.c             |    2 +-
 hw/xenfb.c                  |    3 +-
 include/net/net.h           |    2 +-
 include/ui/console.h        |    3 +-
 linux-user/strace.c         |    6 ++
 linux-user/syscall.c        |   20 ++++-
 net/net.c                   |   19 +++--
 net/tap.c                   |    7 ++
 page_cache.c                |    4 +
 pc-bios/bios.bin            |  Bin 131072 -> 131072 bytes
 qapi-schema.json            |    6 ++
 qemu-bridge-helper.c        |   18 +++++
 qemu-char.c                 |    2 +-
 qemu-options.hx             |    4 +-
 qga/commands-posix.c        |   25 ++++--
 qga/guest-agent-core.h      |    1 +
 qga/main.c                  |  185 +++++++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx             |    2 +-
 roms/seabios                |    2 +-
 target-ppc/translate_init.c |    4 +-
 tests/rtc-test.c            |    4 +-
 tests/test-coroutine.c      |    2 +-
 trace-events                |    1 +
 translate-all.c             |    4 +-
 ui/console.c                |    9 ++-
 42 files changed, 390 insertions(+), 69 deletions(-)
#1 lore raw

PATCH 1/37 target-ppc: Fix "G2leGP3" PVR

From: Andreas Färber <[email protected]>

Unlike derived PVR constants mapped to CPU_POWERPC_G2LEgp3, the "G2leGP3" model definition itself used the CPU_POWERPC_G2LEgp1 PVR.

Fixing this will allow to alias CPU_POWERPC_G2LEgp3-using types to "G2leGP3".

(cherry picked from commit bfe6d5b0daf9fdafeb0dbb7c26774dbb1bbb4507)
---
 target-ppc/translate_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target-ppc/translate_init.c +1 -1
index 6cebaa1..63e6fdc 100644
@@ -8243,7 +8243,7 @@ static const ppc_def_t ppc_defs[] = {
     /* PowerPC G2LE GP1 core                                                 */
     POWERPC_DEF("G2leGP1",       CPU_POWERPC_G2LEgp1,                G2LE),
     /* PowerPC G2LE GP3 core                                                 */
-    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp1,                G2LE),
+    POWERPC_DEF("G2leGP3",       CPU_POWERPC_G2LEgp3,                G2LE),
     /* PowerPC MPC603 microcontrollers                                       */
     /* MPC8240                                                               */
     POWERPC_DEF("MPC8240",       CPU_POWERPC_MPC8240,                603E),
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/37 coroutine: trim down nesting level in perf_nesting test

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

20000 nested coroutines require 20 GB of virtual address space. Only nest 1000 of them so that the test (only enabled with "-m perf" on the command line) runs on 32-bit machines too.

(cherry picked from commit 027003152f4cf21952f9282b4487daf3fdd372ba)
---
 tests/test-coroutine.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/test-coroutine.c +1 -1
index 4c6cc81..39be046 100644
@@ -183,7 +183,7 @@ static void perf_nesting(void)
     double duration;
 
     maxcycles = 100000000;
-    maxnesting = 20000;
+    maxnesting = 1000;
     Coroutine *root;
     NestData nd = {
         .n_enter  = 0,
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/37 block: complete all IOs before .bdrv_truncate

In reply to Michael Roth

From: Peter Lieven <[email protected]>

bdrv_truncate() invalidates the bdrv_check_request() result for in-flight requests, so there should better be none.

(cherry picked from commit 9a665b2b8640e464f0a778216fc2dca8d02acf33)
---
 block.c |    4 ++++
 1 file changed, 4 insertions(+)
block.c +4 -0
index 50dab8e..11f162b 100644
@@ -2427,6 +2427,10 @@ int bdrv_truncate(BlockDriverState *bs, int64_t offset)
         return -EACCES;
     if (bdrv_in_use(bs))
         return -EBUSY;
+
+    /* There better not be any in-flight IOs when we truncate the device. */
+    bdrv_drain_all();
+
     ret = drv->bdrv_truncate(bs, offset);
     if (ret == 0) {
         ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 4/37 tap: forbid creating multiqueue tap when hub is used

In reply to Michael Roth

From: Jason Wang <[email protected]>

Obviously, hub does not support multiqueue tap. So this patch forbids creating multiple queue tap when hub is used to prevent the crash when command line such as "-net tap,queues=2" is used.

(cherry picked from commit ce675a7579fea498397c5d2da3c5367671e9f02a)
---
 net/tap.c |    7 +++++++
 1 file changed, 7 insertions(+)
net/tap.c +7 -0
index 48c254e..daab350 100644
@@ -693,6 +693,13 @@ int net_init_tap(const NetClientOptions *opts, const char *name,
     queues = tap->has_queues ? tap->queues : 1;
     vhostfdname = tap->has_vhostfd ? tap->vhostfd : NULL;
 
+    /* QEMU vlans does not support multiqueue tap, in this case peer is set.
+     * For -netdev, peer is always NULL. */
+    if (peer && (tap->has_queues || tap->has_fds || tap->has_vhostfds)) {
+        error_report("Multiqueue tap cannnot be used with QEMU vlans");
+        return -1;
+    }
+
     if (tap->has_fd) {
         if (tap->has_ifname || tap->has_script || tap->has_downscript ||
             tap->has_vnet_hdr || tap->has_helper || tap->has_queues ||
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 5/37 qemu-char.c: fix waiting for telnet connection message

In reply to Michael Roth

From: Igor Mitsyanko <[email protected]>

Current colon position in "waiting for telnet connection" message template produces messages like:
QEMU waiting for connection on: telnet::127.0.0.16666,server

After moving a colon to the right, we will get a correct messages like:
QEMU waiting for connection on: telnet:127.0.0.1:6666,server

(cherry picked from commit e5545854dd1e2e3507b210ac0c1cbfca69ff0fcb)
---
 qemu-char.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-char.c +1 -1
index e4b0f53..3e152e1 100644
@@ -2482,7 +2482,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay,
         s->do_nodelay = do_nodelay;
         getnameinfo((struct sockaddr *) &ss, ss_len, host, sizeof(host),
                     serv, sizeof(serv), NI_NUMERICHOST | NI_NUMERICSERV);
-        snprintf(chr->filename, 256, "%s:%s:%s%s%s%s",
+        snprintf(chr->filename, 256, "%s:%s%s%s:%s%s",
                  is_telnet ? "telnet" : "tcp",
                  left, host, right, serv,
                  is_listen ? ",server" : "");
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 6/37 net: reduce the unnecessary memory allocation of multiqueue

In reply to Michael Roth

From: Jason Wang <[email protected]>

Edivaldo reports a problem that the array of NetClientState in NICState is too large - MAX_QUEUE_NUM(1024) which will wastes memory even if multiqueue is not used.

Instead of static arrays, solving this issue by allocating the queues on demand for both the NetClientState array in NICState and VirtIONetQueue array in VirtIONet.

Tested by myself, with single virtio-net-pci device. The memory allocation is almost the same as when multiqueue is not merged.

Cc Edivaldo de Araujo Pereira <[email protected]>
(cherry picked from commit f6b26cf257232e5854c0e5c98a8685c625bf986e)
---
 hw/virtio-net.c   |    6 ++++--
 include/net/net.h |    2 +-
 net/net.c         |   19 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)
hw/virtio-net.c +4 -2
index 573c669..bb2c26c 100644
@@ -44,7 +44,7 @@ typedef struct VirtIONet
     VirtIODevice vdev;
     uint8_t mac[ETH_ALEN];
     uint16_t status;
-    VirtIONetQueue vqs[MAX_QUEUE_NUM];
+    VirtIONetQueue *vqs;
     VirtQueue *ctrl_vq;
     NICState *nic;
     uint32_t tx_timeout;
@@ -1326,8 +1326,9 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
     n->vdev.set_status = virtio_net_set_status;
     n->vdev.guest_notifier_mask = virtio_net_guest_notifier_mask;
     n->vdev.guest_notifier_pending = virtio_net_guest_notifier_pending;
+    n->max_queues = MAX(conf->queues, 1);
+    n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues);
     n->vqs[0].rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx);
-    n->max_queues = conf->queues;
     n->curr_queues = 1;
     n->vqs[0].n = n;
     n->tx_timeout = net->txtimer;
@@ -1412,6 +1413,7 @@ void virtio_net_exit(VirtIODevice *vdev)
         }
     }
 
+    g_free(n->vqs);
     qemu_del_nic(n->nic);
     virtio_cleanup(&n->vdev);
 }
include/net/net.h +1 -1
index 43a045e..cb049a1 100644
@@ -72,7 +72,7 @@ struct NetClientState {
 };
 
 typedef struct NICState {
-    NetClientState ncs[MAX_QUEUE_NUM];
+    NetClientState *ncs;
     NICConf *conf;
     void *opaque;
     bool peer_deleted;
net/net.c +9 -10
index be03a8d..6262ed0 100644
@@ -235,23 +235,20 @@ NICState *qemu_new_nic(NetClientInfo *info,
                        const char *name,
                        void *opaque)
 {
-    NetClientState *nc;
     NetClientState **peers = conf->peers.ncs;
     NICState *nic;
-    int i;
+    int i, queues = MAX(1, conf->queues);
 
     assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC);
     assert(info->size >= sizeof(NICState));
 
-    nc = qemu_new_net_client(info, peers[0], model, name);
-    nc->queue_index = 0;
-
-    nic = qemu_get_nic(nc);
+    nic = g_malloc0(info->size + sizeof(NetClientState) * queues);
+    nic->ncs = (void *)nic + info->size;
     nic->conf = conf;
     nic->opaque = opaque;
 
-    for (i = 1; i < conf->queues; i++) {
-        qemu_net_client_setup(&nic->ncs[i], info, peers[i], model, nc->name,
+    for (i = 0; i < queues; i++) {
+        qemu_net_client_setup(&nic->ncs[i], info, peers[i], model, name,
                               NULL);
         nic->ncs[i].queue_index = i;
     }
@@ -261,7 +258,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
 
 NetClientState *qemu_get_subqueue(NICState *nic, int queue_index)
 {
-    return &nic->ncs[queue_index];
+    return nic->ncs + queue_index;
 }
 
 NetClientState *qemu_get_queue(NICState *nic)
@@ -273,7 +270,7 @@ NICState *qemu_get_nic(NetClientState *nc)
 {
     NetClientState *nc0 = nc - nc->queue_index;
 
-    return DO_UPCAST(NICState, ncs[0], nc0);
+    return (NICState *)((void *)nc0 - nc->info->size);
 }
 
 void *qemu_get_nic_opaque(NetClientState *nc)
@@ -368,6 +365,8 @@ void qemu_del_nic(NICState *nic)
         qemu_cleanup_net_client(nc);
         qemu_free_net_client(nc);
     }
+
+    g_free(nic);
 }
 
 void qemu_foreach_nic(qemu_nic_foreach func, void *opaque)
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH 7/37 help: add docs for multiqueue tap options

In reply to Michael Roth

From: Jason Wang <[email protected]>

Cc Markus Armbruster <[email protected]>
Cc Jason Wang <[email protected]>

Message-id: [email protected]

(cherry picked from commit 2ca81baa0b3363d57de94f8b80c02a003b361161)
---
 qapi-schema.json |    6 ++++++
 qemu-options.hx  |    4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)
qapi-schema.json +6 -0
index 7275b5d..cd7ea25 100644
@@ -2504,6 +2504,9 @@
 #
 # @fd: #optional file descriptor of an already opened tap
 #
+# @fds: #optional multiple file descriptors of already opened multiqueue capable
+# tap
+#
 # @script: #optional script to initialize the interface
 #
 # @downscript: #optional script to shut down the interface
@@ -2518,6 +2521,9 @@
 #
 # @vhostfd: #optional file descriptor of an already opened vhost net device
 #
+# @vhostfds: #optional file descriptors of multiple already opened vhost net
+# devices
+#
 # @vhostforce: #optional vhost on for non-MSIX virtio guests
 #
 # Since 1.2
qemu-options.hx +3 -1
index 9d7131a..be21048 100644
@@ -1338,7 +1338,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "-net tap[,vlan=n][,name=str],ifname=name\n"
     "                connect the host TAP network interface to VLAN 'n'\n"
 #else
-    "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off]\n"
+    "-net tap[,vlan=n][,name=str][,fd=h][,fds=x:y:...:z][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostfds=x:y:...:z][,vhostforce=on|off]\n"
     "                connect the host TAP network interface to VLAN 'n'\n"
     "                use network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n"
     "                to configure it and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n"
@@ -1347,6 +1347,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "                use network helper 'helper' (default=" DEFAULT_BRIDGE_HELPER ") to\n"
     "                configure it\n"
     "                use 'fd=h' to connect to an already opened TAP interface\n"
+    "                use 'fds=x:y:...:z' to connect to already opened multiqueue capable TAP interfaces\n"
     "                use 'sndbuf=nbytes' to limit the size of the send buffer (the\n"
     "                default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576')\n"
     "                use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag\n"
@@ -1355,6 +1356,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
     "                    (only has effect for virtio guests which use MSIX)\n"
     "                use vhostforce=on to force vhost on for non-MSIX virtio guests\n"
     "                use 'vhostfd=h' to connect to an already opened vhost net device\n"
+    "                use 'vhostfds=x:y:...:z to connect to multiple already opened vhost net devices\n"
     "-net bridge[,vlan=n][,name=str][,br=bridge][,helper=helper]\n"
     "                connects a host TAP network interface to a host bridge device 'br'\n"
     "                (default=" DEFAULT_BRIDGE_INTERFACE ") using the program 'helper'\n"
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 8/37 vga: fix byteswapping.

In reply to Michael Roth

From: Gerd Hoffmann <[email protected]>

In case host and guest endianness differ the vga code first creates a shared surface (using qemu_create_displaysurface_from), then goes patch the surface format to indicate that the bytes must be swapped.

The switch to pixman broke that hack as the format patching isn't propagated into the pixman image, so ui code using the pixman image directly (such as vnc) uses the wrong format.

Fix that by adding a byteswap parameter to qemu_create_displaysurface_from, so we'll use the correct format when creating the surface (and the pixman image) and don't have to patch the format afterwards.

[ v2: unbreak xen build ]

Message-id: [email protected]

(cherry picked from commit b1424e0381a7f1c9969079eca4458d5f20bf1859)
---
 hw/qxl-render.c      |    3 ++-
 hw/vga.c             |   18 ++++++++----------
 hw/vmware_vga.c      |    2 +-
 hw/xenfb.c           |    3 ++-
 include/ui/console.h |    3 ++-
 ui/console.c         |    9 +++++++--
 6 files changed, 22 insertions(+), 16 deletions(-)
hw/qxl-render.c +2 -1
index 88e63f8..455fb91 100644
@@ -118,7 +118,8 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)
                  qxl->guest_primary.surface.height,
                  qxl->guest_primary.bits_pp,
                  qxl->guest_primary.abs_stride,
-                 qxl->guest_primary.data);
+                 qxl->guest_primary.data,
+                 false);
         } else {
             qemu_resize_displaysurface(vga->ds,
                     qxl->guest_primary.surface.width,
hw/vga.c +8 -10
index e2ba7f2..1caf23d 100644
@@ -1643,6 +1643,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
     uint8_t *d;
     uint32_t v, addr1, addr;
     vga_draw_line_func *vga_draw_line;
+#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
+    static const bool byteswap = false;
+#else
+    static const bool byteswap = true;
+#endif
 
     full_update |= update_basic_params(s);
 
@@ -1685,18 +1690,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
         disp_width != s->last_width ||
         height != s->last_height ||
         s->last_depth != depth) {
-#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
-        if (depth == 16 || depth == 32) {
-#else
-        if (depth == 32) {
-#endif
+        if (depth == 32 || (depth == 16 && !byteswap)) {
             qemu_free_displaysurface(s->ds);
             s->ds->surface = qemu_create_displaysurface_from(disp_width, height, depth,
                     s->line_offset,
-                    s->vram_ptr + (s->start_addr * 4));
-#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
-            s->ds->surface->pf = qemu_different_endianness_pixelformat(depth);
-#endif
+                    s->vram_ptr + (s->start_addr * 4), byteswap);
             dpy_gfx_resize(s->ds);
         } else {
             qemu_console_resize(s->ds, disp_width, height);
@@ -1715,7 +1713,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
         s->ds->surface = qemu_create_displaysurface_from(disp_width,
                 height, depth,
                 s->line_offset,
-                s->vram_ptr + (s->start_addr * 4));
+                s->vram_ptr + (s->start_addr * 4), byteswap);
         dpy_gfx_setdata(s->ds);
     }
 
hw/vmware_vga.c +1 -1
index cd15ee4..8fc201b 100644
@@ -1074,7 +1074,7 @@ static void vmsvga_screen_dump(void *opaque, const char *filename, bool cswitch,
                                  ds_get_height(s->vga.ds),
                                  32,
                                  ds_get_linesize(s->vga.ds),
-                                 s->vga.vram_ptr);
+                                 s->vga.vram_ptr, false);
         ppm_save(filename, ds, errp);
         g_free(ds);
     }
hw/xenfb.c +2 -1
index 903efd3..7f1f6b4 100644
@@ -756,7 +756,8 @@ static void xenfb_update(void *opaque)
             qemu_free_displaysurface(xenfb->c.ds);
             xenfb->c.ds->surface = qemu_create_displaysurface_from
                 (xenfb->width, xenfb->height, xenfb->depth,
-                 xenfb->row_stride, xenfb->pixels + xenfb->offset);
+                 xenfb->row_stride, xenfb->pixels + xenfb->offset,
+                 false);
             break;
         default:
             /* we must convert stuff */
include/ui/console.h +2 -1
index fc23baa..18012f1 100644
@@ -184,7 +184,8 @@ struct DisplayState {
 void register_displaystate(DisplayState *ds);
 DisplayState *get_displaystate(void);
 DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,
-                                                int linesize, uint8_t *data);
+                                                int linesize, uint8_t *data,
+                                                bool byteswap);
 PixelFormat qemu_different_endianness_pixelformat(int bpp);
 PixelFormat qemu_default_pixelformat(int bpp);
 
ui/console.c +7 -2
index 0a68836..25e06a5 100644
@@ -1339,11 +1339,16 @@ DisplaySurface *qemu_resize_displaysurface(DisplayState *ds,
 }
 
 DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
-                                                int linesize, uint8_t *data)
+                                                int linesize, uint8_t *data,
+                                                bool byteswap)
 {
     DisplaySurface *surface = g_new0(DisplaySurface, 1);
 
-    surface->pf = qemu_default_pixelformat(bpp);
+    if (byteswap) {
+        surface->pf = qemu_different_endianness_pixelformat(bpp);
+    } else {
+        surface->pf = qemu_default_pixelformat(bpp);
+    }
 
     surface->format = qemu_pixman_get_format(&surface->pf);
     assert(surface->format != 0);
Signature · 1 line
1.7.9.5
#9 lore raw

PATCH 9/37 qmp: netdev_add is like -netdev, not -net, fix documentation

In reply to Michael Roth

From: Markus Armbruster <[email protected]>

(cherry picked from commit af347aa5a521555f5342e67993eb717d4f542ba8)
---
 qmp-commands.hx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qmp-commands.hx +1 -1
index 799adea..95022e2 100644
@@ -822,7 +822,7 @@ Example:
 -> { "execute": "netdev_add", "arguments": { "type": "user", "id": "netdev1" } }
 <- { "return": {} }
 
-Note: The supported device options are the same ones supported by the '-net'
+Note: The supported device options are the same ones supported by the '-netdev'
       command-line argument, which are listed in the '-help' output or QEMU's
       manual
 
Signature · 1 line
1.7.9.5
#10 lore raw

PATCH 10/37 qemu-ga: make guest-sync-delimited available during fsfreeze

In reply to Michael Roth

We currently maintain a whitelist of commands that are safe during fsfreeze. During fsfreeze, we disable all commands that aren't part of that whitelist.

guest-sync-delimited meets the criteria for being whitelisted, and is also required for qemu-ga clients that rely on guest-sync-delimited for re-syncing the channel after a timeout.

(cherry picked from commit c5dcb6ae23a3ed7a01bae1cd75ce02abea31db5e)
---
 qga/main.c |    1 +
 1 file changed, 1 insertion(+)
qga/main.c +1 -0
index db281a5..ad75171 100644
@@ -85,6 +85,7 @@ static const char *ga_freeze_whitelist[] = {
     "guest-ping",
     "guest-info",
     "guest-sync",
+    "guest-sync-delimited",
     "guest-fsfreeze-status",
     "guest-fsfreeze-thaw",
     NULL
Signature · 1 line
1.7.9.5
#11 lore raw

PATCH 11/37 scsi-disk: handle io_canceled uniformly and correctly

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

Always check it immediately after calling bdrv_acct_done, and always do a "goto done" in case the "done" label has to free some memory---as is the case for scsi_unmap_complete in the previous patch.

This patch could fix problems that happen when a request is split into multiple parts, and one of them is canceled. Then the next part is fired, but the HBA's cancellation callbacks have fired already. Whether this happens or not, depends on how the block/ driver implements AIO cancellation. It it does a simple bdrv_drain_all() or similar, then it will not have a problem. If it only cancels the given AIOCB, this scenario could happen.

(cherry picked from commit 0c92e0e6b64c9061f7365a2712b9055ea35b52f9)
---
 hw/scsi-disk.c |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)
hw/scsi-disk.c +21 -4
index 28e75bb..6bc739d 100644
@@ -176,6 +176,9 @@ static void scsi_aio_complete(void *opaque, int ret)
     assert(r->req.aiocb != NULL);
     r->req.aiocb = NULL;
     bdrv_acct_done(s->qdev.conf.bs, &r->acct);
+    if (r->req.io_canceled) {
+        goto done;
+    }
 
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
@@ -221,6 +224,10 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
 {
     SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
 
+    if (r->req.io_canceled) {
+        goto done;
+    }
+
     if (scsi_is_cmd_fua(&r->req.cmd)) {
         bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH);
         r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_aio_complete, r);
@@ -228,6 +235,8 @@ static void scsi_write_do_fua(SCSIDiskReq *r)
     }
 
     scsi_req_complete(&r->req, GOOD);
+
+done:
     if (!r->req.io_canceled) {
         scsi_req_unref(&r->req);
     }
@@ -241,6 +250,9 @@ static void scsi_dma_complete(void *opaque, int ret)
     assert(r->req.aiocb != NULL);
     r->req.aiocb = NULL;
     bdrv_acct_done(s->qdev.conf.bs, &r->acct);
+    if (r->req.io_canceled) {
+        goto done;
+    }
 
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
@@ -272,6 +284,9 @@ static void scsi_read_complete(void * opaque, int ret)
     assert(r->req.aiocb != NULL);
     r->req.aiocb = NULL;
     bdrv_acct_done(s->qdev.conf.bs, &r->acct);
+    if (r->req.io_canceled) {
+        goto done;
+    }
 
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
@@ -303,6 +318,9 @@ static void scsi_do_read(void *opaque, int ret)
         r->req.aiocb = NULL;
         bdrv_acct_done(s->qdev.conf.bs, &r->acct);
     }
+    if (r->req.io_canceled) {
+        goto done;
+    }
 
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
@@ -310,10 +328,6 @@ static void scsi_do_read(void *opaque, int ret)
         }
     }
 
-    if (r->req.io_canceled) {
-        return;
-    }
-
     /* The request is used as the AIO opaque value, so add a ref.  */
     scsi_req_ref(&r->req);
 
@@ -421,6 +435,9 @@ static void scsi_write_complete(void * opaque, int ret)
         r->req.aiocb = NULL;
         bdrv_acct_done(s->qdev.conf.bs, &r->acct);
     }
+    if (r->req.io_canceled) {
+        goto done;
+    }
 
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
Signature · 1 line
1.7.9.5
#12 lore raw

PATCH 12/37 iscsi: look for pkg-config file too

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

Due to library conflicts, Fedora will have to put libiscsi in /usr/lib/iscsi. Simplify configuration by using a pkg-config file. The Fedora package will distribute one, and the patch to add it has been sent to upstream libiscsi as well.

(cherry picked from commit 3c33ea9640758bb625e110a77673e5abfd184e54)
---
 configure |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
configure +7 -1
index 8789324..5fb388a 100755
@@ -2759,7 +2759,13 @@ if test "$libiscsi" != "no" ; then
 #include <iscsi/iscsi.h>
 int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; }
 EOF
-  if compile_prog "" "-liscsi" ; then
+  if $pkg_config --atleast-version=1.7.0 libiscsi --modversion >/dev/null 2>&1; then
+    libiscsi="yes"
+    libiscsi_cflags=$($pkg_config --cflags libiscsi 2>/dev/null)
+    libiscsi_libs=$($pkg_config --libs libiscsi 2>/dev/null)
+    CFLAGS="$CFLAGS $libiscsi_cflags"
+    LIBS="$LIBS $libiscsi_libs"
+  elif compile_prog "" "-liscsi" ; then
     libiscsi="yes"
     LIBS="$LIBS -liscsi"
   else
Signature · 1 line
1.7.9.5
#13 lore raw

PATCH 13/37 scsi: do not call scsi_read_data/scsi_write_data for a canceled request

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

(cherry picked from commit 6f6710aa99ac53b59ff0f14380830cb9ab6bdc14)
---
 hw/scsi-bus.c |    4 ++++
 trace-events  |    1 +
 2 files changed, 5 insertions(+)
hw/scsi-bus.c +4 -0
index a97f1cd..01e1dec 100644
@@ -1508,6 +1508,10 @@ void scsi_req_unref(SCSIRequest *req)
    will start the next chunk or complete the command.  */
 void scsi_req_continue(SCSIRequest *req)
 {
+    if (req->io_canceled) {
+        trace_scsi_req_continue_canceled(req->dev->id, req->lun, req->tag);
+        return;
+    }
     trace_scsi_req_continue(req->dev->id, req->lun, req->tag);
     if (req->cmd.mode == SCSI_XFER_TO_DEV) {
         req->ops->write_data(req);
trace-events +1 -0
index 1011f27..167f481 100644
@@ -460,6 +460,7 @@ scsi_req_data(int target, int lun, int tag, int len) "target %d lun %d tag %d le
 scsi_req_data_canceled(int target, int lun, int tag, int len) "target %d lun %d tag %d len %d"
 scsi_req_dequeue(int target, int lun, int tag) "target %d lun %d tag %d"
 scsi_req_continue(int target, int lun, int tag) "target %d lun %d tag %d"
+scsi_req_continue_canceled(int target, int lun, int tag) "target %d lun %d tag %d"
 scsi_req_parsed(int target, int lun, int tag, int cmd, int mode, int xfer) "target %d lun %d tag %d command %d dir %d length %d"
 scsi_req_parsed_lba(int target, int lun, int tag, int cmd, uint64_t lba) "target %d lun %d tag %d command %d lba %"PRIu64
 scsi_req_parse_bad(int target, int lun, int tag, int cmd) "target %d lun %d tag %d command %d"
Signature · 1 line
1.7.9.5
#14 lore raw

PATCH 14/37 scsi-disk: do not complete canceled UNMAP requests

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

Canceled requests should never be completed, and doing that could cause accesses to a NULL hba_private field.

(cherry picked from commit d0242eadc5bba4f3abe34bc5d536bbfb81aa9891)
---
 hw/scsi-disk.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
hw/scsi-disk.c +7 -4
index 6bc739d..c9c983a 100644
@@ -1493,13 +1493,17 @@ static void scsi_unmap_complete(void *opaque, int ret)
     uint32_t nb_sectors;
 
     r->req.aiocb = NULL;
+    if (r->req.io_canceled) {
+        goto done;
+    }
+
     if (ret < 0) {
         if (scsi_handle_rw_error(r, -ret)) {
             goto done;
         }
     }
 
-    if (data->count > 0 && !r->req.io_canceled) {
+    if (data->count > 0) {
         sector_num = ldq_be_p(&data->inbuf[0]);
         nb_sectors = ldl_be_p(&data->inbuf[8]) & 0xffffffffULL;
         if (!check_lba_range(s, sector_num, nb_sectors)) {
@@ -1516,10 +1520,9 @@ static void scsi_unmap_complete(void *opaque, int ret)
         return;
     }
 
+    scsi_req_complete(&r->req, GOOD);
+
 done:
-    if (data->count == 0) {
-        scsi_req_complete(&r->req, GOOD);
-    }
     if (!r->req.io_canceled) {
         scsi_req_unref(&r->req);
     }
Signature · 1 line
1.7.9.5
#15 lore raw

PATCH 15/37 rtc-test: Fix test failures with recent glib

In reply to Michael Roth

From: Cole Robinson <[email protected]>

As of glib 2.35.4, glib changed its logic for ordering test cases:

https://bugzilla.gnome.org/show_bug.cgi?id=694487

This was causing failures in rtc-test. Group the reordered test cases into their own suite, which maintains the original ordering.

(cherry picked from commit eeb29fb9aa733f97d85857c210d6580a92a1b532)
---
 tests/rtc-test.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/rtc-test.c +2 -2
index 203c0fc..2441dcf 100644
@@ -387,8 +387,8 @@ int main(int argc, char **argv)
     qtest_add_func("/rtc/alarm-time", alarm_time);
     qtest_add_func("/rtc/set-year/20xx", set_year_20xx);
     qtest_add_func("/rtc/set-year/1980", set_year_1980);
-    qtest_add_func("/rtc/register_b_set_flag", register_b_set_flag);
-    qtest_add_func("/rtc/fuzz-registers", fuzz_registers);
+    qtest_add_func("/rtc/misc/register_b_set_flag", register_b_set_flag);
+    qtest_add_func("/rtc/misc/fuzz-registers", fuzz_registers);
     ret = g_test_run();
 
     if (s) {
Signature · 1 line
1.7.9.5
#16 lore raw

PATCH 16/37 Allow virtio-net features for legacy s390 virtio bus

In reply to Michael Roth

From: Christian Borntraeger <[email protected]>

Enable all virtio-net features for the legacy s390 virtio bus. This also fixes
kernel BUG at /usr/src/packages/BUILD/kernel-default-3.0.58/linux-3.0/drivers/s390/kvm/kvm_virtio.c:121!

(cherry picked from commit 35569cea79fd3f5ccb5b23ca024c7d3aa4d24e75)
---
 hw/s390x/s390-virtio-bus.c |    1 +
 1 file changed, 1 insertion(+)
hw/s390x/s390-virtio-bus.c +1 -0
index 089ed92..d9b7f83 100644
@@ -402,6 +402,7 @@ static const VirtIOBindings virtio_s390_bindings = {
 
 static Property s390_virtio_net_properties[] = {
     DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic),
+    DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features),
     DEFINE_PROP_UINT32("x-txtimer", VirtIOS390Device,
                        net.txtimer, TX_TIMER_INTERVAL),
     DEFINE_PROP_INT32("x-txburst", VirtIOS390Device,
Signature · 1 line
1.7.9.5
#17 lore raw

PATCH 17/37 pseries: Add compatible property to root of device tree

In reply to Michael Roth

From: David Gibson <[email protected]>

Currently, for the pseries machine the device tree supplied by qemu to SLOF and from there to the guest does not include a 'compatible property' at the root level. Usually that works fine, since in this case the compatible property doesn't really give any information not already found in the 'device_type' or 'model' properties.

However, the lack of 'compatible' confuses the bootloader install in the SLES11 SP2 and SLES11 SP3 installers. This patch therefore adds a token 'compatible' property to work around that.

(cherry picked from commit d63919c93e6fb0587632adafba82c21e55ea4396)
---
 hw/spapr.c |    1 +
 1 file changed, 1 insertion(+)
hw/spapr.c +1 -0
index e88a27a..fadf70f 100644
@@ -260,6 +260,7 @@ static void *spapr_create_fdt_skel(const char *cpu_model,
     _FDT((fdt_begin_node(fdt, "")));
     _FDT((fdt_property_string(fdt, "device_type", "chrp")));
     _FDT((fdt_property_string(fdt, "model", "IBM pSeries (emulated by qemu)")));
+    _FDT((fdt_property_string(fdt, "compatible", "qemu,pseries")));
 
     _FDT((fdt_property_cell(fdt, "#address-cells", 0x2)));
     _FDT((fdt_property_cell(fdt, "#size-cells", 0x2)));
Signature · 1 line
1.7.9.5
#18 lore raw

PATCH 18/37 qcow2: make is_allocated return true for zero clusters

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

Otherwise, live migration of the top layer will miss zero clusters and let the backing file show through. This also matches what is done in qed.

QCOW2_CLUSTER_ZERO clusters are invalid in v2 image files. Check this directly in qcow2_get_cluster_offset instead of replicating the test everywhere.

(cherry picked from commit 381b487d54ba18c73df9db8452028a330058c505)
---
 block/qcow2-cluster.c |    3 +++
 block/qcow2.c         |    6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)
block/qcow2-cluster.c +3 -0
index 56fccf9..bb04432 100644
@@ -454,6 +454,9 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset,
         *cluster_offset &= L2E_COMPRESSED_OFFSET_SIZE_MASK;
         break;
     case QCOW2_CLUSTER_ZERO:
+        if (s->qcow_version < 3) {
+            return -EIO;
+        }
         c = count_contiguous_clusters(nb_clusters, s->cluster_size,
                 &l2_table[l2_index], 0,
                 QCOW_OFLAG_COMPRESSED | QCOW_OFLAG_ZERO);
block/qcow2.c +1 -5
index 7610e56..b4c7c54 100644
@@ -584,7 +584,7 @@ static int coroutine_fn qcow2_co_is_allocated(BlockDriverState *bs,
         *pnum = 0;
     }
 
-    return (cluster_offset != 0);
+    return (cluster_offset != 0) || (ret == QCOW2_CLUSTER_ZERO);
 }
 
 /* handle reading after the end of the backing file */
@@ -665,10 +665,6 @@ static coroutine_fn int qcow2_co_readv(BlockDriverState *bs, int64_t sector_num,
             break;
 
         case QCOW2_CLUSTER_ZERO:
-            if (s->qcow_version < 3) {
-                ret = -EIO;
-                goto fail;
-            }
             qemu_iovec_memset(&hd_qiov, 0, 0, 512 * cur_nr_sectors);
             break;
 
Signature · 1 line
1.7.9.5
#19 lore raw

PATCH 19/37 qemu-ga: use key-value store to avoid recycling fd handles after restart

In reply to Michael Roth

Hosts hold on to handles provided by guest-file-open for periods that can span beyond the life of the qemu-ga process that issued them. Since these are issued starting from 0 on every restart, we run the risk of issuing duplicate handles after restarts/reboots.

As a result, users with a stale copy of these handles may end up reading/writing corrupted data due to their existing handles effectively being re-assigned to an unexpected file or offset.

We unfortunately do not issue handles as strings, but as integers, so a solution such as using UUIDs can't be implemented without introducing a new interface.

As a workaround, we fix this by implementing a persistent key-value store that will be used to track the value of the last handle that was issued across restarts/reboots to avoid issuing duplicates.

The store is automatically written to the same directory we currently set via --statedir to track fsfreeze state, and so should be applicable for stable releases where this flag is supported.

A follow-up can use this same store for handling fsfreeze state, but that change is cosmetic and left out for now.

* fixed guest_file_handle_add() return value from uint64_t to int64_t (cherry picked from commit 39097daf15c42243742667607d2cad2c9dc4f764)

---
 qga/commands-posix.c   |   25 +++++--
 qga/guest-agent-core.h |    1 +
 qga/main.c             |  184 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 204 insertions(+), 6 deletions(-)
qga/commands-posix.c +19 -6
index 7a0202e..1c2aff3 100644
@@ -129,14 +129,22 @@ static struct {
     QTAILQ_HEAD(, GuestFileHandle) filehandles;
 } guest_file_state;
 
-static void guest_file_handle_add(FILE *fh)
+static int64_t guest_file_handle_add(FILE *fh, Error **errp)
 {
     GuestFileHandle *gfh;
+    int64_t handle;
+
+    handle = ga_get_fd_handle(ga_state, errp);
+    if (error_is_set(errp)) {
+        return 0;
+    }
 
     gfh = g_malloc0(sizeof(GuestFileHandle));
-    gfh->id = fileno(fh);
+    gfh->id = handle;
     gfh->fh = fh;
     QTAILQ_INSERT_TAIL(&guest_file_state.filehandles, gfh, next);
+
+    return handle;
 }
 
 static GuestFileHandle *guest_file_handle_find(int64_t id, Error **err)
@@ -158,7 +166,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E
 {
     FILE *fh;
     int fd;
-    int64_t ret = -1;
+    int64_t ret = -1, handle;
 
     if (!has_mode) {
         mode = "r";
@@ -184,9 +192,14 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E
         return -1;
     }
 
-    guest_file_handle_add(fh);
-    slog("guest-file-open, handle: %d", fd);
-    return fd;
+    handle = guest_file_handle_add(fh, err);
+    if (error_is_set(err)) {
+        fclose(fh);
+        return -1;
+    }
+
+    slog("guest-file-open, handle: %d", handle);
+    return handle;
 }
 
 void qmp_guest_file_close(int64_t handle, Error **err)
qga/guest-agent-core.h +1 -0
index 3354598..624a559 100644
@@ -35,6 +35,7 @@ bool ga_is_frozen(GAState *s);
 void ga_set_frozen(GAState *s);
 void ga_unset_frozen(GAState *s);
 const char *ga_fsfreeze_hook(GAState *s);
+int64_t ga_get_fd_handle(GAState *s, Error **errp);
 
 #ifndef _WIN32
 void reopen_fd_to_null(int fd);
qga/main.c +184 -0

227 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#20 lore raw

PATCH 20/37 qga/main.c: Don't use g_key_file_get/set_int64

In reply to Michael Roth

From: Peter Crosthwaite <[email protected]>

These functions don't exist until glib version 2.26. QEMU is currently only mandating glib 2.12.

This patch replaces the functions with g_key_file_get/set_integer.

Unbreaks the build on Ubuntu 10.04 and RHEL 5.6.

Regression was introduced by 39097daf15c42243742667607d2cad2c9dc4f764

Message-id: [email protected]

(cherry picked from commit 4f306496183d81aed4b43762cf3bfd6e054de767)
---
 qga/main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qga/main.c +2 -2
index 99346e1..74ef788 100644
@@ -755,7 +755,7 @@ static void persistent_state_from_keyfile(GAPersistentState *pstate,
 
     if (g_key_file_has_key(keyfile, "global", "fd_counter", NULL)) {
         pstate->fd_counter =
-            g_key_file_get_int64(keyfile, "global", "fd_counter", NULL);
+            g_key_file_get_integer(keyfile, "global", "fd_counter", NULL);
     }
 }
 
@@ -765,7 +765,7 @@ static void persistent_state_to_keyfile(const GAPersistentState *pstate,
     g_assert(pstate);
     g_assert(keyfile);
 
-    g_key_file_set_int64(keyfile, "global", "fd_counter", pstate->fd_counter);
+    g_key_file_set_integer(keyfile, "global", "fd_counter", pstate->fd_counter);
 }
 
 static gboolean write_persistent_state(const GAPersistentState *pstate,
Signature · 1 line
1.7.9.5
#21 lore raw

PATCH 21/37 tcg: Fix occasional TCG broken problem when ldst optimization enabled

In reply to Michael Roth

From: Yeongkyoon Lee <[email protected]>

is_tcg_gen_code() checks the upper limit of TCG generated code range wrong, so that TCG could get broken occasionally only when CONFIG_QEMU_LDST_OPTIMIZATION enabled. The reason is code_gen_buffer_max_size does not cover the upper range up to (TCG_MAX_OP_SIZE * OPC_BUF_SIZE), thus code_gen_buffer_max_size should be modified to code_gen_buffer_size.

(cherry picked from commit 52ae646d4a3ebdcdcc973492c6a56f2c49b6578f)

Conflicts:

translate-all.c

*modified to use non-tcg-ctx version of code_gen_* variables

---
 translate-all.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
translate-all.c +2 -2
index d367fc4..bf1db09 100644
@@ -1310,10 +1310,10 @@ static void tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,
 /* check whether the given addr is in TCG generated code buffer or not */
 bool is_tcg_gen_code(uintptr_t tc_ptr)
 {
-    /* This can be called during code generation, code_gen_buffer_max_size
+    /* This can be called during code generation, code_gen_buffer_size
        is used instead of code_gen_ptr for upper boundary checking */
     return (tc_ptr >= (uintptr_t)code_gen_buffer &&
-            tc_ptr < (uintptr_t)(code_gen_buffer + code_gen_buffer_max_size));
+            tc_ptr < (uintptr_t)(code_gen_buffer + code_gen_buffer_size));
 }
 #endif
 
Signature · 1 line
1.7.9.5
#22 lore raw

PATCH 22/37 virtio-ccw: Queue sanity check for notify hypercall.

In reply to Michael Roth

From: Cornelia Huck <[email protected]>

Verify that the virtio-ccw notify hypercall passed a reasonable value for queue.

(cherry picked from commit b57ed9bf075e33cdd2f9eb545ff555301dd57221)
---
 hw/s390x/s390-virtio-ccw.c |    3 +++
 1 file changed, 3 insertions(+)
hw/s390x/s390-virtio-ccw.c +3 -0
index 6549211..f90b5e4 100644
@@ -31,6 +31,9 @@ static int virtio_ccw_hcall_notify(const uint64_t *args)
     if (!sch || !css_subch_visible(sch)) {
         return -EINVAL;
     }
+    if (queue >= VIRTIO_PCI_QUEUE_MAX) {
+        return -EINVAL;
+    }
     virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
     return 0;
 
Signature · 1 line
1.7.9.5
#23 lore raw

PATCH 23/37 qemu-bridge-helper: force usage of a very high MAC address for the bridge

In reply to Michael Roth

From: Paolo Bonzini <[email protected]>

Linux uses the lowest enslaved MAC address as the MAC address of the bridge. Set MAC address to a high value so that it does not affect the MAC address of the bridge.

Changing the MAC address of the bridge could cause a few seconds of network downtime.

Message-id: [email protected]

(cherry picked from commit 226ecabfbd410c7b2041385ea4b6f083a09ce8a2)
---
 qemu-bridge-helper.c |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
qemu-bridge-helper.c +18 -0
index 287bfd5..6a0974e 100644
@@ -367,6 +367,24 @@ int main(int argc, char **argv)
         goto cleanup;
     }
 
+    /* Linux uses the lowest enslaved MAC address as the MAC address of
+     * the bridge.  Set MAC address to a high value so that it doesn't
+     * affect the MAC address of the bridge.
+     */
+    if (ioctl(ctlfd, SIOCGIFHWADDR, &ifr) < 0) {
+        fprintf(stderr, "failed to get MAC address of device `%s': %s\n",
+                iface, strerror(errno));
+        ret = EXIT_FAILURE;
+        goto cleanup;
+    }
+    ifr.ifr_hwaddr.sa_data[0] = 0xFE;
+    if (ioctl(ctlfd, SIOCSIFHWADDR, &ifr) < 0) {
+        fprintf(stderr, "failed to set MAC address of device `%s': %s\n",
+                iface, strerror(errno));
+        ret = EXIT_FAILURE;
+        goto cleanup;
+    }
+
     /* add the interface to the bridge */
     prep_ifreq(&ifr, bridge);
     ifindex = if_nametoindex(iface);
Signature · 1 line
1.7.9.5
#24 lore raw

PATCH 24/37 configure: Require at least spice-protocol-0.12.3

In reply to Michael Roth

From: Michal Privoznik <[email protected]>

As of 5a49d3e9 we assume SPICE_PORT_EVENT_BREAK to be defined. However, it is defined not in 0.12.2 what we require now, but in 0.12.3. Therefore in order to prevent build failure we must adjust our minimal requirements.

(cherry picked from commit 358689fe299c306f1d81bea57a5067d0abb56699)
---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configure +1 -1
index 5fb388a..e7468a9 100755
@@ -2833,7 +2833,7 @@ EOF
   spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)
   spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)
   if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \
-     $pkg_config --atleast-version=0.12.2 spice-protocol > /dev/null 2>&1 && \
+     $pkg_config --atleast-version=0.12.3 spice-protocol > /dev/null 2>&1 && \
      compile_prog "$spice_cflags" "$spice_libs" ; then
     spice="yes"
     libs_softmmu="$libs_softmmu $spice_libs"
Signature · 1 line
1.7.9.5
#25 lore raw

PATCH 25/37 pseries: Add cleanup hook for PAPR virtual LAN device

In reply to Michael Roth

From: David Gibson <[email protected]>

Currently the spapr-vlan device does not supply a cleanup call for its NetClientInfo structure. With current qemu versions, that leads to a SEGV on exit, when net_cleanup() attempts to call the cleanup handlers on all net clients.

(cherry picked from commit 156dfaded87d718a9ea798083e1c3e5ea7526713)
---
 hw/spapr_llan.c |    8 ++++++++
 1 file changed, 8 insertions(+)
hw/spapr_llan.c +8 -0
index 6ef2936..0ace2eb 100644
@@ -175,11 +175,19 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf,
     return size;
 }
 
+static void spapr_vlan_cleanup(NetClientState *nc)
+{
+    VIOsPAPRVLANDevice *dev = qemu_get_nic_opaque(nc);
+
+    dev->nic = NULL;
+}
+
 static NetClientInfo net_spapr_vlan_info = {
     .type = NET_CLIENT_OPTIONS_KIND_NIC,
     .size = sizeof(NICState),
     .can_receive = spapr_vlan_can_receive,
     .receive = spapr_vlan_receive,
+    .cleanup = spapr_vlan_cleanup,
 };
 
 static void spapr_vlan_reset(VIOsPAPRDevice *sdev)
Signature · 1 line
1.7.9.5
#26 lore raw

PATCH 26/37 target-ppc: Fix CPU_POWERPC_MPC8547E

In reply to Michael Roth

From: Andreas Färber <[email protected]>

It was defined to ..._MPC8545E_v21 rather than ..._MPC8547E_v21. Due to both resolving to CPU_POWERPC_e500v2_v21 this did not show.

Fixing this nontheless helps with QOM'ifying CPU aliases.

(cherry picked from commit 0136d715ad985fccb8fed4bb5081d5bd20bfe88c)
---
 target-ppc/translate_init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
target-ppc/translate_init.c +1 -1
index 63e6fdc..a05bb7b 100644
@@ -7282,7 +7282,7 @@ enum {
 #define CPU_POWERPC_MPC8545E_v10     CPU_POWERPC_e500v2_v10
 #define CPU_POWERPC_MPC8545E_v20     CPU_POWERPC_e500v2_v20
 #define CPU_POWERPC_MPC8545E_v21     CPU_POWERPC_e500v2_v21
-#define CPU_POWERPC_MPC8547E         CPU_POWERPC_MPC8545E_v21
+#define CPU_POWERPC_MPC8547E         CPU_POWERPC_MPC8547E_v21
 #define CPU_POWERPC_MPC8547E_v10     CPU_POWERPC_e500v2_v10
 #define CPU_POWERPC_MPC8547E_v20     CPU_POWERPC_e500v2_v20
 #define CPU_POWERPC_MPC8547E_v21     CPU_POWERPC_e500v2_v21
Signature · 1 line
1.7.9.5
#27 lore raw

PATCH 27/37 ide/macio: Fix macio DMA initialisation.

In reply to Michael Roth

From: Mark Cave-Ayland <[email protected]>

Commit 07a7484e5d713f1eb7c1c37b18a8ab0d56d88875 accidentally introduced a bug in the initialisation of the second macio DMA device which could cause some DMA operations to segfault QEMU.

CC Andreas Färber <[email protected]>
(cherry picked from commit 02d583c7232d65920634f7553700eb348f84e472)
---
 hw/macio.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/macio.c +1 -1
index 74bdcd1..0c6a6b8 100644
@@ -188,7 +188,7 @@ static int macio_newworld_initfn(PCIDevice *d)
     sysbus_dev = SYS_BUS_DEVICE(&ns->ide[1]);
     sysbus_connect_irq(sysbus_dev, 0, ns->irqs[3]);
     sysbus_connect_irq(sysbus_dev, 1, ns->irqs[4]);
-    macio_ide_register_dma(&ns->ide[0], s->dbdma, 0x1a);
+    macio_ide_register_dma(&ns->ide[1], s->dbdma, 0x1a);
     ret = qdev_init(DEVICE(&ns->ide[1]));
     if (ret < 0) {
         return ret;
Signature · 1 line
1.7.9.5
#28 lore raw

PATCH 28/37 virtio-blk: fix unplug + virsh reboot

In reply to Michael Roth

From: Christian Borntraeger <[email protected]>

virtio-blk registers a vmstate change handler. Unfortunately this handler is not unregistered on unplug, leading to some random crashes if the system is restarted, e.g. via virsh reboot. Lets unregister the vmstate change handler if the device is removed.

(cherry picked from commit 69b302b2044a9a0f6d157d25b39a91ff7124c61f)
---
 hw/virtio-blk.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio-blk.c +3 -1
index 34913ee..f5e6ee9 100644
@@ -36,6 +36,7 @@ typedef struct VirtIOBlock
     VirtIOBlkConf *blk;
     unsigned short sector_mask;
     DeviceState *qdev;
+    VMChangeStateEntry *change;
 #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
     VirtIOBlockDataPlane *dataplane;
 #endif
@@ -681,7 +682,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk)
     }
 #endif
 
-    qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
+    s->change = qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
     s->qdev = dev;
     register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
                     virtio_blk_save, virtio_blk_load, s);
@@ -702,6 +703,7 @@ void virtio_blk_exit(VirtIODevice *vdev)
     virtio_blk_data_plane_destroy(s->dataplane);
     s->dataplane = NULL;
 #endif
+    qemu_del_vm_change_state_handler(s->change);
     unregister_savevm(s->qdev, "virtio-blk", s);
     blockdev_mark_auto_del(s->bs);
     virtio_cleanup(vdev);
Signature · 1 line
1.7.9.5
#29 lore raw

PATCH 29/37 Fix page_cache leak in cache_resize

In reply to Michael Roth

From: Orit Wasserman <[email protected]>

(cherry picked from commit 0db65d624e0211a43c011579d6607a50d8f06082)
---
 page_cache.c |    1 +
 1 file changed, 1 insertion(+)
page_cache.c +1 -0
index ba5640b..748957b 100644
@@ -208,6 +208,7 @@ int64_t cache_resize(PageCache *cache, int64_t new_num_pages)
         }
     }
 
+    g_free(cache->page_cache);
     cache->page_cache = new_cache->page_cache;
     cache->max_num_items = new_cache->max_num_items;
     cache->num_items = new_cache->num_items;
Signature · 1 line
1.7.9.5
#30 lore raw

PATCH 30/37 page_cache: fix memory leak

In reply to Michael Roth

From: Peter Lieven <[email protected]>

XBZRLE encoded migration introduced a MRU page cache meachnism. Unfortunately, cached items where never freed in case of a collision in the page cache on cache_insert().

This lead to out of memory conditions during XBZRLE migration if the page cache was small and there where a lot of collisions in the cache.

(cherry picked from commit 32a1c08b60a8ac0e63b54a5793a26b5e32b36618)
---
 page_cache.c |    3 +++
 1 file changed, 3 insertions(+)
page_cache.c +3 -0
index 748957b..b92482c 100644
@@ -152,6 +152,9 @@ void cache_insert(PageCache *cache, uint64_t addr, uint8_t *pdata)
     /* actual update of entry */
     it = cache_get_by_addr(cache, addr);
 
+    /* free old cached data if any */
+    g_free(it->it_data);
+
     if (!it->it_data) {
         cache->num_items++;
     }
Signature · 1 line
1.7.9.5
#31 lore raw

PATCH 31/37 qcow2: flush refcount cache correctly in alloc_refcount_block()

In reply to Michael Roth

From: Stefan Hajnoczi <[email protected]>

update_refcount() affects the refcount cache, it does not write to disk. Therefore bdrv_flush(bs->file) does nothing. We need to flush the refcount cache in order to write out the refcount updates!

While we're here also add error returns when qcow2_cache_flush() fails.

(cherry picked from commit 9991923b262dc35f6dd8393ab4853edd7fc3724f)
---
 block/qcow2-refcount.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
block/qcow2-refcount.c +8 -2
index bc1784c..6a7a230 100644
@@ -201,7 +201,10 @@ static int alloc_refcount_block(BlockDriverState *bs,
     *refcount_block = NULL;
 
     /* We write to the refcount table, so we might depend on L2 tables */
-    qcow2_cache_flush(bs, s->l2_table_cache);
+    ret = qcow2_cache_flush(bs, s->l2_table_cache);
+    if (ret < 0) {
+        return ret;
+    }
 
     /* Allocate the refcount block itself and mark it as used */
     int64_t new_block = alloc_clusters_noref(bs, s->cluster_size);
@@ -237,7 +240,10 @@ static int alloc_refcount_block(BlockDriverState *bs,
             goto fail_block;
         }
 
-        bdrv_flush(bs->file);
+        ret = qcow2_cache_flush(bs, s->refcount_block_cache);
+        if (ret < 0) {
+            goto fail_block;
+        }
 
         /* Initialize the new refcount block only after updating its refcount,
          * update_refcount uses the refcount cache itself */
Signature · 1 line
1.7.9.5
#32 lore raw

PATCH 32/37 qcow2: flush refcount cache correctly in qcow2_write_snapshots()

In reply to Michael Roth

From: Stefan Hajnoczi <[email protected]>

Since qcow2 metadata is cached we need to flush the caches, not just the underlying file. Use bdrv_flush(bs) instead of bdrv_flush(bs->file).

Also add the error return path when bdrv_flush() fails and move the flush after checking for qcow2_alloc_clusters() failure so that the qcow2_alloc_clusters() error return value takes precedence.

(cherry picked from commit f6977f15561973d4a67b6aa46da88aa678c505dd)
---
 block/qcow2-snapshot.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
block/qcow2-snapshot.c +4 -1
index eb8fcd5..f4719d9 100644
@@ -180,11 +180,14 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
 
     /* Allocate space for the new snapshot list */
     snapshots_offset = qcow2_alloc_clusters(bs, snapshots_size);
-    bdrv_flush(bs->file);
     offset = snapshots_offset;
     if (offset < 0) {
         return offset;
     }
+    ret = bdrv_flush(bs);
+    if (ret < 0) {
+        return ret;
+    }
 
     /* Write all snapshots to the new list */
     for(i = 0; i < s->nb_snapshots; i++) {
Signature · 1 line
1.7.9.5
#33 lore raw

PATCH 33/37 linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex

In reply to Michael Roth

From: John Rigby <[email protected]>

Upstream libc has recently changed to start using FUTEX_WAIT_BITSET instead of FUTEX_WAIT and this is causing do_futex to return -TARGET_ENOSYS.

Pass bitset in val3 to sys_futex which will be ignored by kernel for the FUTEX_WAIT case.

(cherry picked from commit cce246e0a21577bb2372ab3a7d6789371e087de9)
---
 linux-user/syscall.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
linux-user/syscall.c +2 -1
index 9e31ea7..7bc5ba9 100644
@@ -4920,6 +4920,7 @@ static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
 #endif
     switch (base_op) {
     case FUTEX_WAIT:
+    case FUTEX_WAIT_BITSET:
         if (timeout) {
             pts = &ts;
             target_to_host_timespec(pts, timeout);
@@ -4927,7 +4928,7 @@ static int do_futex(target_ulong uaddr, int op, int val, target_ulong timeout,
             pts = NULL;
         }
         return get_errno(sys_futex(g2h(uaddr), op, tswap32(val),
-                         pts, NULL, 0));
+                         pts, NULL, val3));
     case FUTEX_WAKE:
         return get_errno(sys_futex(g2h(uaddr), op, val, NULL, NULL, 0));
     case FUTEX_FD:
Signature · 1 line
1.7.9.5
#34 lore raw

PATCH 34/37 linux-user: fix futex strace of FUTEX_CLOCK_REALTIME

In reply to Michael Roth

From: John Rigby <[email protected]>

Handle same as existing FUTEX_PRIVATE_FLAG.

(cherry picked from commit bfb669f39f2ecd854992924ced20b00163509043)
---
 linux-user/strace.c |    6 ++++++
 1 file changed, 6 insertions(+)
linux-user/strace.c +6 -0
index 4e91a6e..f8030e0 100644
@@ -1437,6 +1437,12 @@ if( cmd == val ) { \
         cmd &= ~FUTEX_PRIVATE_FLAG;
     }
 #endif
+#ifdef FUTEX_CLOCK_REALTIME
+    if (cmd & FUTEX_CLOCK_REALTIME) {
+        gemu_log("FUTEX_CLOCK_REALTIME|");
+        cmd &= ~FUTEX_CLOCK_REALTIME;
+    }
+#endif
     print_op(FUTEX_WAIT)
     print_op(FUTEX_WAKE)
     print_op(FUTEX_FD)
Signature · 1 line
1.7.9.5
#35 lore raw

PATCH 35/37 linux-user: make bogus negative iovec lengths fail EINVAL

In reply to Michael Roth

From: Peter Maydell <[email protected]>

If the guest passes us a bogus negative length for an iovec, fail EINVAL rather than proceeding blindly forward. This fixes some of the error cases tests for readv and writev in the LTP.

(cherry picked from commit dfae8e00f8ddeedcda24bd28f71d4fd2a9f988b8)
---
 linux-user/syscall.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
linux-user/syscall.c +1 -1
index 7bc5ba9..b682357 100644
@@ -1776,7 +1776,7 @@ static struct iovec *lock_iovec(int type, abi_ulong target_addr,
         errno = 0;
         return NULL;
     }
-    if (count > IOV_MAX) {
+    if (count < 0 || count > IOV_MAX) {
         errno = EINVAL;
         return NULL;
     }
Signature · 1 line
1.7.9.5
#36 lore raw

PATCH 36/37 linux-user/syscall.c: Don't warn about unimplemented get_robust_list

In reply to Michael Roth

From: Peter Maydell <[email protected]>

The nature of the kernel ABI for the get_robust_list and set_robust_list syscalls means we cannot implement them in QEMU. Make get_robust_list silently return ENOSYS rather than using the default "print message and then fail ENOSYS" code path, in the same way we already do for set_robust_list, and add a comment documenting why we do this.

This silences warnings which were being produced for emulating even trivial programs like 'ls' in x86-64-on-x86-64.

(cherry picked from commit e9a970a8316f9f86a6c800a9a90175bd593f862c)
---
 linux-user/syscall.c |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
linux-user/syscall.c +14 -1
index b682357..4e43a58 100644
@@ -8551,7 +8551,20 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
 
 #ifdef TARGET_NR_set_robust_list
     case TARGET_NR_set_robust_list:
-	goto unimplemented_nowarn;
+    case TARGET_NR_get_robust_list:
+        /* The ABI for supporting robust futexes has userspace pass
+         * the kernel a pointer to a linked list which is updated by
+         * userspace after the syscall; the list is walked by the kernel
+         * when the thread exits. Since the linked list in QEMU guest
+         * memory isn't a valid linked list for the host and we have
+         * no way to reliably intercept the thread-death event, we can't
+         * support these. Silently return ENOSYS so that guest userspace
+         * falls back to a non-robust futex implementation (which should
+         * be OK except in the corner case of the guest crashing while
+         * holding a mutex that is shared with another process via
+         * shared memory).
+         */
+        goto unimplemented_nowarn;
 #endif
 
 #if defined(TARGET_NR_utimensat) && defined(__NR_utimensat)
Signature · 1 line
1.7.9.5
#37 lore raw

PATCH 37/37 update seabios to 1.7.2.1

In reply to Michael Roth

From: Gerd Hoffmann <[email protected]>

Alex Williamson (3):
seabios q35: Enable all PIRQn IRQs at startup seabios q35: Add new PCI slot to irq routing function
seabios: Add a dummy PCI slot to irq mapping function

Avik Sil (1):
USB-EHCI: Fix null pointer assignment

Kevin O'Connor (4):

      Update tools/acpi_extract.py to handle iasl 20130117 release.
      Fix Makefile - don't reference "out/" directly, instead use "$(OUT)".
      build: Don't require $(OUT) to be a sub-directory of the main

directory.
Verify CC is valid during build tests.

(cherry picked from commit 5c75fb10029c5fd1e705a6ef5d698fbea06c7a33)
---
 pc-bios/bios.bin |  Bin 131072 -> 131072 bytes
 roms/seabios     |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
pc-bios/bios.bin binary +0 -0
index ab5dd9db6addf9d6a6f67697231ef604bab02fc8..ec9eeb12c62a511f2e45bfc6fe3af90cc6da0d65 100644
GIT binary patch
roms/seabios +1 -1
index 4bd8aeb..88cb66e 160000
@@ -1 +1 @@
-Subproject commit 4bd8aebf3534e10d9aa21e820903f2cf9120708c
+Subproject commit 88cb66ea542906ffff8a80ef397b9e3adbb33116
Signature · 1 line
1.7.9.5
#38 lore raw
In reply to Michael Roth
Quoted 10 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Quoted 7 lines

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Stefan Hajnoczi (2):
qcow2: flush refcount cache correctly in alloc_refcount_block()
qcow2: flush refcount cache correctly in qcow2_write_snapshots()

I think we also want these from Stefan, to avoid existing libvirt from driving migration incorrectly:
https://lists.gnu.org/archive/html/qemu-devel/2013-03/msg04797.html

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#39 lore raw
Quoted 15 lines · Eric Blake
Quoted 14 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Quoted 7 lines
Quoted 3 lines

Stefan Hajnoczi (2):
qcow2: flush refcount cache correctly in alloc_refcount_block()
qcow2: flush refcount cache correctly in qcow2_write_snapshots()

I think we also want these from Stefan, to avoid existing libvirt from driving migration incorrectly:
https://lists.gnu.org/archive/html/qemu-devel/2013-03/msg04797.html

Definitely. There were numerous bugs reported about migration &libvirt, please let Ubuntu huys (Serge Hallyn) verify this patchset and if that's the issue, it should definitely be in 1.4.1. Cc'ing him.

Thanks,

/mjt

#40 lore raw

Hi,

Sorry for jumping in in the middle of this thread, but I just wrote a patch yesterday, and Gerd included it in his usb-pull request for today, which really should go into 1.4.1 too.

I'm talking about this patch:
http://www.kraxel.org/cgit/qemu/commit/?h=usb.79&id=aa1c9e971e80d25b92908dce3dec7c38b49480ea

Which fixes a bug where the usb-tablet is completely non-functional with some guests, which has been reported twice already:
http://lists.gnu.org/archive/html/qemu-devel/2013-02/msg03345.html
http://bugzilla.redhat.com/show_bug.cgi?id=929068

Regards,

Hans

#41 lore raw

Hi Hans

Definitely. This was a huge problem for us with the 1.4 series so far.

Thanks a lot for fixing it!

Am Mittwoch, den 03.04.2013, 14:13 +0200 schrieb Hans de Goede:

Quoted 18 lines

Hi,

Sorry for jumping in in the middle of this thread, but I just wrote a patch yesterday, and Gerd included it in his usb-pull request for today, which really should go into 1.4.1 too.

I'm talking about this patch:
http://www.kraxel.org/cgit/qemu/commit/?h=usb.79&id=aa1c9e971e80d25b92908dce3dec7c38b49480ea

Which fixes a bug where the usb-tablet is completely non-functional with some guests, which has been reported twice already:
http://lists.gnu.org/archive/html/qemu-devel/2013-02/msg03345.html
http://bugzilla.redhat.com/show_bug.cgi?id=929068

Regards,

Hans

Signature · 6 lines
stepping stone GmbH
Neufeldstrasse 9
CH-3012 Bern
Telefon: +41 31 332 53 63
www.stepping-stone.ch
[email protected]
#42 lore raw
In reply to Hans de Goede
Quoted 9 lines · Hans de Goede

Hi,

Sorry for jumping in in the middle of this thread, but I just wrote a patch yesterday, and Gerd included it in his usb-pull request for today, which really should go into 1.4.1 too.

I'm talking about this patch:
http://www.kraxel.org/cgit/qemu/commit/?h=usb.79&id=aa1c9e971e80d25b92908dce3dec7c38b49480ea

Quoted 6 lines

Which fixes a bug where the usb-tablet is completely non-functional with some guests, which has been reported twice already:
http://lists.gnu.org/archive/html/qemu-devel/2013-02/msg03345.html
http://bugzilla.redhat.com/show_bug.cgi?id=929068

Regards,

I've been testing git://github.com/mdroth/qemu #stable-1.4-staging (which appears to include that patch), and so far all looks good.

thanks,
-serge

#43 lore raw
In reply to Michael Roth
Quoted 4 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 8 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

For the MIPS emulation, you might want to also include:

9c19eb1e205b29018f6f61c5f43db6abbe7dc0e5 target-mips: fix for incorrect multiplication with MULQ_S.PH a345481baa2b2fb3d54f8c9ddb58dfcaf75786df target-mips: fix for sign-issue in MULQ_W helper 20c334a797bf46a4ee59a6e42be6d5e7c3cda585 target-mips: fix DSP overflow macro and affected routines 26135ead80fa1fd13e95c162dacfd06f2ba82981 target-mips: Fix accumulator selection for MIPS16 and microMIPS 8b758d0568a986d58c254b3c209691c82e0f82a1 target-mips: fix rndrashift_short_acc and code for EXTR_ instructions

They are five fixing instruction emulation.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net
author
#44 lore raw
Quoted 14 lines · Aurelien Jarno
Quoted 4 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 8 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Quoted 6 lines

For the MIPS emulation, you might want to also include:

9c19eb1e205b29018f6f61c5f43db6abbe7dc0e5 target-mips: fix for incorrect multiplication with MULQ_S.PH a345481baa2b2fb3d54f8c9ddb58dfcaf75786df target-mips: fix for sign-issue in MULQ_W helper 20c334a797bf46a4ee59a6e42be6d5e7c3cda585 target-mips: fix DSP overflow macro and affected routines 26135ead80fa1fd13e95c162dacfd06f2ba82981 target-mips: Fix accumulator selection for MIPS16 and microMIPS

This guy ^ has some nasty conflicts I don't trust myself with. Can you send a version that's backported to v1.4.0 via git cherry-pick -x?

Quoted 8 lines

8b758d0568a986d58c254b3c209691c82e0f82a1 target-mips: fix rndrashift_short_acc and code for EXTR_ instructions

They are five fixing instruction emulation.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net
#45 lore raw
Quoted 17 lines · mdroth
Quoted 16 lines · Aurelien Jarno
Quoted 4 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 8 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

For the MIPS emulation, you might want to also include:

Quoted 8 lines
Quoted 4 lines

9c19eb1e205b29018f6f61c5f43db6abbe7dc0e5 target-mips: fix for incorrect multiplication with MULQ_S.PH a345481baa2b2fb3d54f8c9ddb58dfcaf75786df target-mips: fix for sign-issue in MULQ_W helper 20c334a797bf46a4ee59a6e42be6d5e7c3cda585 target-mips: fix DSP overflow macro and affected routines 26135ead80fa1fd13e95c162dacfd06f2ba82981 target-mips: Fix accumulator selection for MIPS16 and microMIPS

This guy ^ has some nasty conflicts I don't trust myself with. Can you send a version that's backported to v1.4.0 via git cherry-pick -x?

Please find it attached, sorry for the delay.

Signature · 2 lines
Aurelien Jarno                          GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net
Quoted 1 line

From 30947b811973648636c8676f730f18a76bd9749a Mon Sep 17 00:00:00 2001

From: Richard Sandiford <[email protected]>
Date: Mon, 21 Jan 2013 20:43:31 +0000
Subject: [PATCH] target-mips: Fix accumulator selection for MIPS16 and
microMIPS

Add accumulator arguments to gen_HILO and gen_muldiv, rather than extracting the accumulator directly from ctx->opcode. The extraction was only right for the standard encoding: MIPS16 doesn't have access to the DSP registers, while microMIPS encodes the accumulator register in a different field (bits 14 and 15).

Passing the accumulator register is probably an over-generalisation for division and 64-bit multiplication, which never access anything other than HI and LO, and which always pass 0 as the new argument. Separating them felt a bit fussy though.

(cherry picked from commit 26135ead80fa1fd13e95c162dacfd06f2ba82981)

Conflicts:
target-mips/translate.c

---
 target-mips/helper.h    |    4 +-
 target-mips/op_helper.c |   10 ++--
 target-mips/translate.c |  148 ++++++++++++++++++++---------------------------
 3 files changed, 72 insertions(+), 90 deletions(-)
target-mips/helper.h +2 -2
index cd48738..cfe98f1 100644
@@ -24,8 +24,8 @@ DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, tl, tl)
 #ifdef TARGET_MIPS64
 DEF_HELPER_FLAGS_1(dclo, TCG_CALL_NO_RWG_SE, tl, tl)
 DEF_HELPER_FLAGS_1(dclz, TCG_CALL_NO_RWG_SE, tl, tl)
-DEF_HELPER_3(dmult, void, env, tl, tl)
-DEF_HELPER_3(dmultu, void, env, tl, tl)
+DEF_HELPER_4(dmult, void, env, int, tl, tl)
+DEF_HELPER_4(dmultu, void, env, int, tl, tl)
 #endif
 
 DEF_HELPER_3(muls, tl, env, tl, tl)
target-mips/op_helper.c +6 -4
index 526f84f..c054300 100644
@@ -268,14 +268,16 @@ target_ulong helper_mulshiu(CPUMIPSState *env, target_ulong arg1,
 }
 
 #ifdef TARGET_MIPS64
-void helper_dmult(CPUMIPSState *env, target_ulong arg1, target_ulong arg2)
+void helper_dmult(CPUMIPSState *env, int acc, target_ulong arg1,
+                  target_ulong arg2)
 {
-    muls64(&(env->active_tc.LO[0]), &(env->active_tc.HI[0]), arg1, arg2);
+    muls64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2);
 }
 
-void helper_dmultu(CPUMIPSState *env, target_ulong arg1, target_ulong arg2)
+void helper_dmultu(CPUMIPSState *env, int acc, target_ulong arg1,
+                   target_ulong arg2)
 {
-    mulu64(&(env->active_tc.LO[0]), &(env->active_tc.HI[0]), arg1, arg2);
+    mulu64(&(env->active_tc.LO[acc]), &(env->active_tc.HI[acc]), arg1, arg2);
 }
 #endif
 
target-mips/translate.c +64 -84

357 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#46 lore raw
In reply to Michael Roth
Quoted 5 lines
Quoted 1 line
Quoted 1 line · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 9 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Please include the following:

560e63965232e37d1916a447125cf91c18a96930 acpi: initialize s4_val used in s4 shutdown

Thanks,

Bruce

#47 lore raw
In reply to Michael Roth
Quoted 6 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

Quoted 9 lines

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Testing/feedback is greatly appreciated.

Hi Michael,

There's also:

commit c70a01e449536c616c85ab820c6fbad7d7e9cf39

Author: Markus Armbruster <[email protected]>
Date:   Wed Feb 13 19:49:40 2013 +0100

doc: Fix texinfo @table markup in qemu-options.hx

This fixes doc generation with texinfo 5. Well, I haven't actually confirmed that this patch fixes things, but we are carrying a similar patch in Fedora that didn't land upstream:

https://lists.gnu.org/archive/html/qemu-devel/2013-02/msg03460.html

We're also carrying:

commit c099e7aa0295678859d58e9e60b7619f6ae3bac8

Author: Gerd Hoffmann <[email protected]>
Date:   Thu Feb 28 11:08:50 2013 +0100

qxl: better vga init in enter_vga_mode

This patch 'fixed' a VNC + QXL crasher on our F18 qemu-kvm 1.2.2 package, more info here:

https://bugzilla.redhat.com/show_bug.cgi?id=919777

The issue didn't reproduce on 1.4, but since the patch applied cleanly I pushed it there as well. Maybe Gerd has thoughts on whether it's appropriate for 1.4 stable.

Thanks,
Cole

#48 lore raw
In reply to Michael Roth
Quoted 6 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

Quoted 8 lines

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Testing/feedback is greatly appreciated.

Please include

5c91668 Revert "block: complete all IOs before .bdrv_truncate" 92b7a08 block: complete all IOs before resizing a device 142c6b1 vl.c: call bdrv_init_with_whitelist() before cmdline parsing

Peter

author
#49 lore raw
Quoted 14 lines · Peter Lieven
Quoted 13 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Quoted 6 lines
Quoted 1 line

Testing/feedback is greatly appreciated.

Please include

5c91668 Revert "block: complete all IOs before .bdrv_truncate" 92b7a08 block: complete all IOs before resizing a device 142c6b1 vl.c: call bdrv_init_with_whitelist() before cmdline parsing

This one ^ causes a segfault on top of 1.4.0:

mdroth@loki:~/w/qemu-build-stable$ gdb --args x86_64-softmmu/qemu-system-x86_64 
GNU gdb (Ubuntu/Linaro 7.4-2012.04-0ubuntu2.1) 7.4-2012.04
Copyright (C) 2012 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-linux-gnu".
For bug reporting instructions, please see:
<http://bugs.launchpad.net/gdb-linaro/>...
Reading symbols from /home/mdroth/dev/kvm/qemu-build-stable/x86_64-softmmu/qemu-system-x86_64...done.
(gdb) run
Starting program: /home/mdroth/dev/kvm/qemu-build-stable/x86_64-softmmu/qemu-system-x86_64 
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".

Program received signal SIGSEGV, Segmentation fault.
aio_set_fd_handler (ctx=0x0, fd=8, io_read=0x55555570a2d0 <event_notifier_ready>, io_write=0,

    io_flush=0x55555570a1d0 <thread_pool_active>, opaque=0x55555600b9e0)
    at /home/mdroth/w/qemu-stable.git/aio-posix.c:269
269 }
(gdb) bt
#0  aio_set_fd_handler (ctx=0x0, fd=8, io_read=0x55555570a2d0 <event_notifier_ready>, io_write=0, 
    io_flush=0x55555570a1d0 <thread_pool_active>, opaque=0x55555600b9e0)
    at /home/mdroth/w/qemu-stable.git/aio-posix.c:269

#1 0x000055555570a27d in thread_pool_init () at /home/mdroth/w/qemu-stable.git/thread-pool.c:282 #2 0x000055555583529a in module_call_init (type=<optimized out>)
at /home/mdroth/w/qemu-stable.git/util/module.c:79
#3 0x00005555555c6ad1 in main (argc=1, argv=0x7fffffffe3c8, envp=<optimized out>)

    at /home/mdroth/w/qemu-stable.git/vl.c:2890

(gdb)

Quoted 1 line

From what I can tell initialization to before qemu_init_main_loop() causes

thread-pools block_init() function to get called before qemu_aio_context is set. This isn't an issue upstream due to the following patch:

f7311ccc630d925e7351e9440b7ad8bc6f0a51de

Which I think is out of scope for stable. Not sure what the right approach is here.

Quoted 3 lines

Peter

#50 lore raw
In reply to Michael Roth

Il 02/04/2013 23:45, Michael Roth ha scritto:

Quoted 4 lines

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 8 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

Please include
http://permalink.gmane.org/gmane.comp.emulators.qemu/202715 (compiler:
fix warning with GCC 4.8.0). Forgot to CC qemu-stable, sorry.

Paolo

author
#51 lore raw
In reply to Michael Roth
Quoted 4 lines · Michael Roth

Hi everyone,

The following new patches are queued for QEMU stable v1.4.1:

Quoted 8 lines

https://github.com/mdroth/qemu/commits/stable-1.4-staging

The release is planned for 04-15-2013:

http://wiki.qemu.org/Planning/1.4

Please CC [email protected] on any patches you think should be included in the release. The cut-off date is 04-09-2013 for new patches.

The 1.4 staging tree should now include all patches suggested so far, except for the 2 where I noted otherwise:

https://github.com/mdroth/qemu/commits/stable-1.4-staging

Quoted 126 lines

Testing/feedback is greatly appreciated.

Thanks!

Andreas Färber (2):
target-ppc: Fix "G2leGP3" PVR
target-ppc: Fix CPU_POWERPC_MPC8547E

Christian Borntraeger (2):
Allow virtio-net features for legacy s390 virtio bus
virtio-blk: fix unplug + virsh reboot

Cole Robinson (1):
rtc-test: Fix test failures with recent glib

Cornelia Huck (1):
virtio-ccw: Queue sanity check for notify hypercall.

David Gibson (2):
pseries: Add compatible property to root of device tree
pseries: Add cleanup hook for PAPR virtual LAN device

Gerd Hoffmann (2):
vga: fix byteswapping.
update seabios to 1.7.2.1

Igor Mitsyanko (1):
qemu-char.c: fix waiting for telnet connection message

Jason Wang (3):
tap: forbid creating multiqueue tap when hub is used
net: reduce the unnecessary memory allocation of multiqueue
help: add docs for multiqueue tap options

John Rigby (2):
linux-user/syscall.c: handle FUTEX_WAIT_BITSET in do_futex
linux-user: fix futex strace of FUTEX_CLOCK_REALTIME

Mark Cave-Ayland (1):
ide/macio: Fix macio DMA initialisation.

Markus Armbruster (1):
qmp: netdev_add is like -netdev, not -net, fix documentation

Michael Roth (2):
qemu-ga: make guest-sync-delimited available during fsfreeze
qemu-ga: use key-value store to avoid recycling fd handles after restart

Michal Privoznik (1):
configure: Require at least spice-protocol-0.12.3

Orit Wasserman (1):
Fix page_cache leak in cache_resize

Paolo Bonzini (7):
coroutine: trim down nesting level in perf_nesting test
scsi-disk: handle io_canceled uniformly and correctly
iscsi: look for pkg-config file too
scsi: do not call scsi_read_data/scsi_write_data for a canceled request
scsi-disk: do not complete canceled UNMAP requests
qcow2: make is_allocated return true for zero clusters
qemu-bridge-helper: force usage of a very high MAC address for the bridge

Peter Crosthwaite (1):
qga/main.c: Don't use g_key_file_get/set_int64

Peter Lieven (2):
block: complete all IOs before .bdrv_truncate
page_cache: fix memory leak

Peter Maydell (2):
linux-user: make bogus negative iovec lengths fail EINVAL linux-user/syscall.c: Don't warn about unimplemented get_robust_list

Stefan Hajnoczi (2):
qcow2: flush refcount cache correctly in alloc_refcount_block()
qcow2: flush refcount cache correctly in qcow2_write_snapshots()

Yeongkyoon Lee (1):
tcg: Fix occasional TCG broken problem when ldst optimization enabled

 block.c                     |    4 +
 block/qcow2-cluster.c       |    3 +
 block/qcow2-refcount.c      |   10 ++-
 block/qcow2-snapshot.c      |    5 +-
 block/qcow2.c               |    6 +-
 configure                   |   10 ++-
 hw/macio.c                  |    2 +-
 hw/qxl-render.c             |    3 +-
 hw/s390x/s390-virtio-bus.c  |    1 +
 hw/s390x/s390-virtio-ccw.c  |    3 +
 hw/scsi-bus.c               |    4 +
 hw/scsi-disk.c              |   36 +++++++--
 hw/spapr.c                  |    1 +
 hw/spapr_llan.c             |    8 ++
 hw/vga.c                    |   18 ++---
 hw/virtio-blk.c             |    4 +-
 hw/virtio-net.c             |    6 +-
 hw/vmware_vga.c             |    2 +-
 hw/xenfb.c                  |    3 +-
 include/net/net.h           |    2 +-
 include/ui/console.h        |    3 +-
 linux-user/strace.c         |    6 ++
 linux-user/syscall.c        |   20 ++++-
 net/net.c                   |   19 +++--
 net/tap.c                   |    7 ++
 page_cache.c                |    4 +
 pc-bios/bios.bin            |  Bin 131072 -> 131072 bytes
 qapi-schema.json            |    6 ++
 qemu-bridge-helper.c        |   18 +++++
 qemu-char.c                 |    2 +-
 qemu-options.hx             |    4 +-
 qga/commands-posix.c        |   25 ++++--
 qga/guest-agent-core.h      |    1 +
 qga/main.c                  |  185 +++++++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx             |    2 +-
 roms/seabios                |    2 +-
 target-ppc/translate_init.c |    4 +-
 tests/rtc-test.c            |    4 +-
 tests/test-coroutine.c      |    2 +-
 trace-events                |    1 +
 translate-all.c             |    4 +-
 ui/console.c                |    9 ++-
 42 files changed, 390 insertions(+), 69 deletions(-)