Commit 10b11400 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier/tags/q800-for-5.0-pull-request' into staging 



Fix Coverity CID 1412799 (Error handling issues)

# gpg: Signature made Thu 12 Mar 2020 15:15:01 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/q800-for-5.0-pull-request:
  q800: fix coverity warning CID 1412799

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 67d9ef7d 80aab795

hw/misc/mac_via.c

+5 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/qdev-properties.h"

#include "sysemu/block-backend.h"

#include "trace.h"

#include "qemu/log.h"



/*

 * VIAs: There are two in every machine,
@@ -381,8 +382,10 @@ static void via2_irq_request(void *opaque, int irq, int level) 
static void pram_update(MacVIAState *m)

{

    if (m->blk) {

        blk_pwrite(m->blk, 0, m->mos6522_via1.PRAM,

                   sizeof(m->mos6522_via1.PRAM), 0);

        if (blk_pwrite(m->blk, 0, m->mos6522_via1.PRAM,

                       sizeof(m->mos6522_via1.PRAM), 0) < 0) {

            qemu_log("pram_update: cannot write to file\n");

        }

    }

}